Fabian Woltermann
770fce8de5
Bitset flags -- take 2 ( #775 )
...
This introduces a new mechanism for handling bit flags. Instead of using an int (or two, or three) to write bits into, this uses the std::bitset in a wrapper class that accepts an enum class as input. This means that certain classes of errors we've had a few of in the engine, where a coder used the wrong set of flags or checked them against the wrong variable (SF_STEALTH vs SIF_STEALTH, for example) can now be detected at a compiler level rather than not at all.
2016-08-12 16:13:50 -07:00
m!m
22c0255277
Fix a bunch of 64-bit MSVC warnings ( #709 )
...
* Fix a bunch of 64-bit warnings
* Fix Linux compilation error
* Fix Mac error
* Fix some issues
* Fix more GCC warnings
* Remote unwanted change
* Remove accidentally readded file
* Fix wrong limit check
* Use BEAM_INDEX macro for getting beam object index
* Fix 32-bit warning
* Use BEAM_INDEX instead of pointer arithmetic
2016-08-09 11:08:54 -07:00
asarium
bbeaaa1565
Add a new particle effect system
...
This is similar to the script I wrote a few years ago but unlike that
one, this solution doesn't kill the performance.
2016-08-04 11:08:39 +02:00
MageKing17
f7591078b9
Change collisionInfo from an mc_info object to an mc_info* pointer.
...
This seems preferable to storing an entire mc_info object on every weapon, when the vast majority of projectiles (by the very nature of the fact that they still exist) won't have collided with anything.
On the other hand, I'm not wild about allocating and freeing memory every time a weapon collides with a ship or debris. If anyone has a better solution, I'm all ears.
2016-07-21 14:44:24 -07:00
The E
a413255728
Renaming vm_vec_dotprod to vm_vec_dot
2015-12-01 20:35:47 +01:00
DahBlount
3e6fb113ee
Deprecate +Min Damage and +Max Damage, add +Attenuation Damage:
2015-11-13 12:26:04 -07:00
asarium
559198a2e4
Fix format warning in collideshipweapon.cpp
2015-08-19 11:26:29 +02:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
Lari Nieminen
1bf86532fe
Added $Collision LOD ship table property, for using a LOD for collision detection
2015-08-03 13:20:14 +03:00
Lari Nieminen
cacad0ba70
Fixed possibility of +Minimum Weapon Span breaking with modular tables.
2015-07-25 01:14:03 +03:00
Lari Nieminen
7b2c992380
Added a +Minimum Weapon Span auto spread shield option to control the minimum distance weapons must have traveled before being allowed to hit the shield.
2015-07-21 21:59:31 +03:00
Echelon9
1e151865d4
Fix: object/collideshipweapon.cpp:67:185: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:45:38 +10:00
Echelon9
c2a2ef5682
Fix: object/collideshipweapon.cpp:39:63: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:42:15 +10:00
Echelon9
2c4fb4286c
Fix: object/collideshipweapon.cpp:470:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:19:20 +10:00
Echelon9
b326e77574
Fix: object/collideshipweapon.cpp:543:85: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 15:55:15 +10:00
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
Fabian Woltermann