xonotic/xonotic-data.pk3dir.git
9 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

9 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

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

9 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

9 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'

9 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

9 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

9 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

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

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

9 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)

9 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

9 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.

9 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)

9 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

9 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'

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

9 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'

9 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

9 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

9 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'

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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)

9 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

9 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

9 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

9 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

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

9 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

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

9 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

9 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

9 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

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

9 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

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

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

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

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

9 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?)

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

9 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. ;)

9 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

9 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

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

9 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

9 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 :)

9 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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

9 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'

9 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'

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

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

9 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 ;)

9 years agoproperly check the player name length as utf-8 octet count
Rudolf Polzer [Thu, 9 Dec 2010 11:14:41 +0000 (12:14 +0100)]
properly check the player name length as utf-8 octet count

9 years agoAdd theShadow and LJFHutch to the credits list.
ssinghal [Thu, 9 Dec 2010 02:07:46 +0000 (21:07 -0500)]
Add theShadow and LJFHutch to the credits list.

9 years agofix sv_doublejump autocvar
FruitieX [Wed, 8 Dec 2010 20:31:12 +0000 (22:31 +0200)]
fix sv_doublejump autocvar

9 years agodprint a warning if we skip initialization
FruitieX [Wed, 8 Dec 2010 16:43:51 +0000 (18:43 +0200)]
dprint a warning if we skip initialization

9 years agougly fix to prevent the crash, but the issue remains: why is trigger_race_checkpoint_...
FruitieX [Wed, 8 Dec 2010 16:21:57 +0000 (18:21 +0200)]
ugly fix to prevent the crash, but the issue remains: why is trigger_race_checkpoint_verify() sometimes apparently ran twice for the same entity?

9 years agofix some of the defrag compat code, start with the shotgun only in CTS
FruitieX [Wed, 8 Dec 2010 14:27:26 +0000 (16:27 +0200)]
fix some of the defrag compat code, start with the shotgun only in CTS

9 years agofix the finish CTS kill delay
FruitieX [Wed, 8 Dec 2010 13:50:31 +0000 (15:50 +0200)]
fix the finish CTS kill delay

9 years agotry fixing g_campaign_forceteam too (off by default)
Rudolf Polzer [Tue, 7 Dec 2010 10:19:38 +0000 (11:19 +0100)]
try fixing g_campaign_forceteam too (off by default)

9 years agoMerge remote branch 'origin/fruitiex/campaign'
Rudolf Polzer [Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)]
Merge remote branch 'origin/fruitiex/campaign'

9 years agomake team/invert logic identical to most other ents for trigger_multiple
Rudolf Polzer [Mon, 6 Dec 2010 11:28:26 +0000 (12:28 +0100)]
make team/invert logic identical to most other ents for trigger_multiple

9 years agosimplify a bit
Rudolf Polzer [Mon, 6 Dec 2010 10:49:26 +0000 (11:49 +0100)]
simplify a bit

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 6 Dec 2010 08:42:02 +0000 (09:42 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agoMerge remote branch 'origin/terencehill/crosshair_colors'
Rudolf Polzer [Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)]
Merge remote branch 'origin/terencehill/crosshair_colors'

9 years agowhat the crap? WHY OH WHY are the teams even forced in campaign?
FruitieX [Sun, 5 Dec 2010 22:29:28 +0000 (00:29 +0200)]
what the crap? WHY OH WHY are the teams even forced in campaign?

9 years agoRevert "This seems to fix team modes in campaign. Yay." - No it didn't
FruitieX [Sun, 5 Dec 2010 22:23:50 +0000 (00:23 +0200)]
Revert "This seems to fix team modes in campaign. Yay." - No it didn't

This reverts commit 14800edad1a4c4e2e08ec6a2257184ea2f396d23.

9 years agoThis seems to fix team modes in campaign. Yay.
FruitieX [Sun, 5 Dec 2010 21:39:15 +0000 (23:39 +0200)]
This seems to fix team modes in campaign. Yay.

9 years agoremove the CTF win mode autocvar, not needed
Rudolf Polzer [Sun, 5 Dec 2010 20:47:23 +0000 (21:47 +0100)]
remove the CTF win mode autocvar, not needed

9 years agofix mess from last commit
Rudolf Polzer [Sun, 5 Dec 2010 20:45:08 +0000 (21:45 +0100)]
fix mess from last commit

9 years agoeliminate the g_ctf_win_mode global; campaign uses default win mode now
Rudolf Polzer [Sun, 5 Dec 2010 20:44:02 +0000 (21:44 +0100)]
eliminate the g_ctf_win_mode global; campaign uses default win mode now

9 years agofix "delay" not copying target2 to target4
Rudolf Polzer [Sun, 5 Dec 2010 20:12:02 +0000 (21:12 +0100)]
fix "delay" not copying target2 to target4

9 years agosupport ready-restart with the toggling speaker target
Rudolf Polzer [Sun, 5 Dec 2010 17:29:42 +0000 (18:29 +0100)]
support ready-restart with the toggling speaker target

9 years agoclean up SetMovedir related code a little
Rudolf Polzer [Sun, 5 Dec 2010 16:12:19 +0000 (17:12 +0100)]
clean up SetMovedir related code a little

9 years agofix a compile error
Rudolf Polzer [Sun, 5 Dec 2010 15:44:12 +0000 (16:44 +0100)]
fix a compile error

9 years agobetter target_speaker support
Rudolf Polzer [Sun, 5 Dec 2010 14:01:35 +0000 (15:01 +0100)]
better target_speaker support