]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 14 Mar 2013 21:29:57 +0000 (22:29 +0100)]
Merge branch 'master' into terencehill/ca_arena_mutators
terencehill [Wed, 13 Mar 2013 22:06:10 +0000 (23:06 +0100)]
Becoming spectator stat_respawn_time should not be copied as scoreboard respawn info isn't for spectators
terencehill [Wed, 13 Mar 2013 18:06:49 +0000 (19:06 +0100)]
Arena: don't force players to spawn so early. Altought it's intended to be primarly a minor gameplay change, it also is a workaround for player starting with the dead animation when forced to join the game immediately and g_start_delay is > 0
terencehill [Mon, 11 Mar 2013 16:43:46 +0000 (17:43 +0100)]
Add the new field respawn_flags and set it just when the player dies so there's no need of the hook GetRespawnFlags
terencehill [Mon, 11 Mar 2013 15:35:41 +0000 (16:35 +0100)]
Make respawn code cleaner by adding respawn flags and the new mutator hook GetRespawnFlags
terencehill [Sun, 10 Mar 2013 18:38:40 +0000 (19:38 +0100)]
Set a max revival time of 1 minute
terencehill [Sun, 10 Mar 2013 12:34:06 +0000 (13:34 +0100)]
Make "Revival progress" translatable
terencehill [Sat, 9 Mar 2013 23:56:04 +0000 (00:56 +0100)]
Restore this code as game_starttime can change anytime
terencehill [Sat, 9 Mar 2013 23:18:52 +0000 (00:18 +0100)]
Cleanup: replace a few checks with the macro IS_PLAYER
terencehill [Sat, 9 Mar 2013 23:12:30 +0000 (00:12 +0100)]
Give missing teams/players msgs infinite lifetime, expire them only when they are shown and make them independent from round msgs so they can be used in other situations too. Countdown to round start is now stopped by a msg, as it seems there's no CS version of Kill_Notification
terencehill [Sat, 9 Mar 2013 16:33:40 +0000 (17:33 +0100)]
Bad parameter for round over messages in Arena and CA
terencehill [Sat, 9 Mar 2013 16:13:18 +0000 (17:13 +0100)]
Fix other round countdown issues by improving workaround for uninitialized game_starttime in round_handler
terencehill [Sat, 9 Mar 2013 15:10:27 +0000 (16:10 +0100)]
Initialize .cnt in round_handler_Init to fix a round countdown bug
terencehill [Sat, 9 Mar 2013 14:52:49 +0000 (15:52 +0100)]
Correctly initialize game_starttime
terencehill [Sat, 9 Mar 2013 13:49:09 +0000 (14:49 +0100)]
Prevent concurrent game/round start countdown
Samual Lenks [Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)]
Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'
terencehill [Thu, 7 Mar 2013 18:00:09 +0000 (19:00 +0100)]
Since only KH makes use of CENTER_ARENA_ROUNDSTART, rename it to CENTER_KEYHUNT_ROUNDSTART
terencehill [Thu, 7 Mar 2013 17:50:33 +0000 (18:50 +0100)]
Reapply some changes that got lost in the previous merge commit and update code to use the new notify system
Samual Lenks [Thu, 7 Mar 2013 04:51:33 +0000 (23:51 -0500)]
Fix stringcount mismatch
terencehill [Thu, 7 Mar 2013 00:11:34 +0000 (01:11 +0100)]
Merge branch 'master' into terencehill/ca_arena_mutators
Conflicts:
qcsrc/client/announcer.qc
qcsrc/common/constants.qh
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/gamemode_freezetag.qc
Samual Lenks [Wed, 6 Mar 2013 22:55:43 +0000 (17:55 -0500)]
Kill centerprints on client too when doing Destroy_All_Notifications()
Samual Lenks [Wed, 6 Mar 2013 22:50:08 +0000 (17:50 -0500)]
Whoops, allow disabled notifications to be handled properly
terencehill [Wed, 6 Mar 2013 20:24:35 +0000 (21:24 +0100)]
Remove a stupid rule
terencehill [Wed, 6 Mar 2013 20:18:27 +0000 (21:18 +0100)]
Calling Arena_AddChallengers() before the game starts g_start_delay works as expected in Arena too
terencehill [Tue, 5 Mar 2013 23:40:42 +0000 (00:40 +0100)]
CA: Don't try to join the game with jump button if observer is already scheduled to join the next round
terencehill [Tue, 5 Mar 2013 23:13:43 +0000 (00:13 +0100)]
Cleanup: Change freezetag_Initialize() position
terencehill [Tue, 5 Mar 2013 18:12:15 +0000 (19:12 +0100)]
Also apply glowmod for a cooler ice color
terencehill [Tue, 5 Mar 2013 17:16:39 +0000 (18:16 +0100)]
Make some round_handler functions into macros
Samual Lenks [Tue, 5 Mar 2013 07:31:09 +0000 (02:31 -0500)]
Fix some other things
Samual Lenks [Tue, 5 Mar 2013 07:26:22 +0000 (02:26 -0500)]
*sigh*
Samual Lenks [Tue, 5 Mar 2013 04:50:42 +0000 (23:50 -0500)]
Use count_seconds here too
Samual Lenks [Tue, 5 Mar 2013 04:30:18 +0000 (23:30 -0500)]
WHY IS THIS FUCKING SHIT SO FUCKING STUPID??!?!?!
Samual Lenks [Tue, 5 Mar 2013 03:06:33 +0000 (22:06 -0500)]
Add a space.
Samual Lenks [Tue, 5 Mar 2013 02:58:00 +0000 (21:58 -0500)]
Merge remote-tracking branch 'origin/terencehill/onslaught_bugfixes'
Samual Lenks [Tue, 5 Mar 2013 01:40:59 +0000 (20:40 -0500)]
Merge remote-tracking branch 'origin/Mario/seeker_ammo_fix'
Samual Lenks [Tue, 5 Mar 2013 00:56:34 +0000 (19:56 -0500)]
Better settings for aim bones by nifrek
Samual Lenks [Tue, 5 Mar 2013 00:31:37 +0000 (19:31 -0500)]
Merge remote-tracking branch 'origin/samual/notification_rewrite'
Samual Lenks [Tue, 5 Mar 2013 00:21:43 +0000 (19:21 -0500)]
Update config now
Samual Lenks [Tue, 5 Mar 2013 00:15:38 +0000 (19:15 -0500)]
Add server control cvars for location and frag_verbose message information
Samual Lenks [Mon, 4 Mar 2013 22:39:59 +0000 (17:39 -0500)]
Whoops, forgot FL_SPECTATOR
Samual Lenks [Mon, 4 Mar 2013 22:34:14 +0000 (17:34 -0500)]
Remove debug flag
Samual Lenks [Mon, 4 Mar 2013 22:33:30 +0000 (17:33 -0500)]
Begin final cleanup-- remove w_deathtypestring (no longer a string)
Samual Lenks [Mon, 4 Mar 2013 21:39:49 +0000 (16:39 -0500)]
Fix configs, switch notification_allow_chatboxprint off in code for compat
Samual Lenks [Mon, 4 Mar 2013 21:36:06 +0000 (16:36 -0500)]
Fix killnotification a bit, plus make spectating/teamchange centers red
Samual Lenks [Mon, 4 Mar 2013 20:59:02 +0000 (15:59 -0500)]
Use MakeConsoleSafe for the message debugs instead
Samual Lenks [Mon, 4 Mar 2013 20:32:13 +0000 (15:32 -0500)]
Move time processing and counting to counting.qh
Samual Lenks [Mon, 4 Mar 2013 20:14:58 +0000 (15:14 -0500)]
Remove VAR_TO_TEXT
Samual Lenks [Mon, 4 Mar 2013 20:04:15 +0000 (15:04 -0500)]
Rename FL_TEAM_ and STR_TEAM_ to NUM_TEAM_ and NAME_TEAM_ respectively
terencehill [Mon, 4 Mar 2013 18:01:52 +0000 (19:01 +0100)]
Freezetag: team colored ice with full starting alpha
Samual Lenks [Mon, 4 Mar 2013 02:19:49 +0000 (21:19 -0500)]
Forgot one
Samual Lenks [Mon, 4 Mar 2013 02:14:18 +0000 (21:14 -0500)]
Long lines BEGONE!
Samual Lenks [Mon, 4 Mar 2013 01:59:54 +0000 (20:59 -0500)]
Other fixes
Samual Lenks [Mon, 4 Mar 2013 01:04:28 +0000 (20:04 -0500)]
Move deathtypes to entities entirely
terencehill [Sun, 3 Mar 2013 23:42:11 +0000 (00:42 +0100)]
Fix "one minute remains" sound spam during the countdown to round start, less than one minute left
Samual Lenks [Sun, 3 Mar 2013 23:25:38 +0000 (18:25 -0500)]
Start working on moving deathtypes to be entities too
Samual Lenks [Sun, 3 Mar 2013 22:19:59 +0000 (17:19 -0500)]
Also fix spacing for deathtypes list
Samual Lenks [Sun, 3 Mar 2013 21:58:59 +0000 (16:58 -0500)]
Fix some errors and add restartnotifs to commands.cfg
Samual Lenks [Sun, 3 Mar 2013 21:51:35 +0000 (16:51 -0500)]
Use the IS_SPEC macros for these
Samual Lenks [Sun, 3 Mar 2013 21:44:09 +0000 (16:44 -0500)]
Sort notifications
Samual Lenks [Sun, 3 Mar 2013 21:24:33 +0000 (16:24 -0500)]
Fix more spacing in lists
Samual Lenks [Sun, 3 Mar 2013 21:13:16 +0000 (16:13 -0500)]
Now fix MSG_CENTER and MSG_MULTI block
Samual Lenks [Sun, 3 Mar 2013 20:25:11 +0000 (15:25 -0500)]
Straighten out info block
Samual Lenks [Sun, 3 Mar 2013 20:09:50 +0000 (15:09 -0500)]
Spacing changes in the list
Samual Lenks [Sun, 3 Mar 2013 20:06:23 +0000 (15:06 -0500)]
Update arg table
Samual Lenks [Sun, 3 Mar 2013 19:57:57 +0000 (14:57 -0500)]
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
Samual Lenks [Sun, 3 Mar 2013 19:00:00 +0000 (14:00 -0500)]
Attempt to fix csqcplayers walking animations
terencehill [Sun, 3 Mar 2013 18:57:50 +0000 (19:57 +0100)]
Let spectators know that game/round is about to start
terencehill [Sun, 3 Mar 2013 18:28:36 +0000 (19:28 +0100)]
Add ability to reload round times cvars every round
Samual Lenks [Sun, 3 Mar 2013 17:56:47 +0000 (12:56 -0500)]
Stuff and things
Samual Lenks [Sun, 3 Mar 2013 17:29:28 +0000 (12:29 -0500)]
Fix debug print
Samual Lenks [Sun, 3 Mar 2013 16:59:10 +0000 (11:59 -0500)]
Fix tuba/accordian/klein bottle
Samual Lenks [Sun, 3 Mar 2013 08:29:31 +0000 (03:29 -0500)]
Fix infinite lifetime centerprints
Samual Lenks [Sun, 3 Mar 2013 06:04:06 +0000 (01:04 -0500)]
Cleanup of count_ordinal stuffz
Samual Lenks [Sun, 3 Mar 2013 05:57:01 +0000 (00:57 -0500)]
Update that other shit too
Samual Lenks [Sun, 3 Mar 2013 05:53:23 +0000 (00:53 -0500)]
Put more work into process_time function
Samual Lenks [Sun, 3 Mar 2013 04:18:40 +0000 (23:18 -0500)]
Fix subsequent centerprint messages from losing position fading
Samual Lenks [Sun, 3 Mar 2013 01:19:21 +0000 (20:19 -0500)]
Move that to another section
Samual Lenks [Sun, 3 Mar 2013 01:01:07 +0000 (20:01 -0500)]
And now we can remove the legacy shit
Samual Lenks [Sun, 3 Mar 2013 00:57:26 +0000 (19:57 -0500)]
Whoops, missed some things
Samual Lenks [Sun, 3 Mar 2013 00:43:12 +0000 (19:43 -0500)]
Move the rest of race notifications over to new system
terencehill [Sat, 2 Mar 2013 22:14:05 +0000 (23:14 +0100)]
CA: Improve checks to determine whether an observer is in game or not
Samual Lenks [Sat, 2 Mar 2013 22:06:49 +0000 (17:06 -0500)]
Add error in case a MSG_CENTER_CPID notification is sent with NO_CPID
terencehill [Sat, 2 Mar 2013 13:09:57 +0000 (14:09 +0100)]
When manually moving to spectators reset caplayer in the mutator hook MakePlayerObserver
Samual Lenks [Sat, 2 Mar 2013 22:00:30 +0000 (17:00 -0500)]
Better debugs
Samual Lenks [Sat, 2 Mar 2013 21:26:30 +0000 (16:26 -0500)]
Slight cleanup
Samual Lenks [Sat, 2 Mar 2013 21:18:13 +0000 (16:18 -0500)]
Updates/fixes for Kill_Notification
Samual Lenks [Sat, 2 Mar 2013 19:21:21 +0000 (14:21 -0500)]
Rename notif_any to notif_all
Samual Lenks [Sat, 2 Mar 2013 19:04:49 +0000 (14:04 -0500)]
Update the config
Samual Lenks [Sat, 2 Mar 2013 18:54:31 +0000 (13:54 -0500)]
Show kill sprees on newlines instead of the normal message line
Samual Lenks [Sat, 2 Mar 2013 18:49:28 +0000 (13:49 -0500)]
Another minor edit
Samual Lenks [Sat, 2 Mar 2013 18:48:25 +0000 (13:48 -0500)]
Update comment
Samual Lenks [Sat, 2 Mar 2013 18:41:03 +0000 (13:41 -0500)]
Add that check there
terencehill [Sat, 2 Mar 2013 11:51:18 +0000 (12:51 +0100)]
CA: newcomer players can only join the game during the countdown to round start; if they try to do it during a round or when the round is over they get scheduled to play the next round
Samual Lenks [Sat, 2 Mar 2013 03:21:30 +0000 (22:21 -0500)]
Fix suicides
Samual Lenks [Sat, 2 Mar 2013 00:11:17 +0000 (19:11 -0500)]
Remove backtraces, and that should be capitalized
Samual Lenks [Fri, 1 Mar 2013 22:58:23 +0000 (17:58 -0500)]
backtraces for debugging purposes
Samual Lenks [Fri, 1 Mar 2013 21:28:24 +0000 (16:28 -0500)]
Fix scan and start
Samual Lenks [Fri, 1 Mar 2013 21:05:25 +0000 (16:05 -0500)]
Fix CPID's with keyhunt
Samual Lenks [Fri, 1 Mar 2013 20:59:04 +0000 (15:59 -0500)]
Some message fixes
Samual Lenks [Fri, 1 Mar 2013 20:56:27 +0000 (15:56 -0500)]
Partly fix wait message