xonotic/xonotic-data.pk3dir.git
9 years agoMerge remote branch 'origin/master' into fruitiex/cl_vyes
FruitieX [Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)]
Merge remote branch 'origin/master' into fruitiex/cl_vyes

9 years agofix & cleanup cl_vyes
FruitieX [Tue, 30 Nov 2010 11:18:55 +0000 (13:18 +0200)]
fix & cleanup cl_vyes

9 years agooops, didn't want to merge this... reverting
Rudolf Polzer [Tue, 30 Nov 2010 11:16:10 +0000 (12:16 +0100)]
oops, didn't want to merge this... reverting

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agonew configs by LeeStricklin
Rudolf Polzer [Tue, 30 Nov 2010 11:13:18 +0000 (12:13 +0100)]
new configs by LeeStricklin

9 years agoMerge remote branch 'origin/fruitiex/cuinnton_credits'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/cuinnton_credits'

9 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:12 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

9 years agoshow the dot color correctly in the menu preview as well
FruitieX [Mon, 29 Nov 2010 18:57:22 +0000 (20:57 +0200)]
show the dot color correctly in the menu preview as well

9 years agomake an awesome crosshair default ;)
FruitieX [Mon, 29 Nov 2010 18:51:29 +0000 (20:51 +0200)]
make an awesome crosshair default ;)

9 years agoMerge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud
FruitieX [Mon, 29 Nov 2010 18:46:28 +0000 (20:46 +0200)]
Merge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud

9 years agoluminos_xhair hud config, plus bunch of code changes to make it possible
FruitieX [Mon, 29 Nov 2010 18:45:37 +0000 (20:45 +0200)]
luminos_xhair hud config, plus bunch of code changes to make it possible

9 years agoallow hiding text in these cases too
FruitieX [Mon, 29 Nov 2010 17:28:49 +0000 (19:28 +0200)]
allow hiding text in these cases too

9 years agofix typo, allow disabling the border code and just drawing the border image by means...
FruitieX [Mon, 29 Nov 2010 17:17:52 +0000 (19:17 +0200)]
fix typo, allow disabling the border code and just drawing the border image by means of simple stretching (by setting the border size negative)

9 years agoallow changing the progressbar per-panel-item
FruitieX [Mon, 29 Nov 2010 16:46:18 +0000 (18:46 +0200)]
allow changing the progressbar per-panel-item

9 years agoinstead of stretching the status bar image, drawsetclip it. Big cleanup in status...
FruitieX [Mon, 29 Nov 2010 16:24:15 +0000 (18:24 +0200)]
instead of stretching the status bar image, drawsetclip it. Big cleanup in status bar related code

9 years agocustom max values for the health/armor status bars
FruitieX [Mon, 29 Nov 2010 10:10:11 +0000 (12:10 +0200)]
custom max values for the health/armor status bars

9 years agoMerge remote branch 'origin/savagex/assault-centerprint'
Rudolf Polzer [Mon, 29 Nov 2010 09:52:33 +0000 (10:52 +0100)]
Merge remote branch 'origin/savagex/assault-centerprint'

9 years agohud_luminos_minimal.cfg
FruitieX [Mon, 29 Nov 2010 09:47:51 +0000 (11:47 +0200)]
hud_luminos_minimal.cfg

9 years agoMerge remote branch 'origin/tzork/moveturrets-fix'
Rudolf Polzer [Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)]
Merge remote branch 'origin/tzork/moveturrets-fix'

9 years agoinitial player stats system (reports total "alive time" and kills to a stats server...
Rudolf Polzer [Sun, 28 Nov 2010 17:39:40 +0000 (18:39 +0100)]
initial player stats system (reports total "alive time" and kills to a stats server via HTTP)

9 years agocenterprint self.message for done objectives to keep players informed
Maik Merten [Sun, 28 Nov 2010 14:12:06 +0000 (15:12 +0100)]
centerprint self.message for done objectives to keep players informed

9 years agouse the right update notification again
Rudolf Polzer [Sun, 28 Nov 2010 14:05:29 +0000 (15:05 +0100)]
use the right update notification again

9 years agoadd Cuinnton to the active contributors
FruitieX [Sun, 28 Nov 2010 13:20:27 +0000 (15:20 +0200)]
add Cuinnton to the active contributors

9 years agoFix issue 192
tzork [Sun, 28 Nov 2010 08:24:03 +0000 (09:24 +0100)]
Fix issue 192

9 years agomore speed on the uzi, why does it even have a speed :X, annoying
FruitieX [Sat, 27 Nov 2010 20:08:04 +0000 (22:08 +0200)]
more speed on the uzi, why does it even have a speed :X, annoying

9 years agoallow a custom color on the crosshair dot
FruitieX [Sat, 27 Nov 2010 20:07:35 +0000 (22:07 +0200)]
allow a custom color on the crosshair dot

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agolower the charge rates of the nex just a bit (base charge rate now perfectly matches...
FruitieX [Sat, 27 Nov 2010 00:55:38 +0000 (02:55 +0200)]
lower the charge rates of the nex just a bit (base charge rate now perfectly matches the refire time, base charge + secondary charge + continuous shooting gets you ~75% charge instead of 100%)

9 years agohalve crylink primary spread, you can make it huge anyway by just clicking fast
FruitieX [Sat, 27 Nov 2010 00:45:31 +0000 (02:45 +0200)]
halve crylink primary spread, you can make it huge anyway by just clicking fast

9 years agook not quite that much
FruitieX [Sat, 27 Nov 2010 00:40:19 +0000 (02:40 +0200)]
ok not quite that much

9 years agomuch less damage when in lava, actually have a chance of getting out of there :o
FruitieX [Sat, 27 Nov 2010 00:35:53 +0000 (02:35 +0200)]
much less damage when in lava, actually have a chance of getting out of there :o

9 years agomortar primary radius up a bit, damage up very little too
FruitieX [Sat, 27 Nov 2010 00:27:47 +0000 (02:27 +0200)]
mortar primary radius up a bit, damage up very little too

9 years agotake over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest...
FruitieX [Fri, 26 Nov 2010 23:18:00 +0000 (01:18 +0200)]
take over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest up to 250). Armor little more special: 25a up to 50, 50a up to 50, rest up to 150

9 years agocatch errors
Rudolf Polzer [Fri, 26 Nov 2010 19:49:36 +0000 (20:49 +0100)]
catch errors

9 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 26 Nov 2010 19:35:22 +0000 (20:35 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agoadd some test code for uri_post
Rudolf Polzer [Fri, 26 Nov 2010 19:35:00 +0000 (20:35 +0100)]
add some test code for uri_post

9 years agoMerge remote branch 'origin/fruitiex/add_soundchan'
Rudolf Polzer [Fri, 26 Nov 2010 08:56:31 +0000 (09:56 +0100)]
Merge remote branch 'origin/fruitiex/add_soundchan'

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Fri, 26 Nov 2010 08:47:25 +0000 (09:47 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agoMerge remote branch 'origin/fruitiex/noaccuracyspam'
Rudolf Polzer [Fri, 26 Nov 2010 08:44:26 +0000 (09:44 +0100)]
Merge remote branch 'origin/fruitiex/noaccuracyspam'

9 years agoMerge remote branch 'origin/fruitiex/effectinfo_nerf'
Rudolf Polzer [Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)]
Merge remote branch 'origin/fruitiex/effectinfo_nerf'

9 years agolower secondary mortar speed
FruitieX [Thu, 25 Nov 2010 23:29:18 +0000 (01:29 +0200)]
lower secondary mortar speed

9 years agotiny shotgun nerf now
FruitieX [Thu, 25 Nov 2010 22:58:41 +0000 (00:58 +0200)]
tiny shotgun nerf now

9 years agoelectro combo slightly stronger
FruitieX [Thu, 25 Nov 2010 22:52:33 +0000 (00:52 +0200)]
electro combo slightly stronger

9 years agoshotgun primary max dmg from 60 to 80 to balance it out a little more (it's currently...
FruitieX [Thu, 25 Nov 2010 22:46:34 +0000 (00:46 +0200)]
shotgun primary max dmg from 60 to 80 to balance it out a little more (it's currently second last on the damage stats)

9 years agodisable falloff on electro primary
FruitieX [Thu, 25 Nov 2010 22:44:56 +0000 (00:44 +0200)]
disable falloff on electro primary

9 years agoMerge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
FruitieX [Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)]
Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance

9 years agocomment out a debug print
FruitieX [Thu, 25 Nov 2010 15:29:43 +0000 (17:29 +0200)]
comment out a debug print

9 years agonerf shotgun, uzi and hagar impact effects, they were a bit too insane with particle...
FruitieX [Thu, 25 Nov 2010 15:13:56 +0000 (17:13 +0200)]
nerf shotgun, uzi and hagar impact effects, they were a bit too insane with particle quality 1.0 (which is supposed to be the value we tweak these to!)

9 years agoadd an additional arg to the W_SetupShot* functions for adjusting the sound channel...
FruitieX [Thu, 25 Nov 2010 14:46:26 +0000 (16:46 +0200)]
add an additional arg to the W_SetupShot* functions for adjusting the sound channel. Use this on electro secondary and minstanex secondary laser

9 years agomove electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightnin...
Rudolf Polzer [Thu, 25 Nov 2010 13:22:00 +0000 (14:22 +0100)]
move electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightning sound

9 years agosync dpextensions with darkplaces (uri_post stuff)
Rudolf Polzer [Thu, 25 Nov 2010 12:37:20 +0000 (13:37 +0100)]
sync dpextensions with darkplaces (uri_post stuff)

9 years agofix bad side effects of picking up ammo/health
Rudolf Polzer [Thu, 25 Nov 2010 06:19:36 +0000 (07:19 +0100)]
fix bad side effects of picking up ammo/health

9 years agodo announcer messages for bullets only for the rifle
Rudolf Polzer [Wed, 24 Nov 2010 20:15:36 +0000 (21:15 +0100)]
do announcer messages for bullets only for the rifle

9 years agocrylink link maintenance: fix one odd case that may have caused corruption
Rudolf Polzer [Wed, 24 Nov 2010 19:56:58 +0000 (20:56 +0100)]
crylink link maintenance: fix one odd case that may have caused corruption

9 years agobetter handle >100% accuracy
Rudolf Polzer [Wed, 24 Nov 2010 19:01:30 +0000 (20:01 +0100)]
better handle >100% accuracy

9 years agocrylink: properly calculate maxdmg
Rudolf Polzer [Wed, 24 Nov 2010 18:58:24 +0000 (19:58 +0100)]
crylink: properly calculate maxdmg

9 years agomore accuracy fixes
Rudolf Polzer [Wed, 24 Nov 2010 18:48:47 +0000 (19:48 +0100)]
more accuracy fixes

9 years agoMerge remote branch 'origin/divVerent/accuracy-fixes'
Rudolf Polzer [Wed, 24 Nov 2010 18:03:56 +0000 (19:03 +0100)]
Merge remote branch 'origin/divVerent/accuracy-fixes'

9 years agoremove two balance configs nobody needs AT ALL
Rudolf Polzer [Wed, 24 Nov 2010 17:57:38 +0000 (18:57 +0100)]
remove two balance configs nobody needs AT ALL

9 years agoMerge remote branch 'origin/master' into fruitiex/balance
FruitieX [Wed, 24 Nov 2010 17:39:14 +0000 (19:39 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance

9 years agomine layer: properly inherit spawnshieldtime when sticking to a wall, to fix remote...
Rudolf Polzer [Tue, 23 Nov 2010 17:22:05 +0000 (18:22 +0100)]
mine layer: properly inherit spawnshieldtime when sticking to a wall, to fix remote detonate

9 years agoaccuracy: only resend if the accuracy value actually changed
Rudolf Polzer [Tue, 23 Nov 2010 13:05:39 +0000 (14:05 +0100)]
accuracy: only resend if the accuracy value actually changed

9 years agocl_vyes/cl_vno => vyes/vno
FruitieX [Mon, 22 Nov 2010 16:18:59 +0000 (18:18 +0200)]
cl_vyes/cl_vno => vyes/vno

9 years agoadd a cl_cmd cl_vyes/vno command for checking whether a vote should go through the...
FruitieX [Mon, 22 Nov 2010 16:15:23 +0000 (18:15 +0200)]
add a cl_cmd cl_vyes/vno command for checking whether a vote should go through the uid2name screen or as a normal vyes/vno

9 years agomore fixes of accuracy new system
Rudolf Polzer [Mon, 22 Nov 2010 16:12:08 +0000 (17:12 +0100)]
more fixes of accuracy new system

9 years agoforgot to actually initialize the accuracy tracking
Rudolf Polzer [Mon, 22 Nov 2010 15:41:59 +0000 (16:41 +0100)]
forgot to actually initialize the accuracy tracking

9 years agodon't cull the accuracy entity
Rudolf Polzer [Mon, 22 Nov 2010 15:41:00 +0000 (16:41 +0100)]
don't cull the accuracy entity

9 years agoaccuracy: csqc updates to match the svqc stuff
Rudolf Polzer [Mon, 22 Nov 2010 13:43:05 +0000 (14:43 +0100)]
accuracy: csqc updates to match the svqc stuff

9 years agoproperly count minstanex damage
Rudolf Polzer [Mon, 22 Nov 2010 13:31:15 +0000 (14:31 +0100)]
properly count minstanex damage

9 years agoresend accuracy when spectating
Rudolf Polzer [Mon, 22 Nov 2010 13:28:59 +0000 (14:28 +0100)]
resend accuracy when spectating

9 years agoway more fixes
Rudolf Polzer [Mon, 22 Nov 2010 13:26:27 +0000 (14:26 +0100)]
way more fixes

9 years agobeginning of a SANE accuracy networking system
Rudolf Polzer [Mon, 22 Nov 2010 12:49:47 +0000 (13:49 +0100)]
beginning of a SANE accuracy networking system

9 years agowith all the other stuff we have compromised, let's compromise this too! sv_maxspeed...
FruitieX [Sun, 21 Nov 2010 21:36:22 +0000 (23:36 +0200)]
with all the other stuff we have compromised, let's compromise this too! sv_maxspeed 360 = (320 + 400) / 2

9 years agoelectro: eat less ammo again (5 per sec, with secondary you'll quickly empty it anyway)
FruitieX [Sun, 21 Nov 2010 21:34:14 +0000 (23:34 +0200)]
electro: eat less ammo again (5 per sec, with secondary you'll quickly empty it anyway)

9 years agoless damage falloff on electro primary... dont make it useless at it's tip
FruitieX [Sun, 21 Nov 2010 20:49:44 +0000 (22:49 +0200)]
less damage falloff on electro primary... dont make it useless at it's tip

9 years agoonly 100 armor in lms/ca
FruitieX [Sun, 21 Nov 2010 20:20:02 +0000 (22:20 +0200)]
only 100 armor in lms/ca

9 years agoMerge remote branch 'origin/master' into fruitiex/balance
FruitieX [Sun, 21 Nov 2010 20:10:51 +0000 (22:10 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance

9 years agomore typos
Rudolf Polzer [Sun, 21 Nov 2010 20:05:40 +0000 (21:05 +0100)]
more typos

9 years agofix another typo
Rudolf Polzer [Sun, 21 Nov 2010 20:05:12 +0000 (21:05 +0100)]
fix another typo

9 years agodo not reset items bits in non-ctf and non-nexball
Rudolf Polzer [Sun, 21 Nov 2010 20:00:43 +0000 (21:00 +0100)]
do not reset items bits in non-ctf and non-nexball

9 years agokey bind editor: allow permanently unbinding keys
Rudolf Polzer [Sun, 21 Nov 2010 20:00:13 +0000 (21:00 +0100)]
key bind editor: allow permanently unbinding keys

9 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

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

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

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

9 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

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

9 years agojointime 0.1 on crylink primary
FruitieX [Fri, 19 Nov 2010 19:46:18 +0000 (21:46 +0200)]
jointime 0.1 on crylink primary

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

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

9 years agomake the secondary grenades slower (speed 1000, speed_up 300)
FruitieX [Thu, 18 Nov 2010 21:47:29 +0000 (23:47 +0200)]
make the secondary grenades slower (speed 1000, speed_up 300)

9 years agomake this a fruit_vs_tzork_vs_samual-balance branch, by merging in Samual's rocketlau...
FruitieX [Thu, 18 Nov 2010 21:44:53 +0000 (23:44 +0200)]
make this a fruit_vs_tzork_vs_samual-balance branch, by merging in Samual's rocketlauncher speeds ;)

9 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

9 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

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

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

9 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

9 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

9 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

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