]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoRearrange a check in HUD_Panel_GetBgAlpha
terencehill [Sun, 21 Nov 2010 15:54:02 +0000 (16:54 +0100)]
Rearrange a check in HUD_Panel_GetBgAlpha

13 years agoIf panel_bg is 0 avoid to waste time getting useless data
terencehill [Sun, 21 Nov 2010 15:31:16 +0000 (16:31 +0100)]
If panel_bg is 0 avoid to waste time getting useless data
Not adding a similar check for alpha as it cannot be set to 0 in menu

13 years agoFix cvar name in Notify dialog
terencehill [Sun, 21 Nov 2010 10:51:24 +0000 (11:51 +0100)]
Fix cvar name in Notify dialog

13 years agohud_fontsize isn't used by the HUD any longer (scoreboard and map voting screen use...
terencehill [Sun, 21 Nov 2010 10:42:09 +0000 (11:42 +0100)]
hud_fontsize isn't used by the HUD any longer (scoreboard and map voting screen use it and initialize it within their own code)

13 years agoDisplay an example of rankings in hud_configure mode
terencehill [Sun, 21 Nov 2010 09:55:11 +0000 (10:55 +0100)]
Display an example of rankings in hud_configure mode

13 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Sat, 20 Nov 2010 21:22:51 +0000 (22:22 +0100)]
Merge branch 'master' into terencehill/newpanelhud

13 years agoRemove unused radar vars (they were used in the old radar code)
terencehill [Fri, 19 Nov 2010 23:24:06 +0000 (00:24 +0100)]
Remove unused radar vars (they were used in the old radar code)

13 years agoDelete ons-frame.tga and ons-frame-team.tga of the old radar view: code for it has...
terencehill [Fri, 19 Nov 2010 23:06:46 +0000 (00:06 +0100)]
Delete ons-frame.tga and ons-frame-team.tga of the old radar view: code for it has been removed
Since no waypoint gets precached, neither precache ons-cp-* waypoints (path was wrong anyway, they are in models/sprites)

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 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 agoUse directly panel_pos and panel_size instead of copying them into panelPos and panel...
terencehill [Fri, 19 Nov 2010 08:27:54 +0000 (09:27 +0100)]
Use directly panel_pos and panel_size instead of copying them into panelPos and panelSize (in HUD_Panel_HighlightCheck and HUD_Panel_Highlight)

13 years agoFix 2 checks and use cursorsize
terencehill [Fri, 19 Nov 2010 08:15:15 +0000 (09:15 +0100)]
Fix 2 checks and use cursorsize

13 years agoLess operations drawing pressed keys
terencehill [Thu, 18 Nov 2010 23:39:42 +0000 (00:39 +0100)]
Less operations drawing pressed keys

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 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 agoDifferent ammo count for each ammo type in hud_configure mode
terencehill [Thu, 18 Nov 2010 11:32:11 +0000 (12:32 +0100)]
Different ammo count for each ammo type in hud_configure mode

13 years agoautocvar_hud_configure_bg_minalpha
terencehill [Thu, 18 Nov 2010 11:12:10 +0000 (12:12 +0100)]
autocvar_hud_configure_bg_minalpha

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 agoRemove autocvars for hud_configure_grid* and make use of 2 new vectors to draw the...
terencehill [Thu, 18 Nov 2010 00:14:08 +0000 (01:14 +0100)]
Remove autocvars for hud_configure_grid* and make use of 2 new vectors to draw the grid consuming less cpu cycles

13 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Wed, 17 Nov 2010 23:29:38 +0000 (00:29 +0100)]
Merge branch 'master' into terencehill/newpanelhud

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

13 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

13 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

13 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

13 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

13 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

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

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

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

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

13 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

13 years agoFix Alt-Ctrl-arrow not working because of a bad placed check of ctrl
terencehill [Mon, 15 Nov 2010 20:10:29 +0000 (21:10 +0100)]
Fix Alt-Ctrl-arrow not working because of a bad placed check of ctrl

13 years agoScore panel: showing the distribution display a positive difference with the + sign...
terencehill [Mon, 15 Nov 2010 19:38:30 +0000 (20:38 +0100)]
Score panel: showing the distribution display a positive difference with the + sign, it's clearer

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

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

13 years agohud_panel_score_rankings 1 always show my own score; 2 pure rankings
terencehill [Sun, 14 Nov 2010 22:19:13 +0000 (23:19 +0100)]
hud_panel_score_rankings 1 always show my own score; 2 pure rankings

13 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

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

13 years agoCvar hud_panel_score_rankings to enable rankings not only when observing
terencehill [Sun, 14 Nov 2010 19:14:05 +0000 (20:14 +0100)]
Cvar hud_panel_score_rankings to enable rankings not only when observing

13 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

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

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

13 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

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

13 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

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

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

13 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

13 years agoScore panel when observing: in non-team games show rankings of leading players
terencehill [Sat, 13 Nov 2010 23:15:59 +0000 (00:15 +0100)]
Score panel when observing: in non-team games show rankings of leading players

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

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

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

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

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

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

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

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

13 years agoShow scores of empty teams too because this info tells u which teams exist and becaus...
terencehill [Sat, 13 Nov 2010 15:17:57 +0000 (16:17 +0100)]
Show scores of empty teams too because this info tells u which teams exist and because it IS meaningful on many game modes (e.g. DOM: a team becomes empty but it's still scoring and could even win the match)

Also some cleanups:
use score_size, remove teamnum and recycle row instead, remove unneeded leader var

13 years agoScore panel when observing: distribute scores like ammo in the ammo panel
terencehill [Sat, 13 Nov 2010 14:29:01 +0000 (15:29 +0100)]
Score panel when observing: distribute scores like ammo in the ammo panel
It fixes 4th score popping out from the panel if 4 teams are playing

13 years agoWhen observing show the HUD instead of the scoreboard and show only useful panels
terencehill [Fri, 12 Nov 2010 23:07:56 +0000 (00:07 +0100)]
When observing show the HUD instead of the scoreboard and show only useful panels
The score panel needs to be fixed though

13 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)]
Merge branch 'master' into terencehill/newpanelhud

13 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

13 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

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

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

13 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

13 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