Commit Graph
59 Commits
Author SHA1 Message Date
taylor 0ccf57a648 old ✌️ snafu
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4072 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:55 +10:00
Goober5000 aefb3efe15 the great big duplicate model removal commit
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4050 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:54 +10:00
Goober5000 d9fb4b15b9 revert Bobboau's commits for the past two months; these will be added in later in a less messy/buggy manner
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4041 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:53 +10:00
Goober5000 b30ec50714 invert the do-collision flag into a don't-do-collision flag, plus fixed a wee lab bug
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3971 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:50 +10:00
wmcoolmon af9a49e02c Couple of commented-out features.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3940 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:49 +10:00
Goober5000 ad95a28767 removed code that isn't used (see Mantis 1219)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3922 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:48 +10:00
wmcoolmon ff8572af7d Fix CVS & correct various warnings under MSVC 2003
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3904 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:47 +10:00
bobboau a3daa5ff3b ok, something aparently went wrong, last time, so I'm commiting again hopefully it should work this time damnit WORK!!!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3900 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:46 +10:00
Goober5000 0ed509ace7 remove WMC's limbo code, per our discussion a few months ago this will later be handled by copying ship stats using sexps or scripts
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3881 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:45 +10:00
taylor 3c4a168672 make fire-on-normal return value a little more obvious fix the "infinite genius" move I made by breaking turret movements ;)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3856 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:44 +10:00
wmcoolmon fb94960327 WMC codebase commit. See pre-commit build thread for details on changes.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3821 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
taylor 91cd637f73 fix return values (something that was different between 3_6_9 and HEAD)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3722 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor f7201f7046 updated/fixed modelanim code add ships.tbl subsystem flag ("+fire-down-normals") which will force a turret to fire down it's barrel line (Mantis bug #591)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3711 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor cbe140ab76 restore MAX_AIFTT_TURRETS to retail level, and add comment as to what it means for the next person that tries to change it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3555 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:34 +10:00
taylor ece636df39 revert to retail behavior for turret_should_pick_new_target() fix out-of-bounds issue
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3550 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:34 +10:00
taylor c3076eb0f5 fix for Mantis bug #687 (at least until better swarming code can be written, post-3.6.9) a quick speed/sanity check for turrets to be sure that they actually have a weapon to fire before processing them
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3505 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:32 +10:00
Goober5000 d491750ad1 fix macros
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3494 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:31 +10:00
wmcoolmon 62cecf0968 Update to allow flak range to be manually overridden, and safeguard against NULL predicted_pos
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3490 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:31 +10:00
Goober5000 0c4922f248 consolidate the "for reals" crap into a proper ship flag; also move the limbo flags over to SF2_*; etc. this should fix Mantis #977 --Goober5000
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3317 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:25 +10:00
wmcoolmon 32fde03838 Fix muzzleflashes for non-flak weapons. Begin commit of limbo code.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3169 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:19 +10:00
taylor f3f859d28e be sure to to reset ok_to_fire between weapon checks to make sure we don't count something by mistake 2006-06-01 04:40:41 +00:00
taylor ab7f22e9d8 Grrr! That was still stupid. Just going to revert it to retail and work out that bug it was supposed to fix at a later time. 2006-04-14 21:13:31 +00:00
taylor 4fb6d6ba91 I might have blamed this on sleep, if it wasn't a bold faced lie. ;)
- another part of the turret untargetting target bug
2006-04-14 18:36:11 +00:00
taylor 01d9f454ee minor cleanup
address numerous out-of-bounds issues
add some better error checking and Assert()'s around
2006-03-25 10:38:44 +00:00
wmcoolmon d95d6165b5 New subobject animation stuff and Lua functions. 2006-03-24 07:38:36 +00:00
Goober5000 52809741c6 fix taylor's fix :p
--Goober5000
2006-03-21 02:50:59 +00:00
taylor a12024d715 fix target eval check for weapons so that friendly ships will stop shooting at friendly bombs 2006-03-21 00:08:18 +00:00
Goober5000 f665e3928b rearrange some turret code to be more like retail
--Goober5000
2006-02-19 07:20:43 +00:00
Goober5000 4d5a477f71 übercommit of custom IFF stuff :) 2006-01-13 03:31:20 +00:00
wmcoolmon 82d4e2aa4e Somewhat better turret comments 2006-01-11 21:15:15 +00:00
phreak 0c663d84ee fix compile warnings. 2006-01-09 04:52:34 +00:00
wmcoolmon 07fb5808d6 turret-target-order SEXPs, ship thrusters 2006-01-06 04:18:55 +00:00
wmcoolmon 246cfcfa65 Codebase commit, most notably including objecttypes.tbl 2005-12-29 08:08:42 +00:00
Goober5000 b33caf6f45 change from "setting" to "profile"; this way makes more sense
--Goober5000
2005-11-21 02:43:37 +00:00
Goober5000 956e48daf4 add ai_settings.tbl
--Goober5000
2005-11-21 00:50: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
Goober5000 f510a86176 rolled back UnknownPlayer's commit
--Goober5000
2005-10-22 22:22:41 +00:00
unknownplayer 82a8322255 Added -UseNewAI command line option to force the game to always use
the SCP AI changes. As of now there's some problem in gr_d3d_set_render_target
that crashes the game when it gets to a mission.
2005-10-22 04:28:17 +00:00
Goober5000 ae639154f9 removed an unneeded parameter and renamed some stuff
--Goober5000
2005-10-14 07:22:24 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
Goober5000 0aa3b69e1a whoops
--Goober5000
2005-07-25 05:23:33 +00:00
Goober5000 5fb5c7faf7 various code cleanups, tweaks, and fixes; most notably the MISSION_FLAG_USE_NEW_AI
should now be added to all places where it is needed (except the turret code, which I still
have to to review)
--Goober5000
2005-07-25 03:13:26 +00:00
phreak 19370fb061 reverted a tagged only commit, it wasn't needed 2005-05-16 15:40:43 +00:00
phreak 93d2cfeaca another tagged only turret fix 2005-05-14 21:48:22 +00:00
phreak a44e312429 stop turrets from targeting non-bombs. also some tagged-only fixes. 2005-05-14 21:35:04 +00:00
phreak 89d2954f9e fixed another minimum range bug that prevented the Colossus and the Beast from
properly engaging one another in the mission: Their Finest Hour (SM3-08)
2005-05-13 02:50:47 +00:00
phreak e63dfcf41d fixed a minimum weapon range bug that was causing turrets to fire at ships beyond
the actual range of a weapon.
2005-05-10 15:49:04 +00:00
phreak a6ac8901e4 if you're using all_turret_weapons_have_flags() with a WIF2_** flag, use
all_turret_weapons_have_flags_wif2().

Corrected some logic that would dump a valid target for turrets if its objnum is 0, as
opposed to -1.
2005-05-10 02:44:40 +00:00
phreak dfe453a4f7 when finding valid weapons, set i to MAX_SHIP_PRIMARY_BANKS - 1 since i
is incremented at the top of the loop.  otherwise, we would pass over the first secondary
weapon in the bank.
2005-05-10 01:47:34 +00:00
wmcoolmon fe32a70746 Various turret code changes in a vain attempt to make things more readable/work properly 2005-05-08 20:35:26 +00:00