]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

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

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

13 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

13 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

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

13 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

13 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

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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

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

13 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

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

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

13 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

13 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

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

13 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

13 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

13 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?)

13 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

13 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

13 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

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

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

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

13 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

13 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

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

13 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

13 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

13 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

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

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

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

13 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

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

13 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

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

13 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

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

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

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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

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

13 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

13 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

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

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

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

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

13 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

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

13 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

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

13 years agoGame mode is semi-functional now!!!! Tons of fixes were done, but still lots of thing...
unknown [Thu, 18 Nov 2010 04:36:59 +0000 (23:36 -0500)]
Game mode is semi-functional now!!!! Tons of fixes were done, but still lots of things on the todolist. Also: I need to talk to divVerent about adding extra mutator hooks, as there are ~2 or 3 which could be extremely useful.

13 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Wed, 17 Nov 2010 22:05:12 +0000 (17:05 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

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

13 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

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

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

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

13 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

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

13 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

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

13 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

13 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

13 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

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

13 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

13 years agofix starting up keepaway for Samual ;). Gamemode still borken, i see no ball
FruitieX [Wed, 17 Nov 2010 10:13:31 +0000 (12:13 +0200)]
fix starting up keepaway for Samual ;). Gamemode still borken, i see no ball

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

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

13 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