xonotic/xonotic-data.pk3dir.git
9 years agoMerge branch 'master' into tzork/ents-onoff
Jakob MG [Tue, 28 Sep 2010 09:54:21 +0000 (11:54 +0200)]
Merge branch 'master' into tzork/ents-onoff

Conflicts:
qcsrc/server/defs.qh

9 years agoidk.. git told me to commit to be able to merge.
Jakob MG [Tue, 28 Sep 2010 09:51:31 +0000 (11:51 +0200)]
idk.. git told me to commit to be able to merge.

9 years agodon't transform if the zone is faded out clearly (to reduce network entities)
Rudolf Polzer [Sun, 26 Sep 2010 17:54:07 +0000 (19:54 +0200)]
don't transform if the zone is faded out clearly (to reduce network entities)

9 years agoMerge branch 'morphed/armor'
Rudolf Polzer [Sun, 26 Sep 2010 16:45:48 +0000 (18:45 +0200)]
Merge branch 'morphed/armor'

9 years agoWops, maybe it helps if i cinlude the textures too!
Jakob MG [Sun, 26 Sep 2010 16:33:50 +0000 (18:33 +0200)]
Wops, maybe it helps if i cinlude the textures too!

9 years agoAtlas armour textures to 2048x1024, make models use them. remove old models and chang...
Jakob MG [Sun, 26 Sep 2010 14:59:40 +0000 (16:59 +0200)]
Atlas armour textures to 2048x1024, make models use them. remove old models and change code to match new names.

9 years agofix warpzone velocity on output
Rudolf Polzer [Sun, 26 Sep 2010 11:47:41 +0000 (13:47 +0200)]
fix warpzone velocity on output

9 years agoNew armor pickup model (dont forget to change code to use sane names) also textures...
Morphed [Sat, 25 Sep 2010 20:53:29 +0000 (22:53 +0200)]
New armor pickup model (dont forget to  change code to use sane names) also textures are way too big, someone have to lower res them to something that will be more appropriate.

9 years agofixes :)
Rudolf Polzer [Sat, 25 Sep 2010 19:33:39 +0000 (21:33 +0200)]
fixes :)

9 years agooptimize a bit more
Rudolf Polzer [Sat, 25 Sep 2010 19:24:41 +0000 (21:24 +0200)]
optimize a bit more

9 years agowarpzones: support new parameters warpzone_fadestart, warpzone_fadeend (distance...
Rudolf Polzer [Sat, 25 Sep 2010 19:21:38 +0000 (21:21 +0200)]
warpzones: support new parameters warpzone_fadestart, warpzone_fadeend (distance parameters for fading out the effect at a distance)

9 years agoadd Lee Stricklin's balance config; fix a duplicate cvar item
Rudolf Polzer [Sat, 25 Sep 2010 13:34:21 +0000 (15:34 +0200)]
add Lee Stricklin's balance config; fix a duplicate cvar item

9 years agoMerge remote branch 'refs/remotes/origin/terencehill/newpanelhud'
Rudolf Polzer [Sat, 25 Sep 2010 08:28:54 +0000 (10:28 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'

9 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Sat, 25 Sep 2010 08:24:22 +0000 (10:24 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

9 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_bot_forcedteam_clanarena'
Rudolf Polzer [Sat, 25 Sep 2010 08:22:01 +0000 (10:22 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_bot_forcedteam_clanarena'

9 years agoBring some accuracy on the fps counter:
terencehill [Thu, 23 Sep 2010 22:38:04 +0000 (00:38 +0200)]
Bring some accuracy on the fps counter:
- Get the time with gettime(GETTIME_REALTIME) because for some reason the vars time and frametime are not accurate (frametime and (time - time of previous frame) are always > 0.1) and because otherwise fps depend on slowmo value
- Fix inaccurate fps at low hud_panel_engineinfo_framecounter_time values and default this cvar to 0.1 instead of 1 for both fast update and good reading

9 years agoBlock the bots during the countdown to game start in general warmup mode (with g_warm...
terencehill [Thu, 23 Sep 2010 18:06:13 +0000 (20:06 +0200)]
Block the bots during the countdown to game start in general warmup mode (with g_warmup and sv_ready_restart_after_countdown enabled)
Keep doing the last movement until the game starts as they do currently (for example keep running against a wall) just sucks.

9 years agoFix a bug from Nexuiz that would cause a bot's team overrider to be ignored in Clan...
Mircea Kitsune [Thu, 23 Sep 2010 16:14:53 +0000 (19:14 +0300)]
Fix a bug from Nexuiz that would cause a bot's team overrider to be ignored in Clan Arena between rounds (the bot would be assigned to the smallest team after the first round, regardless of his team overrider).

9 years agoexplain more
Rudolf Polzer [Thu, 23 Sep 2010 09:23:33 +0000 (11:23 +0200)]
explain more

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 23 Sep 2010 09:22:10 +0000 (11:22 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

9 years agoupdate-cvarcount: report too much/missing cvars
Rudolf Polzer [Thu, 23 Sep 2010 09:21:30 +0000 (11:21 +0200)]
update-cvarcount: report too much/missing cvars

9 years agoadd two missing values
Rudolf Polzer [Thu, 23 Sep 2010 08:04:53 +0000 (10:04 +0200)]
add two missing values

9 years agonew physics config by Lee Stricklin; fix electro beam through warpzones when standing...
Rudolf Polzer [Thu, 23 Sep 2010 07:45:40 +0000 (09:45 +0200)]
new physics config by Lee Stricklin; fix electro beam through warpzones when standing close to the warp plane

9 years agoAdd a FIXME comment
terencehill [Mon, 20 Sep 2010 16:44:58 +0000 (18:44 +0200)]
Add a FIXME comment

9 years agoOther minor fixes of bot_vs_human:
terencehill [Mon, 20 Sep 2010 16:35:11 +0000 (18:35 +0200)]
Other minor fixes of bot_vs_human:
- Always check for available teams before reading bot_vs_human value, as it works only in games with 2 teams
- Do not read bot_join_empty and minplayers cvars when bot_vs_human is active, they are incompatible with it
- disable team nagger when bot_vs_human is active

9 years agoupdated LS's physics config
Rudolf Polzer [Mon, 20 Sep 2010 07:22:06 +0000 (09:22 +0200)]
updated LS's physics config

9 years agofix warpzone killtarget handling
Rudolf Polzer [Mon, 20 Sep 2010 04:38:28 +0000 (06:38 +0200)]
fix warpzone killtarget handling

9 years agoFix screwed up indentation (removed a TAB from every line)
terencehill [Sun, 19 Sep 2010 14:27:30 +0000 (16:27 +0200)]
Fix screwed up indentation (removed a TAB from every line)

9 years agobetter triggering for warpzones/teleports
Rudolf Polzer [Sun, 19 Sep 2010 13:26:53 +0000 (15:26 +0200)]
better triggering for warpzones/teleports

9 years agov_gamma: default to 1, 1.125 is stupid
Rudolf Polzer [Sat, 18 Sep 2010 11:39:12 +0000 (13:39 +0200)]
v_gamma: default to 1, 1.125 is stupid

9 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/forced_campaign_team'
Rudolf Polzer [Sat, 18 Sep 2010 10:40:56 +0000 (12:40 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/forced_campaign_team'

9 years agonew sound pack (6.6) by tenshihan, untested, sure is fine
Rudolf Polzer [Fri, 17 Sep 2010 23:15:31 +0000 (01:15 +0200)]
new sound pack (6.6) by tenshihan, untested, sure is fine

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Fri, 17 Sep 2010 22:46:35 +0000 (00:46 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

9 years agoremove "#" escape in kill messages; now we use standard "%s". Can also reorder args...
Rudolf Polzer [Fri, 17 Sep 2010 22:45:41 +0000 (00:45 +0200)]
remove "#" escape in kill messages; now we use standard "%s". Can also reorder args in message2 now, like "%2$s threw %1$s in a world of hurt"

9 years agoprevent a new "stealth electro" exploit ;)
Rudolf Polzer [Fri, 17 Sep 2010 13:07:04 +0000 (15:07 +0200)]
prevent a new "stealth electro" exploit ;)

9 years agoagain, fields work better when declared
Rudolf Polzer [Fri, 17 Sep 2010 12:34:04 +0000 (14:34 +0200)]
again, fields work better when declared

9 years agoelectro/hook: add a safeguard to stop the sound 10 seconds after last update
Rudolf Polzer [Fri, 17 Sep 2010 12:15:50 +0000 (14:15 +0200)]
electro/hook: add a safeguard to stop the sound 10 seconds after last update

9 years agoelectro: enforce a 0.4s delay after releasing fire before firing primary again
Rudolf Polzer [Thu, 16 Sep 2010 10:02:35 +0000 (12:02 +0200)]
electro: enforce a 0.4s delay after releasing fire before firing primary again

9 years agoLog the team change too.
Mircea Kitsune [Wed, 15 Sep 2010 13:35:51 +0000 (16:35 +0300)]
Log the team change too.

9 years agoAllow forcing the player to a given team in campaign mode. Useful for story based...
Mircea Kitsune [Wed, 15 Sep 2010 13:19:13 +0000 (16:19 +0300)]
Allow forcing the player to a given team in campaign mode. Useful for story based campaigns where you might want the player to play only in team X.

No, bot_vs_human can't replace this iirc. For one thing, bot_vs_human is useless if you have more than 2 teams. Also, bot_vs_human can only force the player in team X while forcing bots in the other team (so you can't put the player to the team you want without braking bot balance).

9 years agofix typos in last commit
Rudolf Polzer [Wed, 15 Sep 2010 07:04:12 +0000 (09:04 +0200)]
fix typos in last commit

9 years agosv_curl_serverpackages_auto: auto add all packs with a *.serverpackage file to server...
Rudolf Polzer [Wed, 15 Sep 2010 06:54:18 +0000 (08:54 +0200)]
sv_curl_serverpackages_auto: auto add all packs with a *.serverpackage file to serverpackages

9 years agorename hud_luminos_default.cfg to hud_luminos.cfg (can't have a *_default.cfg, sorry)
Rudolf Polzer [Tue, 14 Sep 2010 18:54:27 +0000 (20:54 +0200)]
rename hud_luminos_default.cfg to hud_luminos.cfg (can't have a *_default.cfg, sorry)

9 years agodefault map list to g-23
Rudolf Polzer [Tue, 14 Sep 2010 18:46:09 +0000 (20:46 +0200)]
default map list to g-23

9 years agomake luminos skin the default
Rudolf Polzer [Tue, 14 Sep 2010 03:46:51 +0000 (05:46 +0200)]
make luminos skin the default

9 years agoLuminos skins for the Menu (new), HUD (revision), Scoreboard (new)
sev [Mon, 13 Sep 2010 18:48:40 +0000 (20:48 +0200)]
Luminos skins for the Menu (new), HUD (revision), Scoreboard (new)

9 years agolet's use glossexact
Rudolf Polzer [Sat, 11 Sep 2010 17:25:36 +0000 (19:25 +0200)]
let's use glossexact

9 years agoexec the font .cfg before the commandline args; this breaks some commandline args...
Rudolf Polzer [Sat, 11 Sep 2010 16:39:22 +0000 (18:39 +0200)]
exec the font .cfg before the commandline args; this breaks some commandline args, but fixes +map

9 years agoMerge remote branch 'refs/remotes/origin/terencehill/newpanelhud'
Rudolf Polzer [Fri, 10 Sep 2010 21:29:28 +0000 (23:29 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'

9 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Fri, 10 Sep 2010 21:27:32 +0000 (23:27 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

9 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/item_norespawn'
Rudolf Polzer [Fri, 10 Sep 2010 21:26:54 +0000 (23:26 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/item_norespawn'

9 years agocredits += Calinou
Rudolf Polzer [Fri, 10 Sep 2010 20:58:43 +0000 (22:58 +0200)]
credits += Calinou

9 years agoalso fix picmip directly on startup
Rudolf Polzer [Fri, 10 Sep 2010 15:59:46 +0000 (17:59 +0200)]
also fix picmip directly on startup

9 years agoadd a file I forgot (can do that with git too)
Rudolf Polzer [Fri, 10 Sep 2010 12:16:08 +0000 (14:16 +0200)]
add a file I forgot (can do that with git too)

9 years agoimplement hard limiting of texture resolution to not exceed 2G on 32bit platforms...
Rudolf Polzer [Fri, 10 Sep 2010 12:12:21 +0000 (14:12 +0200)]
implement hard limiting of texture resolution to not exceed 2G on 32bit platforms (needs current DP trunk for now)

9 years agosv_clmovement_inputtimeout 0.05
Rudolf Polzer [Thu, 9 Sep 2010 11:25:42 +0000 (13:25 +0200)]
sv_clmovement_inputtimeout 0.05

9 years agofix balance between strafe and forward turning
Rudolf Polzer [Thu, 9 Sep 2010 06:54:46 +0000 (08:54 +0200)]
fix balance between strafe and forward turning

9 years agor_cullentities_trace 0
Rudolf Polzer [Thu, 9 Sep 2010 06:14:45 +0000 (08:14 +0200)]
r_cullentities_trace 0

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 9 Sep 2010 05:19:58 +0000 (07:19 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

9 years ago++nKojns;
Rudolf Polzer [Thu, 9 Sep 2010 05:19:42 +0000 (07:19 +0200)]
++nKojns;

9 years agofix the team number slider, hopefully
Rudolf Polzer [Wed, 8 Sep 2010 15:55:36 +0000 (17:55 +0200)]
fix the team number slider, hopefully

9 years agochange respawn logic to only use the -1 "hidden totally, currently inactive" mode...
Rudolf Polzer [Wed, 8 Sep 2010 10:33:38 +0000 (12:33 +0200)]
change respawn logic to only use the -1 "hidden totally, currently inactive" mode for picked up items with respawntime -1. This makes sure the item will come back e.g. on assault round end, but still is gone entirely.

9 years agoUse remove() instead. No need to keep the disabled weapon entity as long as it won...
Mircea Kitsune [Wed, 8 Sep 2010 10:25:56 +0000 (13:25 +0300)]
Use remove() instead. No need to keep the disabled weapon entity as long as it won't respawn again.

9 years agoFix for g_weapon_stay 3
Mircea Kitsune [Wed, 8 Sep 2010 10:11:49 +0000 (13:11 +0300)]
Fix for g_weapon_stay 3

9 years agoDon't ghost non-respawning items
Mircea Kitsune [Wed, 8 Sep 2010 09:55:36 +0000 (12:55 +0300)]
Don't ghost non-respawning items

9 years agoNon-respawning items: Allow 'respawntime -1' to cause an item to never respawn again...
Mircea Kitsune [Wed, 8 Sep 2010 09:52:58 +0000 (12:52 +0300)]
Non-respawning items: Allow 'respawntime -1' to cause an item to never respawn again (and only allow picking it up once)

9 years agoanother missing texture bites the dust
Rudolf Polzer [Tue, 7 Sep 2010 06:38:21 +0000 (08:38 +0200)]
another missing texture bites the dust

9 years agofunc_pointparticles: add a spawnflags 4 = PVS culling
Rudolf Polzer [Mon, 6 Sep 2010 04:36:48 +0000 (06:36 +0200)]
func_pointparticles: add a spawnflags 4 = PVS culling

9 years agoreduce particles nearclip range, or shotgun->wall won't show particles
Rudolf Polzer [Sun, 5 Sep 2010 18:32:05 +0000 (20:32 +0200)]
reduce particles nearclip range, or shotgun->wall won't show particles

9 years agooptimize particle near/far clip ranges :)
Rudolf Polzer [Sun, 5 Sep 2010 17:28:20 +0000 (19:28 +0200)]
optimize particle near/far clip ranges :)

9 years agoEnhance isInvisibleString (used to detect invisible nicks) to recognize more invisibl...
terencehill [Sun, 5 Sep 2010 09:19:00 +0000 (11:19 +0200)]
Enhance isInvisibleString (used to detect invisible nicks) to recognize more invisible chars

9 years agoinput-tuba.cfg: attack --> fire
terencehill [Sun, 5 Sep 2010 09:04:05 +0000 (11:04 +0200)]
input-tuba.cfg: attack --> fire

9 years agoadd Xonotic icons for DP engine into our data pk3
Rudolf Polzer [Sat, 4 Sep 2010 14:46:21 +0000 (16:46 +0200)]
add Xonotic icons for DP engine into our data pk3

9 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Sat, 4 Sep 2010 11:26:32 +0000 (13:26 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

9 years agofix sound definitions
Rudolf Polzer [Fri, 3 Sep 2010 22:58:54 +0000 (00:58 +0200)]
fix sound definitions

9 years agomore needed stuff from nexcompat
Rudolf Polzer [Fri, 3 Sep 2010 22:50:16 +0000 (00:50 +0200)]
more needed stuff from nexcompat

9 years agoadd a missing grenade stick sound (placeholder)
Rudolf Polzer [Fri, 3 Sep 2010 22:46:41 +0000 (00:46 +0200)]
add a missing grenade stick sound (placeholder)

9 years agofix useless reference to fireball_impact.wav
Rudolf Polzer [Fri, 3 Sep 2010 22:43:46 +0000 (00:43 +0200)]
fix useless reference to fireball_impact.wav

9 years agomore electro fixes
Rudolf Polzer [Fri, 3 Sep 2010 20:59:55 +0000 (22:59 +0200)]
more electro fixes

9 years agofix stickiness
Rudolf Polzer [Fri, 3 Sep 2010 20:57:34 +0000 (22:57 +0200)]
fix stickiness

9 years agoslightly more accel when strafing
Rudolf Polzer [Fri, 3 Sep 2010 20:34:50 +0000 (22:34 +0200)]
slightly more accel when strafing

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Fri, 3 Sep 2010 20:30:28 +0000 (22:30 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

9 years agofix the weapon ffrowing, no I mean srowing, well, trowing
Rudolf Polzer [Fri, 3 Sep 2010 20:29:19 +0000 (22:29 +0200)]
fix the weapon ffrowing, no I mean srowing, well, trowing

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Fri, 3 Sep 2010 15:39:36 +0000 (17:39 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

9 years agoasplode grenades properly when hitting non-bouncable surfaces
Rudolf Polzer [Fri, 3 Sep 2010 15:39:14 +0000 (17:39 +0200)]
asplode grenades properly when hitting non-bouncable surfaces

9 years agofix detection of DDS options
Rudolf Polzer [Fri, 3 Sep 2010 10:01:26 +0000 (12:01 +0200)]
fix detection of DDS options

9 years agoUse menu_sync in hud configs instead of menu_restart, it's A LOT faster and can be...
terencehill [Thu, 2 Sep 2010 22:31:02 +0000 (00:31 +0200)]
Use menu_sync in hud configs instead of menu_restart, it's A LOT faster and can be added in hud_default.cfg too
Note: at startup menu_sync doesn't really get executed, since before executing hud_default.cfg it's defined as ""

9 years agofalloff on electro primary to nerf it a little, testing and early balance stats hint...
FruitieX [Wed, 1 Sep 2010 19:27:51 +0000 (22:27 +0300)]
falloff on electro primary to nerf it a little, testing and early balance stats hint that it's way overpowered

9 years agoset electro primary ammo usage at 7 (from 5)
FruitieX [Wed, 1 Sep 2010 13:58:17 +0000 (16:58 +0300)]
set electro primary ammo usage at 7 (from 5)

9 years agohalve edgedamage on hagar now
FruitieX [Wed, 1 Sep 2010 13:53:31 +0000 (16:53 +0300)]
halve edgedamage on hagar now

9 years agodouble animtimes on rl and mortar, wtf where they this low for? (now at 0.4 from...
FruitieX [Wed, 1 Sep 2010 13:30:53 +0000 (16:30 +0300)]
double animtimes on rl and mortar, wtf where they this low for? (now at 0.4 from 0.2)

9 years agoincrease hagar usefulness by increasing its radius to 100 (from 70)
FruitieX [Wed, 1 Sep 2010 13:23:45 +0000 (16:23 +0300)]
increase hagar usefulness by increasing its radius to 100 (from 70)

9 years agoattempt: check movetype for this instead, Now it will stick ONLY if MOVETYPE_NONE...
Rudolf Polzer [Wed, 1 Sep 2010 06:58:41 +0000 (08:58 +0200)]
attempt: check movetype for this instead, Now it will stick ONLY if MOVETYPE_NONE and not shootable.

9 years agosticky grenades: only stick if hitting world, not if hitting e.g. a lift (then it...
Rudolf Polzer [Wed, 1 Sep 2010 06:56:03 +0000 (08:56 +0200)]
sticky grenades: only stick if hitting world, not if hitting e.g. a lift (then it shall detonate as before)

9 years agoShow the vote commands when hud_showbinds is 0 or 2
terencehill [Tue, 31 Aug 2010 22:42:13 +0000 (00:42 +0200)]
Show the vote commands when hud_showbinds is 0 or 2
Use the term command in hud_showbinds* cvars definitions because it's more appropriated, not only for the vote commands.

9 years agomacro drawInfoMessage to shorten HUD_InfoMessages code
terencehill [Tue, 31 Aug 2010 22:27:10 +0000 (00:27 +0200)]
macro drawInfoMessage to shorten HUD_InfoMessages code

9 years agoBring back hud_showbinds in defaultXonotic.cfg with a better definition
terencehill [Tue, 31 Aug 2010 21:09:11 +0000 (23:09 +0200)]
Bring back hud_showbinds in defaultXonotic.cfg with a better definition
This actually fixes vote panel not recognizing the keys to vote

I'm sorry for having suggested to FruitieX the removal of this cvar a while ago, I didn't realize the code to read this cvar was moved within getcommandkey function.

9 years agoReplace incorrect +attack with +fire
terencehill [Tue, 31 Aug 2010 20:55:10 +0000 (22:55 +0200)]
Replace incorrect +attack with +fire

9 years agoRevert "change some messages to use sprintf - others are left for someone else to...
Rudolf Polzer [Tue, 31 Aug 2010 20:27:07 +0000 (22:27 +0200)]
Revert "change some messages to use sprintf - others are left for someone else to fix" to back out of compile error

This reverts commit d1594f10ba0de020568b7bbd0c6ee05162ac0406.

9 years agoRevert "fix regex fail" to back out of compile error
Rudolf Polzer [Tue, 31 Aug 2010 20:26:52 +0000 (22:26 +0200)]
Revert "fix regex fail" to back out of compile error

This reverts commit 8d2ef7e2939d36a8b5f69ad37b1e143b3630db46.