xonotic/xonotic-data.pk3dir.git
11 years agotry to put a movement controller into SUB_CalcMove to allow for non-linear movement...
Maik Merten [Sat, 20 Nov 2010 18:10:52 +0000 (19:10 +0100)]
try to put a movement controller into SUB_CalcMove to allow for non-linear movement. This compiles, but I doubt this works.

11 years agocampaigntimer: allow win by timelimit if no fraglimit is set
Rudolf Polzer [Sat, 20 Nov 2010 06:40:54 +0000 (07:40 +0100)]
campaigntimer: allow win by timelimit if no fraglimit is set

11 years agorename physics configs: Xonotic now uses physicsX0, Nexuiz ones are now called physic...
Rudolf Polzer [Sat, 20 Nov 2010 06:15:04 +0000 (07:15 +0100)]
rename physics configs: Xonotic now uses physicsX0, Nexuiz ones are now called physicsNexuiz10 etc.

11 years agonexball: don't display a useless health bar on a lone ball (BUT: could be undone...
Rudolf Polzer [Sat, 20 Nov 2010 05:59:44 +0000 (06:59 +0100)]
nexball: don't display a useless health bar on a lone ball (BUT: could be undone, and later used for having the ball "time out")

11 years agofix latest fix
Rudolf Polzer [Fri, 19 Nov 2010 21:28:53 +0000 (22:28 +0100)]
fix latest fix

11 years agoballistic projectiles: bail out on weapclip
Rudolf Polzer [Fri, 19 Nov 2010 21:22:46 +0000 (22:22 +0100)]
ballistic projectiles: bail out on weapclip

11 years agocrylink: some debugging
Rudolf Polzer [Fri, 19 Nov 2010 21:08:35 +0000 (22:08 +0100)]
crylink: some debugging

11 years agoMerge remote branch 'origin/tzork/turrets-assualt-fix'
Rudolf Polzer [Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)]
Merge remote branch 'origin/tzork/turrets-assualt-fix'

11 years agoMerge remote branch 'origin/fruitiex/cl_gentle_damage'
Rudolf Polzer [Fri, 19 Nov 2010 11:39:48 +0000 (12:39 +0100)]
Merge remote branch 'origin/fruitiex/cl_gentle_damage'

11 years agoset pain_threshold_health back at 50. And s/treshold/threshold/g
FruitieX [Thu, 18 Nov 2010 21:36:45 +0000 (23:36 +0200)]
set pain_threshold_health back at 50. And s/treshold/threshold/g

11 years agonerf the damage flash (same amount of damage now raises alpha by half the amount...
FruitieX [Thu, 18 Nov 2010 21:10:36 +0000 (23:10 +0200)]
nerf the damage flash (same amount of damage now raises alpha by half the amount it used to), allow coloring the gentle flash with a custom color

11 years agocrylink: joinspeed -> joinspread (easier to tune in balance config)
Rudolf Polzer [Thu, 18 Nov 2010 21:05:12 +0000 (22:05 +0100)]
crylink: joinspeed -> joinspread (easier to tune in balance config)

11 years agoMake turrets switch team corretly in assualt.
tzork [Thu, 18 Nov 2010 16:04:14 +0000 (17:04 +0100)]
Make turrets switch team corretly in assualt.

11 years agocl_gentle version of the damage flash
FruitieX [Thu, 18 Nov 2010 14:23:13 +0000 (16:23 +0200)]
cl_gentle version of the damage flash

11 years agofix the bug that antilagged bullets get newtonian projectile direction adjustment...
Rudolf Polzer [Thu, 18 Nov 2010 13:21:06 +0000 (14:21 +0100)]
fix the bug that antilagged bullets get newtonian projectile direction adjustment applied... as this is just wrong

11 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 18 Nov 2010 12:11:15 +0000 (13:11 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agochooksta!
Rudolf Polzer [Thu, 18 Nov 2010 12:11:00 +0000 (13:11 +0100)]
chooksta!

11 years agoMerge remote branch 'origin/fruitiex/csqc_polyblend'
Rudolf Polzer [Thu, 18 Nov 2010 06:27:49 +0000 (07:27 +0100)]
Merge remote branch 'origin/fruitiex/csqc_polyblend'

11 years agofix fruitiex's fix
Rudolf Polzer [Thu, 18 Nov 2010 06:22:33 +0000 (07:22 +0100)]
fix fruitiex's fix

11 years agoMerge remote branch 'origin/fruitiex/fbfix'
Rudolf Polzer [Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)]
Merge remote branch 'origin/fruitiex/fbfix'

11 years agoMerge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'
Rudolf Polzer [Thu, 18 Nov 2010 06:20:06 +0000 (07:20 +0100)]
Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'

11 years agoalso change maxspeed with highspeed; tune minstagib for it
Rudolf Polzer [Thu, 18 Nov 2010 06:11:52 +0000 (07:11 +0100)]
also change maxspeed with highspeed; tune minstagib for it

11 years agojust slightly more RL start speed...
FruitieX [Thu, 18 Nov 2010 06:07:06 +0000 (08:07 +0200)]
just slightly more RL start speed...

11 years agomostly fix prediction in minstagib speed powerup
Rudolf Polzer [Thu, 18 Nov 2010 05:53:02 +0000 (06:53 +0100)]
mostly fix prediction in minstagib speed powerup

11 years agocall the MakePlayerObserver hook BEFORE a player becomes observer (so the old origin...
Rudolf Polzer [Thu, 18 Nov 2010 05:25:33 +0000 (06:25 +0100)]
call the MakePlayerObserver hook BEFORE a player becomes observer (so the old origin is still available)

11 years agoallow sv_defaultplayer* and sv_defaultcharacter cvars in a pure server, don't use...
FruitieX [Wed, 17 Nov 2010 21:42:08 +0000 (23:42 +0200)]
allow sv_defaultplayer* and sv_defaultcharacter cvars in a pure server, don't use g_fullbrightplayers in the sv_fbskin_* aliases (they look much better without that, and arguably even easier to see)

11 years agoanother try
Rudolf Polzer [Wed, 17 Nov 2010 21:21:32 +0000 (22:21 +0100)]
another try

11 years agomake the fbskin aliases work again
Rudolf Polzer [Wed, 17 Nov 2010 21:18:17 +0000 (22:18 +0100)]
make the fbskin aliases work again

11 years agotry making the fbskin work
Rudolf Polzer [Wed, 17 Nov 2010 21:07:57 +0000 (22:07 +0100)]
try making the fbskin work

11 years agoMerge remote branch 'origin/fruitiex/fullbrightskin'
Rudolf Polzer [Wed, 17 Nov 2010 20:40:30 +0000 (21:40 +0100)]
Merge remote branch 'origin/fruitiex/fullbrightskin'

11 years agonope, remove that as well
FruitieX [Wed, 17 Nov 2010 18:50:46 +0000 (20:50 +0200)]
nope, remove that as well

11 years agooops i wasnt supposed to commit this
FruitieX [Wed, 17 Nov 2010 18:35:48 +0000 (20:35 +0200)]
oops i wasnt supposed to commit this

11 years agoalways check the nex primary ammo when trying to charge. We don't want to allow switc...
FruitieX [Wed, 17 Nov 2010 18:32:43 +0000 (20:32 +0200)]
always check the nex primary ammo when trying to charge. We don't want to allow switching back to the nex if we're out of ammo.

11 years agoadd a master switch cvar and a custom color cvar
FruitieX [Wed, 17 Nov 2010 18:28:34 +0000 (20:28 +0200)]
add a master switch cvar and a custom color cvar

11 years agoalso don't draw it if the match ended or we are in the mapvote screen (intermission)
FruitieX [Wed, 17 Nov 2010 18:21:27 +0000 (20:21 +0200)]
also don't draw it if the match ended or we are in the mapvote screen (intermission)

11 years agoremove gl_polyblend, and let a CSQC fullscreen image with blood splatter (thanks...
FruitieX [Wed, 17 Nov 2010 18:16:55 +0000 (20:16 +0200)]
remove gl_polyblend, and let a CSQC fullscreen image with blood splatter (thanks tZork and your decals! :)) replace it. Has code for gradually pulsating the image more and more when below a certain health, and a decreasing pain_treshold as we get below that health. This is DAMN cool btw. :P

11 years agorename a couple of cvars: Nex ring does not show "nexvelocity" anymore, so let's...
FruitieX [Wed, 17 Nov 2010 14:29:52 +0000 (16:29 +0200)]
rename a couple of cvars: Nex ring does not show "nexvelocity" anymore, so let's just call that crosshair_ring_nex_* instead. Make the campingrifle follow the same scheme, with crosshair_ring_campingrifle_*. If we add more features in the future using the crosshair ring they can be renamed accordingly.

11 years agomerge FruitieX's onslaught config changes
Rudolf Polzer [Wed, 17 Nov 2010 11:03:17 +0000 (12:03 +0100)]
merge FruitieX's onslaught config changes

11 years agosys_frametime: if it turns out to be invalid (<= 0), fall back to 60Hz (as sys_ticrat...
Rudolf Polzer [Wed, 17 Nov 2010 10:59:38 +0000 (11:59 +0100)]
sys_frametime: if it turns out to be invalid (<= 0), fall back to 60Hz (as sys_ticrate 0 means variable frametime in the engine)

11 years agoMerge remote branch 'origin/master' into fruitiex/fruit_vs_tzork-balance
FruitieX [Wed, 17 Nov 2010 10:19:06 +0000 (12:19 +0200)]
Merge remote branch 'origin/master' into fruitiex/fruit_vs_tzork-balance

11 years agoWe don't need no runematch gametype, we don't need no spiky runes...
Rudolf Polzer [Tue, 16 Nov 2010 21:16:45 +0000 (22:16 +0100)]
We don't need no runematch gametype, we don't need no spiky runes...

11 years agomodels and content for freezetag (no code yet)
Rudolf Polzer [Tue, 16 Nov 2010 21:10:10 +0000 (22:10 +0100)]
models and content for freezetag (no code yet)

11 years agowhat, why was linkexplode 0 on crylink primary :X
FruitieX [Tue, 16 Nov 2010 19:57:18 +0000 (21:57 +0200)]
what, why was linkexplode 0 on crylink primary :X

11 years agocompromise: much faster nex charge, charge from a charge pool instead of using cells...
FruitieX [Tue, 16 Nov 2010 17:45:52 +0000 (19:45 +0200)]
compromise: much faster nex charge, charge from a charge pool instead of using cells. Charge pool also stops health regen while it's being charged

11 years agolet's compromise by making the mortar fire speedier projectiles
FruitieX [Tue, 16 Nov 2010 16:10:38 +0000 (18:10 +0200)]
let's compromise by making the mortar fire speedier projectiles

11 years agofix cvar use of electro bounce params
Rudolf Polzer [Tue, 16 Nov 2010 12:05:19 +0000 (13:05 +0100)]
fix cvar use of electro bounce params

11 years agoadd cvars for electro secondary bouncefactor/bouncestop
Rudolf Polzer [Tue, 16 Nov 2010 06:45:54 +0000 (07:45 +0100)]
add cvars for electro secondary bouncefactor/bouncestop

11 years agocrylink: let linkjoin damage ignore the attacker
Rudolf Polzer [Tue, 16 Nov 2010 06:41:56 +0000 (07:41 +0100)]
crylink: let linkjoin damage ignore the attacker

11 years agoMerge remote branch 'origin/fruitiex/race_nouid_norec'
Rudolf Polzer [Mon, 15 Nov 2010 20:48:10 +0000 (21:48 +0100)]
Merge remote branch 'origin/fruitiex/race_nouid_norec'

11 years agoMerge remote branch 'origin/fruitiex/mirceakitsune_mapcoordinator'
Rudolf Polzer [Mon, 15 Nov 2010 20:42:29 +0000 (21:42 +0100)]
Merge remote branch 'origin/fruitiex/mirceakitsune_mapcoordinator'

11 years agoMerge remote branch 'origin/fruitiex/branding_lagclock'
Rudolf Polzer [Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)]
Merge remote branch 'origin/fruitiex/branding_lagclock'

11 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Mon, 15 Nov 2010 20:40:21 +0000 (21:40 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

11 years agoupdate notification: use our server now
Rudolf Polzer [Mon, 15 Nov 2010 20:35:14 +0000 (21:35 +0100)]
update notification: use our server now

11 years agoMerge remote branch 'origin/samual/menucheckmarkfix'
Rudolf Polzer [Mon, 15 Nov 2010 06:38:15 +0000 (07:38 +0100)]
Merge remote branch 'origin/samual/menucheckmarkfix'

11 years agoMerge remote branch 'origin/samual/samualbalance'
Rudolf Polzer [Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)]
Merge remote branch 'origin/samual/samualbalance'

11 years agoSamual is somewhat active now, so let's move him up
Rudolf Polzer [Sun, 14 Nov 2010 20:18:20 +0000 (21:18 +0100)]
Samual is somewhat active now, so let's move him up

11 years agoUpdate the luminos menu skin checkmark images so that they don't have a checkmark...
unknown [Sun, 14 Nov 2010 19:51:49 +0000 (14:51 -0500)]
Update the luminos menu skin checkmark images so that they don't have a checkmark in them while unchecked.

11 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 14 Nov 2010 19:02:46 +0000 (20:02 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agobigger joinexplode effect
Rudolf Polzer [Sun, 14 Nov 2010 19:02:28 +0000 (20:02 +0100)]
bigger joinexplode effect

11 years agoshow linkjoin effect only if a radiusdamage is done (joinexplode)
Rudolf Polzer [Sun, 14 Nov 2010 19:01:23 +0000 (20:01 +0100)]
show linkjoin effect only if a radiusdamage is done (joinexplode)

11 years agoUpdate crylink behavior/balance slightly; do not use join feature until refire can...
unknown [Sun, 14 Nov 2010 18:53:30 +0000 (13:53 -0500)]
Update crylink behavior/balance slightly; do not use join feature until refire can be continuous

11 years agoMerge remote branch 'origin/fruitiex/dryfirefix'
Rudolf Polzer [Sun, 14 Nov 2010 18:46:09 +0000 (19:46 +0100)]
Merge remote branch 'origin/fruitiex/dryfirefix'

11 years agoMerge branch 'master' into fruitiex/dryfirefix
FruitieX [Sun, 14 Nov 2010 18:28:00 +0000 (20:28 +0200)]
Merge branch 'master' into fruitiex/dryfirefix

11 years agoMerge remote branch 'origin/samual/samualbalance'
Rudolf Polzer [Sun, 14 Nov 2010 16:46:59 +0000 (17:46 +0100)]
Merge remote branch 'origin/samual/samualbalance'

11 years agoimprove the sorting
Rudolf Polzer [Sun, 14 Nov 2010 14:53:35 +0000 (15:53 +0100)]
improve the sorting

11 years agonet_ cvars also are generally safe
Rudolf Polzer [Sun, 14 Nov 2010 14:52:30 +0000 (15:52 +0100)]
net_ cvars also are generally safe

11 years agofixed for forced team
Rudolf Polzer [Sat, 13 Nov 2010 21:29:40 +0000 (22:29 +0100)]
fixed for forced team

11 years agoMerge remote branch 'origin/divVerent/forced-teams-by-idfp'
Rudolf Polzer [Sat, 13 Nov 2010 21:17:41 +0000 (22:17 +0100)]
Merge remote branch 'origin/divVerent/forced-teams-by-idfp'

11 years agoUpdate balanceSamual.cfg to a slightly usable level, still needs tons of rebalancing...
unknown [Sat, 13 Nov 2010 21:12:18 +0000 (16:12 -0500)]
Update balanceSamual.cfg to a slightly usable level, still needs tons of rebalancing and adjusting.

11 years agoMerge remote branch 'origin/fruitiex/fruitphys'
Rudolf Polzer [Sat, 13 Nov 2010 20:11:49 +0000 (21:11 +0100)]
Merge remote branch 'origin/fruitiex/fruitphys'

11 years agoadd a simple benchmark demo (keyhunt, 3v3v3)
Rudolf Polzer [Sat, 13 Nov 2010 19:14:10 +0000 (20:14 +0100)]
add a simple benchmark demo (keyhunt, 3v3v3)

11 years agog_weaponarena_random_with_laser
Rudolf Polzer [Sat, 13 Nov 2010 19:07:55 +0000 (20:07 +0100)]
g_weaponarena_random_with_laser

11 years agomake maxplayers properly saved
Rudolf Polzer [Sat, 13 Nov 2010 18:56:30 +0000 (19:56 +0100)]
make maxplayers properly saved

11 years agodefault maxplayers: 16
Rudolf Polzer [Sat, 13 Nov 2010 18:55:21 +0000 (19:55 +0100)]
default maxplayers: 16

11 years agoless obnoxious icons, but still not that good
Rudolf Polzer [Fri, 12 Nov 2010 21:45:44 +0000 (22:45 +0100)]
less obnoxious icons, but still not that good

11 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 12 Nov 2010 21:44:10 +0000 (22:44 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agoIPv4/v6 indicator in the server list (test)
Rudolf Polzer [Fri, 12 Nov 2010 21:40:24 +0000 (22:40 +0100)]
IPv4/v6 indicator in the server list (test)

11 years agofullbrightskin for erebus. Why this won't work with the skin file is beyond me.
FruitieX [Fri, 12 Nov 2010 21:33:16 +0000 (23:33 +0200)]
fullbrightskin for erebus. Why this won't work with the skin file is beyond me.

11 years agoget rid of LG missiles more
Rudolf Polzer [Fri, 12 Nov 2010 12:05:32 +0000 (13:05 +0100)]
get rid of LG missiles more

11 years agofix some buttons that apparently share the same id
FruitieX [Fri, 12 Nov 2010 11:10:33 +0000 (13:10 +0200)]
fix some buttons that apparently share the same id

11 years agoapply most of tZork's balance settings to balanceTest
Rudolf Polzer [Fri, 12 Nov 2010 09:05:53 +0000 (10:05 +0100)]
apply most of tZork's balance settings to balanceTest

11 years agoMerge remote branch 'origin/tzork/balance-tzork'
Rudolf Polzer [Fri, 12 Nov 2010 08:37:22 +0000 (09:37 +0100)]
Merge remote branch 'origin/tzork/balance-tzork'

11 years agoGet rid of bouncestop and bouncefactor for electro for now (not worht the fuzz) ...
tzork [Fri, 12 Nov 2010 07:39:39 +0000 (08:39 +0100)]
Get rid of bouncestop and bouncefactor for electro for now (not worht the fuzz)  Support g_balance_crylink_secondary_joinexplode too.

11 years agoimplement a crosshair preview in the playersetup dialog
FruitieX [Fri, 12 Nov 2010 07:24:46 +0000 (09:24 +0200)]
implement a crosshair preview in the playersetup dialog

11 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance'

11 years agomerge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly...
FruitieX [Fri, 12 Nov 2010 06:54:46 +0000 (08:54 +0200)]
merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly unrelated... This is so I could make the colorpicker compatible with the changes in fruitiex/panelhud. Also, terencehill must have forgot a cvar from defaultXonotic.cfg, and setDependent was inverted.

11 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into divVerent/forced-teams-by...
Rudolf Polzer [Fri, 12 Nov 2010 06:52:16 +0000 (07:52 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/forced-teams-by-idfp

11 years agoMerge branch 'terencehill/crosshair_colors' into fruitiex/panelhud
FruitieX [Fri, 12 Nov 2010 06:49:55 +0000 (08:49 +0200)]
Merge branch 'terencehill/crosshair_colors' into fruitiex/panelhud

11 years agooh now that i read the commit message these breaks actually make sense, nice one :-P
FruitieX [Fri, 12 Nov 2010 06:47:43 +0000 (08:47 +0200)]
oh now that i read the commit message these breaks actually make sense, nice one :-P

11 years agoi think terencehill meant that to be a continue instead of break, also why this killn...
FruitieX [Fri, 12 Nov 2010 06:45:09 +0000 (08:45 +0200)]
i think terencehill meant that to be a continue instead of break, also why this killnotify_times == -1 stuff, it prevents e.g. a script that shows you a history of recent events. Calculating a here really won't take much time, so I'd rather leave this optimization out. :)

11 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

11 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

11 years agoSupport g_balance_crylink_primary_joinexplode.
tzork [Fri, 12 Nov 2010 06:17:17 +0000 (07:17 +0100)]
Support g_balance_crylink_primary_joinexplode.

11 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

11 years agoMerge remote branch 'origin/master' into tzork/balance-tzork
unknown [Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)]
Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
balancetZork.cfg

11 years agofix a crash with crylink when only using 1 shot; fix fade_rate networking
Rudolf Polzer [Thu, 11 Nov 2010 22:07:29 +0000 (23:07 +0100)]
fix a crash with crylink when only using 1 shot; fix fade_rate networking

11 years agoalso allow joinspeed==0 with jointime>0
Rudolf Polzer [Thu, 11 Nov 2010 21:56:07 +0000 (22:56 +0100)]
also allow joinspeed==0 with jointime>0

11 years agofix a missing case
Rudolf Polzer [Thu, 11 Nov 2010 21:53:33 +0000 (22:53 +0100)]
fix a missing case

11 years agoalso add jointime parameter
Rudolf Polzer [Thu, 11 Nov 2010 21:52:16 +0000 (22:52 +0100)]
also add jointime parameter

11 years agomake the linkexplode feature its own cvar, and turn it off for those crylink modes...
Rudolf Polzer [Thu, 11 Nov 2010 21:40:33 +0000 (22:40 +0100)]
make the linkexplode feature its own cvar, and turn it off for those crylink modes that have joinspeed