xonotic/xonotic-data.pk3dir.git
10 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.

10 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

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

10 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

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

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

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

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

10 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

10 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

10 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

10 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

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

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

10 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

10 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

10 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

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

10 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

10 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

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

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

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

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

10 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

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

10 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

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

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

10 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

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

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

10 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

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

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

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

10 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

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

10 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

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

10 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

10 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

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

10 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

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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 years agoUpdate code slightly (Compiles now!), go with "keepaway" instead of "ka" whenever...
unknown [Tue, 16 Nov 2010 07:25:28 +0000 (02:25 -0500)]
Update code slightly (Compiles now!), go with "keepaway" instead of "ka" whenever possible, fix some other stuff.. Still a huge issue though: Game mode doesn't START.

10 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

10 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

10 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Tue, 16 Nov 2010 02:47:40 +0000 (21:47 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

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

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

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

10 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

10 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Mon, 15 Nov 2010 19:19:11 +0000 (14:19 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

10 years agoLaying down some ground work for the keepaway game mode, lots more work to do for...
unknown [Mon, 15 Nov 2010 06:54:47 +0000 (01:54 -0500)]
Laying down some ground work for the keepaway game mode, lots more work to do for this to be functional but i'm too tired and I have work tomorrow morning. Currently the TODO list for tomorrow: Finish core game mode so that it at least compiles, do the HUD for keepaway, add code to bot/aim.qc which makes bots only attack carrier, add the cvars needed for the game mode to defaultXonotic.cfg, and decide on just ONE way to refer to keepaway (KA or keepaway?)

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

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

10 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

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

10 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

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

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

10 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

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

10 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

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

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

10 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

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

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

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

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

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

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

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

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

10 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

10 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

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

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

10 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

10 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

10 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

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

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

10 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

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

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

10 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

10 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

10 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