scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 12:41:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
9,625 Commits 63 Branches 1,530 Tags
29faabdfb33398aefe3214f74fbb0df2fd0147cc
Commit Graph
70 Commits
Author SHA1 Message Date
Echelon9 29faabdfb3 Simplify duplicative object/ includes. 2015-06-22 20:24:31 +10:00
Echelon9 c5493bb480 Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes. 2015-06-22 20:24:30 +10:00
Fabian Woltermann f6d0e7d97a Merge pull request #126 from AxemP/PainFlash 
Adding customizable pain flash and shield pain flash settings
 2015-06-13 15:22:40 +02:00
DahBlount 5f63e86dde Add sanity checks and an extra parameter 
This adds extra sanity checks to the Weapon Damage Decay code and also
adds a new parameter for weapons that can GAIN damage is they approach
the end of their lifetime.
 2015-06-12 09:56:13 -07:00
DahBlount e8f58f5947 Create Weapon Damage Decay framework 
This adds the $Daamge Time: and +Min Damage: entries to weapons.tbl.
These parameters are used to create damage attenuation for non-beam primary weapon.
 2015-06-12 05:01:21 -07:00
Lari Nieminen 3e4cfa361d Added customizable shield impact explosion effects, originally adapted from Wanderer branch. 2015-05-27 13:41:50 +03:00
Axem e396686570 Adding customizable pain flash and shield pain flash settings 2015-05-24 09:00:30 -05:00
Lari Nieminen 91000b4468 Revert "Fixed +Spread From LOD not working right." 
This reverts commit 4b15ec4e75.
 2015-04-29 22:41:17 +03:00
zookeeper 4b15ec4e75 Fixed +Spread From LOD not working right. 
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11268 387891d4-d844-0410-90c0-e4c51a9137d3
 2015-04-29 22:36:43 +03:00
m_m 9689711149 From FUBAR-BDHR, chief1983, m!m and MageKing17: Fix for Mantis 2887: Additional workaround for mantis 2693 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10969 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-08-06 19:39:34 +10:00
Echelon9 3f645215ad Address clang warning - object/collideshipweapon.cpp:258:17: warning: declaration shadows a local variable [-Wshadow] 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10877 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:29 +10:00
zookeeper edc515e681 Fixed Mantis #3037; surface shields will again check for a shield mesh collision before hull collision. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10618 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-05-08 19:18:35 +10:00
zookeeper a72f0f9d62 Allowed the $Weapon class hook condition to work on $Weapon Collision hooks. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10430 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-02-20 18:27:34 +10:00
zookeeper 7f74ce48a6 Fixed +Spread From LOD not working. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10290 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-14 20:24:46 +10:00
zookeeper 8cd19aa588 Merged model point shields from zookeeper branch. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10135 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:36 +10:00
zookeeper 3df8818635 Fixed subtle breakage I caused to surface shields in r9794. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9993 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-10-31 19:25:03 +10:00
The_E ea6edd3f8c Catch a rare error condition where shield_hit_tri was -1 for some reason 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9927 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-10-16 19:46:02 +10:00
Goober5000 7e5b2aee52 turn mc_info into a plain data struct, part 2 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9822 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-26 18:51:36 +10:00
zookeeper d993c3e1f5 Merge auto spread shields from zookeeper branch. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9794 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-20 19:23:19 +10:00
Echelon9 65c6a8f51e GCC warning: suggest curly brackets (braces) around empty body in an ‘else’ statement 2012-06-12 15:57:21 +00:00
Echelon9 e20a418c94 PVS-Studio fix: The 'false' value is implicitly casted to the integer type. 2012-05-28 13:35:39 +00:00
Echelon9 0ebe034272 Documentation: Big code cleanup of the collide**.cpp files 2011-09-12 12:34:49 +00:00
The_E ac8b7c4c10 From m!m: Adds access to collision data to the Lua API. 2011-08-04 11:05:25 +00:00
karajorma a561ecc2a3 Remove a few annoying compilation warnings 2011-03-10 00:26:45 +00:00
The_E 083a84feff Swifty's go-swift stuff. Makes collision detection slightly less insane. 2010-12-22 14:42:21 +00:00
Zacam b9b5237123 Purging of the Decal system. Includes Projects updates for codeblocks, MSVC 6-2010 and Xcode. 2010-09-30 05:50:04 +00:00
The_E f421af5016 Another potential var name collision. Thankfully, this one's part of the decal code, so it's likely it never was a problem. 2010-09-22 00:25:01 +00:00
Wanderer 1375bab654 fix for the new effects with shield impacts and with missiles exploding without impacting 2010-01-23 07:58:31 +00:00
Wanderer cd15f39847 lua handled collision groups and lua bitwise ops library 2010-01-05 18:00:01 +00:00
portej05 719825f80d The big CVS comment removal. This chops approx. 3.5mb off a full checkout. 
I've tested this through compiling and through hand checking. 
Normalises line endings in ALL files to \n.
 2009-06-20 08:08:20 +00:00
Wanderer acc7fa2b16 fix for surface shields selecting wrong hit quadrant 2008-10-22 13:56:19 +00:00
phreak ece785dee7 fix mantis #1682 - weapon ship collisions not applying to ships beyond the warpout clip plane. 2008-06-10 01:14:32 +00:00
WMCoolmon 7e7d77c8d7 *Drumroll* The official scripting system commit to the stable branch! 2008-03-15 08:56:43 +00:00
Goober5000 3c3416fa3b the great big duplicate model removal commit 2007-02-20 04:20:38 +00:00
taylor b5fb6913f8 fix a couple of things that I missed earlier 2007-02-12 02:19:45 +00:00
Goober5000 057c4876f9 invert the do-collision flag into a don't-do-collision flag, plus fixed a wee lab bug 2007-02-11 06:19:08 +00:00
Goober5000 850e65f754 Clean up the ship-weapon collision code for both conventional weapons and beams. Improved readability and clarity; untangled program flow; cleaned up sloppy enhancements. Fixed a few bugs too. 2007-02-07 07:35:01 +00:00
Goober5000 321130465c remove obsolete and unused shield flag 2007-02-06 01:27:34 +00:00
Goober5000 d5ad083d91 fix forum links 2006-10-08 02:05:38 +00:00
taylor cd4a173af6 compiler warning fixes 2006-08-22 05:45:39 +00:00
wmcoolmon da11619f8e Scripting system prep for 3.6.9 2006-06-07 03:54:29 +00:00
taylor a4bc040ddd various small cleanups, fixes, error checks 2006-03-05 21:45:12 +00:00
Goober5000 b52b6b1e00 spelling 2006-02-25 21:47:19 +00:00
wmcoolmon d43babc2d5 Various weapon and team related scripting functions; $Collide Ship and $Collide Weapon hooks 2006-02-15 07:19:50 +00:00
wmcoolmon 7cd75811db More warnings instead of Int3s/Asserts, better Lua scripting, weapons_expl.tbl is no longer needed nor read, added "$Disarmed ImpactSnd:", fire-beam fix 2005-11-08 01:04:02 +00:00
wmcoolmon 78fab0c331 Codebase commit - nebula.tbl, scripting, new dinky explosion/shockwave stuff, moving muzzle flashes 2005-10-30 06:45:00 +00:00
taylor 224cde1275 don't do any decal processing if decals are not enabled 2005-10-28 14:48:26 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
Goober5000 2a307d099a CVS header tweaks 
--Goober5000
 2005-07-22 10:18:41 +00:00
Goober5000 2394e9801b remove PreProcDefine #includes in FS2 
--Goober5000
 2005-07-13 03:35:36 +00:00