]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sun, 26 May 2013 16:42:07 +0000 (18:42 +0200)]
Get rid of the HUD_Panel_ApplyFadeAlpha macro
terencehill [Wed, 22 May 2013 13:27:26 +0000 (15:27 +0200)]
Remove stupid code: hud_fade_alpha is already 1 if that condition is true
terencehill [Mon, 20 May 2013 19:03:32 +0000 (21:03 +0200)]
HUD_Panel_UpdatePosSize_ForMenu is more correct this way
terencehill [Sun, 19 May 2013 10:39:08 +0000 (12:39 +0200)]
Make menu_enable_* vars locals
terencehill [Thu, 16 May 2013 08:23:22 +0000 (10:23 +0200)]
Rearrange a check
terencehill [Thu, 16 May 2013 08:06:51 +0000 (10:06 +0200)]
Save team count instead of recounting teams every frame multiple times
terencehill [Thu, 16 May 2013 06:43:42 +0000 (08:43 +0200)]
Decide which ModIcons panel to display right after game type initialization
terencehill [Wed, 15 May 2013 18:41:44 +0000 (20:41 +0200)]
Unify HUD_Panel_GetMenuPos and HUD_Panel_GetMenuSize
terencehill [Wed, 15 May 2013 14:45:00 +0000 (16:45 +0200)]
Get rid of HUD_Panel_GetStringVars
terencehill [Tue, 14 May 2013 17:49:39 +0000 (19:49 +0200)]
Reduce scope of AMMO_COUNT
terencehill [Sun, 12 May 2013 22:42:45 +0000 (00:42 +0200)]
HUD config: improve code to detect if a panel dialog has been closed and put it in HUD_Configure_Frame (HUD_Panel_Mouse wasn't a good place anyway)
terencehill [Sun, 12 May 2013 19:01:50 +0000 (21:01 +0200)]
Rename HUD_Panel_GetScaledVectors and put it in a better place to make the code a bit more intuitive
terencehill [Sun, 12 May 2013 18:44:44 +0000 (20:44 +0200)]
Remove HUD_Panel_GetProgressBarColor and HUD_Panel_GetProgressBarColorForString macros, making use of autocvar_hud_progressbar* autocvars code is simpler and more optimized
terencehill [Sun, 12 May 2013 18:20:56 +0000 (20:20 +0200)]
HUD_FinaleOverlay() stayed there doing nothing for too long
terencehill [Sun, 12 May 2013 18:04:30 +0000 (20:04 +0200)]
More code in hud_config.qc
terencehill [Sun, 12 May 2013 17:55:17 +0000 (19:55 +0200)]
Move most of the hud config code from hud.qc to hud_config.qc
Rudolf Polzer [Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)]
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 11 May 2013 11:44:47 +0000 (13:44 +0200)]
fix weapon duping (thanks, Mario)
Samual Lenks [Fri, 10 May 2013 05:20:57 +0000 (01:20 -0400)]
Merge remote-tracking branch 'origin/Mario/classname_checks'
Samual Lenks [Fri, 10 May 2013 05:11:57 +0000 (01:11 -0400)]
Burn the old arena file
Samual Lenks [Fri, 10 May 2013 05:11:27 +0000 (01:11 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/classname_checks
Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/waypointsprites.qc
Samual Lenks [Fri, 10 May 2013 01:52:58 +0000 (21:52 -0400)]
Make menu compatibility match server code too
Samual Lenks [Fri, 10 May 2013 01:40:54 +0000 (21:40 -0400)]
Clean up mutator loading list a bit
Samual Lenks [Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)]
Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
Samual Lenks [Thu, 9 May 2013 21:21:07 +0000 (17:21 -0400)]
Fix language list size
Samual Lenks [Thu, 9 May 2013 20:51:13 +0000 (16:51 -0400)]
Don't show accuracy in scoreboard anymore (it can be seen in 2 other
places, +accuracy and weapons panel)
Samual Lenks [Thu, 9 May 2013 20:49:55 +0000 (16:49 -0400)]
Merge remote-tracking branch 'origin/cbrutail/hudlaserminsta_fix'
Samual Lenks [Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)]
Merge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix
Samual Lenks [Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)]
Merge remote-tracking branch 'origin/divVerent/meleefix'
Samual Lenks [Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/meleefix
Samual Lenks [Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_fixes'
Mario [Wed, 8 May 2013 04:20:26 +0000 (14:20 +1000)]
Fix some issues with LMS & CA
Samual Lenks [Wed, 8 May 2013 03:12:50 +0000 (23:12 -0400)]
Whoops, forgot that one
Samual Lenks [Wed, 8 May 2013 03:09:03 +0000 (23:09 -0400)]
Try to fix off-by-one error in deathtype code
Mario [Wed, 8 May 2013 02:05:31 +0000 (12:05 +1000)]
Fix compile error
Mario [Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)]
Merge branch 'master' into Mario/mutator_minstagib
Samual Lenks [Wed, 8 May 2013 01:15:35 +0000 (21:15 -0400)]
Merge remote-tracking branch 'origin/terencehill/spectate_prev'
Samual Lenks [Wed, 8 May 2013 01:14:51 +0000 (21:14 -0400)]
Fix stupidass function name
Samual Lenks [Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev
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
Mario [Tue, 7 May 2013 06:14:52 +0000 (16:14 +1000)]
Remove a redundant mutator hook
Mario [Tue, 7 May 2013 05:52:10 +0000 (15:52 +1000)]
Fix new clienttype checks
Mario [Tue, 7 May 2013 05:49:31 +0000 (15:49 +1000)]
Merge branch 'master' into Mario/classname_checks
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
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