]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agoStupid typos
terencehill [Thu, 16 Dec 2010 00:27:22 +0000 (01:27 +0100)]
Stupid typos

14 years agohud_panel_physics 1 = show only when spectating other players, 2 = show always
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

14 years agoMerging the physics panel I forgot to delete the autocvar_cl_show* autocvars :(
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 :(

14 years agoAlso disable score panel in race/cts when observing
terencehill [Wed, 15 Dec 2010 23:48:33 +0000 (00:48 +0100)]
Also disable score panel in race/cts when observing

14 years agoRevert "always draw the scoreboard when observing (won't change behaviour in other...
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.

14 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)]
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/scoreboard.qc

14 years agoReduce self highlight alpha in rankings of the score panel and make constants some...
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

14 years agocheck whether stop ctrl-tab selection only at the mouse click
terencehill [Wed, 15 Dec 2010 19:16:38 +0000 (20:16 +0100)]
check whether stop ctrl-tab selection only at the mouse click

14 years agoFix a minor bug in ctrl-z by adding 2 checks of highlightedPanel and give more approp...
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

14 years agoGet rid of highlightedPanel_prev, I'm really sick of it, it was only bringing confusion.
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.

14 years agoCleanups:
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

14 years agoMerge branch 'terencehill/speedpanel' into terencehill/newpanelhud
terencehill [Mon, 13 Dec 2010 20:54:54 +0000 (21:54 +0100)]
Merge branch 'terencehill/speedpanel' into terencehill/newpanelhud

14 years agouid2name_dialog: fix coloring in a string and do not allow to enter in hud configure...
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

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

14 years agofix player model sound and species loading for invalid skin values; use .model and...
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

14 years agoMove CTRL-TAB case down: between MOUSE1 and ESCAPE isn't that cute, aesthetically...
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 ;)

14 years agoAnd fix interaction with mouse :)
terencehill [Sun, 12 Dec 2010 22:02:47 +0000 (23:02 +0100)]
And fix interaction with mouse :)

14 years agodisable forced console
Rudolf Polzer [Sun, 12 Dec 2010 21:11:57 +0000 (22:11 +0100)]
disable forced console

14 years agoturn off loading screen previous background by default
Rudolf Polzer [Sun, 12 Dec 2010 21:06:49 +0000 (22:06 +0100)]
turn off loading screen previous background by default

14 years agoMerge remote branch 'origin/fruitiex/loadscreen'
Rudolf Polzer [Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)]
Merge remote branch 'origin/fruitiex/loadscreen'

14 years agoFix bad interaction of CTRL-TAB with CTRL-C, CTRL-V and CTRL-SPACE
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

14 years agodo not loop the shoot anim
Rudolf Polzer [Sun, 12 Dec 2010 20:01:52 +0000 (21:01 +0100)]
do not loop the shoot anim

14 years agoget rid of missing cfg reference
Rudolf Polzer [Sun, 12 Dec 2010 19:44:31 +0000 (20:44 +0100)]
get rid of missing cfg reference

14 years agoenable the cvars that shows the previous bg instead of drawing the loadscreen on...
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

14 years agoimprove the loading screen
FruitieX [Sun, 12 Dec 2010 19:41:19 +0000 (21:41 +0200)]
improve the loading screen

14 years agoremove more warning causes
Rudolf Polzer [Sun, 12 Dec 2010 19:36:24 +0000 (20:36 +0100)]
remove more warning causes

14 years agodo not load _lod models if they do not exist (fixes client warning)
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)

14 years agoallow g_weapon_stay on pure servers
Rudolf Polzer [Sun, 12 Dec 2010 17:12:43 +0000 (18:12 +0100)]
allow g_weapon_stay on pure servers

14 years agowe probably shouldn't force a weapon-stay mode in all team modes. Let's only do this...
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.

14 years agofix glowmod of weapon entity (no longer assign it to world, make code more consistent)
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)

14 years agoenable weapon-stay mode 3 in all teamplay modes, and keep weapon-stay mode 1 in CTS
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

14 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Sun, 12 Dec 2010 13:50:24 +0000 (14:50 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

14 years agosimplify
Rudolf Polzer [Sun, 12 Dec 2010 13:48:27 +0000 (14:48 +0100)]
simplify

14 years agoMerge remote branch 'origin/fruitiex/ctsfix'
Rudolf Polzer [Sun, 12 Dec 2010 13:43:25 +0000 (14:43 +0100)]
Merge remote branch 'origin/fruitiex/ctsfix'

14 years agopossibly fix the kill indicator leak bug
Rudolf Polzer [Sun, 12 Dec 2010 13:42:53 +0000 (14:42 +0100)]
possibly fix the kill indicator leak bug

14 years agosettings for the new loading screen
Rudolf Polzer [Sun, 12 Dec 2010 13:39:30 +0000 (14:39 +0100)]
settings for the new loading screen

14 years agoMerge remote branch 'origin/fruitiex/rzde_loadscreen'
Rudolf Polzer [Sun, 12 Dec 2010 13:37:52 +0000 (14:37 +0100)]
Merge remote branch 'origin/fruitiex/rzde_loadscreen'

14 years agoexplicitly allow an instant kill after player finished a CTS run, add a comment
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

14 years agomake it compile
FruitieX [Sun, 12 Dec 2010 11:07:15 +0000 (13:07 +0200)]
make it compile

14 years agoMerge branch 'fruitiex/xpm' into fruitiex/ctsfix
FruitieX [Sun, 12 Dec 2010 10:57:56 +0000 (12:57 +0200)]
Merge branch 'fruitiex/xpm' into fruitiex/ctsfix

14 years agoMerge branch 'fruitiex/balance' 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

14 years agoremove hardcoded weapon stay for CTS
FruitieX [Sun, 12 Dec 2010 10:52:00 +0000 (12:52 +0200)]
remove hardcoded weapon stay for CTS

14 years agoper-gametype weapon_stay cvars. Enable weapon stay by default in: CTF, Assault, 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

14 years agoweapon respawn time 5 sec -> 10 sec
FruitieX [Sun, 12 Dec 2010 10:43:39 +0000 (12:43 +0200)]
weapon respawn time 5 sec -> 10 sec

14 years agoforce g_weapon_stay == 1 in cts, don't show it in the modifications string
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

14 years agountested, entirely theoretical nerfs to the overpowered weapons, and a small bump...
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

14 years agofix the xhair hud config ammo panel: xoffset cvar had been forgotten, so the progress...
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

14 years agoonly silence the killindicator centerprint when it's actually triggered by hitting...
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

14 years agoalways draw the scoreboard when observing (won't change behaviour in other gamemodes...
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)

14 years agoMerge remote branch 'origin/master' into fruitiex/ctsfix
FruitieX [Sat, 11 Dec 2010 20:03:15 +0000 (22:03 +0200)]
Merge remote branch 'origin/master' into fruitiex/ctsfix

14 years agogit wants me to commit, so I will: begin using the improved kill delay code
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

14 years agomove the antispam to a better place :P
Rudolf Polzer [Sat, 11 Dec 2010 20:02:08 +0000 (21:02 +0100)]
move the antispam to a better place :P

14 years agoMerge remote branch 'origin/master' into fruitiex/ctsfix
FruitieX [Sat, 11 Dec 2010 19:53:03 +0000 (21:53 +0200)]
Merge remote branch 'origin/master' into fruitiex/ctsfix

14 years agofix the antispam
Rudolf Polzer [Sat, 11 Dec 2010 19:52:37 +0000 (20:52 +0100)]
fix the antispam

14 years agoroute selectteam through the kill delay system
Rudolf Polzer [Sat, 11 Dec 2010 19:45:49 +0000 (20:45 +0100)]
route selectteam through the kill delay system

14 years agog_balance_kill_antispam
Rudolf Polzer [Sat, 11 Dec 2010 19:37:43 +0000 (20:37 +0100)]
g_balance_kill_antispam

14 years agono deathscoreboard in CTS, you immediately spawn
FruitieX [Sat, 11 Dec 2010 19:35:47 +0000 (21:35 +0200)]
no deathscoreboard in CTS, you immediately spawn

14 years agolimit the amount of kills allowed per time. This code is already rejected, fixing...
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

14 years agoClientKill_TeamChange: target team -2 now means spectator
Rudolf Polzer [Sat, 11 Dec 2010 19:31:16 +0000 (20:31 +0100)]
ClientKill_TeamChange: target team -2 now means spectator

14 years agofix a typo
FruitieX [Sat, 11 Dec 2010 18:57:41 +0000 (20:57 +0200)]
fix a typo

14 years agoallow only 5 suicides every 5 seconds in CTS. No killmessage (centerprint) needed...
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

14 years agoforced respawn in CTS
FruitieX [Sat, 11 Dec 2010 18:42:15 +0000 (20:42 +0200)]
forced respawn in CTS

14 years agono weapon drops in CTS!
FruitieX [Sat, 11 Dec 2010 18:40:08 +0000 (20:40 +0200)]
no weapon drops in CTS!

14 years agoRemove redundant vars
terencehill [Sat, 11 Dec 2010 09:54:17 +0000 (10:54 +0100)]
Remove redundant vars

14 years agoMerge commit 'c5518de'
Rudolf Polzer [Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)]
Merge commit 'c5518de'

14 years agoMerge commit '7b4c329'
Rudolf Polzer [Fri, 10 Dec 2010 23:43:26 +0000 (00:43 +0100)]
Merge commit '7b4c329'

14 years agofix waypointsprite alpha (why was it not set?)
Rudolf Polzer [Fri, 10 Dec 2010 23:42:19 +0000 (00:42 +0100)]
fix waypointsprite alpha (why was it not set?)

14 years agofix start ammo in weaponarena
Rudolf Polzer [Fri, 10 Dec 2010 23:42:30 +0000 (00:42 +0100)]
fix start ammo in weaponarena

14 years agoimprove it further. I'm done with it. ;)
FruitieX [Fri, 10 Dec 2010 23:19:20 +0000 (01:19 +0200)]
improve it further. I'm done with it. ;)

14 years agoMerge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix
FruitieX [Fri, 10 Dec 2010 22:36:31 +0000 (00:36 +0200)]
Merge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix

14 years agouse SUB_Remove instead in the init function that used to cause problems
FruitieX [Fri, 10 Dec 2010 22:35:59 +0000 (00:35 +0200)]
use SUB_Remove instead in the init function that used to cause problems

14 years agomake it poweroftwo...
FruitieX [Fri, 10 Dec 2010 22:27:11 +0000 (00:27 +0200)]
make it poweroftwo...

14 years agotweak the font color a bit
FruitieX [Fri, 10 Dec 2010 22:09:48 +0000 (00:09 +0200)]
tweak the font color a bit

14 years agoimprove the loading screen a bit :)
FruitieX [Fri, 10 Dec 2010 22:04:39 +0000 (00:04 +0200)]
improve the loading screen a bit :)

14 years agoMerge remote branch 'origin/terencehill/WEP_constants_fix' into fruitiex/ctsfix
Rudolf Polzer [Fri, 10 Dec 2010 21:56:37 +0000 (22:56 +0100)]
Merge remote branch 'origin/terencehill/WEP_constants_fix' into fruitiex/ctsfix

14 years agoMerge remote branch 'origin/fruitiex/miscfixes' into fruitiex/ctsfix
Rudolf Polzer [Fri, 10 Dec 2010 21:51:58 +0000 (22:51 +0100)]
Merge remote branch 'origin/fruitiex/miscfixes' into fruitiex/ctsfix

14 years agoPut part2 of HUD_Panel_UpdatePosSizeForId within the main switch to avoid enclosing...
terencehill [Fri, 10 Dec 2010 18:59:16 +0000 (19:59 +0100)]
Put part2 of HUD_Panel_UpdatePosSizeForId within the main switch to avoid enclosing macro calls by brackets (code didn't compile because of missing brackets)

Convert hud_panel_physics_* cvars into autocvars

14 years agoMerge branch 'terencehill/newpanelhud' into terencehill/speedpanel
terencehill [Fri, 10 Dec 2010 18:23:13 +0000 (19:23 +0100)]
Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc

14 years agoUse directly panel_pos and panel_size
terencehill [Fri, 10 Dec 2010 18:08:56 +0000 (19:08 +0100)]
Use directly panel_pos and panel_size

14 years agoloading image by rainerzufalldererste. Someone with sufficient engine knowledge pleas...
FruitieX [Fri, 10 Dec 2010 13:59:05 +0000 (15:59 +0200)]
loading image by rainerzufalldererste. Someone with sufficient engine knowledge please add support for downscaling the image so it fits the screen borders

14 years agoFix panel 0 selected entering hud config mode
terencehill [Thu, 9 Dec 2010 22:16:27 +0000 (23:16 +0100)]
Fix panel 0 selected entering hud config mode

14 years agoTiny cleanups to the CTRL-TAB code
terencehill [Thu, 9 Dec 2010 22:05:01 +0000 (23:05 +0100)]
Tiny cleanups to the CTRL-TAB code

14 years agoMerge branch 'terencehill/hud_config_shortcuts' into terencehill/newpanelhud
terencehill [Thu, 9 Dec 2010 21:52:50 +0000 (22:52 +0100)]
Merge branch 'terencehill/hud_config_shortcuts' into terencehill/newpanelhud

14 years agodo NOT call cvar() again, do it right
Rudolf Polzer [Thu, 9 Dec 2010 21:51:04 +0000 (22:51 +0100)]
do NOT call cvar() again, do it right

14 years agoMerge branch 'fruitiex/ctsfix' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3di...
Rudolf Polzer [Thu, 9 Dec 2010 21:50:15 +0000 (22:50 +0100)]
Merge branch 'fruitiex/ctsfix' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into fruitiex/ctsfix

14 years agoprotected the current entity chain from remove() calls
Rudolf Polzer [Thu, 9 Dec 2010 21:49:57 +0000 (22:49 +0100)]
protected the current entity chain from remove() calls

14 years agoMerge branch 'master' into fruitiex/ctsfix
Rudolf Polzer [Thu, 9 Dec 2010 21:22:11 +0000 (22:22 +0100)]
Merge branch 'master' into fruitiex/ctsfix

14 years agoforce cloak in CTS
FruitieX [Thu, 9 Dec 2010 21:20:39 +0000 (23:20 +0200)]
force cloak in CTS

14 years agoMerge branch 'master' into fruitiex/ctsfix
FruitieX [Thu, 9 Dec 2010 21:19:10 +0000 (23:19 +0200)]
Merge branch 'master' into fruitiex/ctsfix

14 years agoupdate the defaultXPM.cfg file. Add g_teleport_maxspeed to the physics configs, set...
FruitieX [Thu, 9 Dec 2010 21:04:21 +0000 (23:04 +0200)]
update the defaultXPM.cfg file. Add g_teleport_maxspeed to the physics configs, set to 320 in Q3 based ones

14 years agoforce weapon stay on in CTS
FruitieX [Thu, 9 Dec 2010 20:43:36 +0000 (22:43 +0200)]
force weapon stay on in CTS

14 years agobring back the laser in Race
FruitieX [Thu, 9 Dec 2010 20:31:46 +0000 (22:31 +0200)]
bring back the laser in Race

14 years agomake the warning a backtrace instead
FruitieX [Thu, 9 Dec 2010 20:30:18 +0000 (22:30 +0200)]
make the warning a backtrace instead

14 years agoMerge remote branch 'origin/terencehill/small_cleanup'
Rudolf Polzer [Thu, 9 Dec 2010 20:04:43 +0000 (21:04 +0100)]
Merge remote branch 'origin/terencehill/small_cleanup'

Conflicts:
qcsrc/client/waypointsprites.qc

14 years agoMerge remote branch 'origin/mand1nga/bots/weapons-fixes'
Rudolf Polzer [Thu, 9 Dec 2010 19:59:48 +0000 (20:59 +0100)]
Merge remote branch 'origin/mand1nga/bots/weapons-fixes'

14 years agoMerge remote branch 'origin/diabolik/credits-update'
Rudolf Polzer [Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)]
Merge remote branch 'origin/diabolik/credits-update'

14 years agominelayer sprite
FruitieX [Thu, 9 Dec 2010 19:52:00 +0000 (21:52 +0200)]
minelayer sprite

14 years agominelayer hud icon
FruitieX [Thu, 9 Dec 2010 19:45:31 +0000 (21:45 +0200)]
minelayer hud icon

14 years agomore xonotic on campaign winner logo ;)
FruitieX [Thu, 9 Dec 2010 19:32:06 +0000 (21:32 +0200)]
more xonotic on campaign winner logo ;)

14 years agoautocvar for hud_panel_score_rankings
terencehill [Thu, 9 Dec 2010 18:43:41 +0000 (19:43 +0100)]
autocvar for hud_panel_score_rankings