xonotic/xonotic-data.pk3dir.git
9 years agoMerge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
FruitieX [Fri, 12 Nov 2010 06:30:41 +0000 (08:30 +0200)]
Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud

9 years agouse a default value on the colorpicker_string
FruitieX [Fri, 12 Nov 2010 06:28:51 +0000 (08:28 +0200)]
use a default value on the colorpicker_string

9 years agoMerge remote branch 'origin/terencehill/colorpicker_pos' into fruitiex/panelhud
FruitieX [Fri, 12 Nov 2010 05:11:56 +0000 (07:11 +0200)]
Merge remote branch 'origin/terencehill/colorpicker_pos' into fruitiex/panelhud

9 years agosometimes the clientside headshot detection code detects sprees as headshots or somet...
FruitieX [Wed, 10 Nov 2010 18:45:51 +0000 (20:45 +0200)]
sometimes the clientside headshot detection code detects sprees as headshots or something? add a failsafe if(w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) into there just to be sure it won't happen again. Also remove an apparent debug print from the minstanex code that prints a "h" to the console if someone gets a headshot

9 years agoLabel messages as deleted when they have faded out and break the loop at the first...
terencehill [Wed, 10 Nov 2010 16:09:49 +0000 (17:09 +0100)]
Label messages as deleted when they have faded out and break the loop at the first deleted message

9 years agoDo not draw notify messages if they are transparent
terencehill [Tue, 9 Nov 2010 21:27:29 +0000 (22:27 +0100)]
Do not draw notify messages if they are transparent

To make it possible I had to move the hud_configure code and add a goto; also this change made the logic simpler.

And while I'm at it, make each notify message in hud_configure mode different from the other ones

9 years agominelayer: don't send a network update every frame, it's not guided
Rudolf Polzer [Wed, 10 Nov 2010 06:25:31 +0000 (07:25 +0100)]
minelayer: don't send a network update every frame, it's not guided

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 10 Nov 2010 06:22:46 +0000 (07:22 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agogrenade launcher: move bouncefactor to a common cvar for both modes (as it wasn't...
Rudolf Polzer [Wed, 10 Nov 2010 06:22:20 +0000 (07:22 +0100)]
grenade launcher: move bouncefactor to a common cvar for both modes (as it wasn't csqc networked properly)

9 years agodon't let minstagib make a server "non-pure" (minstagib is the most official mutator...
Rudolf Polzer [Tue, 9 Nov 2010 21:19:05 +0000 (22:19 +0100)]
don't let minstagib make a server "non-pure" (minstagib is the most official mutator there is, after all)

9 years agoserverflags here too, forgot this file
Rudolf Polzer [Tue, 9 Nov 2010 21:13:50 +0000 (22:13 +0100)]
serverflags here too, forgot this file

9 years agocvar: sv_allow_fullbright
Rudolf Polzer [Tue, 9 Nov 2010 21:04:23 +0000 (22:04 +0100)]
cvar: sv_allow_fullbright

9 years agosimplify even more :P
Rudolf Polzer [Tue, 9 Nov 2010 20:50:15 +0000 (21:50 +0100)]
simplify even more :P

9 years agoadd a new way to enable fullbright for those poor people who REALLY need it (easy...
Rudolf Polzer [Tue, 9 Nov 2010 20:46:13 +0000 (21:46 +0100)]
add a new way to enable fullbright for those poor people who REALLY need it (easy to detect serverside)

9 years agoCheck whether flip or not out of the for
terencehill [Mon, 8 Nov 2010 23:02:19 +0000 (00:02 +0100)]
Check whether flip or not out of the for

(Curiously, a similar check now is still needed to determine the alpha but only in hud_configure mode)

9 years agoadd a comment
Rudolf Polzer [Tue, 9 Nov 2010 20:20:50 +0000 (21:20 +0100)]
add a comment

9 years agooops, this workaround was missing (don't detonate all projectiles if a crylink projec...
Rudolf Polzer [Tue, 9 Nov 2010 19:45:41 +0000 (20:45 +0100)]
oops, this workaround was missing (don't detonate all projectiles if a crylink projectile simply "dies")

9 years agocrylink counter works different for some time now, the _star_lifetime cvars are obsol...
Rudolf Polzer [Tue, 9 Nov 2010 19:42:14 +0000 (20:42 +0100)]
crylink counter works different for some time now, the _star_lifetime cvars are obsolete now

9 years agohandle running out of crylink ammo better
Rudolf Polzer [Tue, 9 Nov 2010 19:29:10 +0000 (20:29 +0100)]
handle running out of crylink ammo better

9 years agoadd a specific "linkjoin" effect
Rudolf Polzer [Tue, 9 Nov 2010 19:24:23 +0000 (20:24 +0100)]
add a specific "linkjoin" effect

9 years agojoinspeed 150 on crylink primary. Perhaps one day make the secondary similar to the...
FruitieX [Tue, 9 Nov 2010 18:45:31 +0000 (20:45 +0200)]
joinspeed 150 on crylink primary. Perhaps one day make the secondary similar to the nexuiz crylink secondary, enable joinspeed on that, and let e.g. the HLAC replace the crylink secondary function?

9 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Tue, 9 Nov 2010 18:44:32 +0000 (20:44 +0200)]
Merge branch 'master' into fruitiex/fruitbalance

9 years agofix for the missing sqrt
Rudolf Polzer [Tue, 9 Nov 2010 18:28:27 +0000 (19:28 +0100)]
fix for the missing sqrt

9 years agofix a missing sqrt
Rudolf Polzer [Tue, 9 Nov 2010 18:28:13 +0000 (19:28 +0100)]
fix a missing sqrt

9 years agofix joinspeed for secondary
Rudolf Polzer [Tue, 9 Nov 2010 18:23:04 +0000 (19:23 +0100)]
fix joinspeed for secondary

9 years agog_balance_crylink_*_joinspeed
Rudolf Polzer [Tue, 9 Nov 2010 15:50:18 +0000 (16:50 +0100)]
g_balance_crylink_*_joinspeed

9 years agocrylink: also remember the last group of projectiles that was fired
Rudolf Polzer [Tue, 9 Nov 2010 15:37:39 +0000 (16:37 +0100)]
crylink: also remember the last group of projectiles that was fired

9 years agoadd a helper W_Crylink_LinkJoin to be used by tZork's balance in the future
Rudolf Polzer [Tue, 9 Nov 2010 14:11:50 +0000 (15:11 +0100)]
add a helper W_Crylink_LinkJoin to be used by tZork's balance in the future

9 years agocrylink: when a projectile explodes on world, not on player, don't detonate the other...
Rudolf Polzer [Tue, 9 Nov 2010 12:24:45 +0000 (13:24 +0100)]
crylink: when a projectile explodes on world, not on player, don't detonate the other projectiles

9 years ago"Rocket Flying" mutator: also affect the Mine Layer
Rudolf Polzer [Tue, 9 Nov 2010 09:14:43 +0000 (10:14 +0100)]
"Rocket Flying" mutator: also affect the Mine Layer

9 years agouse remote radius, not radius, for spawnshieldtime
Rudolf Polzer [Tue, 9 Nov 2010 07:02:46 +0000 (08:02 +0100)]
use remote radius, not radius, for spawnshieldtime

9 years agoalso add his physics config
Rudolf Polzer [Tue, 9 Nov 2010 06:57:37 +0000 (07:57 +0100)]
also add his physics config

9 years agonew Lee Stricklin configs
Rudolf Polzer [Tue, 9 Nov 2010 06:22:36 +0000 (07:22 +0100)]
new Lee Stricklin configs

9 years agoupdate-cvarcount: small hack to make do without mktemp if needed
Rudolf Polzer [Tue, 9 Nov 2010 06:10:44 +0000 (07:10 +0100)]
update-cvarcount: small hack to make do without mktemp if needed

9 years agoUse an index to access killnotify_* arrays for cheaper insertions of new entries
terencehill [Mon, 8 Nov 2010 22:52:37 +0000 (23:52 +0100)]
Use an index to access killnotify_* arrays for cheaper insertions of new entries
And add a constant to define arrays size

9 years agoSince accuracy colors aren't used exclusively by the HUD weapons panel, rename hud_pa...
terencehill [Mon, 8 Nov 2010 17:25:26 +0000 (18:25 +0100)]
Since accuracy colors aren't used exclusively by the HUD weapons panel, rename hud_panel_weapons_accuracy_color* to accuracy_color*

9 years agoColorpicker cursor for xaw theme (copy of luminos' one)
terencehill [Mon, 8 Nov 2010 14:20:50 +0000 (15:20 +0100)]
Colorpicker cursor for xaw theme (copy of luminos' one)

9 years agoColorpickers now load and remember (when they get re-enabled) the color position
terencehill [Mon, 8 Nov 2010 00:12:07 +0000 (01:12 +0100)]
Colorpickers now load and remember (when they get re-enabled) the color position

9 years agodifferent falling damage (less until speed 1550, more above)
Rudolf Polzer [Sun, 7 Nov 2010 21:15:02 +0000 (22:15 +0100)]
different falling damage (less until speed 1550, more above)

9 years agoincrease headshot damage on rifle, use the headshot image in the notify panel if...
FruitieX [Sun, 7 Nov 2010 21:13:46 +0000 (23:13 +0200)]
increase headshot damage on rifle, use the headshot image in the notify panel if player was killed by a headshot

9 years agofix player view offset and headshot bbox
Rudolf Polzer [Sun, 7 Nov 2010 21:06:45 +0000 (22:06 +0100)]
fix player view offset and headshot bbox

9 years agorevert the polygonoffset-for-decals-behind-warpzone fix as it doesn't really work
Rudolf Polzer [Sun, 7 Nov 2010 16:16:12 +0000 (17:16 +0100)]
revert the polygonoffset-for-decals-behind-warpzone fix as it doesn't really work

9 years agoexec the other configs at the end
Rudolf Polzer [Sun, 7 Nov 2010 15:29:44 +0000 (16:29 +0100)]
exec the other configs at the end

9 years agoshader to reference the correct nexball texture path, finally works! add a reflectmap...
FruitieX [Sun, 7 Nov 2010 14:51:44 +0000 (16:51 +0200)]
shader to reference the correct nexball texture path, finally works! add a reflectmap too + cubemap

9 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 7 Nov 2010 14:45:15 +0000 (15:45 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance'

9 years agoadjust laser in balanceTest too
Rudolf Polzer [Sun, 7 Nov 2010 14:43:50 +0000 (15:43 +0100)]
adjust laser in balanceTest too

9 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 7 Nov 2010 14:39:34 +0000 (15:39 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance'

9 years agoMerge remote branch 'origin/fruitiex/votedivbyzero_fix'
Rudolf Polzer [Sun, 7 Nov 2010 14:29:24 +0000 (15:29 +0100)]
Merge remote branch 'origin/fruitiex/votedivbyzero_fix'

9 years agostart with a 50% nex charge, no need to wait for it to charge to that
FruitieX [Sun, 7 Nov 2010 14:25:43 +0000 (16:25 +0200)]
start with a 50% nex charge, no need to wait for it to charge to that

9 years agoMerge remote branch 'origin/fruitiex/nexballtextures'
Rudolf Polzer [Sun, 7 Nov 2010 14:24:10 +0000 (15:24 +0100)]
Merge remote branch 'origin/fruitiex/nexballtextures'

9 years agogive the HLAC some more sane settings, hopefully
FruitieX [Sun, 7 Nov 2010 14:13:50 +0000 (16:13 +0200)]
give the HLAC some more sane settings, hopefully

9 years agodefault to a nice polygonoffset for the "polygonoffset" q3 shader keyword
Rudolf Polzer [Sun, 7 Nov 2010 13:06:54 +0000 (14:06 +0100)]
default to a nice polygonoffset for the "polygonoffset" q3 shader keyword

9 years agoenable 0.3 velocitybias on laser, increase zscale to 2, decrease force to 150 (sounds...
FruitieX [Sun, 7 Nov 2010 11:52:36 +0000 (13:52 +0200)]
enable 0.3 velocitybias on laser, increase zscale to 2, decrease force to 150 (sounds much slower than what it actually is with velocityscale and zscale!)

9 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Sun, 7 Nov 2010 01:50:55 +0000 (02:50 +0100)]
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/View.qc
qcsrc/client/hud.qc

9 years agoadd a will/won't encrypt message to the server browser
Rudolf Polzer [Sat, 6 Nov 2010 22:41:13 +0000 (23:41 +0100)]
add a will/won't encrypt message to the server browser

9 years agonew AES icons (maybe easier to understand)
Rudolf Polzer [Sat, 6 Nov 2010 22:34:24 +0000 (23:34 +0100)]
new AES icons (maybe easier to understand)

9 years agofix more cvars
Rudolf Polzer [Sat, 6 Nov 2010 21:49:04 +0000 (22:49 +0100)]
fix more cvars

9 years agofix cvars
Rudolf Polzer [Sat, 6 Nov 2010 21:48:36 +0000 (22:48 +0100)]
fix cvars

9 years agoundo the fteqcc compiler bug workaround again (we really shouldn't need it)
Rudolf Polzer [Sat, 6 Nov 2010 21:45:28 +0000 (22:45 +0100)]
undo the fteqcc compiler bug workaround again (we really shouldn't need it)

9 years agowe have velocitybias, we no longer need projectile delay in balanceTest
Rudolf Polzer [Sat, 6 Nov 2010 21:38:37 +0000 (22:38 +0100)]
we have velocitybias, we no longer need projectile delay in balanceTest

9 years agoMerge branch 'master' into fruitiex/fruitbalance
Rudolf Polzer [Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)]
Merge branch 'master' into fruitiex/fruitbalance

9 years agoadditionally to zscale, also add a velocitybias (biases the laser push to your curren...
Rudolf Polzer [Sat, 6 Nov 2010 21:38:04 +0000 (22:38 +0100)]
additionally to zscale, also add a velocitybias (biases the laser push to your current velocity)

9 years agoadd a zscale cvar for laser force that allows scaling z force only. Currently tweaked...
FruitieX [Sat, 6 Nov 2010 21:23:45 +0000 (23:23 +0200)]
add a zscale cvar for laser force that allows scaling z force only. Currently tweaked to closely match 300 force on the z-axis, no change for horizontal push because it was very good already.

9 years agoFix a warning
terencehill [Sat, 6 Nov 2010 21:22:33 +0000 (22:22 +0100)]
Fix a warning

9 years agoWeapons panel code: move other ops out of the for
terencehill [Sat, 6 Nov 2010 21:13:57 +0000 (22:13 +0100)]
Weapons panel code: move other ops out of the for

9 years agoOptimize the ammo panel code further by calculating ammo size with the desired aspect...
terencehill [Sat, 6 Nov 2010 20:01:40 +0000 (21:01 +0100)]
Optimize the ammo panel code further by calculating ammo size with the desired aspect ratio once for all and fix some minor bug I've previously introduced

9 years agofix polygonoffset cvar values
Rudolf Polzer [Sat, 6 Nov 2010 19:06:54 +0000 (20:06 +0100)]
fix polygonoffset cvar values

9 years agofix division by zero, also small optimization
FruitieX [Sat, 6 Nov 2010 17:06:43 +0000 (19:06 +0200)]
fix division by zero, also small optimization

9 years agomapinfo cleanups
Rudolf Polzer [Sat, 6 Nov 2010 16:03:59 +0000 (17:03 +0100)]
mapinfo cleanups

9 years agostart with 250 health, 250 armor in ca/lms now
FruitieX [Sat, 6 Nov 2010 15:21:47 +0000 (17:21 +0200)]
start with 250 health, 250 armor in ca/lms now

9 years agoincrease health caps to 150 for medium pickups, 250 for small/mega (armor limited...
FruitieX [Sat, 6 Nov 2010 15:08:34 +0000 (17:08 +0200)]
increase health caps to 150 for medium pickups, 250 for small/mega (armor limited to 250 too, but can pickup at any time)

9 years agoremove unused variable, set the movingavg nexcharge to = nexcharge if it's 0 (should...
FruitieX [Sat, 6 Nov 2010 14:25:15 +0000 (16:25 +0200)]
remove unused variable, set the movingavg nexcharge to = nexcharge if it's 0 (should only happen right after a game started)

9 years agoadd a slow rot to 50% nex charge (even when not holding the gun), improve the current...
FruitieX [Sat, 6 Nov 2010 14:03:31 +0000 (16:03 +0200)]
add a slow rot to 50% nex charge (even when not holding the gun), improve the current charge indicator image, rename some variables and cvars in this new code (and that only) to make more sense

9 years agoget rid of some debug prints
Rudolf Polzer [Sat, 6 Nov 2010 07:22:16 +0000 (08:22 +0100)]
get rid of some debug prints

9 years agoalso ignore sv_checkforpacketsduringsleep
Rudolf Polzer [Sat, 6 Nov 2010 07:18:41 +0000 (08:18 +0100)]
also ignore sv_checkforpacketsduringsleep

9 years ago15 sec on-spawn rot pause is a bit insane...
Rudolf Polzer [Sat, 6 Nov 2010 07:12:57 +0000 (08:12 +0100)]
15 sec on-spawn rot pause is a bit insane...

9 years agobalanceTest: give laser some delay back; balance25: restore old laser delay
Rudolf Polzer [Sat, 6 Nov 2010 07:10:03 +0000 (08:10 +0100)]
balanceTest: give laser some delay back; balance25: restore old laser delay

9 years agoautocvar_cl_gentle* and autocvar_hud_panel_notify_* gone!
terencehill [Fri, 5 Nov 2010 23:50:22 +0000 (00:50 +0100)]
autocvar_cl_gentle* and autocvar_hud_panel_notify_* gone!

9 years agoOptimize ammo panel code
terencehill [Fri, 5 Nov 2010 23:26:58 +0000 (00:26 +0100)]
Optimize ammo panel code

9 years agoautocvar_hud_panel_powerups_* and autocvar_hud_panel_healtharmore_* are gone
terencehill [Fri, 5 Nov 2010 22:29:06 +0000 (23:29 +0100)]
autocvar_hud_panel_powerups_* and autocvar_hud_panel_healtharmore_* are gone

9 years agoProgress bar: fix alpha multiplied by panel_fg_alpha twice
terencehill [Fri, 5 Nov 2010 21:39:40 +0000 (22:39 +0100)]
Progress bar: fix alpha multiplied by panel_fg_alpha twice

9 years agosome initial code for displaying how fast the nex charges
FruitieX [Fri, 5 Nov 2010 10:40:31 +0000 (12:40 +0200)]
some initial code for displaying how fast the nex charges

9 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

9 years agoautocvar_hud_skin's turn
terencehill [Thu, 4 Nov 2010 23:31:17 +0000 (00:31 +0100)]
autocvar_hud_skin's turn
Also initialize hud_skin_path (zoning it!) when the HUD gets drawn

9 years agoReplace autocvar_hud_dock_*
terencehill [Thu, 4 Nov 2010 23:19:24 +0000 (00:19 +0100)]
Replace autocvar_hud_dock_*

9 years agostart with 200a in lms and ca
FruitieX [Thu, 4 Nov 2010 20:00:51 +0000 (22:00 +0200)]
start with 200a in lms and ca

9 years agorocketlauncher dmg from 100 => 90, not only does it feel overpowered but that's also...
FruitieX [Thu, 4 Nov 2010 19:36:17 +0000 (21:36 +0200)]
rocketlauncher dmg from 100 => 90, not only does it feel overpowered but that's also ALWAYS visible from the weapon stats :P

9 years agoincrease hagar radius as an experiment to make it more useful
FruitieX [Thu, 4 Nov 2010 19:35:49 +0000 (21:35 +0200)]
increase hagar radius as an experiment to make it more useful

9 years agoallow sv_adminnick and some others too
Rudolf Polzer [Thu, 4 Nov 2010 19:20:54 +0000 (20:20 +0100)]
allow sv_adminnick and some others too

9 years agobalanceTest: adjust the Nexuiz-style health-armor system for a bit more rot, but...
Rudolf Polzer [Thu, 4 Nov 2010 19:08:43 +0000 (20:08 +0100)]
balanceTest: adjust the Nexuiz-style health-armor system for a bit more rot, but also more spawn protection

9 years agoset max cells cap a bit lower
FruitieX [Thu, 4 Nov 2010 15:43:11 +0000 (17:43 +0200)]
set max cells cap a bit lower

9 years agoset g_projectiles_spread_style 7 (i think divVerent wanted this :P)
FruitieX [Thu, 4 Nov 2010 15:28:43 +0000 (17:28 +0200)]
set g_projectiles_spread_style 7 (i think divVerent wanted this :P)

9 years agoset g_projectiles_newton_style 2
FruitieX [Thu, 4 Nov 2010 15:27:49 +0000 (17:27 +0200)]
set g_projectiles_newton_style 2

9 years agoelectro: less dlight
Rudolf Polzer [Thu, 4 Nov 2010 07:04:00 +0000 (08:04 +0100)]
electro: less dlight

9 years agoRevert "why does fteqcc fail so much? seems like f *= x now is equivalent to f = x"
Rudolf Polzer [Wed, 3 Nov 2010 21:23:37 +0000 (22:23 +0100)]
Revert "why does fteqcc fail so much? seems like f *= x now is equivalent to f = x"

This reverts commit bb5812761e62c72ffcb95af04778b7b7b65e15fc.

9 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance'

9 years agofix some warnings
Rudolf Polzer [Wed, 3 Nov 2010 21:19:19 +0000 (22:19 +0100)]
fix some warnings

9 years agoget -Werror back
Rudolf Polzer [Wed, 3 Nov 2010 21:07:59 +0000 (22:07 +0100)]
get -Werror back

9 years agoMerge remote branch 'refs/remotes/origin/fruitiex/racefixes'
Rudolf Polzer [Wed, 3 Nov 2010 20:42:30 +0000 (21:42 +0100)]
Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

Conflicts:
defaultXonotic.cfg
qcsrc/server/defs.qh

9 years agoMerge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)]
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir