]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 25 Apr 2013 14:01:34 +0000 (16:01 +0200)]
New rule: frozen players can't pick up any item
terencehill [Thu, 25 Apr 2013 10:25:57 +0000 (12:25 +0200)]
Merge branch 'master' into terencehill/ca_arena_mutators
Conflicts:
qcsrc/client/announcer.qc
qcsrc/server/arena.qc
Samual Lenks [Mon, 22 Apr 2013 20:30:10 +0000 (16:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/MOTD_bugfix'
Samual Lenks [Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix
Samual Lenks [Mon, 22 Apr 2013 20:15:09 +0000 (16:15 -0400)]
Reset killcount on readyrestart too
Samual Lenks [Mon, 22 Apr 2013 02:44:33 +0000 (22:44 -0400)]
forgot to remove the debug flag
Samual Lenks [Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)]
Merge remote-tracking branch 'origin/samual/notifications'
Samual Lenks [Mon, 22 Apr 2013 02:41:32 +0000 (22:41 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Mon, 22 Apr 2013 02:37:03 +0000 (22:37 -0400)]
Add updates to notifications.cfg now
Samual Lenks [Mon, 22 Apr 2013 02:16:48 +0000 (22:16 -0400)]
Alphabetical order
Samual Lenks [Mon, 22 Apr 2013 02:05:28 +0000 (22:05 -0400)]
Fix a bunch of other things with new announcer code
Samual Lenks [Sun, 21 Apr 2013 19:25:46 +0000 (15:25 -0400)]
Add the rest of the announcer calls to new system
Rudolf Polzer [Sun, 21 Apr 2013 15:58:33 +0000 (17:58 +0200)]
get rid of some bad uses of .ogg extension
Samual Lenks [Sun, 21 Apr 2013 15:43:16 +0000 (11:43 -0400)]
Make the legacy announcer code useless/strip most of it out
Samual Lenks [Sun, 21 Apr 2013 15:18:42 +0000 (11:18 -0400)]
Move that shizniz to the .qh file
Samual Lenks [Sat, 20 Apr 2013 22:33:56 +0000 (18:33 -0400)]
Move more things over to new system
Samual Lenks [Sat, 20 Apr 2013 21:26:31 +0000 (17:26 -0400)]
Getting close to finishing the infrastructure for new announcer system
Samual Lenks [Sat, 20 Apr 2013 20:36:36 +0000 (16:36 -0400)]
Fix translations being done on static filenames
Samual Lenks [Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications
Rudolf Polzer [Fri, 19 Apr 2013 14:03:29 +0000 (16:03 +0200)]
++deathlocation
Samual Lenks [Wed, 17 Apr 2013 22:54:41 +0000 (18:54 -0400)]
Enable notifications debug again
Samual Lenks [Wed, 17 Apr 2013 22:53:36 +0000 (18:53 -0400)]
Work more on announcements
Samual Lenks [Tue, 16 Apr 2013 00:47:37 +0000 (20:47 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Tue, 16 Apr 2013 00:47:16 +0000 (20:47 -0400)]
Fix teamkill
Samual Lenks [Mon, 15 Apr 2013 22:06:04 +0000 (18:06 -0400)]
Lower Nex damage to 80, raise animtime to 0.5
Samual Lenks [Mon, 15 Apr 2013 06:16:12 +0000 (02:16 -0400)]
Start removing headshots from notifications (forgot about these :3)
Samual Lenks [Mon, 15 Apr 2013 03:28:51 +0000 (23:28 -0400)]
More announcer stuff, plus fix #1476
Samual Lenks [Mon, 15 Apr 2013 02:22:08 +0000 (22:22 -0400)]
More integration
Samual Lenks [Mon, 15 Apr 2013 01:54:19 +0000 (21:54 -0400)]
Now add the rest of the infrastructure merge for announcer (partly)
Samual Lenks [Mon, 15 Apr 2013 01:27:12 +0000 (21:27 -0400)]
Finish the list of announcements
Samual Lenks [Sun, 14 Apr 2013 22:46:21 +0000 (18:46 -0400)]
Adding more announcements
Samual Lenks [Sat, 13 Apr 2013 18:24:47 +0000 (14:24 -0400)]
Begin moving announcers to the notification system
Rudolf Polzer [Fri, 12 Apr 2013 18:49:57 +0000 (20:49 +0200)]
break xonotic 0.5.0 ;)
terencehill [Wed, 10 Apr 2013 16:15:32 +0000 (18:15 +0200)]
round_handler: allow infinite round time (*round_timelimit 0) and remove 10 seconds minimum round time
Rudolf Polzer [Mon, 1 Apr 2013 18:15:54 +0000 (20:15 +0200)]
turn off r_glsl_skeletal by default
Rudolf Polzer [Mon, 1 Apr 2013 11:38:20 +0000 (13:38 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 1 Apr 2013 11:36:19 +0000 (13:36 +0200)]
fix overly long qcstatus field
terencehill [Sun, 31 Mar 2013 21:20:41 +0000 (23:20 +0200)]
Merge branch 'master' into terencehill/ca_arena_mutators
Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/progs.src
Rudolf Polzer [Thu, 21 Mar 2013 16:27:15 +0000 (17:27 +0100)]
fix stupid compile errors, we don't have COLOR_TEAM1 any more...
Rudolf Polzer [Thu, 21 Mar 2013 16:24:53 +0000 (17:24 +0100)]
Turn plasma turret into instagib turret in minstagib mode (by Mario), fixes #1317
Rudolf Polzer [Thu, 21 Mar 2013 16:21:11 +0000 (17:21 +0100)]
Merge remote-tracking branch 'origin/Mario/runematch_nuke', fixes #1419
Rudolf Polzer [Thu, 21 Mar 2013 16:20:26 +0000 (17:20 +0100)]
Merge remote-tracking branch 'origin/samual/kill_zoom_on_client', fixes #1439
Rudolf Polzer [Thu, 21 Mar 2013 16:16:54 +0000 (17:16 +0100)]
Merge remote-tracking branch 'origin/terencehill/observer_color', fixes #1444
Rudolf Polzer [Thu, 21 Mar 2013 16:13:33 +0000 (17:13 +0100)]
Merge remote-tracking branch 'origin/mirceakitsune/bugfix_jumppad_gravity'
Mircea Kitsune [Sun, 17 Mar 2013 15:35:33 +0000 (17:35 +0200)]
When trigger_gravity modifies the gravity of an entity, jump pads wouldn't account that, causing players to be thrown at the incorrect destination.
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 [Wed, 13 Mar 2013 08:32:14 +0000 (09:32 +0100)]
Fix for hud observer color not neutral (it optimizes code too)
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 [Fri, 8 Mar 2013 21:15:35 +0000 (22:15 +0100)]
Fix wrong parameters sending prevent join message
terencehill [Fri, 8 Mar 2013 21:04:13 +0000 (22:04 +0100)]
Remove old PREVENT_JOIN_TEXT
terencehill [Fri, 8 Mar 2013 20:56:15 +0000 (21:56 +0100)]
MOTD centerprint fixes / changes:
* Kill initial MOTD centerprint (that appears on server connection) when we know it's showing (in PrintWelcomeMessage()), rather than doing it blindly every time the player joins the game: it fixes MOTD never expiring in Arena.
* Info button now instantly hides initial MOTD.
* If player pressed the info button to see the MOTD and immediately joined the game then don't care, just let the MOTD fade away normally (in 2 seconds); killing the MOTD as before caused the MOTD to pop up again after 2 seconds fading away
terencehill [Fri, 8 Mar 2013 17:06:11 +0000 (18:06 +0100)]
Fix PrintWelcomeMessage executed twice per frame when observing/spectating; also don't send MOTD to bots as they don't really care
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
Mario [Thu, 7 Mar 2013 06:13:59 +0000 (17:13 +1100)]
Merge branch 'master' into mario/runematch_nuke
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 06:21:48 +0000 (01:21 -0500)]
"unpress" system on client
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