]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoMerge remote-tracking branch 'origin/master' into samual/fix_deathfade
Samual Lenks [Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)]
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade

11 years agoMerge remote-tracking branch 'origin/zykure/teamscores'
Samual Lenks [Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'

11 years agoBump spec version for playerstats
Samual Lenks [Fri, 31 May 2013 22:26:31 +0000 (18:26 -0400)]
Bump spec version for playerstats

11 years agoMerge remote-tracking branch 'origin/master' into zykure/teamscores
Samual Lenks [Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)]
Merge remote-tracking branch 'origin/master' into zykure/teamscores

11 years agofix something
Samual Lenks [Fri, 31 May 2013 17:25:47 +0000 (13:25 -0400)]
fix something

11 years agoFix some !STRING usage
Samual Lenks [Fri, 31 May 2013 17:14:42 +0000 (13:14 -0400)]
Fix some !STRING usage

11 years agoUntil we get actually nice loading screens, revert back to only one
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

11 years agoOut portal is blue, not red
Samual Lenks [Fri, 31 May 2013 16:35:49 +0000 (12:35 -0400)]
Out portal is blue, not red

11 years agoMerge remote-tracking branch 'origin/samual/update_effects_tab'
Samual Lenks [Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)]
Merge remote-tracking branch 'origin/samual/update_effects_tab'

11 years agoMove that into effects configs
Samual Lenks [Fri, 31 May 2013 15:52:22 +0000 (11:52 -0400)]
Move that into effects configs

11 years agoMerge remote-tracking branch 'origin/master' into samual/update_effects_tab
Samual Lenks [Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

11 years agoMerge remote-tracking branch 'origin/samual/updatecommands'
Samual Lenks [Fri, 31 May 2013 15:29:12 +0000 (11:29 -0400)]
Merge remote-tracking branch 'origin/samual/updatecommands'

11 years agoAdd the proper aliases for the commands
Samual Lenks [Fri, 31 May 2013 15:28:20 +0000 (11:28 -0400)]
Add the proper aliases for the commands

11 years agoMerge remote-tracking branch 'origin/master' into samual/updatecommands
Samual Lenks [Fri, 31 May 2013 15:23:18 +0000 (11:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands

11 years agoBump Xonotic version to 0.7.0
Samual Lenks [Fri, 31 May 2013 15:17:28 +0000 (11:17 -0400)]
Bump Xonotic version to 0.7.0

11 years agoUse the proper indication for swedish .po file
Samual Lenks [Fri, 31 May 2013 01:55:59 +0000 (21:55 -0400)]
Use the proper indication for swedish .po file

11 years agoAlso spacing
Samual Lenks [Fri, 31 May 2013 01:48:28 +0000 (21:48 -0400)]
Also spacing

11 years agoLong line to shorter line
Samual Lenks [Fri, 31 May 2013 01:46:51 +0000 (21:46 -0400)]
Long line to shorter line

11 years agoThat should be UTF-8 in thar.
Samual Lenks [Thu, 30 May 2013 21:04:41 +0000 (17:04 -0400)]
That should be UTF-8 in thar.

11 years agoWhoops, forgot to update those gentle strings with new args. fixes #1597
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

11 years ago./check-translations.sh pot
Samual Lenks [Thu, 30 May 2013 17:15:42 +0000 (13:15 -0400)]
./check-translations.sh pot

11 years agoMerge remote-tracking branch 'origin/terencehill/cmd_fixes'
Samual Lenks [Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)]
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'
Samual Lenks [Tue, 28 May 2013 20:20:12 +0000 (16:20 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'

11 years agoIf the menu gets closed do not update mouse position: it prevents mouse jumping to...
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

11 years agoPrevent a crash (infinite loop) calling the command vote help help
terencehill [Fri, 24 May 2013 17:04:05 +0000 (19:04 +0200)]
Prevent a crash (infinite loop) calling the command vote help help

11 years agoFix trace command
terencehill [Fri, 24 May 2013 16:17:57 +0000 (18:17 +0200)]
Fix trace command

11 years agoWorking on some updates to effects tab (better grouping, added spawnpoint
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)

11 years agoMerge remote-tracking branch 'origin/master' into samual/update_effects_tab
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

11 years agoMerge remote-tracking branch 'origin/Mario/vehicle_fixes'
Samual Lenks [Tue, 21 May 2013 20:59:05 +0000 (16:59 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_fixes'

11 years agoFix crash in CTF caused by improper player check #1574
Samual Lenks [Sun, 19 May 2013 03:03:44 +0000 (23:03 -0400)]
Fix crash in CTF caused by improper player check #1574

11 years agoMove VehicleTouch to the correct function
Mario [Fri, 17 May 2013 01:28:32 +0000 (11:28 +1000)]
Move VehicleTouch to the correct function

11 years agoFixes for some vehicle related issues
Mario [Fri, 17 May 2013 01:26:44 +0000 (11:26 +1000)]
Fixes for some vehicle related issues

11 years agoAdd new 'Q' field to format spec comment
Jan Behrens [Wed, 15 May 2013 22:31:04 +0000 (00:31 +0200)]
Add new 'Q' field to format spec comment

11 years agoOn second thought, disable crosshair_hittest_showimpact, it's too glitchy
Samual Lenks [Wed, 15 May 2013 01:50:39 +0000 (21:50 -0400)]
On second thought, disable crosshair_hittest_showimpact, it's too glitchy

11 years ago"teamplay" is not set yet, just check the serverflag directly
Samual Lenks [Wed, 15 May 2013 01:47:09 +0000 (21:47 -0400)]
"teamplay" is not set yet, just check the serverflag directly

11 years agoEnable crosshair_hittest_showimpact 1 by default
Samual Lenks [Wed, 15 May 2013 01:14:29 +0000 (21:14 -0400)]
Enable crosshair_hittest_showimpact 1 by default

11 years agoFix ItemTouch mutator hook usage (fixes #1572)
Samual Lenks [Wed, 15 May 2013 01:00:19 +0000 (21:00 -0400)]
Fix ItemTouch mutator hook usage (fixes #1572)

11 years agoMerge remote-tracking branch 'origin/samual/individual_switchdelay'
Samual Lenks [Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)]
Merge remote-tracking branch 'origin/samual/individual_switchdelay'

11 years agoCleanup
Samual Lenks [Tue, 14 May 2013 22:20:51 +0000 (18:20 -0400)]
Cleanup

11 years agoAlso add "new toys" cvars
Samual Lenks [Tue, 14 May 2013 22:13:29 +0000 (18:13 -0400)]
Also add "new toys" cvars

11 years agoWorking on crosshair ring fading...
Samual Lenks [Tue, 14 May 2013 20:43:55 +0000 (16:43 -0400)]
Working on crosshair ring fading...

11 years agoFix weirdness with weapon_nextthink frame time on switching
Samual Lenks [Tue, 14 May 2013 18:56:26 +0000 (14:56 -0400)]
Fix weirdness with weapon_nextthink frame time on switching

11 years agoFix/update configs
Samual Lenks [Tue, 14 May 2013 18:14:55 +0000 (14:14 -0400)]
Fix/update configs

11 years agoMerge remote-tracking branch 'origin/master' into samual/individual_switchdelay
Samual Lenks [Tue, 14 May 2013 17:59:18 +0000 (13:59 -0400)]
Merge remote-tracking branch 'origin/master' into samual/individual_switchdelay

11 years agoVarious fixes for spawnpoint effects
Samual Lenks [Tue, 14 May 2013 17:52:48 +0000 (13:52 -0400)]
Various fixes for spawnpoint effects

11 years agoIncrease Nex raise/drop/animtime, decrease laser raise/drop time
Samual Lenks [Tue, 14 May 2013 08:50:46 +0000 (04:50 -0400)]
Increase Nex raise/drop/animtime, decrease laser raise/drop time

11 years agoClone settings to XPM balance
Samual Lenks [Tue, 14 May 2013 08:14:10 +0000 (04:14 -0400)]
Clone settings to XPM balance

11 years agoAdd the cvars to the primary balance config
Samual Lenks [Tue, 14 May 2013 08:10:09 +0000 (04:10 -0400)]
Add the cvars to the primary balance config

11 years agoStrip out old g_balance_weaponswitchdelay cvar usage
Samual Lenks [Tue, 14 May 2013 07:57:13 +0000 (03:57 -0400)]
Strip out old g_balance_weaponswitchdelay cvar usage

11 years agoYay code part basically works now
Samual Lenks [Tue, 14 May 2013 07:31:14 +0000 (03:31 -0400)]
Yay code part basically works now

11 years agoSave what i've got now for later if necessary
Samual Lenks [Tue, 14 May 2013 07:13:53 +0000 (03:13 -0400)]
Save what i've got now for later if necessary

11 years agoWork on adding separate switch delays for each weapon anim, plus clean up
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

11 years agoSome more cleanup
Samual Lenks [Tue, 14 May 2013 03:15:40 +0000 (23:15 -0400)]
Some more cleanup

11 years agoMerge remote-tracking branch 'origin/samual/respawn_improvements'
Samual Lenks [Tue, 14 May 2013 02:27:22 +0000 (22:27 -0400)]
Merge remote-tracking branch 'origin/samual/respawn_improvements'

11 years agoCleanup
Samual Lenks [Tue, 14 May 2013 02:22:37 +0000 (22:22 -0400)]
Cleanup

11 years agoUpdate the server side cvar, fix something
Samual Lenks [Tue, 14 May 2013 02:20:41 +0000 (22:20 -0400)]
Update the server side cvar, fix something

11 years agoAdd the new effects and cvars for spawning
Samual Lenks [Tue, 14 May 2013 02:05:49 +0000 (22:05 -0400)]
Add the new effects and cvars for spawning

11 years agoCreate spawn event entity handler, more work on spawning effects
Samual Lenks [Mon, 13 May 2013 23:19:02 +0000 (19:19 -0400)]
Create spawn event entity handler, more work on spawning effects

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
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

11 years agoRaise default brightness of crosshair rainbow stuffz
Samual Lenks [Mon, 13 May 2013 21:20:59 +0000 (17:20 -0400)]
Raise default brightness of crosshair rainbow stuffz

11 years agoMerge remote-tracking branch 'origin/terencehill/sv_maxidle_fix'
Samual Lenks [Mon, 13 May 2013 03:23:11 +0000 (23:23 -0400)]
Merge remote-tracking branch 'origin/terencehill/sv_maxidle_fix'

11 years agoFix sv_maxidle not kicking dead players and kicking spectators even if sv_maxidle_spe...
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

11 years agoStop sv_maxidle countdown messages
terencehill [Sun, 12 May 2013 16:18:01 +0000 (18:18 +0200)]
Stop sv_maxidle countdown messages

11 years agoMerge remote-tracking branch 'origin/Mario/rainbow_crosshair'
Samual Lenks [Sun, 12 May 2013 00:49:55 +0000 (20:49 -0400)]
Merge remote-tracking branch 'origin/Mario/rainbow_crosshair'

11 years agoUpdate how crosshair color selection is handled, create a switch for it
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

11 years agoMerge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair
Samual Lenks [Sat, 11 May 2013 23:56:42 +0000 (19:56 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair

11 years agoMerge remote-tracking branch 'origin/Mario/mute_bot_warnings'
Samual Lenks [Sat, 11 May 2013 23:44:49 +0000 (19:44 -0400)]
Merge remote-tracking branch 'origin/Mario/mute_bot_warnings'

11 years agoMerge remote-tracking branch 'origin/Mario/extralife_fix'
Samual Lenks [Sat, 11 May 2013 21:47:38 +0000 (17:47 -0400)]
Merge remote-tracking branch 'origin/Mario/extralife_fix'

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_spam_fix'
Samual Lenks [Sat, 11 May 2013 21:45:19 +0000 (17:45 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_spam_fix'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/menu_spam_fix
Samual Lenks [Sat, 11 May 2013 21:37:04 +0000 (17:37 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_spam_fix

11 years agoMerge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)]
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agofix weapon duping (thanks, Mario)
Rudolf Polzer [Sat, 11 May 2013 11:44:47 +0000 (13:44 +0200)]
fix weapon duping (thanks, Mario)

11 years agoMake teamscores add playerstats events (necessary for CA "rounds" field)
Jan Behrens [Sat, 11 May 2013 09:49:24 +0000 (11:49 +0200)]
Make teamscores add playerstats events (necessary for CA "rounds" field)
NOTE: CA needs this to submit the "rounds" field since it is only defined as a teamscore-, but not as a playerscore-field.

11 years agoAdd "rounds" score field for CA
Jan Behrens [Fri, 10 May 2013 11:15:02 +0000 (13:15 +0200)]
Add "rounds" score field for CA

11 years agoMerge branch 'master' into zykure/teamscores
Jan Behrens [Fri, 10 May 2013 13:55:03 +0000 (15:55 +0200)]
Merge branch 'master' into zykure/teamscores

11 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Jan Behrens [Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agoMerge remote-tracking branch 'origin/Mario/classname_checks'
Samual Lenks [Fri, 10 May 2013 05:20:57 +0000 (01:20 -0400)]
Merge remote-tracking branch 'origin/Mario/classname_checks'

11 years agoUse bot_debug for bot navigation dprints
Mario [Fri, 10 May 2013 05:17:35 +0000 (15:17 +1000)]
Use bot_debug for bot navigation dprints

11 years agoBurn the old arena file
Samual Lenks [Fri, 10 May 2013 05:11:57 +0000 (01:11 -0400)]
Burn the old arena file

11 years agoMerge remote-tracking branch 'origin/master' into Mario/classname_checks
Samual Lenks [Fri, 10 May 2013 05:11:27 +0000 (01:11 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/classname_checks

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/waypointsprites.qc

11 years agoMerge branch 'master' into Mario/mute_bot_warnings
Mario [Fri, 10 May 2013 04:56:09 +0000 (14:56 +1000)]
Merge branch 'master' into Mario/mute_bot_warnings

11 years agoFix extra life powerup giving infinite lives in lms & minstagib
Mario [Fri, 10 May 2013 04:21:46 +0000 (14:21 +1000)]
Fix extra life powerup giving infinite lives in lms & minstagib

11 years agoMake menu compatibility match server code too
Samual Lenks [Fri, 10 May 2013 01:52:58 +0000 (21:52 -0400)]
Make menu compatibility match server code too

11 years agoClean up mutator loading list a bit
Samual Lenks [Fri, 10 May 2013 01:40:54 +0000 (21:40 -0400)]
Clean up mutator loading list a bit

11 years agoMerge remote-tracking branch 'origin/Mario/mutator_minstagib'
Samual Lenks [Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)]
Merge remote-tracking branch 'origin/Mario/mutator_minstagib'

11 years agoFix language list size
Samual Lenks [Thu, 9 May 2013 21:21:07 +0000 (17:21 -0400)]
Fix language list size

11 years agog_spawn_furthest 1 by default, players really shouldn't spawn near others
Samual Lenks [Thu, 9 May 2013 20:58:25 +0000 (16:58 -0400)]
g_spawn_furthest 1 by default, players really shouldn't spawn near others

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
Samual Lenks [Thu, 9 May 2013 20:57:46 +0000 (16:57 -0400)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

11 years agoDon't show accuracy in scoreboard anymore (it can be seen in 2 other
Samual Lenks [Thu, 9 May 2013 20:51:13 +0000 (16:51 -0400)]
Don't show accuracy in scoreboard anymore (it can be seen in 2 other
places, +accuracy and weapons panel)

11 years agoMerge remote-tracking branch 'origin/cbrutail/hudlaserminsta_fix'
Samual Lenks [Thu, 9 May 2013 20:49:55 +0000 (16:49 -0400)]
Merge remote-tracking branch 'origin/cbrutail/hudlaserminsta_fix'

11 years agoMerge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix
Samual Lenks [Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)]
Merge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix

11 years agoMerge remote-tracking branch 'origin/divVerent/meleefix'
Samual Lenks [Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)]
Merge remote-tracking branch 'origin/divVerent/meleefix'

11 years agoMerge remote-tracking branch 'origin/master' into divVerent/meleefix
Samual Lenks [Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/meleefix

11 years agoGeneralizing team events for xonstat
Jan Behrens [Thu, 9 May 2013 14:55:01 +0000 (16:55 +0200)]
Generalizing team events for xonstat

11 years agoMerge remote-tracking branch 'origin/Mario/lms_fixes'
Samual Lenks [Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_fixes'

11 years agoFix some issues with LMS & CA
Mario [Wed, 8 May 2013 04:20:26 +0000 (14:20 +1000)]
Fix some issues with LMS & CA

11 years agoWhoops, forgot that one
Samual Lenks [Wed, 8 May 2013 03:12:50 +0000 (23:12 -0400)]
Whoops, forgot that one

11 years agoTry to fix off-by-one error in deathtype code
Samual Lenks [Wed, 8 May 2013 03:09:03 +0000 (23:09 -0400)]
Try to fix off-by-one error in deathtype code

11 years agoMerge branch 'master' into Mario/mute_bot_warnings
Mario [Wed, 8 May 2013 02:11:00 +0000 (12:11 +1000)]
Merge branch 'master' into Mario/mute_bot_warnings

11 years agoMerge branch 'master' into Mario/rainbow_crosshair
Mario [Wed, 8 May 2013 02:07:59 +0000 (12:07 +1000)]
Merge branch 'master' into Mario/rainbow_crosshair