]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoMerge branch 'master' into Mario/lms_updates
Mario [Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)]
Merge branch 'master' into Mario/lms_updates

11 years agoMerge remote-tracking branch 'origin/terencehill/hud_code_restructure'
Samual Lenks [Sat, 4 May 2013 18:30:43 +0000 (14:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure'

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

11 years agotry to detect isdead flag (please test)
Rudolf Polzer [Thu, 2 May 2013 18:26:45 +0000 (20:26 +0200)]
try to detect isdead flag (please test)

11 years agoTry to fix vote reason string
Samual Lenks [Wed, 1 May 2013 18:54:14 +0000 (14:54 -0400)]
Try to fix vote reason string

11 years agoOptimize team color loading a bit
terencehill [Wed, 1 May 2013 11:09:57 +0000 (13:09 +0200)]
Optimize team color loading a bit

11 years agoIf observing force team color to red entering hud config mode
terencehill [Wed, 1 May 2013 09:37:28 +0000 (11:37 +0200)]
If observing force team color to red entering hud config mode

11 years agoUpdate immediately HUD color when changing team
terencehill [Tue, 30 Apr 2013 22:26:29 +0000 (00:26 +0200)]
Update immediately HUD color when changing team

11 years agoMerge remote-tracking branch 'origin/terencehill/hud_code_restructure' into terencehi...
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

11 years agoMerge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
Samual Lenks [Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)]
Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'

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

11 years agoAdd a static function for team names that should not be translated
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

11 years agoAdd classname for panel entities
Samual Lenks [Sun, 28 Apr 2013 23:48:41 +0000 (19:48 -0400)]
Add classname for panel entities

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Samual Lenks [Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
Samual Lenks [Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'

11 years agoAlso add a radio button for "all weapons"
Samual Lenks [Sun, 28 Apr 2013 23:30:55 +0000 (19:30 -0400)]
Also add a radio button for "all weapons"

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon...
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

11 years agoMerge remote-tracking branch 'origin/Mario/vehicle_crash_fix'
Samual Lenks [Sun, 28 Apr 2013 22:01:39 +0000 (18:01 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_crash_fix'

11 years agoMerge remote-tracking branch 'origin/Mario/touchexplode_mutator'
Samual Lenks [Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)]
Merge remote-tracking branch 'origin/Mario/touchexplode_mutator'

11 years agoMerge remote-tracking branch 'origin/Mario/hagar_load_fix'
Samual Lenks [Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)]
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'

11 years agoMerge remote-tracking branch 'origin/Mario/misc_tracker_fixes'
Samual Lenks [Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)]
Merge remote-tracking branch 'origin/Mario/misc_tracker_fixes'

11 years agoActually, enable NOTIFICATIONS_DEBUG by default for now, but also add cvar
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

11 years agoMerge branch 'master' into Mario/misc_tracker_fixes
Mario [Fri, 26 Apr 2013 01:03:33 +0000 (11:03 +1000)]
Merge branch 'master' into Mario/misc_tracker_fixes

11 years agoFixes for some issues on the bug tracker
Mario [Fri, 26 Apr 2013 01:00:10 +0000 (11:00 +1000)]
Fixes for some issues on the bug tracker

11 years agoMerge remote-tracking branch 'origin/master'
Samual Lenks [Fri, 26 Apr 2013 00:03:06 +0000 (20:03 -0400)]
Merge remote-tracking branch 'origin/master'

11 years agoWhen net_type is MSG_CENTER and net_name is 0, still check entity net_type
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

11 years agoThis line was committed accidentally
terencehill [Wed, 24 Apr 2013 22:37:34 +0000 (00:37 +0200)]
This line was committed accidentally

11 years agoMove "Most weapons" under "Weapon arenas:"
terencehill [Tue, 23 Apr 2013 18:20:20 +0000 (20:20 +0200)]
Move "Most weapons" under "Weapon arenas:"

11 years agoFix minstagib and nix radio buttons not reseting releative cvars to 0 when checking...
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

11 years agoFix "No start weapons" radio button: g_start_weapon_fireball was missing and g_start_...
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

11 years agoRemove menu_weaponarena_with_laser from tooltips.db and tooltips.db.it
terencehill [Tue, 23 Apr 2013 17:37:39 +0000 (19:37 +0200)]
Remove menu_weaponarena_with_laser from tooltips.db and tooltips.db.it

11 years agoAllow to select multiple weapons for weapon arena in the menu
terencehill [Tue, 23 Apr 2013 17:35:25 +0000 (19:35 +0200)]
Allow to select multiple weapons for weapon arena in the menu

11 years agoMerge remote-tracking branch 'origin/terencehill/MOTD_bugfix'
Samual Lenks [Mon, 22 Apr 2013 20:30:10 +0000 (16:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/MOTD_bugfix'

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

11 years agoReset killcount on readyrestart too
Samual Lenks [Mon, 22 Apr 2013 20:15:09 +0000 (16:15 -0400)]
Reset killcount on readyrestart too

11 years agoforgot to remove the debug flag
Samual Lenks [Mon, 22 Apr 2013 02:44:33 +0000 (22:44 -0400)]
forgot to remove the debug flag

11 years agoMerge remote-tracking branch 'origin/samual/notifications'
Samual Lenks [Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)]
Merge remote-tracking branch 'origin/samual/notifications'

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Mon, 22 Apr 2013 02:41:32 +0000 (22:41 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years agoAdd updates to notifications.cfg now
Samual Lenks [Mon, 22 Apr 2013 02:37:03 +0000 (22:37 -0400)]
Add updates to notifications.cfg now

11 years agoAlphabetical order
Samual Lenks [Mon, 22 Apr 2013 02:16:48 +0000 (22:16 -0400)]
Alphabetical order

11 years agoFix a bunch of other things with new announcer code
Samual Lenks [Mon, 22 Apr 2013 02:05:28 +0000 (22:05 -0400)]
Fix a bunch of other things with new announcer code

11 years agoAdd the rest of the announcer calls to new system
Samual Lenks [Sun, 21 Apr 2013 19:25:46 +0000 (15:25 -0400)]
Add the rest of the announcer calls to new system

11 years agoget rid of some bad uses of .ogg extension
Rudolf Polzer [Sun, 21 Apr 2013 15:58:33 +0000 (17:58 +0200)]
get rid of some bad uses of .ogg extension

11 years agoMake the legacy announcer code useless/strip most of it out
Samual Lenks [Sun, 21 Apr 2013 15:43:16 +0000 (11:43 -0400)]
Make the legacy announcer code useless/strip most of it out

11 years agoMove that shizniz to the .qh file
Samual Lenks [Sun, 21 Apr 2013 15:18:42 +0000 (11:18 -0400)]
Move that shizniz to the .qh file

11 years agoMove more things over to new system
Samual Lenks [Sat, 20 Apr 2013 22:33:56 +0000 (18:33 -0400)]
Move more things over to new system

11 years agoGetting close to finishing the infrastructure for new announcer system
Samual Lenks [Sat, 20 Apr 2013 21:26:31 +0000 (17:26 -0400)]
Getting close to finishing the infrastructure for new announcer system

11 years agoFix translations being done on static filenames
Samual Lenks [Sat, 20 Apr 2013 20:36:36 +0000 (16:36 -0400)]
Fix translations being done on static filenames

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years ago++deathlocation
Rudolf Polzer [Fri, 19 Apr 2013 14:03:29 +0000 (16:03 +0200)]
++deathlocation

11 years agoEnable notifications debug again
Samual Lenks [Wed, 17 Apr 2013 22:54:41 +0000 (18:54 -0400)]
Enable notifications debug again

11 years agoWork more on announcements
Samual Lenks [Wed, 17 Apr 2013 22:53:36 +0000 (18:53 -0400)]
Work more on announcements

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Tue, 16 Apr 2013 00:47:37 +0000 (20:47 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years agoFix teamkill
Samual Lenks [Tue, 16 Apr 2013 00:47:16 +0000 (20:47 -0400)]
Fix teamkill

11 years agoLower Nex damage to 80, raise animtime to 0.5
Samual Lenks [Mon, 15 Apr 2013 22:06:04 +0000 (18:06 -0400)]
Lower Nex damage to 80, raise animtime to 0.5

11 years agoStart removing headshots from notifications (forgot about these :3)
Samual Lenks [Mon, 15 Apr 2013 06:16:12 +0000 (02:16 -0400)]
Start removing headshots from notifications (forgot about these :3)

11 years agoMore announcer stuff, plus fix #1476
Samual Lenks [Mon, 15 Apr 2013 03:28:51 +0000 (23:28 -0400)]
More announcer stuff, plus fix #1476

11 years agoMore integration
Samual Lenks [Mon, 15 Apr 2013 02:22:08 +0000 (22:22 -0400)]
More integration

11 years agoNow add the rest of the infrastructure merge for announcer (partly)
Samual Lenks [Mon, 15 Apr 2013 01:54:19 +0000 (21:54 -0400)]
Now add the rest of the infrastructure merge for announcer (partly)

11 years agoFinish the list of announcements
Samual Lenks [Mon, 15 Apr 2013 01:27:12 +0000 (21:27 -0400)]
Finish the list of announcements

11 years agoAdding more announcements
Samual Lenks [Sun, 14 Apr 2013 22:46:21 +0000 (18:46 -0400)]
Adding more announcements

11 years agoUse a team switch for control point sprite name
Mario [Sun, 14 Apr 2013 02:25:51 +0000 (12:25 +1000)]
Use a team switch for control point sprite name

11 years agoFix broken domination control point waypoint
Mario [Sun, 14 Apr 2013 02:06:33 +0000 (12:06 +1000)]
Fix broken domination control point waypoint

11 years agoAdd touch explode to the mutators menu
Mario [Sat, 13 Apr 2013 18:44:39 +0000 (04:44 +1000)]
Add touch explode to the mutators menu

11 years agoBegin moving announcers to the notification system
Samual Lenks [Sat, 13 Apr 2013 18:24:47 +0000 (14:24 -0400)]
Begin moving announcers to the notification system

11 years agobreak xonotic 0.5.0 ;)
Rudolf Polzer [Fri, 12 Apr 2013 18:49:57 +0000 (20:49 +0200)]
break xonotic 0.5.0 ;)

11 years agoFix players able to rejoin after spectating
Mario [Tue, 9 Apr 2013 06:05:16 +0000 (16:05 +1000)]
Fix players able to rejoin after spectating

11 years agoMerge branch 'master' into Mario/lms_updates
Mario [Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)]
Merge branch 'master' into Mario/lms_updates

11 years agoturn off r_glsl_skeletal by default
Rudolf Polzer [Mon, 1 Apr 2013 18:15:54 +0000 (20:15 +0200)]
turn off r_glsl_skeletal by default

11 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
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

11 years agofix overly long qcstatus field
Rudolf Polzer [Mon, 1 Apr 2013 11:36:19 +0000 (13:36 +0200)]
fix overly long qcstatus field

11 years agoMerge branch 'master' into terencehill/hud_code_restructure
terencehill [Sun, 31 Mar 2013 22:16:26 +0000 (00:16 +0200)]
Merge branch 'master' into terencehill/hud_code_restructure

11 years agoFix bad usage of panel_enabled
terencehill [Fri, 29 Mar 2013 16:30:02 +0000 (17:30 +0100)]
Fix bad usage of panel_enabled

11 years agohud_panel_update_interval 2 "how often (in seconds) common panel cvars are reloaded"
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"

11 years agoPrevent loading hagar before the match has started. Fixes bug #1434 (Able to shoot...
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)

11 years agoMove touchexplode to a mutator
Mario [Tue, 26 Mar 2013 18:32:14 +0000 (05:32 +1100)]
Move touchexplode to a mutator

11 years agoThis stuff is not needed
terencehill [Mon, 25 Mar 2013 18:01:33 +0000 (19:01 +0100)]
This stuff is not needed

11 years agoMake some float variables (panel ids) into entities (panels)
terencehill [Mon, 25 Mar 2013 09:33:33 +0000 (10:33 +0100)]
Make some float variables (panel ids) into entities (panels)

11 years agoTrying to restructure hud panel code making use of an entity for each panel
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

11 years agoTurn off vehicle damage when initializing, fixes bug 1352 (invisible vehicles exploding)
Mario [Fri, 22 Mar 2013 05:47:34 +0000 (16:47 +1100)]
Turn off vehicle damage when initializing, fixes bug 1352 (invisible vehicles exploding)

11 years agofix stupid compile errors, we don't have COLOR_TEAM1 any more...
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...

11 years agoTurn plasma turret into instagib turret in minstagib mode (by Mario), fixes #1317
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

11 years agoMerge remote-tracking branch 'origin/Mario/runematch_nuke', fixes #1419
Rudolf Polzer [Thu, 21 Mar 2013 16:21:11 +0000 (17:21 +0100)]
Merge remote-tracking branch 'origin/Mario/runematch_nuke', fixes #1419

11 years agoMerge remote-tracking branch 'origin/samual/kill_zoom_on_client', fixes #1439
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

11 years agoMerge remote-tracking branch 'origin/terencehill/observer_color', fixes #1444
Rudolf Polzer [Thu, 21 Mar 2013 16:16:54 +0000 (17:16 +0100)]
Merge remote-tracking branch 'origin/terencehill/observer_color', fixes #1444

11 years agoMerge remote-tracking branch 'origin/mirceakitsune/bugfix_jumppad_gravity'
Rudolf Polzer [Thu, 21 Mar 2013 16:13:33 +0000 (17:13 +0100)]
Merge remote-tracking branch 'origin/mirceakitsune/bugfix_jumppad_gravity'

11 years agoWhen trigger_gravity modifies the gravity of an entity, jump pads wouldn't account...
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.

11 years agoFix for hud observer color not neutral (it optimizes code too)
terencehill [Wed, 13 Mar 2013 08:32:14 +0000 (09:32 +0100)]
Fix for hud observer color not neutral (it optimizes code too)

11 years agoMerge remote-tracking branch 'origin/terencehill/misc_hud_fixes'
Samual Lenks [Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)]
Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'

11 years agoFix wrong parameters sending prevent join message
terencehill [Fri, 8 Mar 2013 21:15:35 +0000 (22:15 +0100)]
Fix wrong parameters sending prevent join message

11 years agoRemove old PREVENT_JOIN_TEXT
terencehill [Fri, 8 Mar 2013 21:04:13 +0000 (22:04 +0100)]
Remove old PREVENT_JOIN_TEXT

11 years agoMOTD centerprint fixes / changes:
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

11 years agoFix PrintWelcomeMessage executed twice per frame when observing/spectating; also...
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

11 years agoMerge branch 'master' into mario/runematch_nuke
Mario [Thu, 7 Mar 2013 06:13:59 +0000 (17:13 +1100)]
Merge branch 'master' into mario/runematch_nuke

11 years agoFix stringcount mismatch
Samual Lenks [Thu, 7 Mar 2013 04:51:33 +0000 (23:51 -0500)]
Fix stringcount mismatch

11 years agoKill centerprints on client too when doing Destroy_All_Notifications()
Samual Lenks [Wed, 6 Mar 2013 22:55:43 +0000 (17:55 -0500)]
Kill centerprints on client too when doing Destroy_All_Notifications()

11 years agoWhoops, allow disabled notifications to be handled properly
Samual Lenks [Wed, 6 Mar 2013 22:50:08 +0000 (17:50 -0500)]
Whoops, allow disabled notifications to be handled properly

11 years agoFix some other things
Samual Lenks [Tue, 5 Mar 2013 07:31:09 +0000 (02:31 -0500)]
Fix some other things

11 years ago*sigh*
Samual Lenks [Tue, 5 Mar 2013 07:26:22 +0000 (02:26 -0500)]
*sigh*

11 years ago"unpress" system on client
Samual Lenks [Tue, 5 Mar 2013 06:21:48 +0000 (01:21 -0500)]
"unpress" system on client