xonotic/xonotic-data.pk3dir.git
8 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir xonotic-v0.1.0preview
Rudolf Polzer [Wed, 22 Dec 2010 19:48:13 +0000 (20:48 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

8 years agoreduce default of hud_damage (by merlijn)
Rudolf Polzer [Wed, 22 Dec 2010 19:48:02 +0000 (20:48 +0100)]
reduce default of hud_damage (by merlijn)

8 years agomore 313(7|20 damage
Rudolf Polzer [Tue, 21 Dec 2010 16:13:05 +0000 (17:13 +0100)]
more 313(7|20 damage

8 years agofix some more rotated-bbox issues
Rudolf Polzer [Tue, 21 Dec 2010 13:16:37 +0000 (14:16 +0100)]
fix some more rotated-bbox issues

8 years agodetect rotated entities, and increase their mins/maxs when used as brush models
Rudolf Polzer [Tue, 21 Dec 2010 13:02:52 +0000 (14:02 +0100)]
detect rotated entities, and increase their mins/maxs when used as brush models

8 years agoadd a missing variable
Rudolf Polzer [Tue, 21 Dec 2010 09:46:09 +0000 (10:46 +0100)]
add a missing variable

8 years agoMerge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent...
Rudolf Polzer [Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)]
Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent/virtual-mirror-damage'

8 years agoalways do -zoom when changing a keybind (so if togglezoom is bound away, we cannot...
Rudolf Polzer [Tue, 21 Dec 2010 06:13:05 +0000 (07:13 +0100)]
always do -zoom when changing a keybind (so if togglezoom is bound away, we cannot get stuck in zoomed mode)

8 years agofix missing args
Rudolf Polzer [Mon, 20 Dec 2010 20:59:05 +0000 (21:59 +0100)]
fix missing args

8 years agorandom weapon arena: fix issue with laser
Rudolf Polzer [Mon, 20 Dec 2010 20:48:24 +0000 (21:48 +0100)]
random weapon arena: fix issue with laser

8 years agobetter tuning of weak rifle tracer
Rudolf Polzer [Mon, 20 Dec 2010 20:38:31 +0000 (21:38 +0100)]
better tuning of weak rifle tracer

8 years agotogglezoom to keybinds.txt
Rudolf Polzer [Mon, 20 Dec 2010 20:23:17 +0000 (21:23 +0100)]
togglezoom to keybinds.txt

8 years agoadd a togglezoom command
Rudolf Polzer [Mon, 20 Dec 2010 20:22:55 +0000 (21:22 +0100)]
add a togglezoom command

8 years agoadd red planet's smoke emitters to effectinfo
Rudolf Polzer [Mon, 20 Dec 2010 20:01:52 +0000 (21:01 +0100)]
add red planet's smoke emitters to effectinfo

8 years agoadd a "weak" rifle trail for secondary
Rudolf Polzer [Mon, 20 Dec 2010 20:01:13 +0000 (21:01 +0100)]
add a "weak" rifle trail for secondary

8 years agoRevert "clamp headshot damage to 120 (125 is spawn health)" because FruitieX says so
Rudolf Polzer [Mon, 20 Dec 2010 19:51:31 +0000 (20:51 +0100)]
Revert "clamp headshot damage to 120 (125 is spawn health)" because FruitieX says so

This reverts commit 1bf6711af7223ff0e5b3aa09c772fc9d607c77fc.

8 years agomore spawnshield time (whole second now)
Rudolf Polzer [Mon, 20 Dec 2010 16:00:17 +0000 (17:00 +0100)]
more spawnshield time (whole second now)

8 years agoclamp headshot damage to 120 (125 is spawn health)
Rudolf Polzer [Mon, 20 Dec 2010 15:59:37 +0000 (16:59 +0100)]
clamp headshot damage to 120 (125 is spawn health)

8 years agotweaks
FruitieX [Mon, 20 Dec 2010 14:09:53 +0000 (16:09 +0200)]
tweaks

8 years agoMerge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage...
FruitieX [Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)]
Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage-dmg_take

8 years agoalso support virtual friendly fire
Rudolf Polzer [Mon, 20 Dec 2010 14:01:12 +0000 (15:01 +0100)]
also support virtual friendly fire

8 years agoMerge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage...
FruitieX [Mon, 20 Dec 2010 13:39:54 +0000 (15:39 +0200)]
Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage-dmg_take

8 years agouse dmg_take, tweak two values to make the effect a bit more visible at hud_damage 1
FruitieX [Mon, 20 Dec 2010 13:36:37 +0000 (15:36 +0200)]
use dmg_take, tweak two values to make the effect a bit more visible at hud_damage 1

8 years agoMerge branch 'master' into divVerent/virtual-mirror-damage
Rudolf Polzer [Mon, 20 Dec 2010 13:30:43 +0000 (14:30 +0100)]
Merge branch 'master' into divVerent/virtual-mirror-damage

8 years agofix column widths
Rudolf Polzer [Mon, 20 Dec 2010 13:30:31 +0000 (14:30 +0100)]
fix column widths

8 years agovirtual mirror damage
Rudolf Polzer [Mon, 20 Dec 2010 13:29:25 +0000 (14:29 +0100)]
virtual mirror damage

8 years agoMerge remote branch 'origin/mand1nga/bot-navigation-fixes'
Rudolf Polzer [Sun, 19 Dec 2010 20:34:32 +0000 (21:34 +0100)]
Merge remote branch 'origin/mand1nga/bot-navigation-fixes'

8 years agoMerge branch 'master' into mand1nga/bot-navigation-fixes
mand1nga [Sat, 18 Dec 2010 22:17:54 +0000 (19:17 -0300)]
Merge branch 'master' into mand1nga/bot-navigation-fixes

8 years agoMerge branch 'master' into mand1nga/bot-navigation-fixes
mand1nga [Sat, 18 Dec 2010 22:14:42 +0000 (19:14 -0300)]
Merge branch 'master' into mand1nga/bot-navigation-fixes

8 years agofix naming of "center dot"
Rudolf Polzer [Sat, 18 Dec 2010 20:35:16 +0000 (21:35 +0100)]
fix naming of "center dot"

8 years agocentered laser
Morphed [Sat, 18 Dec 2010 19:38:17 +0000 (20:38 +0100)]
centered laser

8 years agofixes for weapon model normals and some other stuff
Morphed [Sat, 18 Dec 2010 18:45:19 +0000 (19:45 +0100)]
fixes for weapon model normals and some other stuff

8 years agofix some issues with texture compression default
Rudolf Polzer [Sat, 18 Dec 2010 11:44:25 +0000 (12:44 +0100)]
fix some issues with texture compression default

8 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Thu, 16 Dec 2010 20:53:17 +0000 (21:53 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

8 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 16 Dec 2010 12:39:06 +0000 (13:39 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

8 years agouse the ca.xonotic.org keygen service now
Rudolf Polzer [Thu, 16 Dec 2010 12:38:51 +0000 (13:38 +0100)]
use the ca.xonotic.org keygen service now

8 years agoproperly detect which color to use when drawing team colors in hud, so that it'll...
FruitieX [Wed, 15 Dec 2010 18:15:57 +0000 (20:15 +0200)]
properly detect which color to use when drawing team colors in hud, so that it'll be correct when spectating. No idea why I didn't do this before :P

8 years agofreezetag
Rudolf Polzer [Wed, 15 Dec 2010 18:07:46 +0000 (19:07 +0100)]
freezetag

8 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Wed, 15 Dec 2010 18:06:23 +0000 (19:06 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

8 years agobe a BIT more specific
Rudolf Polzer [Wed, 15 Dec 2010 18:05:48 +0000 (19:05 +0100)]
be a BIT more specific

8 years agoMerge remote branch 'origin/fruitiex/allow-g_warmup'
Rudolf Polzer [Wed, 15 Dec 2010 18:05:05 +0000 (19:05 +0100)]
Merge remote branch 'origin/fruitiex/allow-g_warmup'

8 years agoalso allow restart by readying up if the warmup has a timelimit, if everyone's ready...
FruitieX [Wed, 15 Dec 2010 17:57:52 +0000 (19:57 +0200)]
also allow restart by readying up if the warmup has a timelimit, if everyone's ready to play why force them to wait!

8 years agoallow g_warmup cvars while keeping the server pure
FruitieX [Wed, 15 Dec 2010 17:57:01 +0000 (19:57 +0200)]
allow g_warmup cvars while keeping the server pure

8 years agoargh! use self.weapon instead of weapid here
FruitieX [Wed, 15 Dec 2010 17:47:01 +0000 (19:47 +0200)]
argh! use self.weapon instead of weapid here

8 years agohide some more client cvars from cvar_changes
Rudolf Polzer [Wed, 15 Dec 2010 15:38:59 +0000 (16:38 +0100)]
hide some more client cvars from cvar_changes

8 years agoadd more stats directives: "S" = server hostname, "C" = cvar pure changes count ...
Rudolf Polzer [Wed, 15 Dec 2010 15:16:52 +0000 (16:16 +0100)]
add more stats directives: "S" = server hostname, "C" = cvar pure changes count (0 on pure server)

8 years agoget rid of the nex beam tga, nobody needs this any more for a while
Rudolf Polzer [Wed, 15 Dec 2010 11:58:03 +0000 (12:58 +0100)]
get rid of the nex beam tga, nobody needs this any more for a while

8 years agofix significant digits of some menu-governed crosshair cvars
Rudolf Polzer [Wed, 15 Dec 2010 09:14:17 +0000 (10:14 +0100)]
fix significant digits of some menu-governed crosshair cvars

8 years agoremove menu option for AntiLag (nobody needs it)
Rudolf Polzer [Wed, 15 Dec 2010 09:09:34 +0000 (10:09 +0100)]
remove menu option for AntiLag (nobody needs it)

8 years agonext version of balanceLeeStricklin
Rudolf Polzer [Wed, 15 Dec 2010 07:28:32 +0000 (08:28 +0100)]
next version of balanceLeeStricklin

8 years agobe a bit more conservative regarding the warpzone fix
Rudolf Polzer [Tue, 14 Dec 2010 18:46:36 +0000 (19:46 +0100)]
be a bit more conservative regarding the warpzone fix

8 years agomake warpzones able to transport spectators too now
Rudolf Polzer [Tue, 14 Dec 2010 18:43:08 +0000 (19:43 +0100)]
make warpzones able to transport spectators too now

8 years agoMerge remote branch 'origin/terencehill/waypointsprite_alpha_fix'
Rudolf Polzer [Tue, 14 Dec 2010 06:56:53 +0000 (07:56 +0100)]
Merge remote branch 'origin/terencehill/waypointsprite_alpha_fix'

8 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Tue, 14 Dec 2010 06:56:06 +0000 (07:56 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

8 years agoMerge remote branch 'origin/fruitiex/better_default_color'
Rudolf Polzer [Tue, 14 Dec 2010 06:55:23 +0000 (07:55 +0100)]
Merge remote branch 'origin/fruitiex/better_default_color'

8 years agoMerge remote branch 'origin/fruitiex/no_kill_notify'
Rudolf Polzer [Tue, 14 Dec 2010 06:54:47 +0000 (07:54 +0100)]
Merge remote branch 'origin/fruitiex/no_kill_notify'

8 years agoback to the canjump workaround
Rudolf Polzer [Tue, 14 Dec 2010 06:10:18 +0000 (07:10 +0100)]
back to the canjump workaround

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

8 years agowaste more GPU memory :(
Rudolf Polzer [Tue, 14 Dec 2010 06:03:53 +0000 (07:03 +0100)]
waste more GPU memory :(

8 years agomake weapon panel fading/effect cvars part of the hud config files. Add to the exporter.
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.

8 years agouse a better looking deafault color, and Erebus as the default model (it's imo the...
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!)

8 years agocomment this sprint out, not sure we want it (centerprint should already make it...
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)

8 years agodisable the "engineinfo" panel by default in all HUD configs
FruitieX [Mon, 13 Dec 2010 20:04:46 +0000 (22:04 +0200)]
disable the "engineinfo" panel by default in all HUD configs

8 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

8 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

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

8 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

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

8 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

8 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

8 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

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

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

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

8 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

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

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

8 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

8 years agoFade waypoints out opening the menu (like it was before)
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 :)

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

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

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

8 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

8 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

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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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