]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mircea Kitsune [Sat, 14 Jan 2012 12:09:24 +0000 (14:09 +0200)]
Simplify the bone detection code for damage effects
Mircea Kitsune [Sat, 14 Jan 2012 11:57:31 +0000 (13:57 +0200)]
Clear a code comment
Mircea Kitsune [Sat, 14 Jan 2012 11:53:08 +0000 (13:53 +0200)]
Remove an unneeded execution
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
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
Mircea Kitsune [Sat, 14 Jan 2012 10:46:21 +0000 (12:46 +0200)]
Shorten definition with the normally the same result
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
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
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
Mircea Kitsune [Sat, 14 Jan 2012 10:22:29 +0000 (12:22 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
Jakob MG [Sat, 14 Jan 2012 09:15:33 +0000 (10:15 +0100)]
fix http://dev.xonotic.org/issues/949
Jakob MG [Sat, 14 Jan 2012 09:02:31 +0000 (10:02 +0100)]
fix http://dev.xonotic.org/issues/972
Rudolf Polzer [Fri, 13 Jan 2012 21:49:15 +0000 (22:49 +0100)]
Merge branch 'divVerent/timed-superweapons'
Rudolf Polzer [Fri, 13 Jan 2012 21:48:26 +0000 (22:48 +0100)]
fix teamradar color of weapon sprites
Rudolf Polzer [Fri, 13 Jan 2012 17:52:34 +0000 (18:52 +0100)]
fix cvar check warnings
Rudolf Polzer [Fri, 13 Jan 2012 17:27:13 +0000 (18:27 +0100)]
fix some things about superweapon pickups
Rudolf Polzer [Fri, 13 Jan 2012 17:14:22 +0000 (18:14 +0100)]
stop using IT_SUPERWEAPON in weapon ammo flags
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.
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)
Samual [Thu, 12 Jan 2012 19:43:24 +0000 (14:43 -0500)]
whoops, forgot to add it to compile
Samual [Thu, 12 Jan 2012 19:27:00 +0000 (14:27 -0500)]
Remove stupid whitespace
Samual [Thu, 12 Jan 2012 19:18:53 +0000 (14:18 -0500)]
Use a .qh file for this
Samual [Thu, 12 Jan 2012 19:16:55 +0000 (14:16 -0500)]
Cleanup in client/damage.qc
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
Rudolf Polzer [Thu, 12 Jan 2012 17:36:06 +0000 (18:36 +0100)]
now with icon
Rudolf Polzer [Thu, 12 Jan 2012 17:28:41 +0000 (18:28 +0100)]
simplify some hacks
Rudolf Polzer [Thu, 12 Jan 2012 17:23:39 +0000 (18:23 +0100)]
if throwing away superweapon, it's over
Rudolf Polzer [Thu, 12 Jan 2012 17:19:58 +0000 (18:19 +0100)]
make it compile and work
Rudolf Polzer [Thu, 12 Jan 2012 14:19:20 +0000 (15:19 +0100)]
fix warnings
Rudolf Polzer [Thu, 12 Jan 2012 14:18:27 +0000 (15:18 +0100)]
stuff
Rudolf Polzer [Thu, 12 Jan 2012 14:17:54 +0000 (15:17 +0100)]
stuff
Rudolf Polzer [Thu, 12 Jan 2012 13:56:33 +0000 (14:56 +0100)]
some more fixes
Rudolf Polzer [Thu, 12 Jan 2012 13:53:53 +0000 (14:53 +0100)]
also make minstanex a superweapon
Rudolf Polzer [Thu, 12 Jan 2012 13:51:13 +0000 (14:51 +0100)]
fireball is now a superweapon (expires)
Rudolf Polzer [Thu, 12 Jan 2012 13:50:52 +0000 (14:50 +0100)]
send superweapons_finished as a stat
Rudolf Polzer [Thu, 12 Jan 2012 13:47:33 +0000 (14:47 +0100)]
use a timer for superweapons
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)
Rudolf Polzer [Thu, 12 Jan 2012 13:13:39 +0000 (14:13 +0100)]
fixes some bit tests with superweapons
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)
Rudolf Polzer [Wed, 11 Jan 2012 17:00:13 +0000 (18:00 +0100)]
don't ask. Fixed missing text.
Rudolf Polzer [Wed, 11 Jan 2012 16:57:58 +0000 (17:57 +0100)]
argh, why is the template borked
Rudolf Polzer [Wed, 11 Jan 2012 16:57:00 +0000 (17:57 +0100)]
fix the template pic
Rudolf Polzer [Wed, 11 Jan 2012 14:39:56 +0000 (15:39 +0100)]
fix func_plat
Samual [Tue, 10 Jan 2012 22:15:35 +0000 (17:15 -0500)]
Some extra comments to chat code
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.
Samual [Tue, 10 Jan 2012 17:48:45 +0000 (12:48 -0500)]
Merge remote branch 'origin/master'
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)
Rudolf Polzer [Tue, 10 Jan 2012 11:05:33 +0000 (12:05 +0100)]
fix the colormod fix
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
Mircea Kitsune [Tue, 10 Jan 2012 00:40:56 +0000 (02:40 +0200)]
Rename weapondamage to damage in particle names
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
Mircea Kitsune [Mon, 9 Jan 2012 23:22:19 +0000 (01:22 +0200)]
Since Samual found the cvar description confusing, make it more clear
Mircea Kitsune [Mon, 9 Jan 2012 23:21:02 +0000 (01:21 +0200)]
Use a text slider, looks less ugly
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
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.
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
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 ;)
Rudolf Polzer [Mon, 9 Jan 2012 20:19:08 +0000 (21:19 +0100)]
Merge remote-tracking branch 'origin/divVerent/waypointeditor-auto'
Mircea Kitsune [Mon, 9 Jan 2012 20:19:08 +0000 (22:19 +0200)]
Also update the "used in" comments in effectinfo.txt
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
Rudolf Polzer [Mon, 9 Jan 2012 20:08:18 +0000 (21:08 +0100)]
func_plat: do not crash if broken
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
Mircea Kitsune [Mon, 9 Jan 2012 19:43:55 +0000 (21:43 +0200)]
Fix a bug with self detection. Code working properly again
Rudolf Polzer [Mon, 9 Jan 2012 19:36:41 +0000 (20:36 +0100)]
copybody: also copy dphitcontentsmask
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
Rudolf Polzer [Mon, 9 Jan 2012 18:44:18 +0000 (19:44 +0100)]
bring death glow back, fix issues with respawning
Rudolf Polzer [Mon, 9 Jan 2012 18:18:18 +0000 (19:18 +0100)]
get rid of CSQCMODEL_EF_INVISIBLE
Rudolf Polzer [Mon, 9 Jan 2012 18:16:54 +0000 (19:16 +0100)]
respawn ghosts: don't munge colormap
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 .
Rudolf Polzer [Mon, 9 Jan 2012 18:08:26 +0000 (19:08 +0100)]
csqcplayers: network death_time
Mircea Kitsune [Mon, 9 Jan 2012 16:08:28 +0000 (18:08 +0200)]
Optimize my last change
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.
Mircea Kitsune [Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
Rudolf Polzer [Mon, 9 Jan 2012 15:16:11 +0000 (16:16 +0100)]
add utility fields to detect player death
Rudolf Polzer [Mon, 9 Jan 2012 15:07:57 +0000 (16:07 +0100)]
remove the hack again, fixed the engine
Rudolf Polzer [Mon, 9 Jan 2012 12:27:30 +0000 (13:27 +0100)]
save/restore velocity, don't ask why
Rudolf Polzer [Mon, 9 Jan 2012 12:23:01 +0000 (13:23 +0100)]
properly input velocity to V_CalcRefdef
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
Rudolf Polzer [Mon, 9 Jan 2012 12:13:49 +0000 (13:13 +0100)]
change hceck back to WIP1, it's harmless
Rudolf Polzer [Mon, 9 Jan 2012 12:09:31 +0000 (13:09 +0100)]
use DP_CSQC_V_CALCREFDEF_WIP2
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)
Mircea Kitsune [Mon, 9 Jan 2012 00:13:11 +0000 (02:13 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
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.
Samual [Sat, 7 Jan 2012 21:41:34 +0000 (16:41 -0500)]
Make tell work with magicear like previously
Samual [Sat, 7 Jan 2012 19:39:16 +0000 (14:39 -0500)]
Merge remote branch 'origin/mirceakitsune/preview_images'
Samual [Sat, 7 Jan 2012 19:38:23 +0000 (14:38 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/preview_images
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
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
Rudolf Polzer [Sat, 7 Jan 2012 17:14:29 +0000 (18:14 +0100)]
simplify forcemodels code a bit
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)
Samual [Fri, 6 Jan 2012 22:38:09 +0000 (17:38 -0500)]
Update voting aliases for client/server specific functions
Samual [Fri, 6 Jan 2012 21:49:17 +0000 (16:49 -0500)]
Add bad cvar
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
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
Rudolf Polzer [Fri, 6 Jan 2012 16:42:27 +0000 (17:42 +0100)]
forcemodels: handle missing model better
Samual [Fri, 6 Jan 2012 16:09:32 +0000 (11:09 -0500)]
Also add alias to commands.cfg
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)
Rudolf Polzer [Fri, 6 Jan 2012 15:17:38 +0000 (16:17 +0100)]
t
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
Rudolf Polzer [Fri, 6 Jan 2012 14:57:22 +0000 (15:57 +0100)]
2 more crosshairs for asyyy