Commit Graph
333 Commits
Author SHA1 Message Date
karajorma 8ed8425998 This is better than the other way.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4313 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
karajorma 5417c5077f Make Ships_Exited Dynamic. Add the hits-left-single-subsystem and get-damage-caused SEXPs. Minor changes to make diffing 3.6.9 and HEAD easier.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4295 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
karajorma 336b0fa9ef Doh!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4279 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
taylor dab646c183 fix bugs in beam-*-all and turret-*-all that made them always trigger an Int3()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4278 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
karajorma f3a043668c Fix x-builtin-messages so that the Any Wingman option works
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4273 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
karajorma 5e50d91dee Upgrade the beam-x-all and turret-x-all SEXPs to accept more than one ship. Add the allow-treason SEXP
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4272 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:05 +10:00
turey 4ff88a9e70 "no primary linking" ship flag and related SEXPs - prevent a ship from linking primaries.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4266 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:05 +10:00
Goober5000 7d442047bf fix the factoring on the shudder parameters (Mantis #1419)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4261 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:05 +10:00
Goober5000 2c6cb674ee fix for #1455 plus a bit of cleanup
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4255 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:05 +10:00
phreak eb9ab4c957 destroyed-or-departed-delay needs to check for ships that have self destructed
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4247 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:04 +10:00
Goober5000 373d80684f bring sexp into conformance with other sexps
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4242 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:04 +10:00
Goober5000 613f761043 generalize the way radar ranges are handled (inspired by Shade's fix)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4241 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:04 +10:00
turey 17c73dd526 set-object-position and set-object-orient now work in multi.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4238 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:03 +10:00
Goober5000 13d4be980f fix case-sensitive #include (Linux)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4231 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:03 +10:00
Kazan 0a3ec374d9 small tweak
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4213 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:02 +10:00
Kazan 1d4bed9485 Make asteroid/debris fields interrupt autopilot, add "hazards near" message to autopilot.tbl, add use-nav-cinematics sexp, fix mantis #1441
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4211 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:02 +10:00
Kazan 5d9b38e398 Resolve Mantis 1281
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4209 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:02 +10:00
Kazan d0884812ce Autopilot upgrades as described, MSVC2005 project fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4202 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:01 +10:00
turey 92039aa55a Small change to how Simulated Hull works. If ship is gone, it now has 0 Simulated Hull.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4199 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:00 +10:00
turey 56c871d49d Initial commit of Training Weapons / Simulated Hull code.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4190 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:00 +10:00
Goober5000 4622db3330 --grouped the shake/shudder code together a bit better --added a sexp to generate shudder --fixed a minor bug in lock-perspective
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4150 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:58 +10:00
karajorma 2659bbcb25 Doh! Missed the return type.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4141 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:58 +10:00
karajorma 55e03513c3 Fix a number of places where the player of a dogfight game could end up in the standard debrief.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4139 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:58 +10:00
karajorma cd045d745f A couple of minor fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4105 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:56 +10:00
taylor ba590e029d get rid of non-standard itoa(), make use of the proper sprintf() instead
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4086 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:56 +10:00
taylor 8ea4793841 be sure to page in textures for change ship class sexp preload add a ASF_MENUMUSIC type for things that aren't mission-based event music (since that is handled differently now) make event music keep extension if it exists, so that the special data will be accurate bits of cleanup from old MS code that we don't need
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4077 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 e590e0c5ec *** empty log message ***
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4049 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:53 +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 d14355349e fix a hideous bug with the knossos special warp stuff (how did this ever actually work correctly?)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4029 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:52 +10:00
Goober5000 42ab4d6622 massive shield infrastructure commit
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4008 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:52 +10:00
taylor a7ed006559 remove NO_SOUND fix glow bank sexp bug (Mantis #1250)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3960 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:50 +10:00
Goober5000 1164c1f7ab fix two bugs: --default ship flags in the iff_defs table were not correctly translated from parse flags to ship/object flags --ships were created with default allowed comm orders regardless of which team they were on
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3945 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:49 +10:00
karajorma 2521541fdc Fix add-remove-escort to actually use a priority. Add yet another missing bit of Network variable code
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3924 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:48 +10:00
karajorma 71e1654e33 Fix bug in the set ammo and weapon SEXPs Add the reset-orders SEXP Add support for network variables
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3918 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:47 +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
wmcoolmon de3145b479 Fix +Override, attempted fix for code adjacent to [] causing crash in scripting.tbl (Unreproducable), and (Untested) fix for script-eval.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3899 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:46 +10:00
Goober5000 3b732fab3b assume ships-with-bays which haven't yet entered the mission are valid for syntax checking
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3823 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:43 +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
Goober5000 ff27f47392 allow parsing of similar ship copy names properly (Mantis #1178)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3816 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
Goober5000 38f922a22a prevent false positive while error checking
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3768 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
Goober5000 51e60dfa3a this may have been an oversight
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3765 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
taylor b3136d2214 add some needed wing leader checks to prevent Assert()'s and out-of-bounds problems when the leader is dead/dying (Mantis bug #1134)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3753 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:41 +10:00
taylor dc8b03f68a various bits of cleanup (warning messages, things that Valgrind complained about, etc.) fix an out-of-bounds issue on Sexp_nodes[] which was leading to stack corruption
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3692 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:38 +10:00
Goober5000 b33ea1169c fix is-event-x-delay optional argument type
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3686 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:38 +10:00
Goober5000 c503ef414c moved some stuff around in the sexp menus
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3658 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:38 +10:00
Goober5000 b710bbcc34 make sure to only add the sexp callback once
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3656 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:38 +10:00
Goober5000 cd2953a8c9 make sexp nodes dynamic
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3636 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:37 +10:00
taylor 32aa4ccbeb fix bug where set-object-speed-* could set speed subjectively if left to default
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3546 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:34 +10:00