xonotic/xonotic-data.pk3dir.git
11 years agoforce showing a background in config mode, also adapt old nexuiz hud config for the...
FruitieX [Tue, 18 May 2010 21:06:57 +0000 (00:06 +0300)]
force showing a background in config mode, also adapt old nexuiz hud config for the new bg convention (this also breaks other confs...)

11 years agoadd padding to the export function
FruitieX [Tue, 18 May 2010 20:52:32 +0000 (23:52 +0300)]
add padding to the export function

11 years agomake all hud_bg cvars follow the same convention ("" = use default value)
FruitieX [Tue, 18 May 2010 20:49:20 +0000 (23:49 +0300)]
make all hud_bg cvars follow the same convention ("" = use default value)

11 years agodon't draw "ammo_currentbg" in showonlycurrent mode
FruitieX [Tue, 18 May 2010 20:26:21 +0000 (23:26 +0300)]
don't draw "ammo_currentbg" in showonlycurrent mode

11 years agodraw accuracy bar as a background to the weapon icon, with the size == weapon icon...
FruitieX [Tue, 18 May 2010 13:52:07 +0000 (16:52 +0300)]
draw accuracy bar as a background to the weapon icon, with the size == weapon icon size for better skinning options. Adapt accuracy bar from old HUD to this

11 years agofix a bunch of warnings
FruitieX [Mon, 17 May 2010 18:03:35 +0000 (21:03 +0300)]
fix a bunch of warnings

11 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

11 years agoreduce in-air movement speed (maybe too much, please test)
Rudolf Polzer [Mon, 17 May 2010 14:56:51 +0000 (16:56 +0200)]
reduce in-air movement speed (maybe too much, please test)

11 years agoMerge remote branch 'refs/remotes/origin/diabolik/weaponscale'
Rudolf Polzer [Sun, 16 May 2010 18:53:02 +0000 (20:53 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'

11 years agoalways show some icons on the mod icon panel when in config mode
FruitieX [Sun, 16 May 2010 18:50:06 +0000 (21:50 +0300)]
always show some icons on the mod icon panel when in config mode

11 years agoadd hud_configure_grid ;). Gridsize can be set manually. Maybe make this default...
FruitieX [Sun, 16 May 2010 18:43:53 +0000 (21:43 +0300)]
add hud_configure_grid ;). Gridsize can be set manually. Maybe make this default once we have some problems with resizing fixed (this easily reveals those problems, as exactly those test cases happen with this, ie. panel touches another panel in one direction while being resized in the opposite direction)

11 years agomake pressedkeys description better, make modicons default to on
FruitieX [Sun, 16 May 2010 18:17:30 +0000 (21:17 +0300)]
make pressedkeys description better, make modicons default to on

11 years agoalways draw enabled panels in config mode
FruitieX [Sun, 16 May 2010 18:15:51 +0000 (21:15 +0300)]
always draw enabled panels in config mode

11 years agomod icons, still a bit unfinished but in the interest of getting other importart...
FruitieX [Sun, 16 May 2010 17:56:34 +0000 (20:56 +0300)]
mod icons, still a bit unfinished but in the interest of getting other importart changes pushed... (such as ammo icons!)

11 years agoSome position fixes. TUBA!
Sahil Singhal [Sun, 16 May 2010 17:54:58 +0000 (13:54 -0400)]
Some position fixes. TUBA!

11 years agoMerge remote branch 'refs/remotes/origin/esteel/anim/fixwarns'
Rudolf Polzer [Sun, 16 May 2010 17:31:03 +0000 (19:31 +0200)]
Merge remote branch 'refs/remotes/origin/esteel/anim/fixwarns'

11 years agoparticles quality: make 1 do what currently 0.5 does; adjust effect configs accordingly
Rudolf Polzer [Sun, 16 May 2010 17:27:15 +0000 (19:27 +0200)]
particles quality: make 1 do what currently 0.5 does; adjust effect configs accordingly

11 years agofixed several warnings
Stephan Stahl [Sun, 16 May 2010 13:04:41 +0000 (13:04 +0000)]
fixed several warnings

11 years agoFinish h_* invisible models. Not sure what to do for tuba.
Sahil Singhal [Sat, 15 May 2010 22:22:18 +0000 (18:22 -0400)]
Finish h_* invisible models. Not sure what to do for tuba.

11 years agoMerge commit 'origin/master' into diabolik/weaponscale
Sahil Singhal [Sat, 15 May 2010 21:17:22 +0000 (17:17 -0400)]
Merge commit 'origin/master' into diabolik/weaponscale

11 years agofixes.
Sahil Singhal [Sat, 15 May 2010 21:16:47 +0000 (17:16 -0400)]
fixes.

11 years agoa new shader file with some very short names for certain common stuff (currently...
Rudolf Polzer [Sat, 15 May 2010 21:15:23 +0000 (23:15 +0200)]
a new shader file with some very short names for certain common stuff (currently just nodraw)

11 years agofix pyria and umbra txt files
Rudolf Polzer [Sat, 15 May 2010 20:53:28 +0000 (22:53 +0200)]
fix pyria and umbra txt files

11 years agoMerge remote branch 'refs/remotes/origin/parasti/make-print-chdir-2'
Rudolf Polzer [Sat, 15 May 2010 20:34:08 +0000 (22:34 +0200)]
Merge remote branch 'refs/remotes/origin/parasti/make-print-chdir-2'

11 years agoMerge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'
Rudolf Polzer [Sat, 15 May 2010 20:28:38 +0000 (22:28 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'

11 years agomore preparations for modicon panel
FruitieX [Sat, 15 May 2010 20:04:08 +0000 (23:04 +0300)]
more preparations for modicon panel

11 years agoFirst person campingrifle.
Sahil Singhal [Sat, 15 May 2010 18:51:47 +0000 (14:51 -0400)]
First person campingrifle.

11 years agoFirst person shotgun.
Sahil Singhal [Sat, 15 May 2010 18:46:02 +0000 (14:46 -0400)]
First person shotgun.

11 years agoFake make's directory change output when using "cd"
Jānis Rūcis [Fri, 14 May 2010 17:31:58 +0000 (20:31 +0300)]
Fake make's directory change output when using "cd"

Otherwise, when FTEQCC reports errors or warnings, I can't cycle
through them quickly, because Emacs can't tell which directory the
file names are relative to.

11 years agoMerge commit 'origin/master' into diabolik/weaponscale
Sahil Singhal [Sat, 15 May 2010 18:16:28 +0000 (14:16 -0400)]
Merge commit 'origin/master' into diabolik/weaponscale

11 years agoMerge remote branch 'refs/remotes/origin/tzork/turrets'
Rudolf Polzer [Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/turrets'

11 years agosmall code restructure to prepare for mod icons...
FruitieX [Sat, 15 May 2010 18:10:23 +0000 (21:10 +0300)]
small code restructure to prepare for mod icons...

11 years agoMerge commit 'origin/master' into diabolik/umbraplayermodel
Sahil Singhal [Sat, 15 May 2010 18:05:35 +0000 (14:05 -0400)]
Merge commit 'origin/master' into diabolik/umbraplayermodel

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Sat, 15 May 2010 17:59:46 +0000 (19:59 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'
Rudolf Polzer [Sat, 15 May 2010 17:56:57 +0000 (19:56 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'

11 years agoMerge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'
Rudolf Polzer [Sat, 15 May 2010 17:49:29 +0000 (19:49 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'

11 years agoCamping rifle fix.
Sahil Singhal [Sat, 15 May 2010 17:28:31 +0000 (13:28 -0400)]
Camping rifle fix.

11 years agoAdd turrets.shader
Jakob MG [Sat, 15 May 2010 16:47:30 +0000 (18:47 +0200)]
Add turrets.shader

11 years agoCode change and third person models scaled completely.
Sahil Singhal [Sat, 15 May 2010 14:15:13 +0000 (10:15 -0400)]
Code change and third person models scaled completely.

11 years agolittle restructure, + fix border = 0
FruitieX [Sat, 15 May 2010 12:38:57 +0000 (15:38 +0300)]
little restructure, + fix border = 0

11 years agoAdd hud_panelname_bg_padding for increasing/decreasing distance from contents to...
FruitieX [Sat, 15 May 2010 12:24:23 +0000 (15:24 +0300)]
Add hud_panelname_bg_padding for increasing/decreasing distance from contents to the border. Negative values work too

11 years agomake the id constants a variable instead for more consistency
FruitieX [Sat, 15 May 2010 12:11:29 +0000 (15:11 +0300)]
make the id constants a variable instead for more consistency

11 years agoremove the timer icon, it's often only in the way. designer can place it on their...
FruitieX [Sat, 15 May 2010 11:54:15 +0000 (14:54 +0300)]
remove the timer icon, it's often only in the way. designer can place it on their dock instead if they want it

11 years agosame thing for powerups panel
FruitieX [Sat, 15 May 2010 11:36:27 +0000 (14:36 +0300)]
same thing for powerups panel

11 years agoadd a horizontal mode for h/a panel, also allow mirroring contents
FruitieX [Sat, 15 May 2010 11:01:49 +0000 (14:01 +0300)]
add a horizontal mode for h/a panel, also allow mirroring contents

11 years agofix incorrect image paths in the code
FruitieX [Sat, 15 May 2010 09:05:29 +0000 (12:05 +0300)]
fix incorrect image paths in the code

11 years agoCrylink.
Sahil Singhal [Fri, 14 May 2010 21:27:22 +0000 (17:27 -0400)]
Crylink.

11 years agobuild revision watermark
Rudolf Polzer [Fri, 14 May 2010 18:23:55 +0000 (20:23 +0200)]
build revision watermark
BRIX WILL BE ....
when you see it

11 years agoorder the panel functions in the source file
FruitieX [Fri, 14 May 2010 18:26:56 +0000 (21:26 +0300)]
order the panel functions in the source file

11 years agomore cleaning up and restructuring in gfx/
FruitieX [Fri, 14 May 2010 17:30:23 +0000 (20:30 +0300)]
more cleaning up and restructuring in gfx/

11 years agoimpose some order on the files in gfx/
FruitieX [Fri, 14 May 2010 17:15:08 +0000 (20:15 +0300)]
impose some order on the files in gfx/

11 years agoadd hud_old_nexuiz.cfg ;)
FruitieX [Fri, 14 May 2010 16:58:11 +0000 (19:58 +0300)]
add hud_old_nexuiz.cfg ;)

11 years agoremove useless cvar
FruitieX [Fri, 14 May 2010 16:56:10 +0000 (19:56 +0300)]
remove useless cvar

11 years agoargh, some cvars weren't converted to strings before exporting, thanks for not lettin...
FruitieX [Fri, 14 May 2010 16:52:59 +0000 (19:52 +0300)]
argh, some cvars weren't converted to strings before exporting, thanks for not letting me know that fteqcc

11 years agoforgot to comment out "else {" after commenting out above "if {"
FruitieX [Fri, 14 May 2010 16:48:14 +0000 (19:48 +0300)]
forgot to comment out "else {" after commenting out above "if {"

11 years agoexport more hud cvars and remove some unused cvars
FruitieX [Fri, 14 May 2010 16:45:45 +0000 (19:45 +0300)]
export more hud cvars and remove some unused cvars

11 years agooops, actually insert newlines into the saved config :P
FruitieX [Fri, 14 May 2010 16:02:29 +0000 (19:02 +0300)]
oops, actually insert newlines into the saved config :P

11 years agooops, make timer bg show up correctly in the default config
FruitieX [Fri, 14 May 2010 15:52:15 +0000 (18:52 +0300)]
oops, make timer bg show up correctly in the default config

11 years agouse cvar_string() instead of storing hud_skin in a global so that changes take effect...
FruitieX [Fri, 14 May 2010 15:47:51 +0000 (18:47 +0300)]
use cvar_string() instead of storing hud_skin in a global so that changes take effect immediately

11 years agoMerge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir...
FruitieX [Fri, 14 May 2010 15:39:25 +0000 (18:39 +0300)]
Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud

11 years agomove files into gfx/hud/old/
FruitieX [Fri, 14 May 2010 15:38:22 +0000 (18:38 +0300)]
move files into gfx/hud/old/

11 years agoskin support
FruitieX [Fri, 14 May 2010 14:44:24 +0000 (17:44 +0300)]
skin support

11 years agos/cvar("_hud_configure")/hud_configure
FruitieX [Fri, 14 May 2010 12:17:50 +0000 (15:17 +0300)]
s/cvar("_hud_configure")/hud_configure

11 years agoHUD config exporting
FruitieX [Fri, 14 May 2010 12:16:07 +0000 (15:16 +0300)]
HUD config exporting

11 years agofix some texture brackage on bullets and rockets boxes
Rudolf Polzer [Fri, 14 May 2010 11:11:12 +0000 (13:11 +0200)]
fix some texture brackage on bullets and rockets boxes

11 years agoScale uzi.
Sahil Singhal [Fri, 14 May 2010 03:16:05 +0000 (23:16 -0400)]
Scale uzi.

11 years agoLaser and shotgun rescaling.
Sahil Singhal [Fri, 14 May 2010 02:38:27 +0000 (22:38 -0400)]
Laser and shotgun rescaling.

11 years agoCode changes for shotgun.
Sahil Singhal [Fri, 14 May 2010 02:01:46 +0000 (22:01 -0400)]
Code changes for shotgun.

11 years agoRemove old blend.
Sahil Singhal [Fri, 14 May 2010 00:39:28 +0000 (20:39 -0400)]
Remove old blend.

11 years agoScreenshot for pyria.
Sahil Singhal [Thu, 13 May 2010 18:50:37 +0000 (14:50 -0400)]
Screenshot for pyria.

11 years agoAdd shader. delete screenshot.
Sahil Singhal [Thu, 13 May 2010 18:37:01 +0000 (14:37 -0400)]
Add shader. delete screenshot.

11 years agoFix shader file name too.
Sahil Singhal [Thu, 13 May 2010 18:33:11 +0000 (14:33 -0400)]
Fix shader file name too.

11 years agohope this version of ciabot works ;)
Rudolf Polzer [Thu, 13 May 2010 18:04:11 +0000 (20:04 +0200)]
hope this version of ciabot works ;)

11 years agoagain
Rudolf Polzer [Thu, 13 May 2010 18:00:47 +0000 (20:00 +0200)]
again

11 years agowe need to mod the credits file ;) mark it as incomplete and wrong
Rudolf Polzer [Thu, 13 May 2010 17:59:18 +0000 (19:59 +0200)]
we need to mod the credits file ;) mark it as incomplete and wrong

11 years agodelete the player models that are broken (out of their bbox), only keep the good...
Rudolf Polzer [Thu, 13 May 2010 17:48:06 +0000 (19:48 +0200)]
delete the player models that are broken (out of their bbox), only keep the good quality models for now - note that all of these models CAN go in again, if just the bbox issue gets fixed. To test the bbox, r_showbboxes 3; cl_movement 0; cl_nolerp 1; chase_active 1

11 years agomake umbra the new default model
Rudolf Polzer [Thu, 13 May 2010 17:46:59 +0000 (19:46 +0200)]
make umbra the new default model

11 years agoadd a pyria tga (but from the old model, we need a new one)
Rudolf Polzer [Thu, 13 May 2010 17:34:05 +0000 (19:34 +0200)]
add a pyria tga (but from the old model, we need a new one)

11 years agopyria: add sounds and txt file
Rudolf Polzer [Thu, 13 May 2010 17:33:33 +0000 (19:33 +0200)]
pyria: add sounds and txt file

11 years agoattempt at renaming the pyria model to the proper name
Rudolf Polzer [Thu, 13 May 2010 17:30:35 +0000 (19:30 +0200)]
attempt at renaming the pyria model to the proper name

11 years agoMerge remote branch 'origin/diabolik/pyriaplayermodel'
Rudolf Polzer [Thu, 13 May 2010 17:29:16 +0000 (19:29 +0200)]
Merge remote branch 'origin/diabolik/pyriaplayermodel'

11 years agoteamradar: fix clip fail
Rudolf Polzer [Thu, 13 May 2010 17:28:06 +0000 (19:28 +0200)]
teamradar: fix clip fail

11 years agoMerge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir...
Rudolf Polzer [Thu, 13 May 2010 17:04:15 +0000 (19:04 +0200)]
Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud

11 years agojust for fun, make the HUD look like the old HUD for now :P
FruitieX [Thu, 13 May 2010 15:23:16 +0000 (18:23 +0300)]
just for fun, make the HUD look like the old HUD for now :P

11 years agouse relative coordinates, limit powerups to 99 instead of 999
FruitieX [Thu, 13 May 2010 14:25:21 +0000 (17:25 +0300)]
use relative coordinates, limit powerups to 99 instead of 999

11 years agorebalance nex, uzi and sg
FruitieX [Thu, 13 May 2010 13:45:07 +0000 (16:45 +0300)]
rebalance nex, uzi and sg

11 years agoMerge branch 'master' into fruitiex/newpanelhud
Rudolf Polzer [Thu, 13 May 2010 11:56:01 +0000 (13:56 +0200)]
Merge branch 'master' into fruitiex/newpanelhud

11 years agoMerge branch 'divVerent/model-textures-prefix-removal-v2'
Rudolf Polzer [Thu, 13 May 2010 11:35:20 +0000 (13:35 +0200)]
Merge branch 'divVerent/model-textures-prefix-removal-v2'

11 years agoallow disabling collision checking against other panels
FruitieX [Thu, 13 May 2010 07:53:46 +0000 (10:53 +0300)]
allow disabling collision checking against other panels

11 years agoforce min alpha value in hud configure mode so you can see the panels
FruitieX [Thu, 13 May 2010 07:44:15 +0000 (10:44 +0300)]
force min alpha value in hud configure mode so you can see the panels

11 years agoadd oldhud border and dock >:)
FruitieX [Thu, 13 May 2010 07:39:18 +0000 (10:39 +0300)]
add oldhud border and dock >:)

11 years agoallow for a fullscreen dock image to be drawn behind the panels
FruitieX [Thu, 13 May 2010 07:36:50 +0000 (10:36 +0300)]
allow for a fullscreen dock image to be drawn behind the panels

11 years agoMerge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir...
FruitieX [Thu, 13 May 2010 07:01:08 +0000 (10:01 +0300)]
Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud

11 years agoAdd a shader to fix hair.
Sahil Singhal [Thu, 13 May 2010 01:09:46 +0000 (21:09 -0400)]
Add a shader to fix hair.

11 years agoMatch umbra model animations. Add gloss texture. Can someone make a shader for the...
Sahil Singhal [Wed, 12 May 2010 20:19:56 +0000 (16:19 -0400)]
Match umbra model animations. Add gloss texture. Can someone make a shader for the hair?

11 years agoMerge commit 'origin/master' into diabolik/pyriaplayermodel
Sahil Singhal [Wed, 12 May 2010 20:10:33 +0000 (16:10 -0400)]
Merge commit 'origin/master' into diabolik/pyriaplayermodel

11 years agoFixes to copy over anims from umbra
Sahil Singhal [Wed, 12 May 2010 20:09:27 +0000 (16:09 -0400)]
Fixes to copy over anims from umbra

11 years agoanother file too much (umbra.tga)
Rudolf Polzer [Wed, 12 May 2010 19:49:07 +0000 (21:49 +0200)]
another file too much (umbra.tga)

11 years agoget rid of umbra.txt, not used
Rudolf Polzer [Wed, 12 May 2010 19:48:22 +0000 (21:48 +0200)]
get rid of umbra.txt, not used

11 years agoMerge remote branch 'origin/master' into diabolik/umbraplayermodel
Rudolf Polzer [Wed, 12 May 2010 19:42:18 +0000 (21:42 +0200)]
Merge remote branch 'origin/master' into diabolik/umbraplayermodel