xonotic/xonotic-data.pk3dir.git
10 years agoMerge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
Rudolf Polzer [Tue, 18 May 2010 19:07:42 +0000 (21:07 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'

10 years agoremove a file we accidentally kept
Rudolf Polzer [Tue, 18 May 2010 19:02:55 +0000 (21:02 +0200)]
remove a file we accidentally kept

10 years agoMerge remote branch 'refs/remotes/origin/diabolik/weaponscale'
Rudolf Polzer [Tue, 18 May 2010 19:00:24 +0000 (21:00 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'

10 years agoMerge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'
Rudolf Polzer [Tue, 18 May 2010 18:57:32 +0000 (20:57 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'

10 years agoMerge remote branch 'refs/remotes/origin/diabolik/pyriaplayermodel'
Rudolf Polzer [Tue, 18 May 2010 18:55:12 +0000 (20:55 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/pyriaplayermodel'

10 years agosimplify autocvars ;) we now support savegames properly
Rudolf Polzer [Tue, 18 May 2010 18:44:37 +0000 (20:44 +0200)]
simplify autocvars ;) we now support savegames properly

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Tue, 18 May 2010 18:29:18 +0000 (20:29 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agoautocvars: undefine writing to the autocvar
Rudolf Polzer [Tue, 18 May 2010 18:28:55 +0000 (20:28 +0200)]
autocvars: undefine writing to the autocvar

10 years agoFix double weapons.
Sahil Singhal [Mon, 17 May 2010 18:45:55 +0000 (14:45 -0400)]
Fix double weapons.

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

10 years agoBetter screenshot.
Sahil Singhal [Sun, 16 May 2010 20:45:43 +0000 (16:45 -0400)]
Better screenshot.

10 years agoBetter screenshot.
Sahil Singhal [Sun, 16 May 2010 20:44:41 +0000 (16:44 -0400)]
Better screenshot.

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

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

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

10 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

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

10 years agoBots with the same name are progressively numbered
terencehill [Sat, 15 May 2010 22:47:34 +0000 (00:47 +0200)]
Bots with the same name are progressively numbered
In this way:
[Bot]devil{X}
[Bot]devil(1){X}
[Bot]devil(2){X}
...
[Bot]devil(666){X}
...

It works with bot_usemodelnames too.

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

10 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

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

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

10 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

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

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

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

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

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

10 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

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

10 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

10 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

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

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

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

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

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

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

10 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

10 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

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

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

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

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

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

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

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

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

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

10 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

10 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

10 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

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

10 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

10 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

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

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

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

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

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

10 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

10 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

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

10 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

10 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

10 years agoFix to fit in bbox better and fix pain anims
Sahil Singhal [Wed, 12 May 2010 19:30:28 +0000 (15:30 -0400)]
Fix to fit in bbox better and fix pain anims

10 years agoMerge remote branch 'origin/parasti/weaponprio'
Rudolf Polzer [Wed, 12 May 2010 16:35:35 +0000 (18:35 +0200)]
Merge remote branch 'origin/parasti/weaponprio'

10 years agoeffectinfo: improve MG/rifle trail a bit
Rudolf Polzer [Wed, 12 May 2010 15:41:50 +0000 (17:41 +0200)]
effectinfo: improve MG/rifle trail a bit

10 years agoDP_CSQC_BOXPARTICLES use :P for fading out particle trails
Rudolf Polzer [Wed, 12 May 2010 07:58:21 +0000 (09:58 +0200)]
DP_CSQC_BOXPARTICLES use :P for fading out particle trails

10 years agoPyria playermodel. Textures need fixing.
Sahil Singhal [Wed, 12 May 2010 02:23:27 +0000 (22:23 -0400)]
Pyria playermodel. Textures need fixing.

10 years agoAttempt to get cl_weaponpriority working again
Jānis Rūcis [Wed, 12 May 2010 02:12:38 +0000 (05:12 +0300)]
Attempt to get cl_weaponpriority working again

10 years agoFix animations so they are in the bbox. bbox lags behind so its hard to fix completely.
Sahil Singhal [Wed, 12 May 2010 01:02:07 +0000 (21:02 -0400)]
Fix animations so they are in the bbox. bbox lags behind so its hard to fix completely.

10 years agofix give 30 ALL ;)
Rudolf Polzer [Tue, 11 May 2010 17:59:18 +0000 (19:59 +0200)]
fix give 30 ALL ;)

10 years agouse cl_decals_newsystem
Rudolf Polzer [Tue, 11 May 2010 17:39:59 +0000 (19:39 +0200)]
use cl_decals_newsystem

10 years agoremove some REALLY STUPID files ;)
Rudolf Polzer [Tue, 11 May 2010 17:38:29 +0000 (19:38 +0200)]
remove some REALLY STUPID files ;)

10 years agoxolar is actually newer, so it might be better quality. Keep for now too.
Rudolf Polzer [Tue, 11 May 2010 17:34:58 +0000 (19:34 +0200)]
xolar is actually newer, so it might be better quality. Keep for now too.

10 years agoget rid of some more .tga extensions in skin files (they fail)
Rudolf Polzer [Tue, 11 May 2010 16:19:09 +0000 (18:19 +0200)]
get rid of some more .tga extensions in skin files (they fail)

10 years agoadd textures that we still use
Rudolf Polzer [Tue, 11 May 2010 16:11:50 +0000 (18:11 +0200)]
add textures that we still use

10 years agomore tga extension removed
Rudolf Polzer [Tue, 11 May 2010 16:11:11 +0000 (18:11 +0200)]
more tga extension removed

10 years agofix more model fail (.tga suffix)
Rudolf Polzer [Tue, 11 May 2010 16:01:03 +0000 (18:01 +0200)]
fix more model fail (.tga suffix)

10 years agoget rid of a dupe shader
Rudolf Polzer [Tue, 11 May 2010 15:59:37 +0000 (17:59 +0200)]
get rid of a dupe shader

10 years agoget rid of redundant textures/ prefix in more shader and texture names
Rudolf Polzer [Tue, 11 May 2010 15:04:54 +0000 (17:04 +0200)]
get rid of redundant textures/ prefix in more shader and texture names

10 years agoreflection shader for all weapons
Morphed [Tue, 27 Apr 2010 10:38:03 +0000 (12:38 +0200)]
reflection shader for all weapons

10 years agotry removing the textures/ prefix from ALL model and skin names. Let's see what break...
Rudolf Polzer [Tue, 27 Apr 2010 15:42:06 +0000 (17:42 +0200)]
try removing the textures/ prefix from ALL model and skin names. Let's see what breaks, then fix it :P

10 years agofix species loading
Rudolf Polzer [Tue, 11 May 2010 06:54:56 +0000 (08:54 +0200)]
fix species loading

10 years agoremove a debug message
Rudolf Polzer [Mon, 10 May 2010 11:15:13 +0000 (13:15 +0200)]
remove a debug message

10 years agofix another seeker bug, and fix a division by zero in havocbots
Rudolf Polzer [Mon, 10 May 2010 11:10:37 +0000 (13:10 +0200)]
fix another seeker bug, and fix a division by zero in havocbots

10 years agoseeker volley controller: work properly with IT_UNLIMITED_WEAPON_AMMO
Rudolf Polzer [Mon, 10 May 2010 11:01:19 +0000 (13:01 +0200)]
seeker volley controller: work properly with IT_UNLIMITED_WEAPON_AMMO

10 years agoMerge branch 'master' into diabolik/umbraplayermodel
Rudolf Polzer [Mon, 10 May 2010 07:31:38 +0000 (09:31 +0200)]
Merge branch 'master' into diabolik/umbraplayermodel

10 years agonew options for r_showbboxes: also show the player headshot box
Rudolf Polzer [Mon, 10 May 2010 07:31:11 +0000 (09:31 +0200)]
new options for r_showbboxes: also show the player headshot box

10 years agoumbra: convert to the new model description format
Rudolf Polzer [Mon, 10 May 2010 06:47:35 +0000 (08:47 +0200)]
umbra: convert to the new model description format

10 years agoMerge branch 'master' into diabolik/umbraplayermodel
Rudolf Polzer [Mon, 10 May 2010 06:46:15 +0000 (08:46 +0200)]
Merge branch 'master' into diabolik/umbraplayermodel

10 years agoMerge remote branch 'origin/mirceakitsune/per_character_sounds'
Rudolf Polzer [Mon, 10 May 2010 06:46:02 +0000 (08:46 +0200)]
Merge remote branch 'origin/mirceakitsune/per_character_sounds'

10 years agoMerge branch 'master' into diabolik/umbraplayermodel
Rudolf Polzer [Mon, 10 May 2010 06:44:56 +0000 (08:44 +0200)]
Merge branch 'master' into diabolik/umbraplayermodel

10 years agoforce fire effect even for nonmoving firemine
Rudolf Polzer [Sun, 9 May 2010 19:26:51 +0000 (21:26 +0200)]
force fire effect even for nonmoving firemine

10 years agoMerge branch 'master' into mirceakitsune/per_character_sounds
Rudolf Polzer [Sun, 9 May 2010 18:14:16 +0000 (20:14 +0200)]
Merge branch 'master' into mirceakitsune/per_character_sounds

10 years agoadd seeker to the weapon prio cvars
Rudolf Polzer [Sun, 9 May 2010 18:13:53 +0000 (20:13 +0200)]
add seeker to the weapon prio cvars

10 years agofix a typo in a seeker cvar name
Rudolf Polzer [Sun, 9 May 2010 18:08:49 +0000 (20:08 +0200)]
fix a typo in a seeker cvar name

10 years agoMerge remote branch 'refs/remotes/origin/divVerent/tag_seeker'
Rudolf Polzer [Sun, 9 May 2010 18:01:03 +0000 (20:01 +0200)]
Merge remote branch 'refs/remotes/origin/divVerent/tag_seeker'

10 years agoMerge branch 'master' into mirceakitsune/per_character_sounds
Rudolf Polzer [Sun, 9 May 2010 15:35:35 +0000 (17:35 +0200)]
Merge branch 'master' into mirceakitsune/per_character_sounds