]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Wed, 8 May 2013 00:57:12 +0000 (20:57 -0400)]
Merge branch 'divVerent/lavafix'
Samual Lenks [Wed, 8 May 2013 00:54:26 +0000 (20:54 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/lavafix
Samual Lenks [Wed, 8 May 2013 00:37:05 +0000 (20:37 -0400)]
Merge remote-tracking branch 'origin/terencehill/clear_button'
Samual Lenks [Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/clear_button
Samual Lenks [Wed, 8 May 2013 00:14:05 +0000 (20:14 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_focus_stuff'
Samual Lenks [Wed, 8 May 2013 00:11:53 +0000 (20:11 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff
Samual Lenks [Tue, 7 May 2013 15:56:07 +0000 (11:56 -0400)]
Fix some team things-- whoops, sorry peoplez :D
Samual Lenks [Tue, 7 May 2013 05:43:55 +0000 (01:43 -0400)]
Merge remote-tracking branch 'origin/Mario/assault_mutator'
Samual Lenks [Tue, 7 May 2013 05:42:27 +0000 (01:42 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/assault_mutator
Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
Samual Lenks [Tue, 7 May 2013 05:38:52 +0000 (01:38 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_updates'
Samual Lenks [Tue, 7 May 2013 05:37:55 +0000 (01:37 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/lms_updates
Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/scores.qc
Samual Lenks [Tue, 7 May 2013 05:14:10 +0000 (01:14 -0400)]
Merge remote-tracking branch 'origin/terencehill/ca_arena_mutators'
Samual Lenks [Tue, 7 May 2013 05:13:01 +0000 (01:13 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
Mario [Sat, 4 May 2013 23:12:17 +0000 (09:12 +1000)]
Remove useless weaponarena check
Mario [Sat, 4 May 2013 22:59:10 +0000 (08:59 +1000)]
Fix spectating
Mario [Sat, 4 May 2013 22:48:09 +0000 (08:48 +1000)]
Add a notification for picking up extra lives
Mario [Sat, 4 May 2013 22:39:21 +0000 (08:39 +1000)]
Remove some more g_lms checks & add a use for mega health (disabled by default)
Mario [Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)]
Merge branch 'master' into Mario/lms_updates
Samual Lenks [Sat, 4 May 2013 18:30:43 +0000 (14:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure'
Samual Lenks [Sat, 4 May 2013 03:02:08 +0000 (23:02 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Rudolf Polzer [Thu, 2 May 2013 18:26:45 +0000 (20:26 +0200)]
try to detect isdead flag (please test)
Samual Lenks [Wed, 1 May 2013 18:54:14 +0000 (14:54 -0400)]
Try to fix vote reason string
terencehill [Wed, 1 May 2013 11:09:57 +0000 (13:09 +0200)]
Optimize team color loading a bit
terencehill [Wed, 1 May 2013 09:37:28 +0000 (11:37 +0200)]
If observing force team color to red entering hud config mode
terencehill [Tue, 30 Apr 2013 22:26:29 +0000 (00:26 +0200)]
Update immediately HUD color when changing team
terencehill [Mon, 29 Apr 2013 17:39:11 +0000 (19:39 +0200)]
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure' into terencehill/hud_code_restructure
Samual Lenks [Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)]
Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
Samual Lenks [Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix
Samual Lenks [Mon, 29 Apr 2013 01:18:11 +0000 (21:18 -0400)]
Add a static function for team names that should not be translated
Samual Lenks [Sun, 28 Apr 2013 23:48:41 +0000 (19:48 -0400)]
Add classname for panel entities
Samual Lenks [Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Samual Lenks [Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
Samual Lenks [Sun, 28 Apr 2013 23:30:55 +0000 (19:30 -0400)]
Also add a radio button for "all weapons"
Samual Lenks [Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon_selection
Samual Lenks [Sun, 28 Apr 2013 22:01:39 +0000 (18:01 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_crash_fix'
Samual Lenks [Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)]
Merge remote-tracking branch 'origin/Mario/touchexplode_mutator'
Samual Lenks [Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)]
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'
Samual Lenks [Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)]
Merge remote-tracking branch 'origin/Mario/misc_tracker_fixes'
Samual Lenks [Sun, 28 Apr 2013 21:38:31 +0000 (17:38 -0400)]
Actually, enable NOTIFICATIONS_DEBUG by default for now, but also add cvar
terencehill [Fri, 26 Apr 2013 11:02:50 +0000 (13:02 +0200)]
Fix the new rule...
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
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
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
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
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
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
projects / xonotic / xonotic-data.pk3dir.git / log