]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Fri, 26 Apr 2013 01:03:33 +0000 (11:03 +1000)]
Merge branch 'master' into Mario/misc_tracker_fixes
Mario [Fri, 26 Apr 2013 01:00:10 +0000 (11:00 +1000)]
Fixes for some issues on the bug tracker
Samual Lenks [Fri, 26 Apr 2013 00:03:06 +0000 (20:03 -0400)]
Merge remote-tracking branch 'origin/master'
Samual Lenks [Fri, 26 Apr 2013 00:02:07 +0000 (20:02 -0400)]
When net_type is MSG_CENTER and net_name is 0, still check entity net_type
Mario [Thu, 25 Apr 2013 17:37:27 +0000 (03:37 +1000)]
Merge branch 'master' into Mario/mutator_minstagib
terencehill [Thu, 25 Apr 2013 14:28:48 +0000 (16:28 +0200)]
Forbid impulses even during the countdown to round start, it fixes issues with weapons
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
terencehill [Wed, 24 Apr 2013 22:37:34 +0000 (00:37 +0200)]
This line was committed accidentally
terencehill [Tue, 23 Apr 2013 18:20:20 +0000 (20:20 +0200)]
Move "Most weapons" under "Weapon arenas:"
terencehill [Tue, 23 Apr 2013 17:44:34 +0000 (19:44 +0200)]
Fix minstagib and nix radio buttons not reseting releative cvars to 0 when checking other linked radio buttons
terencehill [Tue, 23 Apr 2013 17:42:01 +0000 (19:42 +0200)]
Fix "No start weapons" radio button: g_start_weapon_fireball was missing and g_start_weapon_minelayer was duplicated
terencehill [Tue, 23 Apr 2013 17:37:39 +0000 (19:37 +0200)]
Remove menu_weaponarena_with_laser from tooltips.db and tooltips.db.it
terencehill [Tue, 23 Apr 2013 17:35:25 +0000 (19:35 +0200)]
Allow to select multiple weapons for weapon arena in the menu
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
Mario [Fri, 19 Apr 2013 09:27:46 +0000 (19:27 +1000)]
Make client minstagib check a local float (still buggy if both minsta & nex are available)
Mario [Fri, 19 Apr 2013 07:40:03 +0000 (17:40 +1000)]
Don't give ammo for laser jumps
Mario [Fri, 19 Apr 2013 05:52:10 +0000 (15:52 +1000)]
Remove useless g_minstagib check
Mario [Fri, 19 Apr 2013 05:43:45 +0000 (15:43 +1000)]
Move waypoint check to mutator (will add it back when we have a proper invisibility powerup)
Mario [Fri, 19 Apr 2013 05:18:08 +0000 (15:18 +1000)]
Lower minstagib extra lives to 1
Mario [Fri, 19 Apr 2013 05:16:04 +0000 (15:16 +1000)]
Attempt to remove more g_minstagib checks from the code
Mario [Fri, 19 Apr 2013 04:42:13 +0000 (14:42 +1000)]
Remove strength sound mutator hook
Mario [Fri, 19 Apr 2013 04:33:03 +0000 (14:33 +1000)]
Merge branch 'master' into Mario/mutator_minstagib
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
terencehill [Sun, 14 Apr 2013 10:19:47 +0000 (12:19 +0200)]
Implement a function to spectate previous player and add possibility to spectate next/previous player with next/previous weapon binds (primary fire still changes to the next player)
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
Mario [Sun, 14 Apr 2013 02:25:51 +0000 (12:25 +1000)]
Use a team switch for control point sprite name
Mario [Sun, 14 Apr 2013 02:06:33 +0000 (12:06 +1000)]
Fix broken domination control point waypoint
terencehill [Sat, 13 Apr 2013 20:39:27 +0000 (22:39 +0200)]
Superspec mutator shouldn't call SpectateNext as it may lead to spectate an unwanted player in CA since players of the same team cannot be spectated
Mario [Sat, 13 Apr 2013 18:44:39 +0000 (04:44 +1000)]
Add touch explode to the mutators menu
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
Mario [Tue, 9 Apr 2013 06:05:16 +0000 (16:05 +1000)]
Fix players able to rejoin after spectating
Mario [Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)]
Merge branch 'master' into Mario/lms_updates
Mario [Tue, 9 Apr 2013 04:40:19 +0000 (14:40 +1000)]
Replace giveplayer entity with other
Mario [Tue, 9 Apr 2013 01:54:59 +0000 (11:54 +1000)]
Fix broken cvar value
Mario [Tue, 9 Apr 2013 01:49:25 +0000 (11:49 +1000)]
Increase minstanex vehicle damage
Mario [Tue, 9 Apr 2013 01:35:40 +0000 (11:35 +1000)]
Fix powerups
Mario [Tue, 9 Apr 2013 00:51:41 +0000 (10:51 +1000)]
Remove useless health check
Mario [Tue, 9 Apr 2013 00:49:41 +0000 (10:49 +1000)]
Fix player not picking up ammo
Mario [Tue, 9 Apr 2013 00:39:58 +0000 (10:39 +1000)]
Merge branch 'master' into Mario/mutator_minstagib
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 22:16:26 +0000 (00:16 +0200)]
Merge branch 'master' into terencehill/hud_code_restructure
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
terencehill [Fri, 29 Mar 2013 16:30:02 +0000 (17:30 +0100)]
Fix bad usage of panel_enabled
terencehill [Fri, 29 Mar 2013 16:02:59 +0000 (17:02 +0100)]
hud_panel_update_interval 2 "how often (in seconds) common panel cvars are reloaded"
Mario [Tue, 26 Mar 2013 19:06:48 +0000 (06:06 +1100)]
Prevent loading hagar before the match has started. Fixes bug #1434 (Able to shoot during countdown)
Mario [Tue, 26 Mar 2013 18:32:14 +0000 (05:32 +1100)]
Move touchexplode to a mutator
terencehill [Mon, 25 Mar 2013 18:01:33 +0000 (19:01 +0100)]
This stuff is not needed
terencehill [Mon, 25 Mar 2013 09:33:33 +0000 (10:33 +0100)]
Make some float variables (panel ids) into entities (panels)
terencehill [Sat, 23 Mar 2013 17:19:56 +0000 (18:19 +0100)]
Trying to restructure hud panel code making use of an entity for each panel
Mario [Fri, 22 Mar 2013 05:47:34 +0000 (16:47 +1100)]
Turn off vehicle damage when initializing, fixes bug 1352 (invisible vehicles exploding)
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