xonotic/xonotic-data.pk3dir.git
10 years agoMerge branch 'master' into fruitiex/fruitbalance
Rudolf Polzer [Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agoadditionally to zscale, also add a velocitybias (biases the laser push to your curren...
Rudolf Polzer [Sat, 6 Nov 2010 21:38:04 +0000 (22:38 +0100)]
additionally to zscale, also add a velocitybias (biases the laser push to your current velocity)

10 years agoadd a zscale cvar for laser force that allows scaling z force only. Currently tweaked...
FruitieX [Sat, 6 Nov 2010 21:23:45 +0000 (23:23 +0200)]
add a zscale cvar for laser force that allows scaling z force only. Currently tweaked to closely match 300 force on the z-axis, no change for horizontal push because it was very good already.

10 years agofix polygonoffset cvar values
Rudolf Polzer [Sat, 6 Nov 2010 19:06:54 +0000 (20:06 +0100)]
fix polygonoffset cvar values

10 years agomapinfo cleanups
Rudolf Polzer [Sat, 6 Nov 2010 16:03:59 +0000 (17:03 +0100)]
mapinfo cleanups

10 years agostart with 250 health, 250 armor in ca/lms now
FruitieX [Sat, 6 Nov 2010 15:21:47 +0000 (17:21 +0200)]
start with 250 health, 250 armor in ca/lms now

10 years agoincrease health caps to 150 for medium pickups, 250 for small/mega (armor limited...
FruitieX [Sat, 6 Nov 2010 15:08:34 +0000 (17:08 +0200)]
increase health caps to 150 for medium pickups, 250 for small/mega (armor limited to 250 too, but can pickup at any time)

10 years agoremove unused variable, set the movingavg nexcharge to = nexcharge if it's 0 (should...
FruitieX [Sat, 6 Nov 2010 14:25:15 +0000 (16:25 +0200)]
remove unused variable, set the movingavg nexcharge to = nexcharge if it's 0 (should only happen right after a game started)

10 years agoadd a slow rot to 50% nex charge (even when not holding the gun), improve the current...
FruitieX [Sat, 6 Nov 2010 14:03:31 +0000 (16:03 +0200)]
add a slow rot to 50% nex charge (even when not holding the gun), improve the current charge indicator image, rename some variables and cvars in this new code (and that only) to make more sense

10 years agoget rid of some debug prints
Rudolf Polzer [Sat, 6 Nov 2010 07:22:16 +0000 (08:22 +0100)]
get rid of some debug prints

10 years agoalso ignore sv_checkforpacketsduringsleep
Rudolf Polzer [Sat, 6 Nov 2010 07:18:41 +0000 (08:18 +0100)]
also ignore sv_checkforpacketsduringsleep

10 years ago15 sec on-spawn rot pause is a bit insane...
Rudolf Polzer [Sat, 6 Nov 2010 07:12:57 +0000 (08:12 +0100)]
15 sec on-spawn rot pause is a bit insane...

10 years agobalanceTest: give laser some delay back; balance25: restore old laser delay
Rudolf Polzer [Sat, 6 Nov 2010 07:10:03 +0000 (08:10 +0100)]
balanceTest: give laser some delay back; balance25: restore old laser delay

10 years agosome initial code for displaying how fast the nex charges
FruitieX [Fri, 5 Nov 2010 10:40:31 +0000 (12:40 +0200)]
some initial code for displaying how fast the nex charges

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agostart with 200a in lms and ca
FruitieX [Thu, 4 Nov 2010 20:00:51 +0000 (22:00 +0200)]
start with 200a in lms and ca

10 years agorocketlauncher dmg from 100 => 90, not only does it feel overpowered but that's also...
FruitieX [Thu, 4 Nov 2010 19:36:17 +0000 (21:36 +0200)]
rocketlauncher dmg from 100 => 90, not only does it feel overpowered but that's also ALWAYS visible from the weapon stats :P

10 years agoincrease hagar radius as an experiment to make it more useful
FruitieX [Thu, 4 Nov 2010 19:35:49 +0000 (21:35 +0200)]
increase hagar radius as an experiment to make it more useful

10 years agoallow sv_adminnick and some others too
Rudolf Polzer [Thu, 4 Nov 2010 19:20:54 +0000 (20:20 +0100)]
allow sv_adminnick and some others too

10 years agobalanceTest: adjust the Nexuiz-style health-armor system for a bit more rot, but...
Rudolf Polzer [Thu, 4 Nov 2010 19:08:43 +0000 (20:08 +0100)]
balanceTest: adjust the Nexuiz-style health-armor system for a bit more rot, but also more spawn protection

10 years agoset max cells cap a bit lower
FruitieX [Thu, 4 Nov 2010 15:43:11 +0000 (17:43 +0200)]
set max cells cap a bit lower

10 years agoset g_projectiles_spread_style 7 (i think divVerent wanted this :P)
FruitieX [Thu, 4 Nov 2010 15:28:43 +0000 (17:28 +0200)]
set g_projectiles_spread_style 7 (i think divVerent wanted this :P)

10 years agoset g_projectiles_newton_style 2
FruitieX [Thu, 4 Nov 2010 15:27:49 +0000 (17:27 +0200)]
set g_projectiles_newton_style 2

10 years agoelectro: less dlight
Rudolf Polzer [Thu, 4 Nov 2010 07:04:00 +0000 (08:04 +0100)]
electro: less dlight

10 years agoRevert "why does fteqcc fail so much? seems like f *= x now is equivalent to f = x"
Rudolf Polzer [Wed, 3 Nov 2010 21:23:37 +0000 (22:23 +0100)]
Revert "why does fteqcc fail so much? seems like f *= x now is equivalent to f = x"

This reverts commit bb5812761e62c72ffcb95af04778b7b7b65e15fc.

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)]
Merge remote branch 'origin/fruitiex/fruitbalance'

10 years agofix some warnings
Rudolf Polzer [Wed, 3 Nov 2010 21:19:19 +0000 (22:19 +0100)]
fix some warnings

10 years agoget -Werror back
Rudolf Polzer [Wed, 3 Nov 2010 21:07:59 +0000 (22:07 +0100)]
get -Werror back

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/racefixes'
Rudolf Polzer [Wed, 3 Nov 2010 20:42:30 +0000 (21:42 +0100)]
Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

Conflicts:
defaultXonotic.cfg
qcsrc/server/defs.qh

10 years agoMerge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)]
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agoexclude more cvars from pure server checking
Rudolf Polzer [Wed, 3 Nov 2010 19:07:15 +0000 (20:07 +0100)]
exclude more cvars from pure server checking

10 years agoexclude more cvars from pure server checking
Rudolf Polzer [Wed, 3 Nov 2010 19:07:15 +0000 (20:07 +0100)]
exclude more cvars from pure server checking

10 years agomore Don Strunzone
Rudolf Polzer [Wed, 3 Nov 2010 19:04:32 +0000 (20:04 +0100)]
more Don Strunzone

10 years agofix Don Strunzone
Rudolf Polzer [Wed, 3 Nov 2010 19:03:34 +0000 (20:03 +0100)]
fix Don Strunzone

10 years agowhy does fteqcc fail so much? seems like f *= x now is equivalent to f = x
FruitieX [Wed, 3 Nov 2010 18:51:03 +0000 (20:51 +0200)]
why does fteqcc fail so much? seems like f *= x now is equivalent to f = x

10 years agoMerge remote branch 'refs/remotes/origin/terencehill/crosshair_fix'
Rudolf Polzer [Wed, 3 Nov 2010 09:28:41 +0000 (10:28 +0100)]
Merge remote branch 'refs/remotes/origin/terencehill/crosshair_fix'

10 years agomake the "icon" part skinnable; fixtrans the icons
Rudolf Polzer [Wed, 3 Nov 2010 07:11:36 +0000 (08:11 +0100)]
make the "icon" part skinnable; fixtrans the icons

10 years agomark "pure" servers as such in the menu
Rudolf Polzer [Wed, 3 Nov 2010 06:45:03 +0000 (07:45 +0100)]
mark "pure" servers as such in the menu

10 years agosv_maxidle -> server.cfg
Rudolf Polzer [Wed, 3 Nov 2010 05:44:37 +0000 (06:44 +0100)]
sv_maxidle -> server.cfg

10 years agomake g_start_delay not saved to not interfere with dedicated server
Rudolf Polzer [Tue, 2 Nov 2010 16:59:23 +0000 (17:59 +0100)]
make g_start_delay not saved to not interfere with dedicated server

10 years agoimprove more :)
Rudolf Polzer [Tue, 2 Nov 2010 16:54:30 +0000 (17:54 +0100)]
improve more :)

10 years agoadd a section for "impure" settings in server.cfg
Rudolf Polzer [Tue, 2 Nov 2010 16:44:44 +0000 (17:44 +0100)]
add a section for "impure" settings in server.cfg

10 years agoalso ignore hud_* cvars
Rudolf Polzer [Tue, 2 Nov 2010 16:41:26 +0000 (17:41 +0100)]
also ignore hud_* cvars

10 years agoMerge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 2 Nov 2010 16:41:02 +0000 (17:41 +0100)]
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agobeginning of "pure server" checking... the rule is simple: only settings in the offic...
Rudolf Polzer [Tue, 2 Nov 2010 16:40:30 +0000 (17:40 +0100)]
beginning of "pure server" checking... the rule is simple: only settings in the official server.cfg may be touched

10 years agomapinfo: put the autogenerated files in an autogenerated/ subdir of maps/
Rudolf Polzer [Mon, 1 Nov 2010 17:36:20 +0000 (17:36 +0000)]
mapinfo: put the autogenerated files in an autogenerated/ subdir of maps/

10 years agoMerge branch 'master' into terencehill/crosshair_fix
terencehill [Mon, 1 Nov 2010 13:35:46 +0000 (14:35 +0100)]
Merge branch 'master' into terencehill/crosshair_fix

Conflicts:
qcsrc/client/View.qc

10 years agosupport initial roll angle too
Rudolf Polzer [Sun, 31 Oct 2010 21:49:26 +0000 (22:49 +0100)]
support initial roll angle too

10 years agopendulum: Q3A changes roll, not pitch, so let's do that here too
Rudolf Polzer [Sun, 31 Oct 2010 21:42:37 +0000 (22:42 +0100)]
pendulum: Q3A changes roll, not pitch, so let's do that here too

10 years agofunc_pendulum
Rudolf Polzer [Sun, 31 Oct 2010 21:20:53 +0000 (22:20 +0100)]
func_pendulum

10 years agoremove redundant code
Rudolf Polzer [Sun, 31 Oct 2010 21:20:41 +0000 (22:20 +0100)]
remove redundant code

10 years agoStrip _color from crosshair*_color_alpha cvars
terencehill [Sun, 31 Oct 2010 21:01:25 +0000 (22:01 +0100)]
Strip _color from crosshair*_color_alpha cvars
If there is a good reason to keep the old names just revert this commit

10 years agoenable subscope
Rudolf Polzer [Sun, 31 Oct 2010 16:42:10 +0000 (17:42 +0100)]
enable subscope

10 years agoenable logicops in a better place (so it works for command line fteqcc call too)
Rudolf Polzer [Sun, 31 Oct 2010 14:07:07 +0000 (15:07 +0100)]
enable logicops in a better place (so it works for command line fteqcc call too)

10 years agofix variable declarations for subscopes
Rudolf Polzer [Sun, 31 Oct 2010 14:04:41 +0000 (15:04 +0100)]
fix variable declarations for subscopes

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair'
Rudolf Polzer [Sun, 31 Oct 2010 13:40:16 +0000 (14:40 +0100)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair'

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/menu_bob_slider'
Rudolf Polzer [Sun, 31 Oct 2010 13:26:15 +0000 (14:26 +0100)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/menu_bob_slider'

10 years agothis should NOT be a warpzone aware trace!
Rudolf Polzer [Sat, 30 Oct 2010 19:27:41 +0000 (21:27 +0200)]
this should NOT be a warpzone aware trace!

10 years agoprevent hooking through wall
Rudolf Polzer [Sat, 30 Oct 2010 19:26:38 +0000 (21:26 +0200)]
prevent hooking through wall

10 years agofix some draw issues with the hook
Rudolf Polzer [Sat, 30 Oct 2010 19:21:51 +0000 (21:21 +0200)]
fix some draw issues with the hook

10 years agosimplify code for falling damage
Rudolf Polzer [Sat, 30 Oct 2010 18:52:57 +0000 (20:52 +0200)]
simplify code for falling damage

10 years agoThis makes more sense here
Mircea Kitsune [Sat, 30 Oct 2010 15:33:07 +0000 (18:33 +0300)]
This makes more sense here

10 years agoBetter names for the stats
Mircea Kitsune [Sat, 30 Oct 2010 15:31:22 +0000 (18:31 +0300)]
Better names for the stats

10 years agoCopy the effect for spectators
Mircea Kitsune [Sat, 30 Oct 2010 15:24:57 +0000 (18:24 +0300)]
Copy the effect for spectators

10 years agoPerhaps it would be best not to name these floats the same way. Who knows what confli...
Mircea Kitsune [Sat, 30 Oct 2010 15:01:26 +0000 (18:01 +0300)]
Perhaps it would be best not to name these floats the same way. Who knows what conflicts that can cause

10 years agoshotgun: play less ricoche sounds, this fixes performance issues for Unknown[NF]
FruitieX [Sat, 30 Oct 2010 14:55:25 +0000 (17:55 +0300)]
shotgun: play less ricoche sounds, this fixes performance issues for Unknown[NF]

10 years agoFinal touches and cleanups. Code is now go!
Mircea Kitsune [Sat, 30 Oct 2010 14:50:47 +0000 (17:50 +0300)]
Final touches and cleanups. Code is now go!

10 years agoGood defaults
Mircea Kitsune [Sat, 30 Oct 2010 14:40:41 +0000 (17:40 +0300)]
Good defaults

10 years agoFrametime dependency
Mircea Kitsune [Sat, 30 Oct 2010 14:39:49 +0000 (17:39 +0300)]
Frametime dependency

10 years agoAll shall be cvared!
Mircea Kitsune [Sat, 30 Oct 2010 14:33:23 +0000 (17:33 +0300)]
All shall be cvared!

10 years agoother, not self.owner. Code is now functional and working as intended
Mircea Kitsune [Sat, 30 Oct 2010 14:26:27 +0000 (17:26 +0300)]
other, not self.owner. Code is now functional and working as intended

10 years agoSet the owner's stat, not the item's.
Mircea Kitsune [Sat, 30 Oct 2010 14:18:04 +0000 (17:18 +0300)]
Set the owner's stat, not the item's.

10 years agoSecond and final part: Apply the changes to the crosshair. Code still incomplete...
Mircea Kitsune [Sat, 30 Oct 2010 14:17:00 +0000 (17:17 +0300)]
Second and final part: Apply the changes to the crosshair. Code still incomplete, nonfunctional and in the works.

10 years agomake crylink primary slightly faster
FruitieX [Sat, 30 Oct 2010 14:10:32 +0000 (17:10 +0300)]
make crylink primary slightly faster

10 years agoAS_FLOAT, since I'll be using time to track down the pickups, unless there's a better...
Mircea Kitsune [Sat, 30 Oct 2010 13:48:01 +0000 (16:48 +0300)]
AS_FLOAT, since I'll be using time to track down the pickups, unless there's a better way.

10 years agoYou know how in some games the crosshair grows and shrinks back when you pickup an...
Mircea Kitsune [Sat, 30 Oct 2010 13:47:08 +0000 (16:47 +0300)]
You know how in some games the crosshair grows and shrinks back when you pickup an item? Well... yeah :) First part: The stat that sends the info you picked something up (don't think I can use WriteByte here, and stat seems ok).

10 years agofix attenuation
Rudolf Polzer [Sat, 30 Oct 2010 11:33:18 +0000 (13:33 +0200)]
fix attenuation

10 years agoMake the 'View Bobbing' slider also address horizontal bobbing, now that it exists.
Mircea Kitsune [Sat, 30 Oct 2010 11:15:01 +0000 (14:15 +0300)]
Make the 'View Bobbing' slider also address horizontal bobbing, now that it exists.

10 years agodon't attenuate your own tuba soudn
Rudolf Polzer [Sat, 30 Oct 2010 11:14:03 +0000 (13:14 +0200)]
don't attenuate your own tuba soudn

10 years agorifle: stronger tracer if tracer is enabled
Rudolf Polzer [Sat, 30 Oct 2010 10:51:42 +0000 (12:51 +0200)]
rifle: stronger tracer if tracer is enabled

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/campingrifle_slot_change'
Rudolf Polzer [Fri, 29 Oct 2010 15:27:04 +0000 (17:27 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/campingrifle_slot_change'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Fri, 29 Oct 2010 15:23:19 +0000 (17:23 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'
Rudolf Polzer [Fri, 29 Oct 2010 15:21:47 +0000 (17:21 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'

10 years agotook over all tZork's changes from balancetZork to balanceTest other than the whitesp...
Rudolf Polzer [Fri, 29 Oct 2010 14:48:48 +0000 (16:48 +0200)]
took over all tZork's changes from balancetZork to balanceTest other than the whitespace changes ;)

10 years agoCrude outline, more to come. Clean up seeker a tad.
unknown [Fri, 29 Oct 2010 14:13:22 +0000 (16:13 +0200)]
Crude outline, more to come. Clean up seeker a tad.

10 years agodropshadow with small radius on new crosshairs, plus replace some of the ugliest...
FruitieX [Fri, 29 Oct 2010 10:50:18 +0000 (13:50 +0300)]
dropshadow with small radius on new crosshairs, plus replace some of the ugliest remaining ones from nexuiz

10 years agonerf the nex from 120 max dmg to 100, it just feels so overpowered... other minor...
FruitieX [Thu, 28 Oct 2010 18:59:44 +0000 (21:59 +0300)]
nerf the nex from 120 max dmg to 100, it just feels so overpowered... other minor changes: uzi dps 100 primary / 90 secondary, electro dps 90

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Thu, 28 Oct 2010 18:14:14 +0000 (21:14 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agonew balance config balanceTest.cfg which tries to take the best ideas from both big...
Rudolf Polzer [Thu, 28 Oct 2010 13:09:30 +0000 (15:09 +0200)]
new balance config balanceTest.cfg which tries to take the best ideas from both big balance configs

10 years agoReorder in hud.qc too, where it should be safe and alright to
Mircea Kitsune [Thu, 28 Oct 2010 11:10:35 +0000 (14:10 +0300)]
Reorder in hud.qc too, where it should be safe and alright to

10 years agoRemake this branch to fix some possible issues and conflicts from yesterday's version...
Mircea Kitsune [Thu, 28 Oct 2010 11:09:29 +0000 (14:09 +0300)]
Remake this branch to fix some possible issues and conflicts from yesterday's version. This moves the Camping Rifle on the same slot as the Nex, because IMO it's a sniper rather than a machine gun.

10 years agoRemove the check if (wcross_style != "0") as wcross_style is now checked earlier
terencehill [Wed, 27 Oct 2010 20:29:25 +0000 (22:29 +0200)]
Remove the check if (wcross_style != "0") as wcross_style is now checked earlier
The remaining changes are only indentation changes (the argument -w in input to git diff will reveal you the truth ;) )

10 years agoDo not execute the TrueAim code if the crosshair doesn't get drawn.
terencehill [Wed, 27 Oct 2010 20:05:50 +0000 (22:05 +0200)]
Do not execute the TrueAim code if the crosshair doesn't get drawn.

Fix big and misaligned crosshair when setting crosshair_size to 0.

Fix wrong cvar name.
However, more appropriate names for the cvars crosshair_color_alpha and crosshair_<weapon>_color_alpha would be crosshair_alpha and crosshair_<weapon>_alpha

10 years agoremove a failed attempt
Rudolf Polzer [Wed, 27 Oct 2010 19:33:18 +0000 (21:33 +0200)]
remove a failed attempt

10 years agofix more warnings
Rudolf Polzer [Wed, 27 Oct 2010 19:21:24 +0000 (21:21 +0200)]
fix more warnings

10 years agomore warning fixes
Rudolf Polzer [Wed, 27 Oct 2010 19:17:25 +0000 (21:17 +0200)]
more warning fixes

10 years agoremove some more unref stuff
Rudolf Polzer [Wed, 27 Oct 2010 19:11:17 +0000 (21:11 +0200)]
remove some more unref stuff

10 years agoremove some unref stuff
Rudolf Polzer [Wed, 27 Oct 2010 19:10:51 +0000 (21:10 +0200)]
remove some unref stuff

10 years agosane up include order
Rudolf Polzer [Wed, 27 Oct 2010 19:03:55 +0000 (21:03 +0200)]
sane up include order