xonotic/xonotic-data.pk3dir.git
11 years agoACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix...
unknown [Sat, 27 Nov 2010 13:09:52 +0000 (08:09 -0500)]
ACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix for the origin issue :P)

11 years agoAdd animations to the HUD (keepaway mod panel)
unknown [Sat, 27 Nov 2010 11:22:56 +0000 (06:22 -0500)]
Add animations to the HUD (keepaway mod panel)

11 years agoNew images for keepaway for send_killnotification and HUD.
unknown [Sat, 27 Nov 2010 08:09:39 +0000 (03:09 -0500)]
New images for keepaway for send_killnotification and HUD.

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sat, 27 Nov 2010 01:36:53 +0000 (20:36 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

11 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

11 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

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

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

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

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

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

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

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

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

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

11 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

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

11 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!)

11 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

11 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

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

11 years agoAdapt keepaway to use Send_KillNotification; code is complete, just needs new images...
unknown [Thu, 25 Nov 2010 11:59:09 +0000 (06:59 -0500)]
Adapt keepaway to use Send_KillNotification; code is complete, just needs new images for it.

11 years agoCode cleanups + keepaway powerups, this one might be questionable and might require...
unknown [Thu, 25 Nov 2010 08:12:45 +0000 (03:12 -0500)]
Code cleanups + keepaway powerups, this one might be questionable and might require some review. Gonna do some testing on my server now to see if it's 100% stable and bug free

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 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

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 25 Nov 2010 01:39:19 +0000 (20:39 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 years agoTEST THIS: Remove the thinkhack from ka_RespawnBall() and just execute the function...
unknown [Thu, 25 Nov 2010 01:34:41 +0000 (20:34 -0500)]
TEST THIS: Remove the thinkhack from ka_RespawnBall() and just execute the function again immediately if spawning failed

11 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

11 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

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

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

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

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

11 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

11 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

11 years agoMake the keepaway ball follow jump pads (Maybe i'll later re-do this by actually...
unknown [Wed, 24 Nov 2010 02:54:34 +0000 (21:54 -0500)]
Make the keepaway ball follow jump pads (Maybe i'll later re-do this by actually doing what was on the todo suggestion)

11 years agoAdd a sound for when the ball touches something, and fix precaching for sounds
unknown [Wed, 24 Nov 2010 02:19:28 +0000 (21:19 -0500)]
Add a sound for when the ball touches something, and fix precaching for sounds

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Tue, 23 Nov 2010 23:56:09 +0000 (18:56 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 years agoRemove the think "hack" for spawning the ball -- not sure if this breaks anything...
unknown [Tue, 23 Nov 2010 23:53:43 +0000 (18:53 -0500)]
Remove the think "hack" for spawning the ball -- not sure if this breaks anything, or why the hack was needed in the first place, or if I need to use initializeentity instead. divVerent? (BTW, with this, the game mode starts just fine and runs just fine as far as I can tell)

11 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

11 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

11 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

11 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

11 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

11 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

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

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

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

11 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

11 years agoBeginning ground work on creating a bot role for keepaway; will do more tomorrow.
unknown [Mon, 22 Nov 2010 08:08:46 +0000 (03:08 -0500)]
Beginning ground work on creating a bot role for keepaway; will do more tomorrow.

11 years agoFix 2 bugs (Warmup to normal match carrier bug - waypoint spawn in solid in ka_SpawnB...
unknown [Mon, 22 Nov 2010 07:06:37 +0000 (02:06 -0500)]
Fix 2 bugs (Warmup to normal match carrier bug - waypoint spawn in solid in ka_SpawnBall) and add a sound for ka_RespawnBall so you can hear when the ball is respawning.

11 years agoAdd some new keepawayball_carrying images with now fully functioning HUD - some bug...
unknown [Mon, 22 Nov 2010 00:25:20 +0000 (19:25 -0500)]
Add some new keepawayball_carrying images with now fully functioning HUD - some bug fixes and cleanups - and add some new effects for the ball

11 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

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

11 years agoRemove kaballcarried, andfix ballcarried so it can be used in keepaway as well
unknown [Sun, 21 Nov 2010 21:07:49 +0000 (16:07 -0500)]
Remove kaballcarried, andfix ballcarried so it can be used in keepaway as well

11 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

11 years agoFinally a functioning HUD! Now all I need is a new keepawayball_carrying.tga image...
unknown [Sun, 21 Nov 2010 20:42:05 +0000 (15:42 -0500)]
Finally a functioning HUD! Now all I need is a new keepawayball_carrying.tga image. (Morphed?)

11 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

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sun, 21 Nov 2010 20:11:13 +0000 (15:11 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 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

11 years agoSome major updates, work on adding HUD to KA, some bug fixes.
unknown [Sun, 21 Nov 2010 20:09:41 +0000 (15:09 -0500)]
Some major updates, work on adding HUD to KA, some bug fixes.

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

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

11 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

11 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

11 years agoUpdate waypoints in keepaway slightly - this creates a bug on initialization/spawning...
unknown [Sat, 20 Nov 2010 06:57:41 +0000 (01:57 -0500)]
Update waypoints in keepaway slightly - this creates a bug on initialization/spawning the ball, but does not actually harm anything currently. I'll fix the bug when I have more time tomorrow.

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sat, 20 Nov 2010 06:57:07 +0000 (01:57 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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 agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sat, 20 Nov 2010 06:27:27 +0000 (01:27 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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 agoAlmost fully functioning now! Just a couple more things to do and then testing.
unknown [Sat, 20 Nov 2010 04:57:01 +0000 (23:57 -0500)]
Almost fully functioning now! Just a couple more things to do and then testing.

11 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Fri, 19 Nov 2010 22:51:58 +0000 (17:51 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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 agojointime 0.1 on crylink primary
FruitieX [Fri, 19 Nov 2010 19:46:18 +0000 (21:46 +0200)]
jointime 0.1 on crylink primary

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 agoSome work on scoring.... still have to fix the bug of not displaying the correct...
unknown [Fri, 19 Nov 2010 07:48:59 +0000 (02:48 -0500)]
Some work on scoring.... still have to fix the bug of not displaying the correct columns, but that'll have to be tomorrow. Lots of cleaning up is going to need done soon as well.

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

11 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 ;)

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 agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 18 Nov 2010 21:10:08 +0000 (16:10 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 years agoIssue fixed so the warning isn't needed anymore
unknown [Thu, 18 Nov 2010 21:09:12 +0000 (16:09 -0500)]
Issue fixed so the warning isn't needed anymore

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/master' into samual/keepaway
unknown [Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

11 years agoUndo a little temporary change before merging into master, should make things easier
unknown [Thu, 18 Nov 2010 06:57:06 +0000 (01:57 -0500)]
Undo a little temporary change before merging into master, should make things easier

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'