]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sat, 18 Dec 2010 22:11:20 +0000 (23:11 +0100)]
Revert Commit:
f36a4689b5f9c4ff82e285e27f4545d1b59f168c
"to terencehill: please be more careful with your optimizations and what they cause, this for instance broke highlighting in some cases"
Sorry FruitieX, but I cannot reproduce the bug. hud_configure_active_panel is meaningful only when _hud_configure is != 0 (or menu_enable is 2, which can only be if _hud_configure is != 0), just look at the checks.
Maybe that bug was caused by something else and now is gone... dunno... let's see if it happens again.
PS: pls do not think I commit thoughtlessly the changes I do. On the contrary I put every effort I can to do them correctly, and I'm talking about the minor changes too. Anyway, I'm not perfect so u should expect that sometimes I could make a mistake.
terencehill [Sat, 18 Dec 2010 21:47:43 +0000 (22:47 +0100)]
Fix missing semicolon
terencehill [Sat, 18 Dec 2010 01:00:58 +0000 (02:00 +0100)]
Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
terencehill [Fri, 17 Dec 2010 23:24:54 +0000 (00:24 +0100)]
Do not return in the double click check, as it forbids the cursor to be drawn the frame the double click happens
Cleanups:
- Give sensible names to HUD_Panel_HighlightCheck and highlightcheck
- Move some var and code in better places
terencehill [Thu, 16 Dec 2010 23:07:53 +0000 (00:07 +0100)]
Draw panel slightly brighter on mouse over
terencehill [Thu, 16 Dec 2010 00:27:22 +0000 (01:27 +0100)]
Stupid typos
terencehill [Thu, 16 Dec 2010 00:23:51 +0000 (01:23 +0100)]
hud_panel_physics 1 = show only when spectating other players, 2 = show always
Just like the pressed keys panel
terencehill [Wed, 15 Dec 2010 23:54:27 +0000 (00:54 +0100)]
Merging the physics panel I forgot to delete the autocvar_cl_show* autocvars :(
terencehill [Wed, 15 Dec 2010 23:48:33 +0000 (00:48 +0100)]
Also disable score panel in race/cts when observing
terencehill [Wed, 15 Dec 2010 23:43:58 +0000 (00:43 +0100)]
Revert "always draw the scoreboard when observing (won't change behaviour in other gamemodes, fixes some panels being visible in CTS where they shouldnt be)"
This reverts commit
4643c9df1b7f2232384263def0eb5bb6c0050d2f .
because it undoes my commit
8c063f818722ca59c769aa742647d729f6a61da3
where forced scoreboard when observing was disabled together with some useless panel.
terencehill [Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)]
Merge branch 'master' into terencehill/newpanelhud
Conflicts:
qcsrc/client/scoreboard.qc
terencehill [Wed, 15 Dec 2010 22:19:56 +0000 (23:19 +0100)]
Reduce self highlight alpha in rankings of the score panel and make constants some variable
terencehill [Wed, 15 Dec 2010 19:16:38 +0000 (20:16 +0100)]
check whether stop ctrl-tab selection only at the mouse click
terencehill [Wed, 15 Dec 2010 19:07:58 +0000 (20:07 +0100)]
Fix a minor bug in ctrl-z by adding 2 checks of highlightedPanel and give more appropriated names to 2 variables used by ctrl-z
terencehill [Wed, 15 Dec 2010 17:44:14 +0000 (18:44 +0100)]
Get rid of highlightedPanel_prev, I'm really sick of it, it was only bringing confusion.
FruitieX [Wed, 15 Dec 2010 16:05:14 +0000 (18:05 +0200)]
remove a debug print... but why does the max speed peaks still not update instantly?
FruitieX [Wed, 15 Dec 2010 14:22:07 +0000 (16:22 +0200)]
center align possibility for physics panel
FruitieX [Wed, 15 Dec 2010 12:42:20 +0000 (14:42 +0200)]
to terencehill: please be more careful with your optimizations and what they cause, this for instance broke highlighting in some cases
FruitieX [Wed, 15 Dec 2010 12:16:51 +0000 (14:16 +0200)]
autocvarize
FruitieX [Wed, 15 Dec 2010 12:11:53 +0000 (14:11 +0200)]
Revert "Network dom pps data in a more efficient way" <---- Lies.
This reverts commit
02d238e88f088f567092b524a09001bfcacc8d75 .
Conflicts:
qcsrc/server/domination.qc
FruitieX [Wed, 15 Dec 2010 12:08:39 +0000 (14:08 +0200)]
make it compile
FruitieX [Wed, 15 Dec 2010 12:04:55 +0000 (14:04 +0200)]
Merge remote branch 'origin/terencehill/newpanelhud-dom_points' into terencehill/newpanelhud
Conflicts:
qcsrc/client/hud.qc
qcsrc/server/domination.qc
FruitieX [Wed, 15 Dec 2010 11:50:53 +0000 (13:50 +0200)]
Merge branch 'master' into terencehill/newpanelhud
Conflicts:
qcsrc/client/scoreboard.qc
Rudolf Polzer [Wed, 15 Dec 2010 09:14:17 +0000 (10:14 +0100)]
fix significant digits of some menu-governed crosshair cvars
Rudolf Polzer [Wed, 15 Dec 2010 09:09:34 +0000 (10:09 +0100)]
remove menu option for AntiLag (nobody needs it)
Rudolf Polzer [Wed, 15 Dec 2010 07:28:32 +0000 (08:28 +0100)]
next version of balanceLeeStricklin
Rudolf Polzer [Tue, 14 Dec 2010 18:46:36 +0000 (19:46 +0100)]
be a bit more conservative regarding the warpzone fix
Rudolf Polzer [Tue, 14 Dec 2010 18:43:08 +0000 (19:43 +0100)]
make warpzones able to transport spectators too now
Rudolf Polzer [Tue, 14 Dec 2010 06:56:53 +0000 (07:56 +0100)]
Merge remote branch 'origin/terencehill/waypointsprite_alpha_fix'
Rudolf Polzer [Tue, 14 Dec 2010 06:56:06 +0000 (07:56 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Tue, 14 Dec 2010 06:55:23 +0000 (07:55 +0100)]
Merge remote branch 'origin/fruitiex/better_default_color'
Rudolf Polzer [Tue, 14 Dec 2010 06:54:47 +0000 (07:54 +0100)]
Merge remote branch 'origin/fruitiex/no_kill_notify'
Rudolf Polzer [Tue, 14 Dec 2010 06:10:18 +0000 (07:10 +0100)]
back to the canjump workaround
Rudolf Polzer [Tue, 14 Dec 2010 06:04:29 +0000 (07:04 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 14 Dec 2010 06:03:53 +0000 (07:03 +0100)]
waste more GPU memory :(
terencehill [Mon, 13 Dec 2010 22:16:47 +0000 (23:16 +0100)]
Cleanups:
- Rename active_panel to hud_configure_active_panel as it's used only in hud configure
- Use more autocvars
- Reduce checks of hud_configure when possible
FruitieX [Mon, 13 Dec 2010 21:01:59 +0000 (23:01 +0200)]
make weapon panel fading/effect cvars part of the hud config files. Add to the exporter.
terencehill [Mon, 13 Dec 2010 20:54:54 +0000 (21:54 +0100)]
Merge branch 'terencehill/speedpanel' into terencehill/newpanelhud
terencehill [Mon, 13 Dec 2010 20:38:49 +0000 (21:38 +0100)]
uid2name_dialog: fix coloring in a string and do not allow to enter in hud configure mode until an answer hasn't been given
FruitieX [Mon, 13 Dec 2010 20:31:19 +0000 (22:31 +0200)]
use a better looking deafault color, and Erebus as the default model (it's imo the best looking model we have!)
FruitieX [Mon, 13 Dec 2010 20:18:47 +0000 (22:18 +0200)]
comment this sprint out, not sure we want it (centerprint should already make it obvious enough, plus the centerprint varies depending on what will happen e.g. spec/teamchange/kill)
FruitieX [Mon, 13 Dec 2010 20:04:46 +0000 (22:04 +0200)]
disable the "engineinfo" panel by default in all HUD configs
Rudolf Polzer [Mon, 13 Dec 2010 06:00:50 +0000 (07:00 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 13 Dec 2010 06:00:20 +0000 (07:00 +0100)]
fix player model sound and species loading for invalid skin values; use .model and .skinindex, not a mixture
terencehill [Sun, 12 Dec 2010 22:16:37 +0000 (23:16 +0100)]
Move CTRL-TAB case down: between MOUSE1 and ESCAPE isn't that cute, aesthetically talking ;)
terencehill [Sun, 12 Dec 2010 22:02:47 +0000 (23:02 +0100)]
And fix interaction with mouse :)
Rudolf Polzer [Sun, 12 Dec 2010 21:11:57 +0000 (22:11 +0100)]
disable forced console
Rudolf Polzer [Sun, 12 Dec 2010 21:06:49 +0000 (22:06 +0100)]
turn off loading screen previous background by default
Rudolf Polzer [Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)]
Merge remote branch 'origin/fruitiex/loadscreen'
terencehill [Sun, 12 Dec 2010 20:32:42 +0000 (21:32 +0100)]
Fix bad interaction of CTRL-TAB with CTRL-C, CTRL-V and CTRL-SPACE
Rudolf Polzer [Sun, 12 Dec 2010 20:01:52 +0000 (21:01 +0100)]
do not loop the shoot anim
Rudolf Polzer [Sun, 12 Dec 2010 19:44:31 +0000 (20:44 +0100)]
get rid of missing cfg reference
FruitieX [Sun, 12 Dec 2010 19:43:10 +0000 (21:43 +0200)]
enable the cvars that shows the previous bg instead of drawing the loadscreen on top of a black bg
FruitieX [Sun, 12 Dec 2010 19:41:19 +0000 (21:41 +0200)]
improve the loading screen
Rudolf Polzer [Sun, 12 Dec 2010 19:36:24 +0000 (20:36 +0100)]
remove more warning causes
Rudolf Polzer [Sun, 12 Dec 2010 19:05:51 +0000 (20:05 +0100)]
do not load _lod models if they do not exist (fixes client warning)
Rudolf Polzer [Sun, 12 Dec 2010 17:12:43 +0000 (18:12 +0100)]
allow g_weapon_stay on pure servers
Rudolf Polzer [Sun, 12 Dec 2010 17:08:04 +0000 (18:08 +0100)]
we probably shouldn't force a weapon-stay mode in all team modes. Let's only do this for CTS now.
Rudolf Polzer [Sun, 12 Dec 2010 16:33:41 +0000 (17:33 +0100)]
fix glowmod of weapon entity (no longer assign it to world, make code more consistent)
Rudolf Polzer [Sun, 12 Dec 2010 15:54:21 +0000 (16:54 +0100)]
enable weapon-stay mode 3 in all teamplay modes, and keep weapon-stay mode 1 in CTS
terencehill [Sun, 12 Dec 2010 13:50:56 +0000 (14:50 +0100)]
Fade waypoints out opening the menu (like it was before)
PS: Commit:
250e9f56c0d1f61f6cf366d90671a79d45049c21
Why was waypointsprite alpha not set? Because waypointsprite_alpha initialization was removed merging my previous changes :)
Rudolf Polzer [Sun, 12 Dec 2010 13:50:24 +0000 (14:50 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Sun, 12 Dec 2010 13:48:27 +0000 (14:48 +0100)]
simplify
Rudolf Polzer [Sun, 12 Dec 2010 13:43:25 +0000 (14:43 +0100)]
Merge remote branch 'origin/fruitiex/ctsfix'
Rudolf Polzer [Sun, 12 Dec 2010 13:42:53 +0000 (14:42 +0100)]
possibly fix the kill indicator leak bug
Rudolf Polzer [Sun, 12 Dec 2010 13:39:30 +0000 (14:39 +0100)]
settings for the new loading screen
Rudolf Polzer [Sun, 12 Dec 2010 13:37:52 +0000 (14:37 +0100)]
Merge remote branch 'origin/fruitiex/rzde_loadscreen'
FruitieX [Sun, 12 Dec 2010 12:26:20 +0000 (14:26 +0200)]
explicitly allow an instant kill after player finished a CTS run, add a comment
FruitieX [Sun, 12 Dec 2010 11:07:15 +0000 (13:07 +0200)]
make it compile
FruitieX [Sun, 12 Dec 2010 10:57:56 +0000 (12:57 +0200)]
Merge branch 'fruitiex/xpm' into fruitiex/ctsfix
FruitieX [Sun, 12 Dec 2010 10:53:24 +0000 (12:53 +0200)]
Merge branch 'fruitiex/balance' into fruitiex/ctsfix
Conflicts:
defaultXonotic.cfg
FruitieX [Sun, 12 Dec 2010 10:52:00 +0000 (12:52 +0200)]
remove hardcoded weapon stay for CTS
FruitieX [Sun, 12 Dec 2010 10:51:12 +0000 (12:51 +0200)]
per-gametype weapon_stay cvars. Enable weapon stay by default in: CTF, Assault, CTS, Freezetag
FruitieX [Sun, 12 Dec 2010 10:43:39 +0000 (12:43 +0200)]
weapon respawn time 5 sec -> 10 sec
FruitieX [Sun, 12 Dec 2010 09:56:44 +0000 (11:56 +0200)]
force g_weapon_stay == 1 in cts, don't show it in the modifications string
FruitieX [Sat, 11 Dec 2010 23:12:30 +0000 (01:12 +0200)]
untested, entirely theoretical nerfs to the overpowered weapons, and a small bump for the mine layer
FruitieX [Sat, 11 Dec 2010 22:34:01 +0000 (00:34 +0200)]
fix the xhair hud config ammo panel: xoffset cvar had been forgotten, so the progressbar was not offset correctly. Add cvar to the exporter. Completely harmless two-liner change, please merge :P
FruitieX [Sat, 11 Dec 2010 20:29:17 +0000 (22:29 +0200)]
only silence the killindicator centerprint when it's actually triggered by hitting the goal
FruitieX [Sat, 11 Dec 2010 20:12:13 +0000 (22:12 +0200)]
always draw the scoreboard when observing (won't change behaviour in other gamemodes, fixes some panels being visible in CTS where they shouldnt be)
FruitieX [Sat, 11 Dec 2010 20:03:15 +0000 (22:03 +0200)]
Merge remote branch 'origin/master' into fruitiex/ctsfix
FruitieX [Sat, 11 Dec 2010 20:02:55 +0000 (22:02 +0200)]
git wants me to commit, so I will: begin using the improved kill delay code
Rudolf Polzer [Sat, 11 Dec 2010 20:02:08 +0000 (21:02 +0100)]
move the antispam to a better place :P
FruitieX [Sat, 11 Dec 2010 19:53:03 +0000 (21:53 +0200)]
Merge remote branch 'origin/master' into fruitiex/ctsfix
Rudolf Polzer [Sat, 11 Dec 2010 19:52:37 +0000 (20:52 +0100)]
fix the antispam
Rudolf Polzer [Sat, 11 Dec 2010 19:45:49 +0000 (20:45 +0100)]
route selectteam through the kill delay system
Rudolf Polzer [Sat, 11 Dec 2010 19:37:43 +0000 (20:37 +0100)]
g_balance_kill_antispam
FruitieX [Sat, 11 Dec 2010 19:35:47 +0000 (21:35 +0200)]
no deathscoreboard in CTS, you immediately spawn
FruitieX [Sat, 11 Dec 2010 19:33:42 +0000 (21:33 +0200)]
limit the amount of kills allowed per time. This code is already rejected, fixing later when div0 does it the right way for other actions as well
Rudolf Polzer [Sat, 11 Dec 2010 19:31:16 +0000 (20:31 +0100)]
ClientKill_TeamChange: target team -2 now means spectator
FruitieX [Sat, 11 Dec 2010 18:57:41 +0000 (20:57 +0200)]
fix a typo
FruitieX [Sat, 11 Dec 2010 18:57:03 +0000 (20:57 +0200)]
allow only 5 suicides every 5 seconds in CTS. No killmessage (centerprint) needed. Disable the respawn delay in CTS
FruitieX [Sat, 11 Dec 2010 18:42:15 +0000 (20:42 +0200)]
forced respawn in CTS
FruitieX [Sat, 11 Dec 2010 18:40:08 +0000 (20:40 +0200)]
no weapon drops in CTS!
terencehill [Sat, 11 Dec 2010 09:54:17 +0000 (10:54 +0100)]
Remove redundant vars
Rudolf Polzer [Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)]
Rudolf Polzer [Fri, 10 Dec 2010 23:43:26 +0000 (00:43 +0100)]
Rudolf Polzer [Fri, 10 Dec 2010 23:42:19 +0000 (00:42 +0100)]
fix waypointsprite alpha (why was it not set?)
Rudolf Polzer [Fri, 10 Dec 2010 23:42:30 +0000 (00:42 +0100)]
fix start ammo in weaponarena
FruitieX [Fri, 10 Dec 2010 23:19:20 +0000 (01:19 +0200)]
improve it further. I'm done with it. ;)
FruitieX [Fri, 10 Dec 2010 22:36:31 +0000 (00:36 +0200)]
Merge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix