Goober5000
ac25da1bd9
remove the Error (originally Assert) from r1675 and add back the comment removed in r8005
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11181 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-01 20:37:52 +10:00
niffiwan
a73404dbd5
Error needs LOCATION :)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11176 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 19:26:53 +10:00
The_E
fbd590cd77
Improvement for this error message
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11175 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 18:43:52 +10:00
Goober5000
6e56b2970f
xt branch: minor tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11146 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:31 +10:00
niffiwan
484b518760
Fix mantis 2804: beams can use damage factors
...
Add game_setting.tbl option that allows beams to use weapons table
Armor/Shield/Subsystem damage factors
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11089 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-27 18:20:18 +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
niffiwan
184cda8e58
remove gcc warnings [-Wunused-but-set-variable] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9922 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
e725bfc7a1
remove gcc warnings [-Wshadow] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9921 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
92e5d5bee3
Coverity 1093637: "fix" out of bounds read of Weapon_info[Weapons[other_obj->instance].weapon_info_index].subtype
...
(fix for release, at least, Assert probably handles this in debug)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9906 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:45:59 +10:00
The_E
658c6c5aa8
From Axem: Patch for Mantis 2870 (hook variable for On Death: scripting hook is not always set correctly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9687 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:17 +10:00
Echelon9
0a7fcfc0a5
Fix Mantis 2854: AddressSanitizer: global-buffer-overflow in do_subobj_hit_stuff()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9649 387891d4-d844-0410-90c0-e4c51a9137d3
2013-06-11 19:22:14 +10:00
Echelon9
72770939a2
Further spelling fixes, inspired by bugmenot's Mantis 2794
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9533 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
d1e73bd8b7
Followup for 2788: Fix potential issue while looping through subobjects.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9530 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
The_E
6197c20010
Patch for Mantis 2788: Difficulty-based damage scaling does not work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9529 387891d4-d844-0410-90c0-e4c51a9137d3
2013-03-18 20:24:45 +10:00
Goober5000
3b5b154712
fix from Admiral MS -- if there's no explosion, explosion sound shouldn't play either
2012-10-29 20:29:54 +00:00
Goober5000
5785885641
Admiral MS's patch for destroy-instantly and destroy-subsys-instantly
2012-08-27 02:50:05 +00:00
Goober5000
00d4f23209
this should fix all of the issues with docked fighters and bombers (Mantis #945 )
2012-07-01 03:24:41 +00:00
Echelon9
8befbc7adf
warning C6246: Local declaration of 'subsys' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '443'
2012-04-15 07:12:28 +00:00
Zacam
2cb5b15bd8
Nukes changes to the Armor Table for Difficulty Scaling and additional options.
...
Potentially handles Mantis issues 2493 and/or 2494.
http://www.hard-light.net/forums/index.php?topic=78277.0
2012-03-28 06:25:26 +00:00
zookeeper
a02fb5a869
Moved the features from r8621 and r8622 behind two game_settings.tbl flags.
2012-03-22 06:15:39 +00:00
zookeeper
8890b61350
Made hits which directly impact a subsystem's submodel always deal damage to that subsystem first, even if other subsystems are closer to the point of impact.
2012-03-21 12:34:34 +00:00
zookeeper
c14399cfb1
Made hits to a turret's barrel count as hits to the turret subsystem itself.
2012-03-21 12:31:02 +00:00
zookeeper
c87c2cbd63
Added a "collide submodel" subsystem flag, which makes the subsystem take local damage only from shots which actually impacted its submodel.
2012-03-17 17:40:53 +00:00
The_E
855fe8cb34
Removing superfluous SSM alert message spawning.
2012-02-04 21:05:02 +00:00
Echelon9
dc4371680a
Clear a whole set of LLVM warnings - some of these would have caused memory fubars, so should marginally improve stability
2012-01-15 08:08:15 +00:00
karajorma
e95201e041
Training weapons shouldn't cause smoke to come off of ships which haven't really taken any damage.
2011-12-31 06:49:30 +00:00
Echelon9
19ae6528e0
Cases of commented out Int3() indicate areas of old, redundant code.
2011-11-17 11:07:53 +00:00
Zacam
a63dbe572c
Part Two: Synchronization pass of Trunk and Antipodes Differences.
...
Removes all extraneous ifdefs (Demo, E3, Multi Beta, etc).
Leaves Debug and Inferno.
2011-09-09 10:23:53 +00:00
The_E
5ea6138708
A bit of cleanup here. Removed unnecessary "if (true)" and changed the sexp code to use the already written armor_type_get_idx function
2011-09-04 19:33:09 +00:00
Goober5000
5fb4a6db18
add ability to set the duration of the ship death roll
2011-05-30 21:06:11 +00:00
Wanderer
bf66734ded
adds table controls for various particle effects, and explosions related to ship death event. per ship class base deathroll time.
2011-04-14 18:59:06 +00:00
Zacam
973fab655e
Reported by chief1983, adds closing brace to line 2346.
...
Mac's should be happy now.
2011-04-12 23:35:58 +00:00
The_E
5cbf11ff6b
Of course, I did it wrong. However, this works now.
2011-04-12 13:32:27 +00:00
The_E
b68ef9b9b0
Requested by Axem: Allow beams to tag targets.
2011-04-11 15:44:33 +00:00
Goober5000
315bd423dc
rename subsystem type fields so as to better distinguish them
...
some consistency checks
add "no aggregate" flag to exclude a subsystem from aggregate hitpoint calculations
2011-02-14 08:33:23 +00:00
The_E
b4db3b3ecf
FUBAR's damage type sexps. Tested ad nauseum by BP.
2011-01-18 16:21:36 +00:00
Goober5000
34fd0c53ad
make subsystem-vanish consistent with ship-vanish
...
clarify sexp help and fix name (using deprecation, so that old missions will still work)
2011-01-16 08:20:08 +00:00
FUBAR-BDHR
c07f1a1c1d
Fix for Mantis 2368. Subsystems with vanish flag still play sound from player ship
2011-01-07 22:01:36 +00:00
FUBAR-BDHR
1529f948f2
Add flag that applies damage to subsystem as if it were the hull.
2011-01-05 00:12:01 +00:00
The_E
5db4e2a6b3
Fix for Mantis 2306 (Destroy subsystem cheat does not work in release builds)
2010-12-09 20:28:16 +00:00
FUBAR-BDHR
31853b77de
Fix issue with beams not doing damage due to the traitor beam fix.
2010-11-24 02:22:46 +00:00
FUBAR-BDHR
e818f7840f
Fix for Mantis 2190 - Player beams do not cause traitor.
2010-11-21 06:34:27 +00:00
Wanderer
57a2f2955c
feature commit - diaspora subsystem options
2010-10-08 21:32:48 +00:00
Wanderer
eb660e86c1
Fix to prevent global damage (shockwaves etc) from creating debris shards that spawn in empty space
2010-09-25 20:50:33 +00:00
The_E
dc54a7d11d
No wonder it didn't really work. I was looking in the wrong array.
2010-07-18 02:18:40 +00:00
The_E
4f2942e440
Slight cockup on my part here. Pain flashes were not supposed to be gone for everyone.
2010-07-16 18:35:13 +00:00
The_E
7bcd8d162b
Reverting the revert (Yay for feedback), as the ships flag solution seems to be what people really want.
2010-07-15 14:55:59 +00:00
The_E
3b93ad2ba9
Reverting 6279, and making it more intelligently (Thanks Goober for the heads-up)
2010-07-07 00:04:32 +00:00
The_E
7a8973eade
Introducing new SIF2 flag ("no pain flash") to turn off the pain flash. I guess all the peeps who want to do capship missions can rejoice now.
2010-07-05 02:28:48 +00:00
karajorma
a2afa2b67a
Switch to using the Macros for Multiplayer modes whenever possible.
2010-04-27 13:42:59 +00:00
Goober5000