xonotic/xonotic-data.pk3dir.git
9 years agoMerge remote branch 'refs/remotes/origin/esteel/anim/slider'
Rudolf Polzer [Sun, 23 May 2010 14:46:47 +0000 (16:46 +0200)]
Merge remote branch 'refs/remotes/origin/esteel/anim/slider'

9 years agopartially merge fruitiex/fruitphys physics (except for doublejump and jumpspeedcap)
Rudolf Polzer [Sun, 23 May 2010 12:43:45 +0000 (14:43 +0200)]
partially merge fruitiex/fruitphys physics (except for doublejump and jumpspeedcap)

9 years agofireball fly sound: fix their looping
Rudolf Polzer [Sun, 23 May 2010 12:40:23 +0000 (14:40 +0200)]
fireball fly sound: fix their looping

9 years agouse copysign instead of sign() (why doesn't sign() work)
Rudolf Polzer [Sat, 22 May 2010 18:12:58 +0000 (20:12 +0200)]
use copysign instead of sign() (why doesn't sign() work)

9 years agoremove a comment that no longer applies
Rudolf Polzer [Sat, 22 May 2010 18:10:30 +0000 (20:10 +0200)]
remove a comment that no longer applies

9 years agominor cosmetics fix (no change in behaviour)
Rudolf Polzer [Sat, 22 May 2010 18:09:20 +0000 (20:09 +0200)]
minor cosmetics fix (no change in behaviour)

9 years agonew physics cvar: sv_airstrafeaccel_qw; also try to fix analog input issues with...
Rudolf Polzer [Sat, 22 May 2010 17:54:09 +0000 (19:54 +0200)]
new physics cvar: sv_airstrafeaccel_qw; also try to fix analog input issues with maxairstrafespeed

9 years agoMerge remote branch 'origin/samual/balanceSamual'
Rudolf Polzer [Fri, 21 May 2010 21:18:06 +0000 (23:18 +0200)]
Merge remote branch 'origin/samual/balanceSamual'

9 years agoturn off respawn ghosts by default (that should be a mutator and not default)
Rudolf Polzer [Fri, 21 May 2010 18:26:58 +0000 (20:26 +0200)]
turn off respawn ghosts by default (that should be a mutator and not default)

9 years agoalso apply this (density) to clones
Rudolf Polzer [Fri, 21 May 2010 12:26:46 +0000 (14:26 +0200)]
also apply this (density) to clones

9 years agomake bullets go through 2x the distance when inside a player, and 10x when inside...
Rudolf Polzer [Fri, 21 May 2010 12:25:14 +0000 (14:25 +0200)]
make bullets go through 2x the distance when inside a player, and 10x when inside a corpse (please test)

9 years agoAdd g_pickup_ammo/weapons_anyway functionality
samual [Fri, 21 May 2010 09:27:23 +0000 (05:27 -0400)]
Add g_pickup_ammo/weapons_anyway functionality

9 years agoforbid weapon throwing of non-WS_READY weapons, fixes a bug
Rudolf Polzer [Fri, 21 May 2010 08:20:13 +0000 (10:20 +0200)]
forbid weapon throwing of non-WS_READY weapons, fixes a bug

9 years agorifle: "bullet hail" feature: empty whole magazine (not enabled)
Rudolf Polzer [Fri, 21 May 2010 07:36:35 +0000 (09:36 +0200)]
rifle: "bullet hail" feature: empty whole magazine (not enabled)

9 years agoFix small mistake in balance with armor regen
samual [Fri, 21 May 2010 01:52:19 +0000 (21:52 -0400)]
Fix small mistake in balance with armor regen

9 years agoAdded g_pickup_<item>_anyway to health/armor items (todo: add ammo), added defaultSam...
samual [Thu, 20 May 2010 20:42:57 +0000 (16:42 -0400)]
Added g_pickup_<item>_anyway to health/armor items (todo: add ammo), added defaultSamual.cfg, minor changes to balanceSamual.cfg and physicsSamual.cfg

9 years agoMerge remote branch 'origin/master' into samual/balanceSamual
samual [Thu, 20 May 2010 07:58:12 +0000 (03:58 -0400)]
Merge remote branch 'origin/master' into samual/balanceSamual

Conflicts:
balanceSamual.cfg

9 years agoCommitting small changes to balanceSamual.cfg, also testing git push
samual [Thu, 20 May 2010 07:13:34 +0000 (03:13 -0400)]
Committing small changes to balanceSamual.cfg, also testing git push

9 years agoMerge commit 'origin/master' into diabolik/umbraplayermodel
Sahil Singhal [Wed, 19 May 2010 19:36:48 +0000 (15:36 -0400)]
Merge commit 'origin/master' into diabolik/umbraplayermodel

9 years agoMerge remote branch 'origin/diabolik/weaponscale'
Rudolf Polzer [Wed, 19 May 2010 13:44:52 +0000 (15:44 +0200)]
Merge remote branch 'origin/diabolik/weaponscale'

9 years agobalance configs: get rid of weaponreplace (really doesn't belong there, is server...
Rudolf Polzer [Wed, 19 May 2010 05:37:41 +0000 (07:37 +0200)]
balance configs: get rid of weaponreplace (really doesn't belong there, is server admin preference)
add a defaultXPM.cfg to set default settings for XPM (including weaponreplaces)

9 years agoImprovements to animations thanks to theShadow.
Sahil Singhal [Wed, 19 May 2010 02:37:56 +0000 (22:37 -0400)]
Improvements to animations thanks to theShadow.

9 years agomore stuff for the animation framework and use that to make sliders behave better...
Stephan Stahl [Tue, 18 May 2010 21:58:06 +0000 (21:58 +0000)]
more stuff for the animation framework and use that to make sliders behave better when mixing clicking and dragging

9 years agowe were moving too fast... try fixing this again :)
Rudolf Polzer [Tue, 18 May 2010 19:41:31 +0000 (21:41 +0200)]
we were moving too fast... try fixing this again :)

9 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitphys'
Rudolf Polzer [Tue, 18 May 2010 19:31:34 +0000 (21:31 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitphys'

9 years agoFix rl position.
Sahil Singhal [Tue, 18 May 2010 19:27:48 +0000 (15:27 -0400)]
Fix rl position.

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

9 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

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

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

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

9 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

9 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

9 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

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

9 years agodo some tweaks to the physics config...
FruitieX [Mon, 17 May 2010 16:56:11 +0000 (19:56 +0300)]
do some tweaks to the physics config...

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

9 years agostop old slider animation before starting a new one
Stephan Stahl [Mon, 17 May 2010 10:59:09 +0000 (10:59 +0000)]
stop old slider animation before starting a new one

9 years agofix warning
Stephan Stahl [Sun, 16 May 2010 22:38:07 +0000 (22:38 +0000)]
fix warning

9 years agooverlooked two places that set a slider value, now the slider animations and start...
Stephan Stahl [Sun, 16 May 2010 13:25:04 +0000 (13:25 +0000)]
overlooked two places that set a slider value, now the slider animations and start values are finally correct
(cherry picked from commit 831dba921412caf90cde69de77ddb00a836f91a9)

9 years agonow slider work quite nice.. dragging uses unanimated movement, all the rest does.
Stephan Stahl [Fri, 23 Apr 2010 20:33:29 +0000 (20:33 +0000)]
now slider work quite nice.. dragging uses unanimated movement, all the rest does.
(cherry picked from commit 1952fd4d4c1bd906fb71f8332c796d021bea34f3)

9 years agotrying to make all slider animatable
Stephan Stahl [Fri, 16 Apr 2010 19:57:23 +0000 (19:57 +0000)]
trying to make all slider animatable
(cherry picked from commit a3451406868bace6a8e8f8f9480e33ff83be8b0c)

9 years agoshow a simple easing animation on the default slider. beware its ugly when draging...
Stephan Stahl [Sun, 11 Apr 2010 19:31:32 +0000 (19:31 +0000)]
show a simple easing animation on the default slider.  beware its ugly when draging and otherwise
(cherry picked from commit 0279f7b481307dd7c2c3a37e1ec3f6f14433565b)

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

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

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

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

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

9 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

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

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

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

9 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

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

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

9 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

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

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

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

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

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

9 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

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

9 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

9 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

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

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

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

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

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

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

9 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

9 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

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

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

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

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

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

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

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

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

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

9 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

9 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

9 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

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

9 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

9 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

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

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

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

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

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

9 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

9 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

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

9 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

9 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

9 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

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