]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
12 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

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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

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

12 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

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

12 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

12 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

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

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

12 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

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

12 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

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

12 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

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

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

12 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

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

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

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

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

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

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

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

12 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

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

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

12 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

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

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

12 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

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

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

12 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

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

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

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

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

12 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

12 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

12 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

12 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

12 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

12 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

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

12 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

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

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

12 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

12 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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

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

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

12 years agoOptimize my last change
Mircea Kitsune [Mon, 9 Jan 2012 16:08:28 +0000 (18:08 +0200)]
Optimize my last change

12 years agoDetect if the player respawned and clear damage effects if so. Otherwise, if his...
Mircea Kitsune [Mon, 9 Jan 2012 15:59:36 +0000 (17:59 +0200)]
Detect if the player respawned and clear damage effects if so. Otherwise, if his dead body isn't gibbed, effects would be copied back once he respawns.

12 years agoMerge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects

12 years agoadd utility fields to detect player death
Rudolf Polzer [Mon, 9 Jan 2012 15:16:11 +0000 (16:16 +0100)]
add utility fields to detect player death

12 years agoremove the hack again, fixed the engine
Rudolf Polzer [Mon, 9 Jan 2012 15:07:57 +0000 (16:07 +0100)]
remove the hack again, fixed the engine

12 years agosave/restore velocity, don't ask why
Rudolf Polzer [Mon, 9 Jan 2012 12:27:30 +0000 (13:27 +0100)]
save/restore velocity, don't ask why

12 years agoproperly input velocity to V_CalcRefdef
Rudolf Polzer [Mon, 9 Jan 2012 12:23:01 +0000 (13:23 +0100)]
properly input velocity to V_CalcRefdef

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 9 Jan 2012 12:15:04 +0000 (13:15 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agochange hceck back to WIP1, it's harmless
Rudolf Polzer [Mon, 9 Jan 2012 12:13:49 +0000 (13:13 +0100)]
change hceck back to WIP1, it's harmless

12 years agouse DP_CSQC_V_CALCREFDEF_WIP2
Rudolf Polzer [Mon, 9 Jan 2012 12:09:31 +0000 (13:09 +0100)]
use DP_CSQC_V_CALCREFDEF_WIP2

12 years agoFix colormap with copybody (so now, ghost bodies of dead players retain the player...
Samual [Mon, 9 Jan 2012 04:33:57 +0000 (23:33 -0500)]
Fix colormap with copybody (so now, ghost bodies of dead players retain the player color instead of going white)

12 years agoMerge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Mon, 9 Jan 2012 00:13:11 +0000 (02:13 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects

12 years agoBring back jump_interval to handle refire, this way primary and secondary are separat...
Samual [Sun, 8 Jan 2012 21:32:08 +0000 (16:32 -0500)]
Bring back jump_interval to handle refire, this way primary and secondary are separate with ATTACK_FINISHED, but secondary still has the benefits of prepare_attack.

12 years agoMake tell work with magicear like previously
Samual [Sat, 7 Jan 2012 21:41:34 +0000 (16:41 -0500)]
Make tell work with magicear like previously

12 years agoMerge remote branch 'origin/mirceakitsune/preview_images'
Samual [Sat, 7 Jan 2012 19:39:16 +0000 (14:39 -0500)]
Merge remote branch 'origin/mirceakitsune/preview_images'

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Sat, 7 Jan 2012 19:38:23 +0000 (14:38 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

12 years agocsqcplayers: fix wrong input_buttons in a case that shouldn't ever happen
Rudolf Polzer [Sat, 7 Jan 2012 18:34:10 +0000 (19:34 +0100)]
csqcplayers: fix wrong input_buttons in a case that shouldn't ever happen

12 years agoMerge remote branch 'origin/master' into mirceakitsune/preview_images
Samual [Sat, 7 Jan 2012 18:18:00 +0000 (13:18 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
qcsrc/common/util.qh

12 years agosimplify forcemodels code a bit
Rudolf Polzer [Sat, 7 Jan 2012 17:14:29 +0000 (18:14 +0100)]
simplify forcemodels code a bit

12 years agoFix autoscreenshot system - don't use an alias anymore, but instead use the already...
Samual [Fri, 6 Jan 2012 23:34:04 +0000 (18:34 -0500)]
Fix autoscreenshot system - don't use an alias anymore, but instead use the already added "cl_autoscreenshot" cvar to allow/disallow automatic screenshots. (helps prevent cheating)

12 years agoUpdate voting aliases for client/server specific functions
Samual [Fri, 6 Jan 2012 22:38:09 +0000 (17:38 -0500)]
Update voting aliases for client/server specific functions

12 years agoAdd bad cvar
Samual [Fri, 6 Jan 2012 21:49:17 +0000 (16:49 -0500)]
Add bad cvar

12 years agoGlobal cvar for all sv_fraginfo stuff, plus make the entire thing support between...
Samual [Fri, 6 Jan 2012 21:47:51 +0000 (16:47 -0500)]
Global cvar for all sv_fraginfo stuff, plus make the entire thing support between warmup and normal mode

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 6 Jan 2012 17:14:38 +0000 (18:14 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agoforcemodels: handle missing model better
Rudolf Polzer [Fri, 6 Jan 2012 16:42:27 +0000 (17:42 +0100)]
forcemodels: handle missing model better

12 years agoAlso add alias to commands.cfg
Samual [Fri, 6 Jan 2012 16:09:32 +0000 (11:09 -0500)]
Also add alias to commands.cfg

12 years agoAdd another hard coded alias for compatibility (will be removed after 0.6 release)
Samual [Fri, 6 Jan 2012 16:06:39 +0000 (11:06 -0500)]
Add another hard coded alias for compatibility (will be removed after 0.6 release)

12 years agot
Rudolf Polzer [Fri, 6 Jan 2012 15:17:38 +0000 (16:17 +0100)]
t

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 6 Jan 2012 14:57:51 +0000 (15:57 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years ago2 more crosshairs for asyyy
Rudolf Polzer [Fri, 6 Jan 2012 14:57:22 +0000 (15:57 +0100)]
2 more crosshairs for asyyy