]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mircea Kitsune [Thu, 5 Jan 2012 13:53:34 +0000 (15:53 +0200)]
Further improve some of the plasma damage particles
Mircea Kitsune [Thu, 5 Jan 2012 12:21:05 +0000 (14:21 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Thu, 5 Jan 2012 12:16:44 +0000 (14:16 +0200)]
More code optimizations and code comments
Rudolf Polzer [Thu, 5 Jan 2012 09:41:50 +0000 (10:41 +0100)]
rename to check-cvars
Rudolf Polzer [Thu, 5 Jan 2012 09:41:19 +0000 (10:41 +0100)]
remove 4 unused cvars
Rudolf Polzer [Thu, 5 Jan 2012 09:36:36 +0000 (10:36 +0100)]
Merge remote-tracking branch 'origin/terencehill/hud_skin_files_sync'
Rudolf Polzer [Thu, 5 Jan 2012 09:30:26 +0000 (10:30 +0100)]
Merge remote-tracking branch 'origin/nifrek/duckanims'
Mircea Kitsune [Thu, 5 Jan 2012 00:50:17 +0000 (02:50 +0200)]
Don't show fire and some plasma damage effects underwater
Mircea Kitsune [Thu, 5 Jan 2012 00:42:55 +0000 (02:42 +0200)]
Larger changes and improvements to the damage particles. Added different types of sparks to plasma/ energy damage, made rocket flames look a lot better, and also tweaked bullet blood
Mircea Kitsune [Wed, 4 Jan 2012 23:12:31 +0000 (01:12 +0200)]
Fix blood-dependent damage effects
Mircea Kitsune [Wed, 4 Jan 2012 23:12:12 +0000 (01:12 +0200)]
Slightly lower light intensities
Mircea Kitsune [Wed, 4 Jan 2012 22:57:27 +0000 (00:57 +0200)]
More tweaks to the impact particles
Mircea Kitsune [Wed, 4 Jan 2012 22:42:22 +0000 (00:42 +0200)]
Simpler way of defining the entity number of the player
Mircea Kitsune [Wed, 4 Jan 2012 22:31:21 +0000 (00:31 +0200)]
Allow cvar to specify whether effects should show only on players, or both players and objects. Also do more code cleanups and code comments
Mircea Kitsune [Wed, 4 Jan 2012 22:13:17 +0000 (00:13 +0200)]
Change how damage effects are applied to non-player objects. Only allow one damage effect per object, and don't allow objects to bleed. Also do some code optimization and cleanup
Mircea Kitsune [Wed, 4 Jan 2012 21:29:46 +0000 (23:29 +0200)]
Fix a bug causing damage effects to not show for alt-fire hits
Mircea Kitsune [Wed, 4 Jan 2012 21:08:41 +0000 (23:08 +0200)]
Kill damage effects when the player gets gibbed or goes spectating
Mircea Kitsune [Wed, 4 Jan 2012 20:40:33 +0000 (22:40 +0200)]
Make damage effects last longer
Mircea Kitsune [Wed, 4 Jan 2012 20:28:07 +0000 (22:28 +0200)]
Now that damage effects are limb based, make particles smaller and less distanced
Mircea Kitsune [Wed, 4 Jan 2012 20:09:13 +0000 (22:09 +0200)]
Improve the tag counting macro
Mircea Kitsune [Wed, 4 Jan 2012 19:51:04 +0000 (21:51 +0200)]
Use a different and smarter way to go through the bones of a model. The previous loop had a bug which would eventually crash CSQC. Also use this for the sandbox to fix the same issue.
Samual [Wed, 4 Jan 2012 17:12:06 +0000 (12:12 -0500)]
Merge remote branch 'origin/samual/updatecommands'
Samual [Wed, 4 Jan 2012 17:10:08 +0000 (12:10 -0500)]
Final preparations/cleanup/fixes before merge
Samual [Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Mircea Kitsune [Wed, 4 Jan 2012 16:35:17 +0000 (18:35 +0200)]
Attach the damage effect entity to the bone and use its origin, instead of not attaching it but getting bone origin each time. This might have some uses and should be more optimal
Mircea Kitsune [Wed, 4 Jan 2012 16:00:16 +0000 (18:00 +0200)]
Remove forgotten ReadByte (part of previous commit)
Mircea Kitsune [Wed, 4 Jan 2012 15:57:24 +0000 (17:57 +0200)]
Remove the old way of showing damage effects on gibs. Currently, damage effects no longer display on gibs. The old way was clearly not a good implementation, and it will need to be done differently if possible at all.
Mircea Kitsune [Wed, 4 Jan 2012 15:46:31 +0000 (17:46 +0200)]
Allow multiple damage effects on the same player, but limit the number of damages that can exist at the same time
Mircea Kitsune [Wed, 4 Jan 2012 15:38:35 +0000 (17:38 +0200)]
Skip damage effects for entities that have un model (eg: world)
Mircea Kitsune [Wed, 4 Jan 2012 15:26:37 +0000 (17:26 +0200)]
Go through all bones on the player model, and select the one closest to the damage origin. Damage effects now show on the limb a player was shot on.
Mircea Kitsune [Wed, 4 Jan 2012 14:59:32 +0000 (16:59 +0200)]
First part of bone-based damage effects: The origin of the effects is now a given player bone, not the player's origin
Mircea Kitsune [Wed, 4 Jan 2012 14:22:02 +0000 (16:22 +0200)]
Remove debug print now that species are working
Mircea Kitsune [Wed, 4 Jan 2012 14:20:31 +0000 (16:20 +0200)]
Get the correct species value. This fixes the last known bug for the damage effects (except an issue with gibs)
Mircea Kitsune [Wed, 4 Jan 2012 14:15:32 +0000 (16:15 +0200)]
Use the correct damage value in damage effects. Edge damage will now be accounted, and damage particles will last based on the damage actually dealt
Mircea Kitsune [Wed, 4 Jan 2012 14:13:52 +0000 (16:13 +0200)]
Fix an epic failure in my code. This finally gets the damage effects working as intended again, for both hitscan and splash damage weapons
Mircea Kitsune [Wed, 4 Jan 2012 14:09:57 +0000 (16:09 +0200)]
Revert last commit, it was a mistake. The client already does a radius search in ent_DamageInfo, so we don't need to send it for each damaged player. We do however have to do this for hitscan weapons, including railgunbullet
Mircea Kitsune [Wed, 4 Jan 2012 14:05:17 +0000 (16:05 +0200)]
Send an ent_DamageInfo for each player in the radius of a splash damage blast. This should allow damage effects to work again, but will currently cause effects to show at the origin of each player too (eg: A rocket hitting the ground will also cause explosions to show on all players who are damaged). Do we want this?
Mircea Kitsune [Wed, 4 Jan 2012 13:53:06 +0000 (15:53 +0200)]
Also send ent_DamageInfo for hitscan weapons when they hit a player, not only when hitting a surface. First step in getting damage effects working for hitscan guns again.
Rudolf Polzer [Wed, 4 Jan 2012 12:48:26 +0000 (13:48 +0100)]
don't overemphasize direct hits
Mircea Kitsune [Wed, 4 Jan 2012 12:47:29 +0000 (14:47 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
Mircea Kitsune [Wed, 4 Jan 2012 12:46:29 +0000 (14:46 +0200)]
Some tweaks, and preparations for a fix
Rudolf Polzer [Wed, 4 Jan 2012 12:44:30 +0000 (13:44 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 4 Jan 2012 12:41:49 +0000 (13:41 +0100)]
damageextraradius for svqc too
Rudolf Polzer [Wed, 4 Jan 2012 12:34:09 +0000 (13:34 +0100)]
add a field .damageextraradius to DamageInfo entities to be able to tune how much an entity "attracts" damage
Mircea Kitsune [Wed, 4 Jan 2012 12:31:12 +0000 (14:31 +0200)]
Damage_DamageInfo is already sent for hitscan weapons. I really need to check more before making a commit :P
Mircea Kitsune [Wed, 4 Jan 2012 12:30:46 +0000 (14:30 +0200)]
Send species properly from the server?
Samual [Wed, 4 Jan 2012 03:56:42 +0000 (22:56 -0500)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands
Mircea Kitsune [Wed, 4 Jan 2012 00:52:03 +0000 (02:52 +0200)]
Send ent_DamageInfo for hitscan damage too. Why wasn't this done in the first place? This change might need some checking to make sure it's ok.
Mircea Kitsune [Wed, 4 Jan 2012 00:06:12 +0000 (02:06 +0200)]
Get damage effects working without using a separate entity, but taking advantage of the existing Ent_DamageInfo. Note that some damage effects seem to break, and I need to see why they aren't working.
Mircea Kitsune [Tue, 3 Jan 2012 19:20:46 +0000 (21:20 +0200)]
Merge branch 'master' into mirceakitsune/damage_effects
Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc
Samual [Tue, 3 Jan 2012 19:18:26 +0000 (14:18 -0500)]
Fixes for sv_fraginfo
Rudolf Polzer [Tue, 3 Jan 2012 15:19:59 +0000 (16:19 +0100)]
cl_forcemyplayer*
Rudolf Polzer [Tue, 3 Jan 2012 14:20:42 +0000 (15:20 +0100)]
put the colors in rainbow order on the menu
Rudolf Polzer [Tue, 3 Jan 2012 13:49:44 +0000 (14:49 +0100)]
make white whiter
Rudolf Polzer [Tue, 3 Jan 2012 13:32:46 +0000 (14:32 +0100)]
fix palette lump file
Rudolf Polzer [Tue, 3 Jan 2012 13:21:36 +0000 (14:21 +0100)]
try to fix some camouflagish colors
Rudolf Polzer [Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 3 Jan 2012 12:02:28 +0000 (13:02 +0100)]
increase the default curl speed a little again
Samual [Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Rudolf Polzer [Sun, 1 Jan 2012 20:20:22 +0000 (21:20 +0100)]
more tooltip friendly description
Samual [Sun, 1 Jan 2012 20:19:01 +0000 (15:19 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Rudolf Polzer [Sun, 1 Jan 2012 20:14:39 +0000 (21:14 +0100)]
to the menu
Samual [Sun, 1 Jan 2012 20:11:16 +0000 (15:11 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Rudolf Polzer [Sun, 1 Jan 2012 20:09:58 +0000 (21:09 +0100)]
document the cvar
Rudolf Polzer [Sun, 1 Jan 2012 20:09:04 +0000 (21:09 +0100)]
sv_forceplayercolors
Rudolf Polzer [Sun, 1 Jan 2012 16:17:39 +0000 (17:17 +0100)]
renumber notification types to annoy mi..., I mean, to prevent clashes with future death type additions
Rudolf Polzer [Sun, 1 Jan 2012 16:14:08 +0000 (17:14 +0100)]
cleanup headshot handling
Rudolf Polzer [Sun, 1 Jan 2012 15:33:25 +0000 (16:33 +0100)]
stop removing the world, I still need it
Rudolf Polzer [Sun, 1 Jan 2012 15:19:04 +0000 (16:19 +0100)]
simplify antilag handling again :)
Rudolf Polzer [Sun, 1 Jan 2012 15:17:54 +0000 (16:17 +0100)]
antilag_takeback: better handling for the present
Rudolf Polzer [Sun, 1 Jan 2012 15:13:28 +0000 (16:13 +0100)]
ntilag: fix division by zero after antilag reset
Rudolf Polzer [Sun, 1 Jan 2012 12:14:52 +0000 (13:14 +0100)]
minor fixes for csqcplayers
Samual [Sat, 31 Dec 2011 16:09:11 +0000 (11:09 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Rudolf Polzer [Sat, 31 Dec 2011 13:32:01 +0000 (14:32 +0100)]
support EF_DYNAMICMODELLIGHT in csqcmodel
Rudolf Polzer [Sat, 31 Dec 2011 13:30:13 +0000 (14:30 +0100)]
dpdefs updates
Rudolf Polzer [Sat, 31 Dec 2011 12:15:01 +0000 (13:15 +0100)]
fix a spam bug
Rudolf Polzer [Sat, 31 Dec 2011 12:04:30 +0000 (13:04 +0100)]
try getting rid of the CSQCMODEL_EF_INVISIBLE hack and use alpha instead
Rudolf Polzer [Sat, 31 Dec 2011 11:55:59 +0000 (12:55 +0100)]
clear drawmask if alpha < 0 (better fps)
Rudolf Polzer [Sat, 31 Dec 2011 11:53:15 +0000 (12:53 +0100)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 31 Dec 2011 11:50:14 +0000 (12:50 +0100)]
support negative alpha
Jakob MG [Sat, 31 Dec 2011 11:11:18 +0000 (12:11 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Jakob MG [Sat, 31 Dec 2011 11:09:58 +0000 (12:09 +0100)]
Stop turrets from using teleporters. More explicitly forbid vehicles from using teleports (still dont work tough. hmpf.)
Rudolf Polzer [Sat, 31 Dec 2011 09:16:29 +0000 (10:16 +0100)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 31 Dec 2011 09:16:11 +0000 (10:16 +0100)]
try to fix vehicle chase cam (untested)
Jakob MG [Sat, 31 Dec 2011 08:56:10 +0000 (09:56 +0100)]
Fix http://dev.xonotic.org/issues/944 Likely things may be strange anyway if TNSF_SETUP is not the first message recived. But at least the warning should go away
Samual [Sat, 31 Dec 2011 07:28:45 +0000 (02:28 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands
Samual [Sat, 31 Dec 2011 07:26:17 +0000 (02:26 -0500)]
Greatly update commands.cfg..... updatecommands SHOULD be ready for merging! #woxblox#
Samual [Sat, 31 Dec 2011 07:02:37 +0000 (02:02 -0500)]
More aliases for commands.cfg
Samual [Sat, 31 Dec 2011 06:58:10 +0000 (01:58 -0500)]
whoops, forgot this
Samual [Sat, 31 Dec 2011 06:55:18 +0000 (01:55 -0500)]
Update the reply code
Samual [Sat, 31 Dec 2011 00:31:11 +0000 (19:31 -0500)]
More cleanup/fixes
Samual [Fri, 30 Dec 2011 22:14:49 +0000 (17:14 -0500)]
Whoops, forgot the actual getreplies files :P
Samual [Fri, 30 Dec 2011 22:01:29 +0000 (17:01 -0500)]
Many many many fixes and usage updates for generic commands/ban commands
Rudolf Polzer [Fri, 30 Dec 2011 20:08:30 +0000 (21:08 +0100)]
some dpdefs fixes
Rudolf Polzer [Fri, 30 Dec 2011 20:05:02 +0000 (21:05 +0100)]
fix colormap of clones/corpses
Rudolf Polzer [Fri, 30 Dec 2011 20:01:59 +0000 (21:01 +0100)]
fix bugs with conveyor and some items
Rudolf Polzer [Fri, 30 Dec 2011 19:15:38 +0000 (20:15 +0100)]
conveyor: make it more clever for regular ents too
Rudolf Polzer [Fri, 30 Dec 2011 18:43:18 +0000 (19:43 +0100)]
fix trigger_conveyor, before only func_conveyor worked
Samual [Fri, 30 Dec 2011 16:10:52 +0000 (11:10 -0500)]
Fix some things with timeout
Samual [Fri, 30 Dec 2011 15:39:48 +0000 (10:39 -0500)]
Merge remote branch 'origin/master' into samual/updatecommands