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

11 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

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

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

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

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/master' into samual/keepaway
unknown [Tue, 16 Nov 2010 02:47:40 +0000 (21:47 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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/master' into samual/keepaway
unknown [Mon, 15 Nov 2010 19:19:11 +0000 (14:19 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

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

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

11 years agoproperly handle warpzones in performing crylink projectile joining
Rudolf Polzer [Thu, 11 Nov 2010 21:34:21 +0000 (22:34 +0100)]
properly handle warpzones in performing crylink projectile joining

11 years agojoinspeed: tune a bit more
Rudolf Polzer [Thu, 11 Nov 2010 21:20:48 +0000 (22:20 +0100)]
joinspeed: tune a bit more

11 years agomake the uzi just slightly stronger
FruitieX [Thu, 11 Nov 2010 17:56:41 +0000 (19:56 +0200)]
make the uzi just slightly stronger

11 years agohealth/armor back to 200/150 in LMS/CA, 250/250 IS way too much...
FruitieX [Thu, 11 Nov 2010 17:18:30 +0000 (19:18 +0200)]
health/armor back to 200/150 in LMS/CA, 250/250 IS way too much...

11 years agobump electro primary dps up again, this time to 100 dps. 90 was still way too low...
FruitieX [Thu, 11 Nov 2010 16:29:42 +0000 (18:29 +0200)]
bump electro primary dps up again, this time to 100 dps. 90 was still way too low, and now especially it is harder to hit with it with a ground speed of 400.

11 years agomovetoteam: undo the team forcing in this too (so movetoteam can be done to override...
Rudolf Polzer [Thu, 11 Nov 2010 13:19:47 +0000 (14:19 +0100)]
movetoteam: undo the team forcing in this too (so movetoteam can be done to override the force)

11 years agoMerge branch 'master' into divVerent/forced-teams-by-idfp
Rudolf Polzer [Thu, 11 Nov 2010 13:16:59 +0000 (14:16 +0100)]
Merge branch 'master' into divVerent/forced-teams-by-idfp

11 years agoforcing teams by player ID (usign cvars g_forced_team_*)
Rudolf Polzer [Thu, 11 Nov 2010 13:12:01 +0000 (14:12 +0100)]
forcing teams by player ID (usign cvars g_forced_team_*)

11 years agoFix conflict
unknown [Thu, 11 Nov 2010 00:09:03 +0000 (01:09 +0100)]
Fix conflict

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

Conflicts:
balancetZork.cfg
qcsrc/server/w_crylink.qc

11 years agoGotta go this to be able to merge.
unknown [Wed, 10 Nov 2010 23:57:48 +0000 (00:57 +0100)]
Gotta go this to be able to merge.

11 years agogive 2 cells for vampire hit in minsta, not one (so cells actually increase)
Rudolf Polzer [Wed, 10 Nov 2010 21:02:06 +0000 (22:02 +0100)]
give 2 cells for vampire hit in minsta, not one (so cells actually increase)

11 years agomove g_vampire to the mutator system
Rudolf Polzer [Wed, 10 Nov 2010 20:57:15 +0000 (21:57 +0100)]
move g_vampire to the mutator system

11 years agoget rid of g_laserguided_missile due to non-use and unnecessary complexity
Rudolf Polzer [Wed, 10 Nov 2010 20:44:11 +0000 (21:44 +0100)]
get rid of g_laserguided_missile due to non-use and unnecessary complexity

11 years agoadd todo comments regarding mutators
Rudolf Polzer [Wed, 10 Nov 2010 20:39:23 +0000 (21:39 +0100)]
add todo comments regarding mutators

11 years agoexperiment: 400 ups ground speed again, Lee Stricklin was perhaps right, 320 might...
FruitieX [Wed, 10 Nov 2010 19:34:59 +0000 (21:34 +0200)]
experiment: 400 ups ground speed again, Lee Stricklin was perhaps right, 320 might be a bit on the low side

11 years agosometimes the clientside headshot detection code detects sprees as headshots or somet...
FruitieX [Wed, 10 Nov 2010 18:45:51 +0000 (20:45 +0200)]
sometimes the clientside headshot detection code detects sprees as headshots or something? add a failsafe if(w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) into there just to be sure it won't happen again. Also remove an apparent debug print from the minstanex code that prints a "h" to the console if someone gets a headshot

11 years agoLabel messages as deleted when they have faded out and break the loop at the first...
terencehill [Wed, 10 Nov 2010 16:09:49 +0000 (17:09 +0100)]
Label messages as deleted when they have faded out and break the loop at the first deleted message

11 years agoDo not draw notify messages if they are transparent
terencehill [Tue, 9 Nov 2010 21:27:29 +0000 (22:27 +0100)]
Do not draw notify messages if they are transparent

To make it possible I had to move the hud_configure code and add a goto; also this change made the logic simpler.

And while I'm at it, make each notify message in hud_configure mode different from the other ones

11 years agoMirceaKitsune/Taoki was a map coordinator for a while already, bump him up from ...
FruitieX [Wed, 10 Nov 2010 15:06:05 +0000 (17:06 +0200)]
MirceaKitsune/Taoki was a map coordinator for a while already, bump him up from "past contributors" in the credits.

11 years agomore rockets in CA/LMS, I always run out of them! Less nails and cells though, there...
FruitieX [Wed, 10 Nov 2010 11:50:08 +0000 (13:50 +0200)]
more rockets in CA/LMS, I always run out of them! Less nails and cells though, there was perhaps too many of them.

11 years agorefire 1 on the minstanex
FruitieX [Wed, 10 Nov 2010 11:39:11 +0000 (13:39 +0200)]
refire 1 on the minstanex

11 years agouse g_balance_laser_primary_refire on the minstanex laser instead of the hardcoded...
FruitieX [Wed, 10 Nov 2010 11:38:25 +0000 (13:38 +0200)]
use g_balance_laser_primary_refire on the minstanex laser instead of the hardcoded 0.9 seconds

11 years agoFix warning.
unknown [Wed, 10 Nov 2010 07:48:01 +0000 (08:48 +0100)]
Fix warning.

11 years agog_blance_electro_secondary_bouncefactor & _bouncestop for electro seoncdary. merge...
unknown [Wed, 10 Nov 2010 07:38:39 +0000 (08:38 +0100)]
g_blance_electro_secondary_bouncefactor & _bouncestop for electro seoncdary. merge health rot and related from balanceTest. Use divVerent's fancy new crylink stuff, also make it explode @ "join". And teh usual pile of balance tweakage.

11 years agominelayer: don't send a network update every frame, it's not guided
Rudolf Polzer [Wed, 10 Nov 2010 06:25:31 +0000 (07:25 +0100)]
minelayer: don't send a network update every frame, it's not guided

11 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 10 Nov 2010 06:22:46 +0000 (07:22 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agogrenade launcher: move bouncefactor to a common cvar for both modes (as it wasn't...
Rudolf Polzer [Wed, 10 Nov 2010 06:22:20 +0000 (07:22 +0100)]
grenade launcher: move bouncefactor to a common cvar for both modes (as it wasn't csqc networked properly)

11 years agoMerge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork
unknown [Wed, 10 Nov 2010 00:04:44 +0000 (01:04 +0100)]
Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork