]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Sat, 1 Jun 2013 20:01:59 +0000 (06:01 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Sat, 1 Jun 2013 19:47:42 +0000 (15:47 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'
Jan Behrens [Sat, 1 Jun 2013 17:22:32 +0000 (19:22 +0200)]
fix db-key bug in PlayerStats_TeamScore()
Samual Lenks [Sat, 1 Jun 2013 05:07:04 +0000 (01:07 -0400)]
Merge remote-tracking branch 'origin/samual/fix_deathfade'
Samual Lenks [Sat, 1 Jun 2013 04:16:43 +0000 (00:16 -0400)]
Last thing to clean up, I swear
Samual Lenks [Sat, 1 Jun 2013 04:13:30 +0000 (00:13 -0400)]
Even more cleanup :D
Samual Lenks [Sat, 1 Jun 2013 04:10:37 +0000 (00:10 -0400)]
More cleanup
Samual Lenks [Sat, 1 Jun 2013 04:08:37 +0000 (00:08 -0400)]
A bit of clean up, plus make it ACTUALLY work properly
Samual Lenks [Sat, 1 Jun 2013 03:32:37 +0000 (23:32 -0400)]
Try and unify the color selection code for csqcmodels
Samual Lenks [Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)]
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade
Samual Lenks [Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'
Samual Lenks [Fri, 31 May 2013 22:26:31 +0000 (18:26 -0400)]
Bump spec version for playerstats
Samual Lenks [Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)]
Merge remote-tracking branch 'origin/master' into zykure/teamscores
Mario [Fri, 31 May 2013 19:43:21 +0000 (05:43 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Fri, 31 May 2013 17:25:47 +0000 (13:25 -0400)]
fix something
Samual Lenks [Fri, 31 May 2013 17:14:42 +0000 (13:14 -0400)]
Fix some !STRING usage
Samual Lenks [Fri, 31 May 2013 16:45:19 +0000 (12:45 -0400)]
Until we get actually nice loading screens, revert back to only one
Samual Lenks [Fri, 31 May 2013 16:35:49 +0000 (12:35 -0400)]
Out portal is blue, not red
Samual Lenks [Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)]
Merge remote-tracking branch 'origin/samual/update_effects_tab'
Samual Lenks [Fri, 31 May 2013 15:52:22 +0000 (11:52 -0400)]
Move that into effects configs
Samual Lenks [Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
Samual Lenks [Fri, 31 May 2013 15:29:12 +0000 (11:29 -0400)]
Merge remote-tracking branch 'origin/samual/updatecommands'
Samual Lenks [Fri, 31 May 2013 15:28:20 +0000 (11:28 -0400)]
Add the proper aliases for the commands
Samual Lenks [Fri, 31 May 2013 15:23:18 +0000 (11:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands
Samual Lenks [Fri, 31 May 2013 15:17:28 +0000 (11:17 -0400)]
Bump Xonotic version to 0.7.0
Mario [Fri, 31 May 2013 04:11:22 +0000 (14:11 +1000)]
Show available parameters if mobedit argument is invalid
Samual Lenks [Fri, 31 May 2013 01:55:59 +0000 (21:55 -0400)]
Use the proper indication for swedish .po file
Samual Lenks [Fri, 31 May 2013 01:48:28 +0000 (21:48 -0400)]
Also spacing
Samual Lenks [Fri, 31 May 2013 01:46:51 +0000 (21:46 -0400)]
Long line to shorter line
Samual Lenks [Thu, 30 May 2013 21:04:41 +0000 (17:04 -0400)]
That should be UTF-8 in thar.
Mario [Thu, 30 May 2013 19:04:16 +0000 (05:04 +1000)]
Fusion Reactor now heals monsters instead of turrets, idea by hutty
Mario [Thu, 30 May 2013 18:53:12 +0000 (04:53 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Thu, 30 May 2013 17:56:40 +0000 (13:56 -0400)]
Whoops, forgot to update those gentle strings with new args. fixes #1597
Samual Lenks [Thu, 30 May 2013 17:15:42 +0000 (13:15 -0400)]
./check-translations.sh pot
Samual Lenks [Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)]
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
Samual Lenks [Tue, 28 May 2013 20:20:12 +0000 (16:20 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'
Mario [Tue, 28 May 2013 13:51:19 +0000 (23:51 +1000)]
Fix players not taking damage from anything
Mario [Sun, 26 May 2013 18:02:49 +0000 (04:02 +1000)]
Add waypoint support for multiple targets
Mario [Sun, 26 May 2013 15:34:25 +0000 (01:34 +1000)]
Add frozen vehicle fix to main vehicle code
Mario [Sun, 26 May 2013 15:32:54 +0000 (01:32 +1000)]
Fix compile error
Mario [Sun, 26 May 2013 15:29:26 +0000 (01:29 +1000)]
Merge branch 'master' into Mario/monsters
terencehill [Sun, 26 May 2013 10:32:26 +0000 (12:32 +0200)]
If the menu gets closed do not update mouse position: it prevents mouse jumping to '0 0 0' when menu is fading out
terencehill [Fri, 24 May 2013 17:04:05 +0000 (19:04 +0200)]
Prevent a crash (infinite loop) calling the command vote help help
terencehill [Fri, 24 May 2013 16:17:57 +0000 (18:17 +0200)]
Fix trace command
Samual Lenks [Wed, 22 May 2013 04:56:25 +0000 (00:56 -0400)]
Working on some updates to effects tab (better grouping, added spawnpoint
options)
Samual Lenks [Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
Conflicts:
tooltips.db
Samual Lenks [Tue, 21 May 2013 20:59:05 +0000 (16:59 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_fixes'
Samual Lenks [Sun, 19 May 2013 03:03:44 +0000 (23:03 -0400)]
Fix crash in CTF caused by improper player check #1574
Mario [Sat, 18 May 2013 09:37:59 +0000 (19:37 +1000)]
Add a basic ready system
Mario [Sat, 18 May 2013 09:10:07 +0000 (19:10 +1000)]
Decrease default turret power
Mario [Sat, 18 May 2013 07:44:04 +0000 (17:44 +1000)]
Fix generators not updating team colors on first load
Mario [Sat, 18 May 2013 07:21:24 +0000 (17:21 +1000)]
Enable fraglimit & fix players blocking monster paths
Mario [Sat, 18 May 2013 06:39:52 +0000 (16:39 +1000)]
Fix generator colors resetting each round
Mario [Fri, 17 May 2013 15:18:20 +0000 (01:18 +1000)]
Don't reset generator health at round start
Mario [Fri, 17 May 2013 15:01:47 +0000 (01:01 +1000)]
Fix generator team colors
Mario [Fri, 17 May 2013 14:40:17 +0000 (00:40 +1000)]
Begin converting tower defense to a teamplay mode
Mario [Fri, 17 May 2013 01:28:32 +0000 (11:28 +1000)]
Move VehicleTouch to the correct function
Mario [Fri, 17 May 2013 01:26:44 +0000 (11:26 +1000)]
Fixes for some vehicle related issues
Mario [Thu, 16 May 2013 11:08:23 +0000 (21:08 +1000)]
Remove ice if monster was frozen
Mario [Thu, 16 May 2013 10:02:59 +0000 (20:02 +1000)]
Don't allow frozen players to enter vehicles
Jan Behrens [Wed, 15 May 2013 22:31:04 +0000 (00:31 +0200)]
Add new 'Q' field to format spec comment
Mario [Wed, 15 May 2013 04:35:22 +0000 (14:35 +1000)]
Use a fancy lightning effect
Mario [Wed, 15 May 2013 04:26:52 +0000 (14:26 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Wed, 15 May 2013 01:50:39 +0000 (21:50 -0400)]
On second thought, disable crosshair_hittest_showimpact, it's too glitchy
Samual Lenks [Wed, 15 May 2013 01:47:09 +0000 (21:47 -0400)]
"teamplay" is not set yet, just check the serverflag directly
Samual Lenks [Wed, 15 May 2013 01:14:29 +0000 (21:14 -0400)]
Enable crosshair_hittest_showimpact 1 by default
Samual Lenks [Wed, 15 May 2013 01:00:19 +0000 (21:00 -0400)]
Fix ItemTouch mutator hook usage (fixes #1572)
Samual Lenks [Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)]
Merge remote-tracking branch 'origin/samual/individual_switchdelay'
Samual Lenks [Tue, 14 May 2013 22:20:51 +0000 (18:20 -0400)]
Cleanup
Samual Lenks [Tue, 14 May 2013 22:13:29 +0000 (18:13 -0400)]
Also add "new toys" cvars
Samual Lenks [Tue, 14 May 2013 20:43:55 +0000 (16:43 -0400)]
Working on crosshair ring fading...
Samual Lenks [Tue, 14 May 2013 18:56:26 +0000 (14:56 -0400)]
Fix weirdness with weapon_nextthink frame time on switching
Samual Lenks [Tue, 14 May 2013 18:14:55 +0000 (14:14 -0400)]
Fix/update configs
Samual Lenks [Tue, 14 May 2013 17:59:18 +0000 (13:59 -0400)]
Merge remote-tracking branch 'origin/master' into samual/individual_switchdelay
Samual Lenks [Tue, 14 May 2013 17:52:48 +0000 (13:52 -0400)]
Various fixes for spawnpoint effects
Samual Lenks [Tue, 14 May 2013 08:50:46 +0000 (04:50 -0400)]
Increase Nex raise/drop/animtime, decrease laser raise/drop time
Samual Lenks [Tue, 14 May 2013 08:14:10 +0000 (04:14 -0400)]
Clone settings to XPM balance
Samual Lenks [Tue, 14 May 2013 08:10:09 +0000 (04:10 -0400)]
Add the cvars to the primary balance config
Samual Lenks [Tue, 14 May 2013 07:57:13 +0000 (03:57 -0400)]
Strip out old g_balance_weaponswitchdelay cvar usage
Samual Lenks [Tue, 14 May 2013 07:31:14 +0000 (03:31 -0400)]
Yay code part basically works now
Samual Lenks [Tue, 14 May 2013 07:13:53 +0000 (03:13 -0400)]
Save what i've got now for later if necessary
Samual Lenks [Tue, 14 May 2013 06:48:02 +0000 (02:48 -0400)]
Work on adding separate switch delays for each weapon anim, plus clean up
register weapon a bit
Samual Lenks [Tue, 14 May 2013 03:15:40 +0000 (23:15 -0400)]
Some more cleanup
Mario [Tue, 14 May 2013 02:57:27 +0000 (12:57 +1000)]
Allow revive progress to be used while not frozen
Mario [Tue, 14 May 2013 02:53:01 +0000 (12:53 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Tue, 14 May 2013 02:27:22 +0000 (22:27 -0400)]
Merge remote-tracking branch 'origin/samual/respawn_improvements'
Samual Lenks [Tue, 14 May 2013 02:22:37 +0000 (22:22 -0400)]
Cleanup
Samual Lenks [Tue, 14 May 2013 02:20:41 +0000 (22:20 -0400)]
Update the server side cvar, fix something
Samual Lenks [Tue, 14 May 2013 02:05:49 +0000 (22:05 -0400)]
Add the new effects and cvars for spawning
Samual Lenks [Mon, 13 May 2013 23:19:02 +0000 (19:19 -0400)]
Create spawn event entity handler, more work on spawning effects
Samual Lenks [Mon, 13 May 2013 21:29:52 +0000 (17:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
Conflicts:
qcsrc/server/cl_client.qc
Samual Lenks [Mon, 13 May 2013 21:20:59 +0000 (17:20 -0400)]
Raise default brightness of crosshair rainbow stuffz
Mario [Mon, 13 May 2013 07:37:23 +0000 (17:37 +1000)]
Fix scoreboard not showing correct wave count
Mario [Mon, 13 May 2013 07:17:54 +0000 (17:17 +1000)]
Fix slime touch explode not calling MonsterDies mutator hook
Samual Lenks [Mon, 13 May 2013 03:23:11 +0000 (23:23 -0400)]
Merge remote-tracking branch 'origin/terencehill/sv_maxidle_fix'
terencehill [Sun, 12 May 2013 16:49:06 +0000 (18:49 +0200)]
Fix sv_maxidle not kicking dead players and kicking spectators even if sv_maxidle_spectatorsareidle is 0
terencehill [Sun, 12 May 2013 16:18:01 +0000 (18:18 +0200)]
Stop sv_maxidle countdown messages
Samual Lenks [Sun, 12 May 2013 00:49:55 +0000 (20:49 -0400)]
Merge remote-tracking branch 'origin/Mario/rainbow_crosshair'
Samual Lenks [Sun, 12 May 2013 00:49:05 +0000 (20:49 -0400)]
Update how crosshair color selection is handled, create a switch for it
Mario [Sun, 12 May 2013 00:04:22 +0000 (10:04 +1000)]
Fix monster spawnshield cvar
projects / xonotic / xonotic-data.pk3dir.git / log