]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agoalso ignore hud_* cvars
Rudolf Polzer [Tue, 2 Nov 2010 16:41:26 +0000 (17:41 +0100)]
also ignore hud_* cvars

14 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 http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

14 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

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

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

14 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

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

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

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

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

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

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

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

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

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

14 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

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

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

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

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

14 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

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

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

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

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

14 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

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

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

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

14 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).

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

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

14 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

14 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

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

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

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

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

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

14 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

14 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

14 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

14 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

14 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

14 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

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

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

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

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

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

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

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

14 years agochange visible name to Sniper Rifle
Rudolf Polzer [Wed, 27 Oct 2010 16:39:02 +0000 (18:39 +0200)]
change visible name to Sniper Rifle

14 years agomultiple fixes for the weapon priority management
Rudolf Polzer [Wed, 27 Oct 2010 16:34:10 +0000 (18:34 +0200)]
multiple fixes for the weapon priority management

14 years agoexperimental change: sort impulse weapon order by weapon priority too
Rudolf Polzer [Wed, 27 Oct 2010 15:40:36 +0000 (17:40 +0200)]
experimental change: sort impulse weapon order by weapon priority too

14 years agowe can get rid of the "hanging ;" warning by calling an empty macro ENDS_WITH_CURLY_B...
Rudolf Polzer [Wed, 27 Oct 2010 13:50:41 +0000 (15:50 +0200)]
we can get rid of the "hanging ;" warning by calling an empty macro ENDS_WITH_CURLY_BRACE at the end of the causing macro. So let's do that instead of totally disabling the warning

14 years agofix all remaining warnings
Rudolf Polzer [Wed, 27 Oct 2010 13:27:36 +0000 (15:27 +0200)]
fix all remaining warnings

14 years agoget rid of a LOT of warnings
Rudolf Polzer [Wed, 27 Oct 2010 13:22:31 +0000 (15:22 +0200)]
get rid of a LOT of warnings

14 years agosome warning fixes
Rudolf Polzer [Wed, 27 Oct 2010 13:18:23 +0000 (15:18 +0200)]
some warning fixes

14 years agow_all: add a nice comment
Rudolf Polzer [Wed, 27 Oct 2010 12:36:42 +0000 (14:36 +0200)]
w_all: add a nice comment

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Wed, 27 Oct 2010 09:28:12 +0000 (11:28 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

14 years agowhen loading the DB, and it's a dump, also parse the first line (so even if it's...
Rudolf Polzer [Wed, 27 Oct 2010 09:27:38 +0000 (11:27 +0200)]
when loading the DB, and it's a dump, also parse the first line (so even if it's missing due to a filter op, the DB still loads)

14 years agosv_db_saveasdump and cl_db_saveasdump cvars
Rudolf Polzer [Tue, 26 Oct 2010 18:58:26 +0000 (20:58 +0200)]
sv_db_saveasdump and cl_db_saveasdump cvars

14 years agodisable -Werror for now
Rudolf Polzer [Tue, 26 Oct 2010 18:37:07 +0000 (20:37 +0200)]
disable -Werror for now

14 years agofix some warnings in HUD code
Rudolf Polzer [Tue, 26 Oct 2010 18:36:43 +0000 (20:36 +0200)]
fix some warnings in HUD code

14 years agobe more strict with warnings (csqc now no longer compiles)
Rudolf Polzer [Tue, 26 Oct 2010 18:31:22 +0000 (20:31 +0200)]
be more strict with warnings (csqc now no longer compiles)

14 years agoget rid of a warning
Rudolf Polzer [Tue, 26 Oct 2010 18:29:14 +0000 (20:29 +0200)]
get rid of a warning

14 years agohide one warning
Rudolf Polzer [Tue, 26 Oct 2010 18:11:38 +0000 (20:11 +0200)]
hide one warning

14 years agofix particlefont.tga not getting closed
Rudolf Polzer [Tue, 26 Oct 2010 17:23:49 +0000 (19:23 +0200)]
fix particlefont.tga not getting closed

14 years agoset rocket detonatedelay to 0.05 to allow rocket flying
FruitieX [Tue, 26 Oct 2010 11:05:50 +0000 (14:05 +0300)]
set rocket detonatedelay to 0.05 to allow rocket flying

14 years agoremove the traceline at the end of CSQC_UpdateView as the engine cleans up these...
Rudolf Polzer [Sun, 24 Oct 2010 15:57:30 +0000 (17:57 +0200)]
remove the traceline at the end of CSQC_UpdateView as the engine cleans up these globals now;
split up PolyDrawModel function in CSQC (unused)

14 years agoMerge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round'
Rudolf Polzer [Sun, 24 Oct 2010 12:14:49 +0000 (14:14 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round'

14 years agoremove the old muzzleflash field that is no longer in use
Rudolf Polzer [Sat, 23 Oct 2010 19:32:12 +0000 (21:32 +0200)]
remove the old muzzleflash field that is no longer in use

14 years agoFix uzi flash entity leakage
Jakob MG [Sat, 23 Oct 2010 19:30:24 +0000 (21:30 +0200)]
Fix uzi flash entity leakage

14 years agomove the redalive/bluealive checks further up to avoid a return if block
FruitieX [Sat, 23 Oct 2010 18:35:19 +0000 (21:35 +0300)]
move the redalive/bluealive checks further up to avoid a return if block

14 years agoomg. this is probably the ugliest hack i've ever written. YUCK YUCK! BUT IT WORKS! D:
FruitieX [Sat, 23 Oct 2010 18:27:21 +0000 (21:27 +0300)]
omg. this is probably the ugliest hack i've ever written. YUCK YUCK! BUT IT WORKS! D:

14 years agooops forgot the hud icons
FruitieX [Sat, 23 Oct 2010 18:16:02 +0000 (21:16 +0300)]
oops forgot the hud icons

14 years agorifle: more accuracy
Rudolf Polzer [Sat, 23 Oct 2010 17:57:37 +0000 (19:57 +0200)]
rifle: more accuracy

14 years agofixes
FruitieX [Sat, 23 Oct 2010 17:27:33 +0000 (20:27 +0300)]
fixes

14 years agoactually add the new crosshair ring image
Rudolf Polzer [Sat, 23 Oct 2010 17:09:05 +0000 (19:09 +0200)]
actually add the new crosshair ring image

14 years agoremove muzzleflash when player leaves
Rudolf Polzer [Sat, 23 Oct 2010 17:08:56 +0000 (19:08 +0200)]
remove muzzleflash when player leaves

14 years agoless obtrusive ring display
Rudolf Polzer [Sat, 23 Oct 2010 17:06:40 +0000 (19:06 +0200)]
less obtrusive ring display

14 years agoCA modicon panel
FruitieX [Sat, 23 Oct 2010 16:53:59 +0000 (19:53 +0300)]
CA modicon panel

14 years agouse the right spawnflag
Rudolf Polzer [Sat, 23 Oct 2010 16:40:56 +0000 (18:40 +0200)]
use the right spawnflag

14 years agotrigger_hurt, misc_laser: support "team" like trigger_push
Rudolf Polzer [Sat, 23 Oct 2010 16:36:46 +0000 (18:36 +0200)]
trigger_hurt, misc_laser: support "team" like trigger_push

14 years agoremove some of this tied stuff... it won't make any difference anyway (score is set...
FruitieX [Sat, 23 Oct 2010 15:55:21 +0000 (18:55 +0300)]
remove some of this tied stuff... it won't make any difference anyway (score is set immediately as enemy dies, win sound is played etc. What would you do if the round then after that got tied?)

14 years agoadd a time limit of 3 minutes to a CA round, show instant feedback when the opposing...
FruitieX [Sat, 23 Oct 2010 15:43:14 +0000 (18:43 +0300)]
add a time limit of 3 minutes to a CA round, show instant feedback when the opposing team was eliminated, allow a bigger time frame for two remaining players to kill each other and ending the match in a draw

14 years agoset allowed_to_spawn = TRUE as early as we can, this way bots already connected after...
FruitieX [Sat, 23 Oct 2010 15:11:10 +0000 (18:11 +0300)]
set allowed_to_spawn = TRUE as early as we can, this way bots already connected after mapchange seem to actually spawn

14 years agostore the champion name in a global string so that we can reset the champion entity...
FruitieX [Sat, 23 Oct 2010 15:00:31 +0000 (18:00 +0300)]
store the champion name in a global string so that we can reset the champion entity already at round countdown

14 years agofix a bug where a player for some reason couldn't spawn
FruitieX [Sat, 23 Oct 2010 14:50:49 +0000 (17:50 +0300)]
fix a bug where a player for some reason couldn't spawn

14 years agomake that * 0.01 score actually
FruitieX [Sat, 23 Oct 2010 14:42:20 +0000 (17:42 +0300)]
make that * 0.01 score actually

14 years agofix champion check
FruitieX [Sat, 23 Oct 2010 14:42:02 +0000 (17:42 +0300)]
fix champion check

14 years agono ready restart counter in ca, fix bot behaviour when warmup is enabled in ca, new...
FruitieX [Sat, 23 Oct 2010 14:24:30 +0000 (17:24 +0300)]
no ready restart counter in ca, fix bot behaviour when warmup is enabled in ca, new scoring system for ca (round win = 1 point for team, 10 damage dealt = 1 point for a player)

14 years agono damage after the round has ended in CA or arena
FruitieX [Sat, 23 Oct 2010 13:34:46 +0000 (16:34 +0300)]
no damage after the round has ended in CA or arena

14 years agoalso show rocket flying mutator as enabled if the rocket detonate delay is 0 currentl...
Rudolf Polzer [Sat, 23 Oct 2010 08:47:04 +0000 (10:47 +0200)]
also show rocket flying mutator as enabled if the rocket detonate delay is 0 currently and not 0 by default

14 years agofix warning
Rudolf Polzer [Sat, 23 Oct 2010 07:54:58 +0000 (09:54 +0200)]
fix warning

14 years agoadd Rocket Flying to menu
Rudolf Polzer [Sat, 23 Oct 2010 07:54:17 +0000 (09:54 +0200)]
add Rocket Flying to menu

14 years agoadd the "rocket flying" mutator, cvar g_rocket_flying
Rudolf Polzer [Sat, 23 Oct 2010 07:47:57 +0000 (09:47 +0200)]
add the "rocket flying" mutator, cvar g_rocket_flying

14 years agomutator system: add an EditProjectile hook
Rudolf Polzer [Sat, 23 Oct 2010 07:43:43 +0000 (09:43 +0200)]
mutator system: add an EditProjectile hook

14 years agoalso hide net_address and friends from cvar_changes
Rudolf Polzer [Sat, 23 Oct 2010 07:08:39 +0000 (09:08 +0200)]
also hide net_address and friends from cvar_changes