]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoRename effectnum to effectname
Mircea Kitsune [Mon, 16 Jan 2012 20:05:36 +0000 (22:05 +0200)]
Rename effectnum to effectname

13 years agoCheck if the master cvar is enabled first thing in the code
Mircea Kitsune [Mon, 16 Jan 2012 20:04:02 +0000 (22:04 +0200)]
Check if the master cvar is enabled first thing in the code

13 years agoAdd a TODO for reading species client-side
Mircea Kitsune [Mon, 16 Jan 2012 20:01:24 +0000 (22:01 +0200)]
Add a TODO for reading species client-side

13 years agoReorder effectinfo.txt effects at the bottom
Mircea Kitsune [Mon, 16 Jan 2012 19:58:43 +0000 (21:58 +0200)]
Reorder effectinfo.txt effects at the bottom

13 years agoMerge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Mon, 16 Jan 2012 19:54:53 +0000 (21:54 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects

13 years agoalso send game duration
Rudolf Polzer [Mon, 16 Jan 2012 19:39:08 +0000 (20:39 +0100)]
also send game duration

13 years agoalso notify emergency teleport location
Rudolf Polzer [Mon, 16 Jan 2012 15:56:34 +0000 (16:56 +0100)]
also notify emergency teleport location

13 years agolog when info_autoscreenshot was used
Rudolf Polzer [Mon, 16 Jan 2012 14:48:38 +0000 (15:48 +0100)]
log when info_autoscreenshot was used

13 years agoproperly factor in the previous error
Rudolf Polzer [Mon, 16 Jan 2012 14:17:00 +0000 (15:17 +0100)]
properly factor in the previous error

13 years agocl_predictionerrorcompensation #woxblox#
Rudolf Polzer [Mon, 16 Jan 2012 14:10:34 +0000 (15:10 +0100)]
cl_predictionerrorcompensation #woxblox#

This feature is one of the first nice things we get from csqcplayers. It is an
improved prediction algorithm that tries to reduce shivering/jittering when the
client handles a prediction error, e.g. when standing on lifts or flying in
vents.

Try it out!

13 years agoinvert the sense in which prediction error is stored; document the cvar
Rudolf Polzer [Mon, 16 Jan 2012 14:09:43 +0000 (15:09 +0100)]
invert the sense in which prediction error is stored; document the cvar

13 years agoimprove prediction error compensation
Rudolf Polzer [Mon, 16 Jan 2012 14:05:44 +0000 (15:05 +0100)]
improve prediction error compensation

13 years agoattempt prediction error compensation (off by default, broken)
Rudolf Polzer [Mon, 16 Jan 2012 13:04:35 +0000 (14:04 +0100)]
attempt prediction error compensation (off by default, broken)

13 years agodefault expire timer: 20
Rudolf Polzer [Mon, 16 Jan 2012 12:27:47 +0000 (13:27 +0100)]
default expire timer: 20

13 years agofixes
Rudolf Polzer [Mon, 16 Jan 2012 12:00:12 +0000 (13:00 +0100)]
fixes

13 years agoallow throwing superweapons
Rudolf Polzer [Mon, 16 Jan 2012 11:53:24 +0000 (12:53 +0100)]
allow throwing superweapons

13 years agoin minstagib, DO allow throwing superweapons
Rudolf Polzer [Mon, 16 Jan 2012 11:04:21 +0000 (12:04 +0100)]
in minstagib, DO allow throwing superweapons

13 years agofix warning
Rudolf Polzer [Mon, 16 Jan 2012 10:25:34 +0000 (11:25 +0100)]
fix warning

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 16 Jan 2012 09:47:32 +0000 (10:47 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agoadd an entity info_autoscreenshot to define autoscreenshot camera location
Rudolf Polzer [Mon, 16 Jan 2012 09:47:03 +0000 (10:47 +0100)]
add an entity info_autoscreenshot to define autoscreenshot camera location

13 years agoFix mutator hook system for client commands (now sandbox works, CuBeOwL)
Samual [Sun, 15 Jan 2012 23:08:42 +0000 (18:08 -0500)]
Fix mutator hook system for client commands (now sandbox works, CuBeOwL)

13 years agofixing MY bug in there ;)
Rudolf Polzer [Sun, 15 Jan 2012 17:38:50 +0000 (18:38 +0100)]
fixing MY bug in there ;)

13 years agoadd a gamecommand "nextframe" to help automate map screenshots
Rudolf Polzer [Sun, 15 Jan 2012 17:10:06 +0000 (18:10 +0100)]
add a gamecommand "nextframe" to help automate map screenshots

13 years agoDon't keep the skeletal object around, but only check if the model index has changed
Mircea Kitsune [Sat, 14 Jan 2012 15:00:49 +0000 (17:00 +0200)]
Don't keep the skeletal object around, but only check if the model index has changed

13 years agoClean my last commits
Mircea Kitsune [Sat, 14 Jan 2012 14:41:08 +0000 (16:41 +0200)]
Clean my last commits

13 years agoFix animation breakage, and use a separate value similar to self.skeletonindex. I...
Mircea Kitsune [Sat, 14 Jan 2012 14:34:10 +0000 (16:34 +0200)]
Fix animation breakage, and use a separate value similar to self.skeletonindex. I still don't get why the normal skeletonindex can't return the total number of bones however, given it's already used

13 years agoAttempt to cache the skeleton for each model, as requested by divVerent. This will...
Mircea Kitsune [Sat, 14 Jan 2012 14:29:10 +0000 (16:29 +0200)]
Attempt to cache the skeleton for each model, as requested by divVerent. This will have many uses in the code too. Currently, it uses a new function to set / update the skeleton, which also returns the total number of bones

13 years agorocket guiding: handle the case of thisdir == -goaldir without returning the zero...
Rudolf Polzer [Sat, 14 Jan 2012 14:02:15 +0000 (15:02 +0100)]
rocket guiding: handle the case of thisdir == -goaldir without returning the zero vector

13 years agoUse a safer formula to skip empty bones
Mircea Kitsune [Sat, 14 Jan 2012 12:17:14 +0000 (14:17 +0200)]
Use a safer formula to skip empty bones

13 years agoRemove a check which is now useless
Mircea Kitsune [Sat, 14 Jan 2012 12:14:16 +0000 (14:14 +0200)]
Remove a check which is now useless

13 years agoSimplify the bone detection code for damage effects
Mircea Kitsune [Sat, 14 Jan 2012 12:09:24 +0000 (14:09 +0200)]
Simplify the bone detection code for damage effects

13 years agoClear a code comment
Mircea Kitsune [Sat, 14 Jan 2012 11:57:31 +0000 (13:57 +0200)]
Clear a code comment

13 years agoRemove an unneeded execution
Mircea Kitsune [Sat, 14 Jan 2012 11:53:08 +0000 (13:53 +0200)]
Remove an unneeded execution

13 years agoSeparate total tags into a different definition, so it can be used anywhere
Mircea Kitsune [Sat, 14 Jan 2012 11:46:11 +0000 (13:46 +0200)]
Separate total tags into a different definition, so it can be used anywhere

13 years agoUse a different way to get the total number of bones. Fixes the console spam issue...
Mircea Kitsune [Sat, 14 Jan 2012 11:32:15 +0000 (13:32 +0200)]
Use a different way to get the total number of bones. Fixes the console spam issue when developer mode is enabled

13 years agoShorten definition with the normally the same result
Mircea Kitsune [Sat, 14 Jan 2012 10:46:21 +0000 (12:46 +0200)]
Shorten definition with the normally the same result

13 years agocl_damageeffect_* should be seta, now that it's in the menu
Mircea Kitsune [Sat, 14 Jan 2012 10:40:12 +0000 (12:40 +0200)]
cl_damageeffect_* should be seta, now that it's in the menu

13 years agoAllow FOR_EACH_TAG to start from tag 0 instead of 1
Mircea Kitsune [Sat, 14 Jan 2012 10:39:34 +0000 (12:39 +0200)]
Allow FOR_EACH_TAG to start from tag 0 instead of 1

13 years agoMerge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonot...
Mircea Kitsune [Sat, 14 Jan 2012 10:24:26 +0000 (12:24 +0200)]
Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/damage_effects

13 years agoMerge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Sat, 14 Jan 2012 10:22:29 +0000 (12:22 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects

13 years agofix http://dev.xonotic.org/issues/949
Jakob MG [Sat, 14 Jan 2012 09:15:33 +0000 (10:15 +0100)]
fix http://dev.xonotic.org/issues/949

13 years agofix http://dev.xonotic.org/issues/972
Jakob MG [Sat, 14 Jan 2012 09:02:31 +0000 (10:02 +0100)]
fix http://dev.xonotic.org/issues/972

13 years agoMerge branch 'divVerent/timed-superweapons'
Rudolf Polzer [Fri, 13 Jan 2012 21:49:15 +0000 (22:49 +0100)]
Merge branch 'divVerent/timed-superweapons'

13 years agofix teamradar color of weapon sprites
Rudolf Polzer [Fri, 13 Jan 2012 21:48:26 +0000 (22:48 +0100)]
fix teamradar color of weapon sprites

13 years agofix cvar check warnings
Rudolf Polzer [Fri, 13 Jan 2012 17:52:34 +0000 (18:52 +0100)]
fix cvar check warnings

13 years agofix some things about superweapon pickups
Rudolf Polzer [Fri, 13 Jan 2012 17:27:13 +0000 (18:27 +0100)]
fix some things about superweapon pickups

13 years agostop using IT_SUPERWEAPON in weapon ammo flags
Rudolf Polzer [Fri, 13 Jan 2012 17:14:22 +0000 (18:14 +0100)]
stop using IT_SUPERWEAPON in weapon ammo flags

13 years agoUse "null" instead of a whole other model for it -- it's the same thing, but "null...
Samual [Thu, 12 Jan 2012 20:26:45 +0000 (15:26 -0500)]
Use "null" instead of a whole other model for it -- it's the same thing, but "null" already exists, and doesn't need duplicated.

13 years agoFixes for the menu (though this will be changed soon enough anyway in my branch)
Samual [Thu, 12 Jan 2012 20:02:59 +0000 (15:02 -0500)]
Fixes for the menu (though this will be changed soon enough anyway in my branch)

13 years agowhoops, forgot to add it to compile
Samual [Thu, 12 Jan 2012 19:43:24 +0000 (14:43 -0500)]
whoops, forgot to add it to compile

13 years agoRemove stupid whitespace
Samual [Thu, 12 Jan 2012 19:27:00 +0000 (14:27 -0500)]
Remove stupid whitespace

13 years agoUse a .qh file for this
Samual [Thu, 12 Jan 2012 19:18:53 +0000 (14:18 -0500)]
Use a .qh file for this

13 years agoCleanup in client/damage.qc
Samual [Thu, 12 Jan 2012 19:16:55 +0000 (14:16 -0500)]
Cleanup in client/damage.qc

13 years agoMerge remote branch 'origin/master' into mirceakitsune/damage_effects
Samual [Thu, 12 Jan 2012 19:00:00 +0000 (14:00 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/damage_effects

Conflicts:
qcsrc/common/util.qh

13 years agonow with icon
Rudolf Polzer [Thu, 12 Jan 2012 17:36:06 +0000 (18:36 +0100)]
now with icon

13 years agosimplify some hacks
Rudolf Polzer [Thu, 12 Jan 2012 17:28:41 +0000 (18:28 +0100)]
simplify some hacks

13 years agoif throwing away superweapon, it's over
Rudolf Polzer [Thu, 12 Jan 2012 17:23:39 +0000 (18:23 +0100)]
if throwing away superweapon, it's over

13 years agomake it compile and work
Rudolf Polzer [Thu, 12 Jan 2012 17:19:58 +0000 (18:19 +0100)]
make it compile and work

13 years agofix warnings
Rudolf Polzer [Thu, 12 Jan 2012 14:19:20 +0000 (15:19 +0100)]
fix warnings

13 years agostuff
Rudolf Polzer [Thu, 12 Jan 2012 14:18:27 +0000 (15:18 +0100)]
stuff

13 years agostuff
Rudolf Polzer [Thu, 12 Jan 2012 14:17:54 +0000 (15:17 +0100)]
stuff

13 years agosome more fixes
Rudolf Polzer [Thu, 12 Jan 2012 13:56:33 +0000 (14:56 +0100)]
some more fixes

13 years agoalso make minstanex a superweapon
Rudolf Polzer [Thu, 12 Jan 2012 13:53:53 +0000 (14:53 +0100)]
also make minstanex a superweapon

13 years agofireball is now a superweapon (expires)
Rudolf Polzer [Thu, 12 Jan 2012 13:51:13 +0000 (14:51 +0100)]
fireball is now a superweapon (expires)

13 years agosend superweapons_finished as a stat
Rudolf Polzer [Thu, 12 Jan 2012 13:50:52 +0000 (14:50 +0100)]
send superweapons_finished as a stat

13 years agouse a timer for superweapons
Rudolf Polzer [Thu, 12 Jan 2012 13:47:33 +0000 (14:47 +0100)]
use a timer for superweapons

13 years agopreparations for timed superweapons (are safe, as we have no superweapons at the...
Rudolf Polzer [Thu, 12 Jan 2012 13:19:10 +0000 (14:19 +0100)]
preparations for timed superweapons (are safe, as we have no superweapons at the moment)

13 years agofixes some bit tests with superweapons
Rudolf Polzer [Thu, 12 Jan 2012 13:13:39 +0000 (14:13 +0100)]
fixes some bit tests with superweapons

13 years agogive superweapons a special respawn time (note: we have no weapons declared as such...
Rudolf Polzer [Thu, 12 Jan 2012 12:12:27 +0000 (13:12 +0100)]
give superweapons a special respawn time (note: we have no weapons declared as such yet)

13 years agodon't ask. Fixed missing text.
Rudolf Polzer [Wed, 11 Jan 2012 17:00:13 +0000 (18:00 +0100)]
don't ask. Fixed missing text.

13 years agoargh, why is the template borked
Rudolf Polzer [Wed, 11 Jan 2012 16:57:58 +0000 (17:57 +0100)]
argh, why is the template borked

13 years agofix the template pic
Rudolf Polzer [Wed, 11 Jan 2012 16:57:00 +0000 (17:57 +0100)]
fix the template pic

13 years agofix func_plat
Rudolf Polzer [Wed, 11 Jan 2012 14:39:56 +0000 (15:39 +0100)]
fix func_plat

13 years agoSome extra comments to chat code
Samual [Tue, 10 Jan 2012 22:15:35 +0000 (17:15 -0500)]
Some extra comments to chat code

13 years agoif intermission is active, spectators should be able to talk even if g_chat_nospectat...
Samual [Tue, 10 Jan 2012 21:34:03 +0000 (16:34 -0500)]
if intermission is active, spectators should be able to talk even if g_chat_nospectators is active -- the game is over, teams/spectating should not matter anymore.

13 years agoMerge remote branch 'origin/master'
Samual [Tue, 10 Jan 2012 17:48:45 +0000 (12:48 -0500)]
Merge remote branch 'origin/master'

13 years agoMake showname tags fade out when a player is dead (according to csqcplayers)
Samual [Tue, 10 Jan 2012 17:47:24 +0000 (12:47 -0500)]
Make showname tags fade out when a player is dead (according to csqcplayers)

13 years agofix the colormod fix
Rudolf Polzer [Tue, 10 Jan 2012 11:05:33 +0000 (12:05 +0100)]
fix the colormod fix

13 years agoAdd extra check to make sure that a client has called ClientConnect, this way it...
Samual [Tue, 10 Jan 2012 04:42:26 +0000 (23:42 -0500)]
Add extra check to make sure that a client has called ClientConnect, this way it only sends the centerprints if the client is initialized

13 years agoRename weapondamage to damage in particle names
Mircea Kitsune [Tue, 10 Jan 2012 00:40:56 +0000 (02:40 +0200)]
Rename weapondamage to damage in particle names

13 years agoAdd damage effects after particles in the menu, since they're a feature of particles...
Mircea Kitsune [Mon, 9 Jan 2012 23:25:34 +0000 (01:25 +0200)]
Add damage effects after particles in the menu, since they're a feature of particles so it makes more sense

13 years agoSince Samual found the cvar description confusing, make it more clear
Mircea Kitsune [Mon, 9 Jan 2012 23:22:19 +0000 (01:22 +0200)]
Since Samual found the cvar description confusing, make it more clear

13 years agoUse a text slider, looks less ugly
Mircea Kitsune [Mon, 9 Jan 2012 23:21:02 +0000 (01:21 +0200)]
Use a text slider, looks less ugly

13 years agoSecond requirement for merge; Add the effect to the menu and presets. I don't agree...
Mircea Kitsune [Mon, 9 Jan 2012 23:18:40 +0000 (01:18 +0200)]
Second requirement for merge; Add the effect to the menu and presets. I don't agree with this, but fine

13 years agoFirst change requested by Samual; Disable particle lights for damage effects. I appro...
Mircea Kitsune [Mon, 9 Jan 2012 23:08:04 +0000 (01:08 +0200)]
First change requested by Samual; Disable particle lights for damage effects. I approve of this because of performance, since the lights would have looked nice.

13 years agoMerge remote-tracking branch 'origin/divVerent/allow-override-item-model'
Rudolf Polzer [Mon, 9 Jan 2012 20:54:32 +0000 (21:54 +0100)]
Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

Conflicts:
qcsrc/server/t_items.qc

13 years agoTweak some descriptions and code comments. Now damage effects are 100% ready... and...
Mircea Kitsune [Mon, 9 Jan 2012 20:45:53 +0000 (22:45 +0200)]
Tweak some descriptions and code comments. Now damage effects are 100% ready... and 20% cooler ;)

13 years agoMerge remote-tracking branch 'origin/divVerent/waypointeditor-auto'
Rudolf Polzer [Mon, 9 Jan 2012 20:19:08 +0000 (21:19 +0100)]
Merge remote-tracking branch 'origin/divVerent/waypointeditor-auto'

13 years agoAlso update the "used in" comments in effectinfo.txt
Mircea Kitsune [Mon, 9 Jan 2012 20:19:08 +0000 (22:19 +0200)]
Also update the "used in" comments in effectinfo.txt

13 years agosniperrifle is now called rifle, which I forgot to update in my code when it changed...
Mircea Kitsune [Mon, 9 Jan 2012 20:17:27 +0000 (22:17 +0200)]
sniperrifle is now called rifle, which I forgot to update in my code when it changed. This fixes the rifle blood not working

13 years agofunc_plat: do not crash if broken
Rudolf Polzer [Mon, 9 Jan 2012 20:08:18 +0000 (21:08 +0100)]
func_plat: do not crash if broken

13 years agoRename cl_damageeffect_limit to cl_damageeffect_bones, which is more appropriate now
Mircea Kitsune [Mon, 9 Jan 2012 19:46:09 +0000 (21:46 +0200)]
Rename cl_damageeffect_limit to cl_damageeffect_bones, which is more appropriate now

13 years agoFix a bug with self detection. Code working properly again
Mircea Kitsune [Mon, 9 Jan 2012 19:43:55 +0000 (21:43 +0200)]
Fix a bug with self detection. Code working properly again

13 years agocopybody: also copy dphitcontentsmask
Rudolf Polzer [Mon, 9 Jan 2012 19:36:41 +0000 (20:36 +0100)]
copybody: also copy dphitcontentsmask

13 years agoAttempt to make damage effects use skeletal attachments for all rigged objects, not...
Mircea Kitsune [Mon, 9 Jan 2012 19:07:53 +0000 (21:07 +0200)]
Attempt to make damage effects use skeletal attachments for all rigged objects, not only players. Useful if eg: Vehicles will also be made client-side, or someone uses misc_clientmodel. Does not work exactly as it should yet

13 years agobring death glow back, fix issues with respawning
Rudolf Polzer [Mon, 9 Jan 2012 18:44:18 +0000 (19:44 +0100)]
bring death glow back, fix issues with respawning

13 years agoget rid of CSQCMODEL_EF_INVISIBLE
Rudolf Polzer [Mon, 9 Jan 2012 18:18:18 +0000 (19:18 +0100)]
get rid of CSQCMODEL_EF_INVISIBLE

13 years agorespawn ghosts: don't munge colormap
Rudolf Polzer [Mon, 9 Jan 2012 18:16:54 +0000 (19:16 +0100)]
respawn ghosts: don't munge colormap

13 years agoRevert "Fix colormap with copybody (so now, ghost bodies of dead players retain the...
Rudolf Polzer [Mon, 9 Jan 2012 18:13:33 +0000 (19:13 +0100)]
Revert "Fix colormap with copybody (so now, ghost bodies of dead players retain the player color instead of going white)"

This reverts commit a939674ad9b0e6b62ad9c3eb44ebc8b1d91b6792.

13 years agocsqcplayers: network death_time
Rudolf Polzer [Mon, 9 Jan 2012 18:08:26 +0000 (19:08 +0100)]
csqcplayers: network death_time