]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Rudolf Polzer [Fri, 19 Nov 2010 21:28:53 +0000 (22:28 +0100)]
fix latest fix
Rudolf Polzer [Fri, 19 Nov 2010 21:22:46 +0000 (22:22 +0100)]
ballistic projectiles: bail out on weapclip
Rudolf Polzer [Fri, 19 Nov 2010 21:08:35 +0000 (22:08 +0100)]
crylink: some debugging
FruitieX [Fri, 19 Nov 2010 19:46:18 +0000 (21:46 +0200)]
jointime 0.1 on crylink primary
Rudolf Polzer [Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)]
Merge remote branch 'origin/tzork/turrets-assualt-fix'
Rudolf Polzer [Fri, 19 Nov 2010 11:39:48 +0000 (12:39 +0100)]
Merge remote branch 'origin/fruitiex/cl_gentle_damage'
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.
FruitieX [Thu, 18 Nov 2010 21:47:29 +0000 (23:47 +0200)]
make the secondary grenades slower (speed 1000, speed_up 300)
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 ;)
FruitieX [Thu, 18 Nov 2010 21:36:45 +0000 (23:36 +0200)]
set pain_threshold_health back at 50. And s/treshold/threshold/g
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
unknown [Thu, 18 Nov 2010 21:10:08 +0000 (16:10 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 18 Nov 2010 21:09:12 +0000 (16:09 -0500)]
Issue fixed so the warning isn't needed anymore
Rudolf Polzer [Thu, 18 Nov 2010 21:05:12 +0000 (22:05 +0100)]
crylink: joinspeed -> joinspread (easier to tune in balance config)
tzork [Thu, 18 Nov 2010 16:04:14 +0000 (17:04 +0100)]
Make turrets switch team corretly in assualt.
FruitieX [Thu, 18 Nov 2010 14:23:13 +0000 (16:23 +0200)]
cl_gentle version of the damage flash
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
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
Rudolf Polzer [Thu, 18 Nov 2010 12:11:00 +0000 (13:11 +0100)]
chooksta!
unknown [Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
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
Rudolf Polzer [Thu, 18 Nov 2010 06:27:49 +0000 (07:27 +0100)]
Merge remote branch 'origin/fruitiex/csqc_polyblend'
Rudolf Polzer [Thu, 18 Nov 2010 06:22:33 +0000 (07:22 +0100)]
fix fruitiex's fix
Rudolf Polzer [Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)]
Merge remote branch 'origin/fruitiex/fbfix'
Rudolf Polzer [Thu, 18 Nov 2010 06:20:06 +0000 (07:20 +0100)]
Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'
Rudolf Polzer [Thu, 18 Nov 2010 06:11:52 +0000 (07:11 +0100)]
also change maxspeed with highspeed; tune minstagib for it
FruitieX [Thu, 18 Nov 2010 06:07:06 +0000 (08:07 +0200)]
just slightly more RL start speed...
Rudolf Polzer [Thu, 18 Nov 2010 05:53:02 +0000 (06:53 +0100)]
mostly fix prediction in minstagib speed powerup
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)
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.
FruitieX [Wed, 17 Nov 2010 23:05:50 +0000 (01:05 +0200)]
fix, again, several important things
unknown [Wed, 17 Nov 2010 22:05:12 +0000 (17:05 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
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)
Rudolf Polzer [Wed, 17 Nov 2010 21:21:32 +0000 (22:21 +0100)]
another try
Rudolf Polzer [Wed, 17 Nov 2010 21:18:17 +0000 (22:18 +0100)]
make the fbskin aliases work again
Rudolf Polzer [Wed, 17 Nov 2010 21:07:57 +0000 (22:07 +0100)]
try making the fbskin work
Rudolf Polzer [Wed, 17 Nov 2010 20:40:30 +0000 (21:40 +0100)]
Merge remote branch 'origin/fruitiex/fullbrightskin'
FruitieX [Wed, 17 Nov 2010 20:30:41 +0000 (22:30 +0200)]
fix the first round now finally, hopefully, other minor fixes
FruitieX [Wed, 17 Nov 2010 19:41:48 +0000 (21:41 +0200)]
add some failsafes
FruitieX [Wed, 17 Nov 2010 19:21:08 +0000 (21:21 +0200)]
decrease revive time by 0.5s
FruitieX [Wed, 17 Nov 2010 19:19:02 +0000 (21:19 +0200)]
ah, i actually have to call count_alive_players(). Also, now i think i know why the revive counter failed a lot... (fixed hopefully)
FruitieX [Wed, 17 Nov 2010 19:08:04 +0000 (21:08 +0200)]
set self.freezetag_frozen = 1 before checking if a round ended when a player leaves
FruitieX [Wed, 17 Nov 2010 18:56:59 +0000 (20:56 +0200)]
Merge remote branch 'origin/fruitiex/gamemode_freezetag' into fruitiex/gamemode_freezetag
FruitieX [Wed, 17 Nov 2010 18:56:27 +0000 (20:56 +0200)]
lol STUPID mistake. Only break if we actually FOUND a teammate nearby
FruitieX [Wed, 17 Nov 2010 18:54:52 +0000 (20:54 +0200)]
Merge branch 'master' into fruitiex/gamemode_freezetag
FruitieX [Wed, 17 Nov 2010 18:50:46 +0000 (20:50 +0200)]
nope, remove that as well
FruitieX [Wed, 17 Nov 2010 18:35:48 +0000 (20:35 +0200)]
oops i wasnt supposed to commit this
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.
FruitieX [Wed, 17 Nov 2010 18:28:34 +0000 (20:28 +0200)]
add a master switch cvar and a custom color cvar
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)
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
unknown [Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
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.
Rudolf Polzer [Wed, 17 Nov 2010 11:03:17 +0000 (12:03 +0100)]
merge FruitieX's onslaught config changes
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)
FruitieX [Wed, 17 Nov 2010 10:19:06 +0000 (12:19 +0200)]
Merge remote branch 'origin/master' into fruitiex/fruit_vs_tzork-balance
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
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...
Rudolf Polzer [Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)]
Merge branch 'master' into fruitiex/gamemode_freezetag
Rudolf Polzer [Tue, 16 Nov 2010 21:10:10 +0000 (22:10 +0100)]
models and content for freezetag (no code yet)
FruitieX [Tue, 16 Nov 2010 19:57:18 +0000 (21:57 +0200)]
what, why was linkexplode 0 on crylink primary :X
FruitieX [Tue, 16 Nov 2010 19:40:06 +0000 (21:40 +0200)]
add revive progress indicator to hud
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
FruitieX [Tue, 16 Nov 2010 16:10:38 +0000 (18:10 +0200)]
let's compromise by making the mortar fire speedier projectiles
FruitieX [Tue, 16 Nov 2010 15:17:06 +0000 (17:17 +0200)]
more fixes around ending/starting rounds...
FruitieX [Tue, 16 Nov 2010 12:58:19 +0000 (14:58 +0200)]
use cvar_or on the hud flash alpha so it can be seen if you don't have the cvars yet
Rudolf Polzer [Tue, 16 Nov 2010 12:05:19 +0000 (13:05 +0100)]
fix cvar use of electro bounce params
FruitieX [Tue, 16 Nov 2010 09:44:01 +0000 (11:44 +0200)]
some fixes
FruitieX [Tue, 16 Nov 2010 09:22:30 +0000 (11:22 +0200)]
add freezetag into the menu
FruitieX [Tue, 16 Nov 2010 09:22:10 +0000 (11:22 +0200)]
waypoints for frozen teammates
FruitieX [Tue, 16 Nov 2010 08:40:47 +0000 (10:40 +0200)]
draw a fullscreen cyan tint when frozen, easy to add/replace with an image later
FruitieX [Tue, 16 Nov 2010 08:27:27 +0000 (10:27 +0200)]
freezetag can use the CA modicons panel for now, at the moment there's only support for two teams anyway
FruitieX [Tue, 16 Nov 2010 08:23:31 +0000 (10:23 +0200)]
bots: don't attack frozen players. This might bring some form of hope into freezetag-botmatches
FruitieX [Tue, 16 Nov 2010 08:19:15 +0000 (10:19 +0200)]
increase the force on frozen players from 0.25 to 0.6 * force
FruitieX [Tue, 16 Nov 2010 08:18:10 +0000 (10:18 +0200)]
YAY found a way to block player movement, but still allow him to be pushed around
FruitieX [Tue, 16 Nov 2010 07:57:53 +0000 (09:57 +0200)]
don't use setattachment() on the ice, this way it won't rotate with the player
FruitieX [Tue, 16 Nov 2010 07:47:18 +0000 (09:47 +0200)]
remove these
FruitieX [Tue, 16 Nov 2010 07:30:38 +0000 (09:30 +0200)]
fix code for checking if player killed himself, also print a message to someone spawning after the round notifying them of why they are frozen
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.
FruitieX [Tue, 16 Nov 2010 07:22:21 +0000 (09:22 +0200)]
lol i had forgotten the mutators/gamemode_freezetag.qc file itself :X
FruitieX [Tue, 16 Nov 2010 07:03:49 +0000 (09:03 +0200)]
no cull none in the ice shader, helps fps here
Rudolf Polzer [Tue, 16 Nov 2010 06:45:54 +0000 (07:45 +0100)]
add cvars for electro secondary bouncefactor/bouncestop
Rudolf Polzer [Tue, 16 Nov 2010 06:41:56 +0000 (07:41 +0100)]
crylink: let linkjoin damage ignore the attacker
unknown [Tue, 16 Nov 2010 02:47:40 +0000 (21:47 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
FruitieX [Mon, 15 Nov 2010 22:31:29 +0000 (00:31 +0200)]
a number of fixes.
FruitieX [Mon, 15 Nov 2010 21:55:24 +0000 (23:55 +0200)]
disable weapons during warmup countdown in freezetag
FruitieX [Mon, 15 Nov 2010 21:49:35 +0000 (23:49 +0200)]
fix starting the gametype
FruitieX [Mon, 15 Nov 2010 21:15:22 +0000 (23:15 +0200)]
Freeze Tag. It compiles. Untested. (don't test :P)
Rudolf Polzer [Mon, 15 Nov 2010 20:48:10 +0000 (21:48 +0100)]
Merge remote branch 'origin/fruitiex/race_nouid_norec'
Rudolf Polzer [Mon, 15 Nov 2010 20:42:29 +0000 (21:42 +0100)]
Merge remote branch 'origin/fruitiex/mirceakitsune_mapcoordinator'
Rudolf Polzer [Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)]
Merge remote branch 'origin/fruitiex/branding_lagclock'
Rudolf Polzer [Mon, 15 Nov 2010 20:40:21 +0000 (21:40 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Mon, 15 Nov 2010 20:35:14 +0000 (21:35 +0100)]
update notification: use our server now
unknown [Mon, 15 Nov 2010 19:19:11 +0000 (14:19 -0500)]
Merge remote branch 'origin/master' into samual/keepaway
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?)
Rudolf Polzer [Mon, 15 Nov 2010 06:38:15 +0000 (07:38 +0100)]
Merge remote branch 'origin/samual/menucheckmarkfix'
Rudolf Polzer [Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)]
Merge remote branch 'origin/samual/samualbalance'
Rudolf Polzer [Sun, 14 Nov 2010 20:18:20 +0000 (21:18 +0100)]
Samual is somewhat active now, so let's move him up
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.
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