Compare commits

...
7475 Commits
Author SHA1 Message Date
chief1983 db63304c28 Trunk sync r9486. 2013-01-06 19:34:23 +00:00
chief1983 6377b16f85 RC1 revision bump. 2013-01-04 16:54:26 +00:00
chief1983 236c309971 Trunk sync r9480. 2013-01-04 16:46:41 +00:00
chief1983 d327428008 RC1 BUILD STAGE COMMIT: Sets all (crosses fingers) version info to 3.6.16 RC1. 2012-12-26 22:50:02 +00:00
chief1983 16d350fa49 Copy trunk r9464 to 3.6.16 branch. 2012-12-26 22:40:59 +00:00
chief1983 142449e5a8 Trunk sync: All trunk commits from r9456 to r9464. 2012-12-26 22:27:36 +00:00
chief1983 be6158d8d5 Copy trunk r9456 to 3.6.16 branch. 2012-12-21 22:31:51 +00:00
chief1983 a8f1ed8566 Copy trunk r9456 to 3.6.16 branch. 2012-12-21 22:30:21 +00:00
karajorma 14a837126c Fix Mantis 1818 (PXO Login fails ambiguously if you don't have a password or username) 2012-12-21 07:15:07 +00:00
Goober5000 32e2c9b9d1 enhance debug warning for Mantis #1951 2012-12-20 07:34:38 +00:00
Valathil a1bef9316f Adding an assert to multi_ts_get_team_and_slot so we can get Auto variable data in the crash dump to track down ticket 2757. 2012-12-19 01:58:27 +00:00
Valathil 6fbf9ff864 Fix for Mantis 2738: Reset buffer state before drawing spheres and lines. Additionally fix the new htl outline rendering in fred by setting the outline color. 2012-12-19 00:11:28 +00:00
The_E 174ed8f13f Rename the model subsystem flag masks to MSS_MODEL_FLAG_MASK and MSS_MODEL_FLAG2_MASK respectively, for readability 2012-12-18 21:55:26 +00:00
The_E d551a62c48 Fix for Mantis 2513 by Admiral MS: Fixes issues with two ship classes sharing model data. 2012-12-18 21:46:35 +00:00
Valathil 761abb6cba Fix for Mantis 2364: Load the relevant thruster bitmaps when switching weapons in lab. 2012-12-18 20:09:08 +00:00
Valathil dc816c6cdf Fix for Mantis 1901: Update the displayed ship after the loadout is refreshed. 2012-12-18 19:42:59 +00:00
Valathil ecdb8fd674 Fix for Mantis 1928: Recreate the briefing and background dialog when the mission updates. 2012-12-18 18:40:25 +00:00
Valathil d68a9cbb1c Fix for Mantis 2447: Allow fighters to use anti subsystem weapons when disarming/disabling protected ships. 2012-12-18 17:26:48 +00:00
Goober5000 1caf2ea47e properly fix the removal of particles (Mantis #2165) 2012-12-17 09:36:40 +00:00
Goober5000 00ac2c1be6 revert revision 9411 in preparation for fixing particles (Mantis #2165) 2012-12-17 08:59:55 +00:00
Goober5000 575c259737 since invisible textures were loaded as -1, they have to be flagged specially to actually replace real textures (Mantis #2340) 2012-12-17 08:00:17 +00:00
Goober5000 511bd4b44b there is actually a way to check for extra sound values per Mantis #2048, and here it is 2012-12-17 05:54:18 +00:00
Valathil d62c8a8132 Fix for Mantis 2199: Reject objects from being clicked on when selection lock is active. 2012-12-17 01:17:19 +00:00
Valathil 7d79e36374 Fix for Mantis 2755: Update weapon_info references after weapon_create to get updates from possible substitution 2012-12-16 14:25:21 +00:00
Valathil 72b4c0ea36 Set the 3D flag in the new sounds.tbl parsing. 2012-12-15 22:11:57 +00:00
Valathil 3baae61054 Fix for Mantis 2707: Pass the firing turret to weapon_create so it knows where to look for when using $Substitute. 2012-12-15 21:47:51 +00:00
Valathil 915732ada9 Fix for Mantis 2737: Recreate the entire orientation matrix not just the forward vector when ships spawn from docking bays. 2012-12-15 19:51:40 +00:00
The_E ae03533c2d Change the default toolset for MSVC2012 to "110-XP", to make builds made with VS2012 XP-compatible. 2012-12-15 10:33:35 +00:00
Goober5000 f2b1727a29 allow saving of invisible textures for replacements (Mantis #2340) 2012-12-15 04:41:52 +00:00
Goober5000 628b86bfb3 fix Mantis #2319 (alt names and callsigns aren't properly removed) 2012-12-15 04:36:27 +00:00
Valathil efd12a02dc Fix for Mantis 1978: Add eyepoint directions to cameras; Add guncam view for cameras that are bound to turrets 2012-12-14 22:18:45 +00:00
The_E 8012dc86ab Fix for Mantis 2754: Reset the frame offset for custom HUD gauges when reinitializing. 2012-12-14 12:07:30 +00:00
karajorma 15620b60e9 Fix Mantis 2753 (Customised Loadouts sometimes won't save for next time the mission is played). 2012-12-14 09:27:17 +00:00
karajorma 00c9d8c6ec Fix a couple of event logs. Clean up the operators array. 2012-12-14 08:51:22 +00:00
karajorma f4307ea309 Actually fix a bug in Num-ships-in-battle rather than accidentally committing a different minor fix. 2012-12-14 03:31:26 +00:00
karajorma fe1ed9755d Fix a bug in Num-ships-in-battle 2012-12-14 03:28:40 +00:00
Goober5000 5254110651 fix Mantis #2752 2012-12-13 06:14:04 +00:00
Goober5000 226634f470 patch another memory leak 2012-12-13 06:12:24 +00:00
Goober5000 1aed40bf31 patch a memory leak 2012-12-13 05:56:28 +00:00
The_E 185f3dcc4f Patch for Mantis 2733: Updates the description for add-nav-waypoint. Also makes it work as intended. 2012-12-12 13:57:34 +00:00
Goober5000 4e290a5833 fix compilation 2012-12-11 03:53:53 +00:00
Zacam c9cc585dd0 Revert of 9410. Apparently not ready for prime time, what with older compilers that don't seem to understand C++0x types (and complaints about upgrades to enable it), and it apparently (under said compilers) isn't any faster than stdext::hash_set anyway. 2012-12-10 08:23:19 +00:00
The_E 2a95115b57 Fix for Mantis 2733: Adds documentation for the 4th argument for the add-nav-waypoint sexp 2012-12-09 22:47:31 +00:00
The_E 1b2a6d792f Rewrite the sexp documentation for most of Kazan's navpoint sexps to follow the formatting established by the rest of the sexp docs. 2012-12-09 22:36:17 +00:00
Valathil 98ae0853ab Fix for Mantis 184: Use Vertex shader to replicate nohtl rendering of thruster cones. Also make shader state handling a bit less hackish. 2012-12-09 21:51:20 +00:00
Valathil 4a9a5019da Fix for Mantis 2146: Move the model_clear_instance call so it doesn't reset the replaced texture. 2012-12-09 21:49:20 +00:00
Zacam c1f477e4df Fixes Mantis 2706: Weapons not colliding 2012-12-09 06:28:56 +00:00
Zacam 597b559ebd Fixes Mantis 2325: View shakes in 'show ship' flag when far from the mission origin 2012-12-09 04:28:44 +00:00
Zacam 146128429e Fix for Mantis 1496: Ships stopping mid-waypoint; From Admiral MS 2012-12-09 03:45:27 +00:00
Zacam 4480b5383a Fix for Mantis 2165: Vector iterator becomes invalid in Particle.cpp 2012-12-09 03:31:18 +00:00
Zacam bbe0906f73 Mantis 2746: Fix for geometry batcher, from Valathil. Update for Mac by Echelon9. 2012-12-09 02:59:02 +00:00
The_E 6fa32269b0 From CommanderDJ: Patch for Mantis 2009 2012-12-08 20:25:37 +00:00
The_E 9ab4daa1cf Patch for Mantis 2188 by Admiral MS 2012-12-08 20:23:09 +00:00
The_E 38c46dd384 Patch for Mantis 2200 by Eli2 2012-12-08 20:21:25 +00:00
Valathil 6bc0bfdd87 Fix for Mantis 2693: Fix rotating submodels still colliding even if $no_collision or $no_collision_this_only is set. Also fix ships that have $no_collision on detail0 set colliding with bigger ships. 2012-12-06 20:44:29 +00:00
Goober5000 64efa20223 set the mini help text to blank if we select an operator
make sure special lists of arguments are checked for mini help text
(Mantis #2020)
2012-12-06 06:50:43 +00:00
Goober5000 775c57ca5b fix Mantis #1975 2012-12-06 06:14:24 +00:00
Goober5000 4b0261fbf1 1) don't actually copy the ship object, because it has classes
2) fix Mantis #1616 by re-applying the original parsed texture replacements
2012-12-06 04:20:54 +00:00
The_E c12cc16f80 Fix for Mantis 1616: Texture replacement data is not copied over when changing ship classes that share models 2012-12-05 19:06:49 +00:00
FUBAR-BDHR e24b0db408 Fix for mantis 2748: Wing delay values not reset when using file->new 2012-12-05 18:09:32 +00:00
niffiwan f01082927a Goober!!! :) Fix parentheses in r9397 2012-12-05 09:23:29 +00:00
niffiwan de1d2cc047 Fix for mantis 1922: set glowmaps on/off in the hud target box 2012-12-05 09:02:48 +00:00
Goober5000 a960232e04 bulletproof the activation and deactivation of shields; this should fix Mantis #2747 2012-12-05 07:45:47 +00:00
Goober5000 946a16bc1d for Mantis #2346 and #1129 -- munge the data if it runs afoul of the warnings 2012-12-05 04:20:45 +00:00
Valathil db2878faea From Mantis 2346: Spit out a warning if the two docking slots lie on the same axis as the docking normal. 2012-12-04 23:02:02 +00:00
Valathil 41e6099c7b From Mantis 1129: Spit out a Warning if a model has a docking port with identical slot positions. 2012-12-04 20:25:55 +00:00
Valathil bbf9da9af0 Fix for Mantis 2743: Strip down 16 Bit files to 8 Bit by adding PNG_TRANSFORM_STRIP_16 to png_read_png 2012-12-04 17:19:05 +00:00
Goober5000 4a3d93e4b9 CommanderDJ's patch for #2730 2012-12-04 05:12:48 +00:00
Valathil 3c152392da Fix for Mantis 2727: Add Autocenter for debris rendering 2012-12-03 20:45:14 +00:00
Valathil 80e2b8ab21 Fix for Mantis 2736: abs is int in Linux and Mac; change to fl_abs in all instances where floats were used in the codebase. 2012-12-03 00:59:45 +00:00
The_E cf546f44ec And another fix for Mantis 2326. 2012-12-02 10:23:23 +00:00
The_E dbec51f9dc I am just going to assume that this was a hasty application of Ctrl-C Ctrl-V, not some kind of intentional cast of a boolean to a float 2012-12-01 18:12:50 +00:00
karajorma 5c88f21a50 Update SEXP help for ai goal SEXPs to reflect that priorities over 89 are allowed now. 2012-12-01 07:11:29 +00:00
The_E d4fa7d3f64 Changing the function descriptions of isLaser() and isMissile() to better explain what they're doing. Also adding isPrimary() and isSecondary(), which are basically the same as the first two, but named better. 2012-11-28 21:38:09 +00:00
The_E 5b8d656556 Fix for Mantis 1596: Adds "turret-fired" animation trigger 2012-11-28 20:08:07 +00:00
The_E 7597c3fa29 From FUBAR: Patch for Mantis 2256 2012-11-28 18:32:39 +00:00
karajorma 785a4d9888 This might or might not help with Mantis 1841. Either way Assertion > Int3() anyway. 2012-11-28 09:18:23 +00:00
Goober5000 9d345cedf9 update comment 2012-11-28 06:56:08 +00:00
Goober5000 136be49032 clean out dead_docked list as part of ship_cleanup -- fixes Mantis #2294 2012-11-28 06:55:15 +00:00
Goober5000 aaca017004 update ship orders when changing ship classes in FRED - fix Mantis #2341 2012-11-27 06:59:48 +00:00
Goober5000 12553d7467 improve ship-copy-damage sexp with more robust checks and incidentally a fix for Mantis #2734 2012-11-26 05:49:23 +00:00
Valathil fea148afcd Fix for Mantis 2735: Port commit 8643 & 8644 to Turrets as well 2012-11-26 01:37:24 +00:00
Echelon9 8d6a34ba26 PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type. 2012-11-25 02:45:16 +00:00
The_E ebdbf8150a Did you know that WP_BEAM isn't actually used anywhere? I didn't. Neither did the isBeam() scripting function. 2012-11-24 09:17:18 +00:00
karajorma f16eb6fcb2 Fix Mantis 2703 (Primary weapons with the child flag prevent any further weapons appearing in the ships-editor->weapons list) 2012-11-24 08:37:25 +00:00
niffiwan 45a2ae9359 Fix for mantis 2664: shockwaves now use bounding box to test distance for damage 2012-11-24 02:40:55 +00:00
karajorma 535bde8737 Fix an issue with persistent variables being ignored by the loadout code. 2012-11-23 06:49:04 +00:00
karajorma 4b73dc389d That buffer needs to be bigger! 2012-11-23 06:37:09 +00:00
FUBAR-BDHR 1605a28ad1 Log but don't warn about LOD mismatches when running a standalone server. 2012-11-21 18:49:13 +00:00
Valathil 0170cbbf34 Fix for Mantis 2207: Use Missiontime for F4 Logscreen entries and fix the calculation. 2012-11-20 23:42:12 +00:00
Valathil 3158272345 Fix for Mantis 2376: Don't calculate nose offsets for chase view. 2012-11-20 20:54:28 +00:00
Valathil 68adb9517a Correct some issues with Help screens that popped up because of glCleanup and undocumented Nvidia driver behaviour. 2012-11-20 18:53:26 +00:00
niffiwan 7a075518f8 Fix mantis 2732 2012-11-20 10:38:52 +00:00
Goober5000 d72829c6bb for Mantis #2636 2012-11-20 00:05:51 +00:00
Goober5000 77f724de55 fix Mantis #2691 by just ending colorization on whitespace 2012-11-19 23:40:50 +00:00
Goober5000 63d63594bb addendum to r9340 to fix Mantis #2714 in scripting function (thanks to Admiral MS) 2012-11-19 22:57:41 +00:00
Valathil 464772b661 Fix for Mantis 2731: Add a +use_pxo flag in multi.cfg 2012-11-19 17:43:40 +00:00
Goober5000 e6a0f0a765 follow-up to 9355: since we have a version of get_string that accepts SCP_string, just use that 2012-11-19 05:36:05 +00:00
Valathil d847c31c31 Followup to 9357: Don't flush texture state we don't care about that in shader pipeline and also move the fix to a more efficient place per Swifty's suggestion. 2012-11-18 23:33:01 +00:00
Valathil fa11577d5b Fix for Mantis 2719: Clear Vertex Array state after rendering. 2012-11-18 19:07:33 +00:00
Valathil 16408693d2 Fix for Mantis 2729: Remove the Int3 and make the log entry a little clearer. 2012-11-18 18:01:41 +00:00
The_E 0ce25fd7dd Increase the buffer size for stuff_string_list(SCP_vector<SCP_string>) to 2048. If this function was used with substrings longer than NAME_LENGTH, this would cause stack corruption due to a buffer overrun. 2012-11-18 17:58:05 +00:00
Zacam ce3e1f11af From Valathil, glCleanup to reduce the amount of calls.
First post here: http://www.hard-light.net/forums/index.php?topic=82886.0
Mantis Here: http://scp.indiegames.us/mantis/view.php?id=2728
2012-11-18 10:05:44 +00:00
Zacam c450047137 Warning resolution: grbatch.cpp(806) : warning C4018: '<' : signed/unsigned mismatch; solved by setting 'Batch_buffer_size' from 'int' to 'size_t' 2012-11-17 23:12:17 +00:00
zookeeper 2c9e716b02 Fixed the reset button in the HUD config screen not resetting to the default color scheme given to new pilots. 2012-11-16 21:17:18 +00:00
zookeeper ca73196b42 Ought to fix bug 2690. 2012-11-16 19:45:24 +00:00
zookeeper fe5e8db7f1 Fix really stupid mistake. 2012-11-16 11:26:48 +00:00
Zacam 1eefabfd83 From Valathil: Corrects for dynamic switching regarding Fixed Render Pipeline in the LAB 2012-11-16 04:14:29 +00:00
Goober5000 a0929ed2ce fix for Mantis #2726 -- proper handling of mismatch of LOD levels 2012-11-15 07:52:45 +00:00
zookeeper c3db907357 Tweaked some of the settings of the four detail level presets. 2012-11-14 12:05:59 +00:00
zookeeper d04af470c0 Made the default detail level tableable in game_settings.tbl, but kept "very high" as the default. 2012-11-14 11:54:47 +00:00
Echelon9 fa671e043a PVS-Studio fix: Resolve bug introduced in r201 (9 years, 11 months ago) in relation to an if statement without encompassing curly brackets. 2012-11-12 14:32:57 +00:00
Goober5000 e5bfcf3927 Admiral MS's fix for Mantis #2723 2012-11-12 06:57:18 +00:00
Goober5000 3ac8ef419b CommanderDJ's fix for Mantis #2529 2012-11-12 06:48:17 +00:00
Goober5000 8a13376c56 fix Mantis #2714 -- hud doesn't change when change-ship-class is called 2012-11-12 03:25:59 +00:00
zookeeper ec34c80a67 Fix botchedness in r9338. 2012-11-11 20:59:02 +00:00
zookeeper 0789544699 Set the default detail level of new pilots to "very high". 2012-11-11 12:09:25 +00:00
chief1983 280c2dc0a6 Ignore the copied buildconfig.conf file. 2012-11-06 02:56:05 +00:00
chief1983 3a8b13423e Subversion must be changing their output defaults a bit, some of the platforms keep having the regex break just a bit. 2012-11-06 02:50:25 +00:00
chief1983 7d659b501b Also, make this executable, tired of having to add it manually on every *nix platform I set up. 2012-11-06 02:45:56 +00:00
chief1983 1684351c9d Change buildconfig.conf to buildconfig.conf.sample to allow it to be copied and edited freely without worrying about committing passwords later. 2012-11-06 02:34:55 +00:00
chief1983 cc52d20d2c FreeBSD support for the nightly build script. 2012-11-06 02:20:46 +00:00
chief1983 46a9ff74a9 Update Linux build configs to match changes to the autotools config. 2012-11-06 01:39:40 +00:00
chief1983 260406bb6e Update OS X build config defaults a bit too, saves me some trouble later. 2012-11-06 01:30:23 +00:00
chief1983 02749fd7d6 Update the default Windows/MSVC2008 build options a bit. 2012-11-06 01:27:34 +00:00
chief1983 0faf7d3490 Fix an export bug that cropped up somehow. 2012-11-06 01:27:01 +00:00
Goober5000 657a2df34f inspired by recent change to multi_sexp.cpp... in most cases, SCP_string should not be passed by value 2012-11-05 08:31:39 +00:00
Goober5000 6396379fe7 a ship that is self-destructed should have the same behavior as one that is destroyed, if going by mission log entries
(c.f. thread: http://www.hard-light.net/forums/index.php?topic=82718.0)
2012-11-05 05:43:28 +00:00
Zacam 4ec8c9d4db Lets see if this handles Mantis 2724.
On Valathil's suggestion, pulled the code added in 9312 from 'model_render_glow_points' and 'model_render_thrusters'
2012-11-04 21:50:34 +00:00
Zacam 9fe701516a One more spot to update Build revision from .13 to .15 2012-11-04 15:44:11 +00:00
The_E 5f97971670 Compiler warning removal: Variable initialized but not used 2012-11-04 08:30:20 +00:00
The_E 53231d5fad Compiler Warning removal: int-to-ubyte conversion 2012-11-04 08:29:46 +00:00
The_E c27695fde1 Compiler warning removal: Unused variable, float-to-int cast 2012-11-04 08:27:50 +00:00
The_E b7b1d28b85 Compiler warning removal: ubyte/int comparison 2012-11-04 08:25:53 +00:00
Echelon9 a1b0073c3f Re: r9305 - while NULL pointer checks in non-Debug are useful, ensure we don't lose the better check in Debug as well. 2012-11-03 23:11:41 +00:00
The_E 0304e8e475 PVS Studio fix: string last_portion is not used anywhere 2012-11-03 09:39:11 +00:00
The_E 2cc477e08f PVS Studio suggestion: Create a reference to avoid repeated vector access 2012-11-03 09:38:34 +00:00
The_E 156fab74d3 PVS Studio fix: Pointer not checked against NULL 2012-11-03 09:37:29 +00:00
The_E 27aef0e2b8 PVS Studio fix: Pointer shipp is not checked against NULL 2012-11-03 09:36:44 +00:00
The_E 30bfc2fc4e PVS Studio fix: Really confusing code 2012-11-03 09:35:46 +00:00
The_E 9bb6fd25e8 PVS Studio fix: "!none_valid" is always true 2012-11-03 09:33:54 +00:00
The_E 4aaa244fee PVS Studio suggestion: Create a reference to avoid multiple vector access operations 2012-11-03 09:31:54 +00:00
The_E 2498431f31 PVS Studio fix: String play_callsign is not used anywhere 2012-11-03 09:28:49 +00:00
The_E ac3cb0f7d3 PVS Studio suggestion: Create a reference instead of repeated vector access 2012-11-03 09:25:48 +00:00
The_E dc5c259f60 PVS Studio suggestion: Use ++it for iterators 2012-11-03 09:24:25 +00:00
The_E d607df8fac PVS Studio fix: Add checks against NULL pointer dereferences 2012-11-03 09:23:23 +00:00
karajorma c112b286d4 Turns out you do need some of those after all. No idea why grep didn't find them. 2012-11-03 09:01:17 +00:00
karajorma 9334bc3219 Clear out some cruft from the multiplayer code. Make sure Macros are being used. 2012-11-03 08:25:27 +00:00
karajorma 18c620bbb2 Object numbers are not guaranteed to the same on the client. Sent the net_sig instead. 2012-11-03 06:08:22 +00:00
chief1983 69f1e12b35 He did the job, parse error fixes came with ease, but one couldn't stop it's like he had a disease, he fixed another and another and a sista and her brotha... 2012-11-02 19:48:57 +00:00
chief1983 8d51c92adc Darn typos. 2012-11-02 19:41:59 +00:00
chief1983 8406aaca6d More tweaks for FreeBSD support, and cleanup of configure.ac. Slightly experimental. 2012-11-02 19:36:53 +00:00
chief1983 00bd66cac2 Fix all the 'no newline at end of file' warnings I saw thrown by gcc on FreeBSD. 2012-11-02 17:30:17 +00:00
Echelon9 5738146d7a Update Xcode4 project file to the latest recommended settings in Xcode 4.5.x 2012-11-01 14:41:07 +00:00
Goober5000 4f45d2e90f Admiral MS's fix to the lab weaponmodel fix 2012-10-31 01:56:35 +00:00
The_E 69f120d2af OOps, forgot a : 2012-10-30 20:09:03 +00:00
The_E 9d44b64d1e Fix for Mantis 2679: Adds new setting to game_settings.tbl: "$Weapons inherit parent collision group:", a boolean setting defaulting to FALSE. Setting it to true will cause weapons fired to inherit their parent ships' collision group setting. 2012-10-30 19:37:53 +00:00
karajorma 0a867cd53b Move the add paste button in FRED. Hopefully this will result in less cursing when people press paste instead of add paste. 2012-10-30 03:26:30 +00:00
karajorma 62ee9127ab Switch the name of the deselect-nav SEXP 2012-10-30 02:07:41 +00:00
Goober5000 a529c3843f fix an old Volition bug -- properly mark a goal as not achievable if a ship departs, not only if it's destroyed
and throw in self-destructed for good measure, per Admiral MS
2012-10-29 20:48:06 +00:00
Goober5000 06a70f5955 fix from Admiral MS -- if there's no explosion, explosion sound shouldn't play either 2012-10-29 20:29:54 +00:00
Goober5000 10a80704a7 fix from Admiral MS -- move waypoints properly when moved via scripting 2012-10-29 20:27:31 +00:00
Goober5000 b39c6dbe58 fix from Admiral MS -- page out weapons when lab is exited
also, modelnum comparisons should be >= 0, not > 0
2012-10-29 20:26:29 +00:00
Goober5000 50442f9d05 yes, whoops (fix bug noticed by Droid803) 2012-10-29 07:10:01 +00:00
The_E 3933f98c86 Make change-team-color multi. Also adds SCP_string overloads for multi_send_string/multi_get_string 2012-10-27 09:24:11 +00:00
The_E 137ca0a85b A few updates to Team Colors:
-Team Colors can now be applied to player ships
-change-team-color sexp for on the fly changes
-New F3 lab controls: T and Y can now be used to cycle team color presets
2012-10-26 18:39:43 +00:00
karajorma c69e1723b5 Resaving a mission shouldn't result in any changes other than the date. 2012-10-26 09:44:12 +00:00
karajorma 34bb902a41 Small error with alter-ship-flag fixed. 2012-10-26 00:28:20 +00:00
chief1983 7e3ddaaf33 Bump trunk revision to 3.6.15. Update output build names for MSVC 2005 through 2012, Xcode 3 and 4, Linux, and internal version strings. 2012-10-25 16:26:11 +00:00
chief1983 2c01685fce Add event.log stuff to Xcode3 project file. 2012-10-25 16:03:17 +00:00
niffiwan be2f900327 Add generic_log files to Makefile.am for *nix compiles 2012-10-25 10:16:38 +00:00
karajorma 511c2bdd08 alter-ship-flag SEXP. Now does AI flags too. 2012-10-23 12:02:28 +00:00
IssMneur f62858effa Name the packfile with the odd header 2012-10-20 03:41:25 +00:00
Swifty 598babdca8 Axem's rotating dead subobjects. 2012-10-17 05:58:33 +00:00
Goober5000 de0032756e fix for Mantis #2643 (generated shield quadrants displayed in the wrong spots) 2012-10-16 03:20:47 +00:00
Goober5000 9e51e69b93 add missing files to project 2012-10-16 02:27:14 +00:00
Goober5000 bf2bba4c3b add arrival_delay and departure_delay arguments to set-arrival-info and set-departure-info 2012-10-16 01:08:30 +00:00
Echelon9 04560e9911 PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type. Inspect the first argument. 2012-10-15 10:57:15 +00:00
Echelon9 1e41905a83 PVS-Studio fix: V576 Incorrect format. Consider checking the fourth actual argument of the '_snprintf' function. The SIGNED integer type argument is expected. 2012-10-15 10:53:01 +00:00
Swifty 6e83914e0a Let's simplify that no autoaim in multiplayer commit. 2012-10-15 09:08:20 +00:00
Swifty a4f9048055 Removed the multiplayer game mode check in unnecessary places in the autoaim/convergence firing code. 2012-10-15 07:31:26 +00:00
Swifty ce78ac1f6f Made sure that cockpit models are getting flushed out when unloading a given model. 2012-10-15 06:21:00 +00:00
Swifty 546aee6fac Fixed scaling and positioning issues with cockpit displays. Added Display Offsets: to all RTT capable gauges. 2012-10-15 04:45:02 +00:00
Swifty fc42de34d2 Added RTIF settings for DRADIS. 2012-10-15 02:42:10 +00:00
IssMneur 736801c36f Added a note to the configure file about letting SCP know about successful builds on our unsupported and less supported platforms. 2012-10-13 21:42:06 +00:00
IssMneur a281b5f8d5 nbspjr's changes for FreeBSD building
See: http://www.hard-light.net/forums/index.php?topic=82425.msg1646772#msg1646772
2012-10-13 21:27:42 +00:00
m_m 23572167d0 Adding a few new scripting functions, including support for dockingpoint access for scripting and a function to draw HUD-like brackets around an arbitrary subsystem. 2012-10-12 16:14:47 +00:00
m_m 6baceeee3e Fix compilation for Visual Studio 2010 and 2012. 2012-10-12 10:39:44 +00:00
Echelon9 4669583c11 Documentation: Pass cleaning up a few functions with partial docs 2012-10-08 15:53:14 +00:00
Echelon9 b8215c7d75 Fix: Format string is not a string literal (potentially insecure) 2012-10-08 15:17:43 +00:00
Echelon9 13e4765548 Support event.log compilation in the Xcode4 project file 2012-10-08 15:03:01 +00:00
karajorma 2899d8b524 Okay, this time JUST the event.log stuff! 2012-10-08 09:13:21 +00:00
karajorma 1669fa99ac Backout that commit. Wrong codebsse! 2012-10-08 09:11:14 +00:00
karajorma f4ef8dd595 Commit the event.log feature. 2012-10-08 09:02:44 +00:00
Swifty b22cfa6460 Cockpit display support for a crapload of gauges. 2012-10-07 05:37:50 +00:00
Goober5000 8eb15efc4f remove all hacks with #weak because FSPort has corrected data 2012-10-07 04:06:29 +00:00
karajorma df7550f00b Fix AI issue where ships ended up with no target to land on. 2012-10-07 01:18:30 +00:00
Swifty c37c453beb Disabled auto aim in multiplayer. 2012-10-06 23:57:29 +00:00
Swifty 17c811926f Fixed crash caused by certain AI code assuming all objects are Ships. 2012-10-06 23:56:20 +00:00
karajorma 9d4e68c404 Talon1024's Nav select/deselect SEXPs. 2012-10-04 02:28:23 +00:00
Goober5000 6634a31ade change alloca to standard vm_malloc/vm_free 2012-10-01 06:16:15 +00:00
Goober5000 8e662c0f87 update comments 2012-10-01 03:19:46 +00:00
Goober5000 ee75aee1a8 update const-correctness 2012-10-01 03:19:31 +00:00
Swifty 162ade1828 Fixed attempted reinitialization of collision pairs. Need to use OBJ_INDEX(objp), not objp->instance as that refers to the ship index, not the object index. 2012-10-01 03:05:20 +00:00
Goober5000 f4723ad4d6 MSVC6 compatibility 2012-09-30 21:08:05 +00:00
Goober5000 2eef9ae32b Admiral MS's lab patch
http://www.hard-light.net/forums/index.php?topic=82192.0
2012-09-30 19:43:24 +00:00
Goober5000 10279a394f fix a compiler warning 2012-09-28 06:26:34 +00:00
Goober5000 fd4b5ae7a3 fix the techroom bug where #weak weapons appear because they were assigned the player-allowed flag during parsing 2012-09-28 06:26:14 +00:00
Goober5000 507db9eaaf revert r9218 per discussion with karajorma... new fix will follow shortly 2012-09-28 05:36:12 +00:00
Echelon9 63030ce401 Fix up cmd_brief and cmd_brief_stage struct definitions; some general cleanup of code within missioncmdbrief as well 2012-09-26 10:39:56 +00:00
Valathil 59fc8d690f Fix for Mantis 2709: Use the correct dimensions for updating texture images when texture streaming to fix crashes on hardware not capable of handling non power of 2 texture dimensions 2012-09-25 19:11:05 +00:00
karajorma 7dd7e6f3d1 Allow mods to mark campaigns as ignored. 2012-09-25 13:40:05 +00:00
karajorma e842594b63 Doh! Those two should be the other way round. 2012-09-25 01:08:19 +00:00
m_m 97d9efc33b Let's try this again, hopefully this time without reverting previous changes. See r9215 for a better description. 2012-09-24 16:17:26 +00:00
karajorma 9bb53f2640 Commit Mission Moods 2012-09-24 11:00:40 +00:00
Goober5000 3d437c6d76 play-sound-from-table should work for both 3d and non-3d sounds 2012-09-24 06:58:54 +00:00
Goober5000 35c4931ddf remove a warning 2012-09-24 06:58:10 +00:00
Echelon9 dc125dec6a Support Universal builds (32/64 bit) on Mac OS X 10.6+. Also updates library frameworks to libogg-1.3.0, libvorbis-1.3.3 and libtheora-1.1.1 2012-09-23 15:17:52 +00:00
karajorma a02813466e Stop #weak weapons appearing in the tech room in multiplayer missions. 2012-09-23 08:33:32 +00:00
The_E 5f4f75b1a9 Reverting 9215, because it conflicts massively with my fixes for hud_gauges. m|m, did you update your checkout before committing your stuff? 2012-09-22 21:41:23 +00:00
m_m 654d0079fe Added weapon specific HUD tracking and lock-on sounds and in-flight sounds.
New options are $TrackingSnd, $LockedSnd, $InFlightSnd and +Inflight sound type.
2012-09-20 13:05:09 +00:00
karajorma b06e20e222 Display the skill level on the debriefing stats screen. 2012-09-20 01:05:23 +00:00
The_E 0928cf7e06 Fixes memory management issues due to duplicated pointers 2012-09-19 19:28:03 +00:00
The_E 4544f417da Clear the ship list between gauge configs to avoid multiple huds rendering at once 2012-09-19 18:40:10 +00:00
The_E 11d51d4e1c And another fix. Apparently, = != ==, who knew 2012-09-19 17:34:09 +00:00
The_E 042a7c5af6 And more fixes 2012-09-19 16:52:30 +00:00
The_E 1ee09c1a46 Fix a stupid parsing bug 2012-09-19 16:37:34 +00:00
The_E 481f77c554 As requested by mjn.mixael: Allows modders to specify a list of ship classes a given hud config can be applied to. To use this, use "$Ships: ("Some ship" "Another ship")" instead of "$Ship: This ship". $Ship has been deprecated. 2012-09-19 15:31:31 +00:00
karajorma be24ff7c82 Allow subtitles to also display remappable keys. 2012-09-18 09:22:21 +00:00
karajorma 41890671bb Looks like Do-Nothing went walkabout. Putting it back. 2012-09-16 13:30:18 +00:00
karajorma 4a457367fa Send a keep alive packet when loading icons as sometimes this can take quite a while (for instance in debug). 2012-09-16 09:09:19 +00:00
karajorma b5ead94174 Fix Mantis 2712 (Change-ship-class does not update clients). Only a partial fix as cockpit and HUD are not updated. 2012-09-16 08:30:48 +00:00
karajorma 8e18b4186d Axem's Radians -> Degrees fix for FRED 2012-09-16 01:27:32 +00:00
karajorma 0eb8a97bf2 Axem's SEXP reorganisation. 2012-09-15 03:28:36 +00:00
karajorma c2f7133eed Add the debug SEXP. 2012-09-13 09:35:13 +00:00
karajorma b9f0261c97 We really shouldn't be doing that on the standalone 2012-09-13 04:47:27 +00:00
IssMneur 165a6fddc0 Fixes mantis 2711. AudioStream handles are leaked under certain conditions.
AudioStream handles that were to destroy and fade would not if the stream was already finished or not started.
2012-09-12 02:41:08 +00:00
The_E 3d397f3d4a Fixes issue with Team Colors accidentally causing a null pointer dereference. Thanks to mjn.mixael for prodding at this. 2012-09-11 22:24:45 +00:00
Valathil 1583017d27 Only use offsets for thruster distortions. Fixes weird framebuffer explosions. 2012-09-11 12:50:43 +00:00
niffiwan 525164b8ca From m!m: Fix for mantis #0002695 2012-09-11 10:02:59 +00:00
Swifty 777f6e0bdd Created Primary Weapons Gauge and Secondary Weapons Gauge. 2012-09-10 07:09:32 +00:00
Swifty 7d346b992d Created Hardpoints gauge. 2012-09-10 06:58:59 +00:00
Swifty 895c544f6f Created Warhead Count gauge. 2012-09-10 06:51:14 +00:00
Swifty 2c515e5fcb Added additional parameters for the Wingman Status gauge. 2012-09-10 06:35:33 +00:00
Swifty 724df4e6a7 Added text color parameters for the auto target and auto speed gauges. 2012-09-10 06:31:03 +00:00
Swifty 7742570597 Added Bottom Background Offset: and Max Line Width: to Directives gauge. 2012-09-10 06:23:46 +00:00
Swifty bbbbd044e8 Added Bottom Background Offset: to Squad Message gauge. 2012-09-10 06:14:06 +00:00
Swifty 18823788c3 Added parameters to adjust subsystem name, integrity, and status offsets for the Target Monitor. 2012-09-10 06:04:24 +00:00
Swifty 049c6518a4 Added Desaturated rendering to the Target Monitor. 2012-09-10 05:59:55 +00:00
Swifty e24a3741d0 Added alpha masking support for the Target Monitor gauge. 2012-09-10 05:53:53 +00:00
Swifty e3673c5d80 Added a variety of parameters to the Weapon Energy gauge. 2012-09-10 05:43:10 +00:00
Swifty 7f5e8402a7 Added a variety of parameters to the Throttle gauge. 2012-09-10 05:38:02 +00:00
Swifty 0227356dbf Added Bottom Background Offset: and Ship Name Max Width: parameters to the Escort gauge in hud_gauges.tbl. 2012-09-10 05:35:49 +00:00
Swifty 6816aa8e1e Created Flight Path Marker gauge. 2012-09-10 05:33:17 +00:00
Swifty ab610a33fd Added bottom offset parameter to the Damage gauge in hud_gauges.tbl 2012-09-10 05:21:46 +00:00
Swifty f4e0a7114e Added better object and weapon cleanup code for the new collision detection code when max object and weapon counts are reached. 2012-09-10 05:08:16 +00:00
Swifty 2108d1689e Added OpenGL color masking functions to the graphics code. 2012-09-10 05:06:36 +00:00
Swifty 8bd6c256c3 Added OpenGL alpha testing functions to the graphics code. 2012-09-10 05:05:14 +00:00
Swifty 363120bf69 Forgot to add these stubs for the graphics code stencil functions. 2012-09-10 05:03:33 +00:00
Swifty 055e7fe964 Added basic OpenGL stencil support. Valathil, feel free to alter this implementation if you need to get things working with deferred shading. 2012-09-10 05:00:26 +00:00
Swifty ddb89f2456 Base support for desaturated model rendering. 2012-09-10 04:51:11 +00:00
Swifty e166ee3f90 Added method to the HudGauge class that renders full color bitmaps. 2012-09-10 04:39:41 +00:00
Swifty bdb7abc239 Allowed resizing of scaled HUD gauges even if we're using GR_640 or GR_1024. 2012-09-10 04:32:28 +00:00
Swifty f7a1c69392 Added "$Radar Color Image 2D:" to ships.tbl. Adds full color radar image blips on top of IFF-colored image blips. 2012-09-10 04:22:07 +00:00
Swifty 1d521d22e1 HUD Config Options will properly set Text Messages and Messages to its defaults when reset. 2012-09-10 04:01:17 +00:00
Swifty 2159e9e978 Collision caching properly resets between missions. 2012-09-10 03:58:14 +00:00
Swifty 2424e43c96 Fixed change_ship_type to use proper collision functions. 2012-09-10 03:57:00 +00:00
Swifty eaf1d6d920 Fixed crash when using viewing from a ship using the "show ship" flag. 2012-09-10 03:55:46 +00:00
Echelon9 d75ed3d77c Fix LLVM warning: Declaration shadows a field of 'NavPoint' 2012-09-06 17:01:51 +00:00
Echelon9 2be421ad77 Fix LLVM warning: Declaration shadows a local variable (modelread.cpp) 2012-09-06 16:59:02 +00:00
Echelon9 4fc2e8a651 Fix LLVM warning: Declaration shadows a local variable (ship.cpp) 2012-09-06 16:57:52 +00:00
Echelon9 24dfc21cf1 Fix LLVM warning: Declaration shadows a local variable (missionparse.cpp) 2012-09-06 16:56:47 +00:00
Echelon9 5a79940ecc Fix LLVM warning: Declaration shadows a field of 'HudGaugeRadarDradis' 2012-09-06 16:51:06 +00:00
Echelon9 34c44fd9b1 Fix LLVM warning: Declaration shadows a field of 'WE_BSG' 2012-09-06 16:47:59 +00:00
Echelon9 2227bb40d1 Fix LLVM warning: Declaration shadows a field of 'LoopingSoundInfo' 2012-09-06 16:45:52 +00:00
Echelon9 99842b1f5f Fix LLVM warning: Declaration shadows a field of 'cockpit_display_*' 2012-09-06 16:44:16 +00:00
Echelon9 2b9cf5845a Fix LLVM warning: Declaration shadows a field of 'waypoint_list' 2012-09-06 16:40:18 +00:00
Echelon9 46a1fb7af2 Fix LLVM warning: Declaration shadows a field of 'waypoint' 2012-09-06 16:38:15 +00:00
Echelon9 c1b9ffd5dc Remove some unused variables 2012-09-06 15:51:52 +00:00
The_E d47bdf1586 This warning needs to be a bit more helpful 2012-09-05 15:29:56 +00:00
zookeeper b9ceeacbc1 Fix the disabled flag not getting initialized right for controls which don't have an entry in controlconfigdefaults.tbl. 2012-08-31 19:23:44 +00:00
zookeeper b2013d7f3b Added support for hiding/disabling keybinds in controlconfigdefaults.tbl. Patch from http://www.hard-light.net/forums/index.php?topic=81727.0 2012-08-30 06:45:22 +00:00
Valathil 14d236c211 Fix for Mantis 2705: Add Jump Nodes to the list of object types that are models so they are rendered at the right time 2012-08-28 18:50:53 +00:00
Goober5000 75306bc4fd Admiral MS's patch for destroy-instantly and destroy-subsys-instantly 2012-08-27 02:50:05 +00:00
Goober5000 5e86f5cb34 this actually does exactly the same thing, but it's more consistent with the rest of the code 2012-08-25 23:49:32 +00:00
Goober5000 b34375bb86 make red-alert not dependent on whether the HUD is visible or not
(fixes Mantis #2683)
2012-08-24 04:09:05 +00:00
The_E 785ebdcc6d Also revert 9132. That was actually meant to go through review first. 2012-08-22 16:35:49 +00:00
The_E f088fb8d13 Revert 9131 for real 2012-08-22 16:35:18 +00:00
The_E 4f858c44f1 Double oops, I don't know why I committed this 2012-08-22 16:30:27 +00:00
The_E bf7ef32449 Ooooops, forgot a ":" in the parser 2012-08-22 16:26:06 +00:00
Goober5000 1173100397 variable tokens can be quite a bit longer than standard tokens due to their unusual format; handle this properly
(fixes Mantis #2670)
2012-08-22 05:31:40 +00:00
Goober5000 b87c2efc5b the initialized value should match the default value 2012-08-22 02:00:03 +00:00
niffiwan e7b8a6ee07 Replace RamTable memory management with something a bit faster 2012-08-21 10:32:05 +00:00
The_E 6c5e0abd5a Adding nameplate textures to the list of texture names that trigger the transparency renderer. 2012-08-20 19:00:28 +00:00
Goober5000 91a29bc799 spelling 2012-08-20 01:42:45 +00:00
Goober5000 67d22dba82 sync ai_profiles.cpp with def_files.cpp and with wiki page 2012-08-20 01:04:49 +00:00
Echelon9 189391391c Fix Mantis 2699: Replace deprecated hash_map on systems that support std::tr1::unordered_map. Code review following ni1s initial patch and suggestions. 2012-08-19 14:14:20 +00:00
Goober5000 dd29077983 there is indeed one minor bug -- switching flags for flags2 2012-08-19 07:53:12 +00:00
Goober5000 f5a0edfb97 reverting 9121 -- I'll give karajorma the benefit of the doubt and assume he just didn't see the compatibility additions 2012-08-19 07:20:06 +00:00
karajorma abf49b0e05 Revert 9119 and 9120 since at least one of them breaks compatibility with 3.6.12 2012-08-19 06:13:45 +00:00
Goober5000 b786e34cff all mod_table flags should also default to NO
also, change the generic_anim flag on whether to use the HUD color settings to be a bit more descriptive
2012-08-19 03:27:31 +00:00
Goober5000 4c7d4040a9 LESS -> FEWER
also, all ai profiles flags should default to NO
2012-08-19 02:06:26 +00:00
Valathil cd5451b082 Fix for Mantis #2697: That was supposed to be the other way round. DIVIDE BY 0 OH SHIII... 2012-08-18 17:47:13 +00:00
The_E fe54042595 Fix for Mantis 2685: Glowpoints attached to a modelled subsystem will be rendered even if that subsysstem has been destroyed 2012-08-18 16:57:48 +00:00
Swifty 5fed856495 Fixed rendering when using fixed function OpenGL pipeline. (Mantis 2696) 2012-08-18 10:39:20 +00:00
Swifty e6b32ff858 Restored set object position functionality for OSWPT_TYPE_SHIP since they no longer should be sharing the same code with OSWPT_TYPE_WAYPOINT. See Mantis 2612. 2012-08-17 06:47:19 +00:00
Echelon9 1e19bdb6f7 Fix Mantis 2687: In weapon selection window, glowpoints can be seen through a ships hull. Note this is similar to the fix in r9031. 2012-08-16 10:05:22 +00:00
IssMneur fb662687c7 Fixes 2266 by reverting ds_get_free_channel to retail 2012-08-16 04:42:21 +00:00
Valathil 45c103f7a4 Followup to 9109: Add some error handling to handle 1 frame "animations" and missing frame 0 image files 2012-08-16 01:16:05 +00:00
zookeeper a8a49fb84c Turned $Comms Menu Hides Messages from a global HUD flag to a +Messages gauge flag. 2012-08-15 19:18:25 +00:00
zookeeper 86141efeb3 Added a hud_gauges.tbl boolean flag to allow one to override the default behaviour of messages not being displayed while the comms menu is open. 2012-08-15 14:27:12 +00:00
Valathil a69e56094c Allow generic_anim's to reuse bmpman and texture_cache slots and implement eff streaming. Changed talking heads to use generic_anim. Fixes Mantis 2417 2012-08-14 23:48:23 +00:00
Valathil f13ef37c81 Fix for Mantis #2612: Allow set-object-position to work with waypoints. Patch by Admiral MS 2012-08-14 20:25:23 +00:00
zookeeper 14f9479feb Added some default mod_table comments. 2012-08-14 05:53:49 +00:00
The_E de4f2aff13 Adding stub functions for maybe_create_shader, set_team_color, enable_team_color and disable_team_color 2012-08-13 19:43:21 +00:00
Swifty e107ee3814 BSG FTL effect modified to use soft particle rendering if available. 2012-08-11 21:40:01 +00:00
Swifty 9eb0d166dc go_even_faster: Improved collision detection performance by rewriting broadphase and narrowphase testing. 2012-08-11 21:14:53 +00:00
Swifty fa101a2d60 go_even_faster: Improved rendering performance of particles by sending vertex data via buffer object. 2012-08-11 21:01:13 +00:00
Swifty e3c38a2a35 go_even_faster: Added framework to improve rendering performance by reducing OpenGL state changes between vertex data binds. 2012-08-11 20:20:24 +00:00
The_E 886587f97e Removing the "run_launcher" function, since as far as I know, it hasn't worked for a looooong time 2012-08-11 15:18:23 +00:00
niffiwan 70e2280e25 Also check we have a valid bitmap before trying to render it 2012-08-11 09:39:43 +00:00
niffiwan 89e5314fdd Switch mprintf to Warning - if these are missing you can get bmpman assertions 2012-08-11 09:27:20 +00:00
Echelon9 2db1a837b5 Clean up the Xcode 4 project file, to work default on Xocde 4.4.1 (latest) 2012-08-08 14:24:10 +00:00
niffiwan 53a28035c2 Remove unnecessary Int3() - already gracefully handles running out of turret swarm slots 2012-08-07 09:11:41 +00:00
Goober5000 2961654439 fix for Mantis #2694: homing breaks when free_flight_time is 0
also, correctly set default free_flight_time to retail value of 0.5 second
2012-08-07 05:59:35 +00:00
chief1983 750ce4d27d Fix compile errors about an ambiguous call when using the Xcode project and Xcode 3. 2012-08-06 18:12:02 +00:00
The_E 60b6b37cd7 Correcting a few mistakes that somehow happened 2012-08-04 06:18:00 +00:00
The_E 78204d282f Changing "use" to "enable" 2012-08-04 05:44:51 +00:00
The_E d8ac9dba52 New game_settings.tbl setting: "$Enable External Shaders:", which allows the use of, you may have guessed it, external shaders. Default is off. 2012-08-03 20:31:57 +00:00
The_E 4ade2616db Fix to make glowpoints respect clip planes during warpout again 2012-08-03 18:19:35 +00:00
The_E 70215df9c0 Fixes issue with team color setting resetting itself when tbms become involved 2012-08-02 14:24:14 +00:00
niffiwan 3e25d252f8 remove memsets on game_snd vars - struct now has vectors in it... 2012-08-02 10:17:32 +00:00
The_E f59e8506d1 Aaargh, derp again 2012-08-01 17:32:48 +00:00
The_E 9cb2b7bf9a A bit of un-derping. 2012-08-01 17:23:05 +00:00
The_E 6439041e79 Fix for Mantis 2692: Invalid memory access in initial ship status editor. Also adds a line to ships.tbl "$Enable Team Colors: <BOOL>", inserted after the "$ND:" block and before the "$Default Team" entry, which can be used to switch on Team Colors without specifying a team.
Also adds a "None" entry to the Team color selection that can be used to switch off team colors.
2012-08-01 16:40:33 +00:00
zookeeper 188ced5934 Fixed includes forgotten from last commit. 2012-08-01 10:06:54 +00:00
zookeeper bc9c66e4ae Prevent garbage collection of texture handles which still have a non-zero load count. Underlying reason for why this can happen in the first place still unknown. 2012-08-01 09:45:26 +00:00
The_E e3fb584433 Patch from Pecenipicek that allows a "none" team color to be defined in ships.tbl 2012-07-31 18:27:07 +00:00
The_E 48fb6a7d49 Remove a define from the builtin shader that was causing issues now that AMD has fixed their driver's clipping behaviour 2012-07-31 14:18:27 +00:00
chief1983 a069d8f27a From pecenipicek: Fix team colors bug in built-in shaders. 2012-07-30 06:34:04 +00:00
Goober5000 67a06aab4d clean up some of the CString code in FRED 2012-07-30 01:49:57 +00:00
Goober5000 2cc30e1890 unherp the derp 2012-07-29 20:59:44 +00:00
Goober5000 137684cbbb remove warning 2012-07-29 20:57:35 +00:00
Goober5000 b499b1fc7a move the selection effect settings into game_settings.tbl because putting them in ai_profiles.tbl is incorrect and misleading
also, fix game_settings.tbl to not leave some settings uninitialized
2012-07-29 20:57:20 +00:00
Goober5000 95e0088d13 m!m's patch for returning invalid IDs 2012-07-29 19:22:48 +00:00
The_E 4d588e94fe Do not penalize for linking weapons with WIF3_NOLINK 2012-07-29 17:54:23 +00:00
The_E ad69d4480a A few fixes for the On Weapon Fired hook. 2012-07-29 17:31:08 +00:00
Goober5000 49da4a1d33 hooray for parentheses 2012-07-29 17:00:18 +00:00
The_E 420ad4a06a New weapons.tbl flag: "no primary linking" Weapons with this flag can not be linked with other weapons. This also introduces a third (!) field for weapon flags. 2012-07-29 11:32:39 +00:00
The_E 2dae8157bb New weapons.tbl flag: "anti-subsystem beam" Enabling this allows the turret AI to use beams against subsystems 2012-07-29 11:09:36 +00:00
Goober5000 5d51a80547 more warning reduction 2012-07-29 07:47:49 +00:00
Goober5000 b4e09672bc m!m's modular sounds patch, with minor modifications 2012-07-29 07:35:37 +00:00
Goober5000 a525d0adbc this gets rid of the "conversion to ushort" warning, strangely 2012-07-29 07:34:46 +00:00
The_E d62326c3e9 Ooops, this should not be here twice 2012-07-28 21:13:37 +00:00
The_E e0405ebdb6 After a long time being tested in TAP, Team Colors are now stable. Please refer to http://www.hard-light.net/forums/index.php?topic=79743.0 for details. 2012-07-28 20:53:57 +00:00
Echelon9 c2ec77f66f Fix commit 2628 - treatment of is_training_mission(). Nothing like fixing 6.5 year old bugs. 2012-07-26 14:01:32 +00:00
Goober5000 94fae9be50 some const stuff, useful for the sounds patch 2012-07-26 07:46:35 +00:00
niffiwan 8b20f576d6 Fix 4 for #2590: don't use "j" when its value could be greater than the array size - thanks to Zacam & Goober for finding this 2012-07-24 10:02:11 +00:00
Goober5000 890273c22c allow skyboxes to be rendered at a custom orientation 2012-07-24 03:53:25 +00:00
Goober5000 39e8f1e376 I guess these need to be listed in the project file? 2012-07-24 03:37:40 +00:00
Swifty 87326ac68e Fixed glow points in the Tech Room. 2012-07-22 08:35:44 +00:00
Goober5000 2a6e39bef7 standardize conversion to radians 2012-07-20 23:19:11 +00:00
Echelon9 f00943355e PVS Studio fix: V619 The array 'Players' is being utilized as a pointer to single object. hudsquadmsg.cpp 2595 2012-07-19 14:38:01 +00:00
Goober5000 493c6d0a92 these arguments are needed 2012-07-19 03:31:37 +00:00
Goober5000 d5c481770b update SCP credits, add $Music: for credits.tbl 2012-07-19 02:31:10 +00:00
Swifty 951af0427e Corrected glow point directional attenuation. Need to use world coordinates of glow points, not local. 2012-07-18 08:07:47 +00:00
Echelon9 abdebd208e PVS-Studio fix: V601 The 'true' value is implicitly casted to the integer type. Inspect the fifth argument. lua.cpp 6982 2012-07-16 12:19:00 +00:00
Echelon9 225af83a6b PVS-Studio fix: Subtle one, as FALSE (the define) is not the same as false (the boolean).
V601 The 'false' value is implicitly casted to the integer type. hudtarget.cpp 1346
2012-07-16 12:14:28 +00:00
Echelon9 fa3d85d9df PVS-Studio fix: V601 The 'true' value is implicitly cast to the integer type. Inspect the second argument. 2012-07-16 12:08:57 +00:00
Echelon9 9728afc774 PVS-Studio fix: There is only one PI.
V624 The constant 3.14159 is being utilized. The resulting value could be inaccurate.
2012-07-16 11:44:22 +00:00
Echelon9 f256f3137a Whoops, fix commit r9020 2012-07-16 11:34:02 +00:00
Echelon9 e2e99f8a8a PVS-Studio fix: V619 The array 'shipp->ab_info' is being utilized as a pointer to single object. shipcontrails.cpp 2012-07-16 11:26:43 +00:00
Echelon9 5303ee95b4 PVS-Studio fix: V619 The array 'v' is being utilized as a pointer to single object. gropengldraw.cpp 2012-07-16 11:16:28 +00:00
Goober5000 f413ad2857 prevent ships with mismatched models and tables from causing crashes later on (Mantis #2689) 2012-07-15 22:54:47 +00:00
Goober5000 d4dc153515 this is a slightly modified version of m!m's patch for Mantis #2688 2012-07-15 18:48:42 +00:00
Echelon9 8f9a4cfe45 Commit contribution from community for Lua debug as preference, while preserving old behaviour. Sorry I don't have the name of the contributor or can find the original thread containing this patch. 2012-07-15 15:53:51 +00:00
Goober5000 449a0dcfb9 add four useful sexps: set-arrival-info, set-departure-info, set-debriefing-toggled, set-subspace-drive
also, fix a hole in the oswpt routine (and a few sexps) dealing with wings that weren't present yet
2012-07-15 05:21:12 +00:00
Goober5000 9314251a2e this really ought to be a Warning, not an Error 2012-07-15 05:16:13 +00:00
Goober5000 58b99031b6 m!m's fix for signed/unsigned mismatch
(IT'S OVER 9000!!!)
2012-07-14 18:11:21 +00:00
Goober5000 e48a1e34f3 we want to truncate based on number of lines, not number of characters
also, we want to truncate the FRED error message boxes too
(this is a better fix for Mantis #2658)
2012-07-14 06:23:45 +00:00
Goober5000 b3e2821efd that's an order of magnitude too high for integers 2012-07-14 05:34:44 +00:00
Goober5000 bf53ce2ffa check to make sure a wing that has a player does not also have an arrival delay (Mantis #2678) 2012-07-13 05:06:08 +00:00
Swifty 12d9500e5c Target direction arrow properly disappears when target is placed under reticle. Fixes Mantis 2504. 2012-07-12 07:26:45 +00:00
karajorma d77d5ca81f It's about time these changes got committed. They've been tested by Diaspora for over a year without issue. 2012-07-12 06:27:36 +00:00
The_E e3473857f1 Various fixes and additions to the lua API from m!m:
Matrix vectors: getUvec(), getFVec() and getRVec()
equals operators for weaponclass and shipclass to improve performance where a string comparison was needed before
Cockpit display interface. Allows scripting to access the cockpit displays defined in ships.tbl and render to them using RTT
A getParent() function in the subsystem handle which returns the parent object of the subsystem
Numerous fixes in the way turret subsystems are handled which now results in more correct behavior
Targetable variable in subsystem which specifies if the subsystem is targetable or not
getNextFiringPosition() function in subsystem which returns the position and the direction of the next firing operation of the specified turret
Scripting access to post processing values
getCurrentCamera() function to retrieve the currently active camera
setLineWidth() to modify the width of the lines that are getting drawn
setClip() and resetClip() to set the clipping areas used for drawing
2012-07-11 17:19:33 +00:00
Goober5000 931efc529e add the mission cutscene save type, per Karajorma and MjnMixael 2012-07-09 06:48:53 +00:00
Goober5000 dd32379441 in the interest of avoiding mysterious and subtle differences in AI behavior, restore retail behavior where:
a) the player's wing forms on him at mission start
b) wings in the Starting_wings list will form on the player if they arrive later in the mission
c) no other wing automatically forms on its leader
2012-07-09 05:29:43 +00:00
Goober5000 62dd4bed46 also revert the "nohtl" part of r8977 for FRED (Mantis #2676) because no-HTL models shouldn't use HTL rendering 2012-07-07 21:01:27 +00:00
Goober5000 b896cf3b15 revert r8975 because this fix adds unwanted diagonal lines to the jump node model (Mantis #2396) 2012-07-07 21:00:37 +00:00
Goober5000 d04a9051ec niffiwan's fix for Mantis #2681 2012-07-07 20:51:39 +00:00
The_E 03067d1312 Fix for Mantis 2682: extra glowpoints are rendered for targeted ships 2012-07-07 14:31:14 +00:00
The_E 5e4c4c298b *sigh* And because MSVC6 is a bit on the stupid side (read: Does not know about this little thing called C++0x), I have to do this bit of ugliness. 2012-07-07 08:41:12 +00:00
Goober5000 a74947ced9 restore this extra space, which is necessary for formatting purposes 2012-07-07 07:39:46 +00:00
The_E a98fda19eb Removing the rest of the glBegin()/glEnd() pairs. 2012-07-07 06:45:35 +00:00
niffiwan 33bc4cb1a8 Fix number 3 for mantis #2590 - move array overflow detection to correct place in loops 2012-07-07 01:39:27 +00:00
niffiwan 06d8773760 Sync linux binary name format between 3.6.14 & trunk 2012-07-04 10:13:25 +00:00
Goober5000 bf852eda06 replace variables in recommendations too 2012-07-04 05:38:51 +00:00
Echelon9 f06651f32a Fix for Mantis 2677: Compiler errors following r8973, thanks to niffiwan 2012-07-03 13:13:23 +00:00
niffiwan 358709929f Linux release compilation back to using -Wall, but with -Wno-write-strings 2012-07-03 10:01:20 +00:00
Goober5000 e07c530e98 fix a rather important variable initialization
(follow-up to r8967)
2012-07-03 05:12:24 +00:00
Goober5000 e4d1345f08 this is the equivalent of r8975 for FRED (Mantis #2676) 2012-07-03 05:05:33 +00:00
Goober5000 12a216050e attacking a protected target will remove its protected flag, so don't allow this if hit by EMP
(Mantis #2192)
2012-07-03 05:02:32 +00:00
Goober5000 840ac7fc4c Zacam's fix for Mantis #2396 2012-07-03 05:01:33 +00:00
Goober5000 757bd15690 fix for Mantis #2179, proper afterburner shutdown 2012-07-03 03:46:18 +00:00
The_E e0f3c17b2a Changes the glBegin()/glEnd() stuff we were using in some places to the more modern glDrawArrays() way of doing things. Thanks to Kromaatikse for the initial implementation. 2012-07-02 15:48:56 +00:00
Goober5000 a62b615252 fix Mantis #1972: hotkey brackets are drawn around stealth ships 2012-07-02 06:00:41 +00:00
Goober5000 ac01fec401 fix TD2192...
[derp, wrong game]
fix Mantis #2192, EMP brings play-dead fighters back to life
2012-07-02 03:47:53 +00:00
Goober5000 88dadc0405 CommanderDJ's set-player-throttle-speed 2012-07-02 02:17:35 +00:00
Goober5000 c5fdcbe102 wings that are initially docked will now arrive in mission correctly 2012-07-02 01:59:35 +00:00
Goober5000 cd7ecea3cb follow-up to r8922: this part isn't actually a problem 2012-07-01 19:54:22 +00:00
Goober5000 91254dc872 make the dock leader code more robust, and make FRED mark dock leaders in wings correctly 2012-07-01 08:17:59 +00:00
Goober5000 5d2c2f9afd add more error checking for initially docked ships, per Mantis #1658 2012-07-01 05:56:15 +00:00
Goober5000 2aaf428337 looks like this was never actually implemented! 2012-07-01 05:54:26 +00:00
Goober5000 9110b7dded add mod.tbl flag for Mantis #82 2012-07-01 04:32:03 +00:00
Goober5000 49537e6b5a remove extension if user didn't 2012-07-01 04:17:22 +00:00
Goober5000 ed2b76ad40 this should fix all of the issues with docked fighters and bombers (Mantis #945) 2012-07-01 03:24:41 +00:00
Goober5000 38af5bdc77 fix for Mantis #2673, following Valathil's detective work 2012-06-30 23:31:48 +00:00
karajorma 9109febf79 Minor fixes to the message.tbl settings I just added. 2012-06-25 14:23:00 +00:00
Goober5000 d8c518153b fix the old Volition bug where a docked ship would execute its default behavior even when the preceding comment explicitly said that it should "just sit here" :-/
also guard against a few edge cases related to this
(all of this is in regards to Mantis #945)
2012-06-25 10:39:26 +00:00
Goober5000 63d5c2d1cc remove unused variable 2012-06-25 07:06:03 +00:00
Goober5000 a0b0733aa3 CommanderDJ's fix for Mantis #2628 2012-06-25 06:41:06 +00:00
Goober5000 df33fcf2b1 fine-tune Valathil's error message 2012-06-25 04:27:26 +00:00
The_E 7ed7f4d7db Changing glowpoint rendering from being a separate step during model rendering to being a part of the batch renderer. This makes glowpoint rendering much faster. 2012-06-24 20:17:46 +00:00
Valathil 1c7b321795 Fix for Mantis 2671: Skip submodels that have been blown off in ship-ship collisions. 2012-06-24 18:12:43 +00:00
Valathil 667f79cd65 Fix for Mantis 2670: Followup: Fix the bug without breaking mission parsing. 2012-06-24 14:04:16 +00:00
karajorma cb7b81aa9e Additions to message.tbl to allow users to specify the frequency of builtin messages. 2012-06-24 11:36:45 +00:00
IssMneur fee78ac7d3 No warnings for release linux builds. 2012-06-23 21:19:41 +00:00
Valathil 147138e327 Fix for Mantis 2670: Truncate tokens to their maximum length and pop up a MessageBox for the user. 2012-06-23 20:54:05 +00:00
Goober5000 b1928b4edc synchronize the ship classes that evade shockwaves
(this fixes Mantis #2548)
2012-06-23 11:51:47 +00:00
Goober5000 ce08eb1f76 restore retail behavior for chaining by reverting r8603 -- this fixes Mantis #2667
also add descriptive comment in header file
2012-06-23 10:31:42 +00:00
niffiwan b672f6769d Fix for mantis #2666: call the new HUD renderBitmap function for the red alert notification background image 2012-06-23 03:02:33 +00:00
The_E 78d15f25cc From CommanderDJ: Fix for Mantis 2657 (Alt-Shift-E does not clear escort list) 2012-06-22 15:55:43 +00:00
Echelon9 0d919a417b GCC warning: variable set but not used 2012-06-17 13:32:04 +00:00
Goober5000 2a601a11e8 MSVC6 compatibility 2012-06-17 05:43:28 +00:00
Goober5000 5f3c4e3602 revert r8893 since it's no longer needed and since RTTI adds overhead 2012-06-17 05:42:54 +00:00
Goober5000 96f5149827 since the if() block already checks for a specific gauge type, we can safely do the static_cast 2012-06-17 05:41:47 +00:00
Goober5000 c6afc5e8dc MSVC6 project should have Run-Time Type Information enabled 2012-06-17 05:04:48 +00:00
Valathil e921253fc7 Fix for Mantis 2665: Include Player Ship's in the search for valid Message Sources 2012-06-14 21:52:23 +00:00
niffiwan 4248462bef GCC warnings: more 'variable set but not used' 2012-06-14 11:21:09 +00:00
niffiwan bfa7e2c6fa GCC warnings: declaration of ‘ship_obj’ shadows a global declaration (weapon/*.cpp) 2012-06-14 10:30:01 +00:00
IssMneur bd0e3833dd Recommit 8843 with a simpler fix to the build failure with GCC. 2012-06-14 04:44:13 +00:00
IssMneur ecfcf48def Reverse 8843 as requested by Goober5000. Breaks compilation with GCC.
- This fix is too confusing.
2012-06-14 04:41:16 +00:00
Echelon9 f9de92df4b GCC warning: variable set but not used (related to HUD) 2012-06-13 14:50:57 +00:00
Echelon9 e99f9c2e98 GCC warning: defined but not used 2012-06-13 14:43:08 +00:00
Echelon9 41727a4f58 GCC warning: missing initialiser for member ‘opengl_shader_file_t::attributes’ 2012-06-13 14:26:30 +00:00
Echelon9 f17e4c6bce GCC warning: statement has no effect (clearing this warning as it was prevalent throughout) 2012-06-13 14:18:56 +00:00
Echelon9 437835ba82 GCC warning: missing initialiser for member ‘<anonymous struct>::bitmap’ 2012-06-13 14:10:52 +00:00
Echelon9 f1cc947f5e GCC warning: missing initialiser 2012-06-13 14:07:37 +00:00
Echelon9 6291a968f9 GCC warning: variable set but not used (further) 2012-06-13 14:07:05 +00:00
Echelon9 fb575da26b GCC warning: variable set but not used (fireballs.cpp) 2012-06-13 13:20:04 +00:00
Echelon9 4bd22f3cdd GCC warning: variable set but not used (within AI code) 2012-06-12 16:45:36 +00:00
Echelon9 8bef3bc28a GCC warning: variable set but not used (further cases) 2012-06-12 16:09:22 +00:00
Echelon9 d3cae20976 GCC warning: suggest curly brackets (braces) around empty body in an ‘else’ statement 2012-06-12 15:57:21 +00:00
Echelon9 c868a16513 GCC warnings: first pass of warning: variable is set but not used 2012-06-12 15:32:47 +00:00
niffiwan 383fa14273 GCC warning: weapon/shockwave.cpp - variable set but not used 2012-06-11 10:12:09 +00:00
niffiwan 47c251d612 GCC Warnings: mission/missiontraining.cpp - variable set but not used 2012-06-11 09:56:13 +00:00
niffiwan 92ea540b65 GCC Warnings: mission/missiontraining.cpp - variable defined but not used 2012-06-11 09:51:16 +00:00
Valathil d31f858052 Fix for Mantis 2631: Take the main hall of first mission of the fallback campaign as the current one and save the campaign to the pilot struct. 2012-06-11 04:53:35 +00:00
niffiwan bba234afb5 Fix for last bit of mantis #2410: show training messages when hud-disabled-except-messages 2012-06-11 03:45:12 +00:00
Goober5000 b70ffe26c8 Valathil's fix for Mantis #2652 2012-06-11 03:22:48 +00:00
Goober5000 7d5523d73c remove the unnecessary null sets 2012-06-11 03:17:55 +00:00
Goober5000 ed8825bb98 remove the vestiges of free_flight_time, which never worked 2012-06-11 02:52:43 +00:00
Goober5000 89f9151d4d fix some aspects of homing (pun not intended), including hopefully Mantis #2652 2012-06-11 02:40:05 +00:00
Goober5000 ef728764ad parentheses are A-1 SUPAR 2012-06-11 01:04:46 +00:00
Goober5000 de3ac905c1 fix download destination 2012-06-10 04:19:21 +00:00
Goober5000 5311e4c918 add downloading? 2012-06-10 04:14:38 +00:00
Goober5000 5d3c371a6a minor fix 2012-06-10 04:14:14 +00:00
Goober5000 2128f493a6 Zacam's new header 2012-06-10 04:04:45 +00:00
Goober5000 77e65840dd install panel 2012-06-10 02:00:54 +00:00
Goober5000 4d39ca820b fix the line-wrapping algorithm, as pointed out by Zacam 2012-06-10 00:06:11 +00:00
Goober5000 429cd35dd6 again with 1.5 2012-06-09 22:42:25 +00:00
Goober5000 cdb839a542 some more work on the installation section 2012-06-09 22:42:12 +00:00
Goober5000 ce0944563a create the logs folder if it doesn't already exist 2012-06-09 22:13:07 +00:00
Goober5000 44186b9709 rewrite ProgressBarDialog to not use SwingWorker (for 1.5 compatibility) 2012-06-09 21:47:03 +00:00
Goober5000 dd66b119d6 use default directory
handle Java security exceptions in a user-friendly way
add a directory task for checking write access, presence of FS2, and presence of spurious VPs
2012-06-09 20:19:50 +00:00
Goober5000 88b1fc005e minor tweaks and fixes 2012-06-09 20:17:56 +00:00
Goober5000 21d08ec512 changes for compatibility with 1.5... mostly @Override annotations on implemented interfaces 2012-06-09 17:17:49 +00:00
Goober5000 b2b47430da a few more fixes 2012-06-09 05:30:42 +00:00
Goober5000 efd487a30f refine the way the configuration works because we want to be able to expand this to standalone mods in the future 2012-06-09 05:29:12 +00:00
Goober5000 a860ad8257 rewrite for compatibility with 1.5 2012-06-09 03:51:23 +00:00
Sushi 22ef0536f7 Mastadon's fix to make auto-target pick the nearest enemy ship instead of the nearest ship attacking the player.
http://www.hard-light.net/forums/index.php?topic=80906.msg1614837#msg1614837
2012-06-09 01:33:53 +00:00
The_E 2d9d70913b From CommanderDJ: Fix for Mantis 2663 (hud-set-color only works once per mission) 2012-06-08 14:45:41 +00:00
The_E 26f3fa6cca As requested and tested by VA, bumping MAX_INSTANCE_DEPTH to 10 2012-06-06 10:50:23 +00:00
Sushi 5563781514 Fix Evil Turret Bug of Doom. :) 2012-06-06 06:17:23 +00:00
IssMneur 57cc4a770f Reformat the function modified by 8842 so that we don't jump over a variable initialization
This issue was not picked up by VC, and was brought to my attention by ZekeS on #scp and his GCC build. Fix was tested by ZekeS.
2012-06-02 23:25:08 +00:00
IssMneur 79036c21dd From Mastadon: "target nearest attacker" now selects only *attacking* hostiles
Fixes #2659
2012-06-01 02:07:56 +00:00
IssMneur 0ed31753e7 From Mastadon: "Target closest attacker" cycles through all attackers; misc code cleanup.
- Changed "target closest attacker" command to cycle through the other baddies gunning for you by pressing the "target closest attacker" command repeatedly.
- The new functionality behaves similarly to the "target closest hostile" key.
- Moved the esct (or, the "Evaluate Ship as Closest Target" struct) to hudtarget.h, where a type declaration belongs.
- Moved the documenting comments for hud_target_closest() to be just above the function definition.
-- Also, converted these comments to doxygen format.
2012-06-01 02:05:14 +00:00
niffiwan 404f82120a Add mod_table.* to codeblocks 2012-05-30 08:48:47 +00:00
Echelon9 57a970dd4d Implement EModelAnimationPosition enum to more completely address boolean issue fixed in r8837 2012-05-29 10:27:52 +00:00
niffiwan eaea9218df GCC Warning: declaration shadows a global declarationa (hudparse.*) 2012-05-29 10:24:00 +00:00
Echelon9 430f1d7995 PVS-Studio fix: The 'false' value is implicitly casted to the integer type. 2012-05-29 09:55:54 +00:00
Goober5000 72ee16fa6c add very rudimentary queuing of install items 2012-05-29 05:01:51 +00:00
Goober5000 bbcf76f0cc Downloader is now set up to represent a single download task, which fits better with the way its listeners are set up 2012-05-29 05:01:29 +00:00
Goober5000 055dff7d99 truncate assert strings, warnings, errors, and dump buffers if they are too long
(this should fix Mantis #2658)
2012-05-28 22:24:53 +00:00
Echelon9 2c498d9fee PVS-Studio fix: The 'false' value is implicitly casted to the integer type. 2012-05-28 13:35:39 +00:00
Echelon9 3f2814f131 PVS-Studio fix: The 'modified' variable is assigned values twice successively. Perhaps this is a mistake (freespace.cpp:4666,4668) 2012-05-28 13:20:40 +00:00
niffiwan 0aeec34f5b Mantis 2419: add a new ETS gauge that behaves like the retail one 2012-05-28 08:13:35 +00:00
Echelon9 df99062e10 GCC warning: Absence of curly brackets in initialiser 2012-05-27 15:00:40 +00:00
Echelon9 bb22bd6b75 GCC warning: base_res[0] and base_res[1] may be used uninitialised in this function 2012-05-27 14:52:56 +00:00
Echelon9 9f737c7079 GCC warning: initialisation reorder 2012-05-27 14:46:00 +00:00
Echelon9 df1ac0c435 GCC warning: suggest brackets (parentheses) around '&&' within '||' 2012-05-27 14:38:53 +00:00
Echelon9 a5cfd79ee3 GCC warning: comparison between signed and unsigned integer expressions 2012-05-27 14:23:41 +00:00
Echelon9 ead0c16c17 GCC warning: passing NULL to non-pointer argument, in hudtarget.cpp 2012-05-27 14:16:00 +00:00
Echelon9 6dde3485f5 GCC warning: passing NULL to non-pointer argument, in gropenglpostprocessing.cpp 2012-05-27 14:13:25 +00:00
Echelon9 93554b9daf GCC warning: missing curly brackets (braces) around initialiser for 'vec3d::<anonymous union>::<anonymous struct>' 2012-05-27 14:07:34 +00:00
Echelon9 c8db334bcf GCC warning: Defined by not used, in lua.cpp 2012-05-27 14:00:17 +00:00
Echelon9 101f8ee858 GCC warning: converting to non-pointer type 'int' from NULL 2012-05-27 13:53:04 +00:00
Echelon9 a1e9906ff1 GCC warning: Fix absence of parentheses, further 2012-05-27 13:35:05 +00:00
Echelon9 9317e3de69 GCC warning: converting to non-pointer type 'char' from NULL 2012-05-27 13:32:08 +00:00
Echelon9 2c9a70d297 GCC warning: Fix absence of parenthesis 2012-05-27 13:07:53 +00:00
Goober5000 eaf345af79 some tweaks, such as printing the version underneath the mod name 2012-05-27 07:46:31 +00:00
Goober5000 ce78c5c8bb keep track of mod versions that have already been installed
also, load legacy mod version information from Turey's old installedversions file
2012-05-27 07:26:53 +00:00
Goober5000 9883ebb233 fix for Mantis #2117 (dock names with trailing spaces cause errors) 2012-05-22 08:39:13 +00:00
Goober5000 dc1ac7de44 restrict multi-editing for Mantis #1681 2012-05-22 06:43:38 +00:00
Goober5000 30f6e73488 time the briefing stages appropriately for text-to-speech (Mantis #2637)
also, make the briefing speech timing, which is badly written, a little bit more like the command briefing, which is a bit better written
2012-05-21 08:05:18 +00:00
Goober5000 f207283746 the Microsoft documentation was misleading; there is a hidden "queued to speak" state 2012-05-21 05:24:47 +00:00
Goober5000 c4a2bf187c project changes to enable simulated speech 2012-05-21 03:53:58 +00:00
Goober5000 b4cb28fb1f if a movie fails to play, give back the mouse cursor 2012-05-20 20:50:17 +00:00
Goober5000 e2a62ed35d restore code that was inadvertently deleted, fixing Mantis #2478 2012-05-20 19:25:38 +00:00
niffiwan c0dca6fea9 Documentation for head-ani's && messages 2012-05-20 10:07:21 +00:00
niffiwan 20d742f111 GCC: remove trivial warning: multi-line comment [-Wcomment] 2012-05-20 06:31:09 +00:00
niffiwan 92eb151c21 save a tiny amount of RAM when creating BMP_AABITMAP bitmaps 2012-05-20 06:15:23 +00:00
niffiwan 1be4d003c9 Fix for mantis 2655: play messages at least until head ani finishes 2012-05-20 06:03:24 +00:00
niffiwan 130c5a97f4 Fix for mantis 2411: allow repeated messages to play head anis 2012-05-20 05:41:53 +00:00
zookeeper ea969dea69 Decoupled height and normal maps in one more place. 2012-05-19 10:10:12 +00:00
The_E 56e1b724de Ooops, forgot the safety check 2012-05-19 09:27:36 +00:00
The_E 1b43f1423f Decoupling height and normal maps 2012-05-19 09:22:11 +00:00
The_E 5072ec800b Turn -height into -noheight, to follow the precedent set by the other flags. 2012-05-19 08:51:12 +00:00
karajorma fac2db1ba1 Niffiwan's fix for 2590 seems to have introduced a bug of it's own. Easy enough to fix it though. 2012-05-19 02:28:41 +00:00
zookeeper b0d8d2ee60 Added changes missing from previous commit. 2012-05-18 17:02:49 +00:00
zookeeper 23be454e36 Allowed detail spheres to provide an $offset: x,y,z prop to offset the sphere from the model center. 2012-05-18 15:24:45 +00:00
Echelon9 62b82c9f42 GCC: Remove unused variable 2012-05-17 17:51:51 +00:00
Echelon9 036924a24f GCC: warning: converting to non-pointer type 'char' from NULL 2012-05-17 17:36:55 +00:00
Echelon9 0cb6c022cf Remove some unused variables 2012-05-17 17:20:36 +00:00
IssMneur a334a53efa From jg18: Allow FSO to actually fetch the max anisotropy value rather than hard capping at 2.0. 2012-05-17 03:10:12 +00:00
IssMneur f8037a8fd2 Fixes #2624. The sound environment should now track the camera correctly. 2012-05-17 02:57:33 +00:00
Goober5000 9c42bba13c if we are ignoring whitespace and we encounter a newline, don't eat it 2012-05-15 01:27:38 +00:00
Goober5000 df067ce460 make the closing color span brace be $} instead of $c} 2012-05-15 01:26:36 +00:00
Goober5000 e00557df52 add capability to specify different nested default colors
(see http://www.hard-light.net/forums/index.php?topic=80766.0)
2012-05-14 06:48:47 +00:00
Goober5000 0984aae308 remove small warning 2012-05-14 06:32:58 +00:00
Goober5000 18f56ae734 other people than me also deprecate sexps now 2012-05-14 06:23:05 +00:00
The_E 6602907b3e Fix for Mantis 2647, take two: Remove the pointers in question 2012-05-13 19:38:21 +00:00
Echelon9 fed15486fb Fix PVS-Studio warnings: The 'rval' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: freespace.cpp:8277, 8281.
The 'then' statement is equivalent to the 'else' statement. freespace.cpp:8311.
2012-05-13 05:00:31 +00:00
The_E 2d1cfce09a Introduces "-misc" maps, which can be used to pass information to shaders using the sMiscmap sampler and FLAG_MISC_MAP shader define. 2012-05-12 21:08:15 +00:00
The_E f5d85d038a Add a log print for my previous mod.tbl addition 2012-05-11 11:30:19 +00:00
The_E 8b45f6a348 Since we can't change the default cutscene camera behaviour (switching off the HUD when cutscene camera is active), this introduces a mod.tbl setting to alter this behaviour.
The new setting is called "$Cutscene camera disables HUD:", is a boolean, and defaults to true.
2012-05-11 07:57:01 +00:00
Goober5000 8e5a53e133 supernova-stop sexp, written by CommanderDJ 2012-05-11 06:34:49 +00:00
The_E f959d481f5 Partial fix for 2410: Fixes Directive gauge ignoring hud-disable-except messages 2012-05-10 21:38:15 +00:00
The_E 5b362827a0 Fix for Mantis 2606: Local SSMs fired in swarm may cause propagating NaN errors 2012-05-10 20:54:40 +00:00
The_E 0dc1480394 Make sure we use a valid pointer for 8768 2012-05-10 15:06:41 +00:00
The_E 1f5f6eb1ea Fix for Mantis 2647: Pointers becoming invalid when going out of scope during armor calculations (PVS Studio warning) 2012-05-10 15:04:05 +00:00
The_E 53848a6868 From CommanderDJ: Patch for Mantis 2650 (Allow 0 door animations in mainhall.tbls/tbms) 2012-05-10 12:32:19 +00:00
karajorma 1b5d55d943 Add a SEXP allowing the FREDder to change the orders a player can give to a ship. 2012-05-09 05:09:40 +00:00
niffiwan 3290aa9920 From m!m: Fix for mantis #0002648 - skip intercom mainhall sounds when none are defined 2012-05-08 07:28:45 +00:00
Goober5000 33dd8a90af make the install page display the mods it will install 2012-05-07 07:52:25 +00:00
Goober5000 3bc93b25d1 make those classes and methods static again, and use SharedCounter to bridge the gap 2012-05-07 07:18:33 +00:00
Goober5000 1fe8e51a39 correct behavior of selecting/deselecting parents/children
disable Install button if nothing is checked
2012-05-07 04:23:47 +00:00
Goober5000 a49c2041d5 change InstallerPage to WizardPage
add word-wrapping capability to mod descriptions
2012-05-07 02:56:51 +00:00
Echelon9 a2605d58ba PVS-Studio fix: The conditional expressions of the 'if' operators situated alongside each other are identical. multi_ingame.cpp: 1073, 1086 2012-05-06 14:23:11 +00:00
Echelon9 5268e8c570 Fix The_E's partially broken commit in r8757 -- there is no wi_flags3 or WIF3_NOLINK yet 2012-05-06 06:47:12 +00:00
niffiwan f19103014d From CommanderDJ: Fix for mantis #0002646 2012-05-06 03:46:03 +00:00
The_E 7ad43ec365 Fixes a few more bugs with the On Weapon Deselect hook 2012-05-05 22:05:46 +00:00
zookeeper f51ddb925c Fixed a pointer assignment which should have been a value assignment. 2012-05-05 15:01:14 +00:00
The_E cbf1b58436 Adds ability for scripting to manipulate subsystem armor classes and shield armor classes as well. 2012-05-05 14:39:49 +00:00
The_E f7da03f2cd Adds scripting access to a ships' armor type. 2012-05-05 14:07:31 +00:00
The_E 7cccae4a4a Clarifies the code for the On Weapon Fired hook. also adds On Primary Fire and On Secondary Fire hooks. 2012-05-05 13:46:24 +00:00
The_E f3b7935982 Change this little piece of code to avoid a potentially very baffling null pointer dereference later on 2012-05-05 12:50:06 +00:00
Valathil 45e7b93efd Fix for transparent submodels that are children of submodels. 2012-05-04 21:26:49 +00:00
Valathil ca3ea60744 Fix for transparent cockpits that should'nt be transparent. Breaks lightshafts for cockpit models with glass which don't use "-trans". This may be remedied in the future. 2012-05-04 18:49:34 +00:00
Echelon9 55a0f314d8 Fix Mantis 2644: Replace vector<bool> with proper STL deque<bool>, thanks IssMneur and CommanderDJ 2012-05-02 15:20:57 +00:00
Echelon9 b14d17daa0 Utilise the CLAMP() utility macro in a further range of appropriate locations 2012-05-02 15:15:48 +00:00
Echelon9 83e127ab2b Use CLAMP utility macro in lightin.cpp 2012-05-02 14:48:22 +00:00
Echelon9 1d8f7aafeb Documentation: Doxygen comments for lighting.cpp 2012-05-02 14:35:50 +00:00
chief1983 fb8d0e241b Remove ltests from Xcode 3 project file. 2012-05-01 18:48:28 +00:00
karajorma e62b2c85de Fix a bug that caused bombs to be indestructible by the player for much longer than they should be according to the table settings given. 2012-04-30 07:47:23 +00:00
karajorma 74752957e8 Fix the bug in closing the event editor that caused it to take minutes with some missions rather than seconds. 2012-04-30 07:26:44 +00:00
Echelon9 d96359f722 Fix Assert and Assertion for non-MSVC compilers, due to changes in r8692; Fix use of C++11 cbegin/cend() STL operators as these are not going to be supported widely yet, due to changes in r8693 2012-04-29 11:10:29 +00:00
IssMneur 0a967c395b Make the asteroid.tbl parser generate a more useful error messages.
- Converts asteroid_info into the class that it is.
- Changes the asteroid.tbl parser to parse the table as specified
- Also removes the attempts at being clever from the asteroid.tbl parser.
2012-04-29 04:10:58 +00:00
IssMneur f0204a82d4 Rename the args of Assert and Assertion macros to be more helpful than just 'x' and 'y'. 2012-04-29 03:52:30 +00:00
Echelon9 f3bba752be Documentation: Doxygen comments throughout mainhallmenu.cpp 2012-04-29 03:49:00 +00:00
The_E 31078b80f1 Update the MSVC projects to remove ltests.c from the lua library. 2012-04-27 11:01:24 +00:00
Echelon9 d98b1428f3 Upgrade internal Lua interpreter to 5.1.5 bugfix release; announcement details http://lua-users.org/lists/lua-l/2012-02/msg00639.html 2012-04-25 13:40:32 +00:00
Echelon9 b4070ae0a2 Fix Mantis 2640: Double free in missionbriefcommon.cpp, thanks 3dL3XAqPiDaS5WF2 2012-04-22 13:44:06 +00:00
Echelon9 e2fd7ad6e7 Documentation: Remove redundant #includes 2012-04-22 13:36:31 +00:00
Echelon9 a68ae80bd0 Fix Mantis 2642: Cockpits are rendered incorrectly when post-processing is disabled, thanks m_m 2012-04-22 13:34:37 +00:00
Echelon9 acbde9115f Setting the floats correctly in avd_movement constructor 2012-04-22 11:27:31 +00:00
Echelon9 57935f2850 Eradicate the memset(this...) paradigm within ade_table_entry 2012-04-22 11:25:15 +00:00
Echelon9 f902846fa3 Eradicate the memset(this...) paradigm within class avd_movement 2012-04-22 10:54:59 +00:00
Sushi 0f73dd193a Add support for weapon spread over time (+FOF Spread Rate, +FOF Reset Rate, +Max FOF) 2012-04-21 15:40:06 +00:00
Echelon9 e11574eec4 These two variables were missed; the sort of overlooked error that is easy with this odd method of copy constructing... 2012-04-19 13:22:44 +00:00
Echelon9 31a1d488b4 warning C4018: '<' : signed/unsigned mismatch 2012-04-15 09:02:10 +00:00
Echelon9 c48d8be302 warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1037' 2012-04-15 07:55:27 +00:00
Echelon9 093af371b2 warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '832' 2012-04-15 07:44:11 +00:00
Echelon9 be277b8b8f warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1350' 2012-04-15 07:17:51 +00:00
Echelon9 d9e3878ab8 warning C6246: Local declaration of 'curspeed' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1877' 2012-04-15 07:14:58 +00:00
Echelon9 7a6e694ef0 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
Echelon9 f8394e554d warning C6246: Local declaration of 'exp' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '8063' 2012-04-15 07:02:18 +00:00
Echelon9 8926875f33 warning C6246: Local declaration of 'pm' hides declaration of the same name in outer scope. 2012-04-15 06:57:05 +00:00
Echelon9 bd655cc2b4 Ensure that the Xcode 4 project file can build Mac binaries for OS X 10.6, as well as 10.7 2012-04-15 06:20:56 +00:00
Goober5000 0a7e63e9c8 fix for Mantis #2630
(LUA is not mentioned, but the problem might affect that too)
2012-04-13 07:01:45 +00:00
Echelon9 590e2f7332 Documentation: Some extra notes within aiturret.cpp 2012-04-12 16:09:33 +00:00
Echelon9 7130c1813b Correct copy/paste error -- refer functions above for similar pattern used correctly 2012-04-12 16:05:57 +00:00
Echelon9 b9b660ad9f Documentation: Attempt to begin getting aiturret.cpp under control 2012-04-12 15:55:57 +00:00
Goober5000 7af8cee789 modular credits.tbl, courtesy of m!m
(with a few tiny tweaks)
2012-04-12 03:49:47 +00:00
Goober5000 b234f710e3 const-correctness in preparation for modular credits.tbl, courtesy of m!m 2012-04-12 03:48:24 +00:00
Echelon9 8e5510ae79 warning C6011: Dereferencing NULL pointer 'wp->turret_subsys' 2012-04-11 14:44:59 +00:00
Echelon9 e775a88369 warning C6011: Dereferencing NULL pointer 'lowest_vol_osp' 2012-04-11 14:44:05 +00:00
Echelon9 79d5c1f5ea warning C6280: 'tmp_Player' is allocated with 'new', but deleted with 'free' 2012-04-11 13:04:28 +00:00
Echelon9 fdddc99b89 warning C6246: Local declaration of 'props' hides declaration of the same name in outer scope 2012-04-11 13:00:28 +00:00
Echelon9 c24fcf8841 warning C6246: Local declaration of 'temp' hides declaration of the same name in outer scope. 2012-04-11 12:59:16 +00:00
The_E d5ad20aeb6 Do shader compilation during modelload, in order to avoid having to compile shaders during gameplay as much as possible 2012-04-09 12:43:20 +00:00
Swifty db8068fd4f Optimization: sped up rendering of trails by switching out g3_draw_poly with gr_render. Removed extra memory allocation. 2012-04-08 22:00:16 +00:00
Echelon9 19d69603d2 Remove redundant #includes to fs2open's internal linked list implementation 2012-04-08 01:39:34 +00:00
Echelon9 8a208a5cff Documentation: Complete documentation of CJumpNode 2012-04-07 23:31:23 +00:00
Echelon9 f755c95453 CJumpNode class code convention; convert to UpperCamelCase for class and function name; ensure all private variables adopt m_ prefix 2012-04-07 11:07:30 +00:00
Echelon9 05b729ad4b Documentation: A bit of code cleanup 2012-04-06 08:52:15 +00:00
The_E 1555c4b07b Converting this Assert() to an Assertion(), for better error logging 2012-04-04 22:01:32 +00:00
The_E d9eec34322 MSVC Analyze warning fix: Incorrect type passed as parameter in call to function printf() 2012-04-03 19:44:39 +00:00
The_E 59b6ad42c0 MSVC Analyze warning fix: Local declaration of variable hides variable of same name in outer scope 2012-04-03 19:35:37 +00:00
The_E d3b8d0f77f Change the MSVC2012 projects to use the MSVC2012 toolset 2012-04-03 19:34:22 +00:00
Echelon9 7a0cda6820 Fix Mantis 2632: Sounds assigned to objects get dropped when limit hardcoded gets reached. Patch from m_m 2012-04-02 21:32:47 +00:00
The_E 1df8d902de Fixes LLVM and Doxygen errors 2012-04-02 15:01:31 +00:00
The_E 9da38c9b28 New shader initialization code. This removes the big, ugly GL_Shader_file[] array, and changes shader compilation behaviour to only compile shaders on demand, not on program startup 2012-04-02 10:20:31 +00:00
zookeeper 5617ad9939 Made @Laser Color2 work even with a value of 0,0,0. 2012-04-02 06:35:19 +00:00
The_E cc5a3b5258 Same for secondary weapons 2012-04-01 15:09:24 +00:00
The_E d77d7e1727 Fix for Mantis 2635: Invalid memory access when saving a mission due to a weapon bank set to empty. 2012-04-01 14:57:09 +00:00
Echelon9 d83eae494e Fix Doxygen documentation for wl_draw_ship_weapons() 2012-04-01 08:25:53 +00:00
Echelon9 950389871d PVS-Studio fix: The 'Player' pointer is used simultaneously as an array and as a pointer to single object. 2012-04-01 08:06:21 +00:00
Echelon9 666cb5649b PVS-Studio fix: The 'Players' pointer is used simultaneously as an array and as a pointer to single object. Check lines: 1392, 1410. 2012-04-01 08:05:29 +00:00
Echelon9 aa9ce4aab4 PVS-Studio fix: The 'Weapon_info' pointer is used simultaneously as an array and as a pointer to single object. Check lines: 2962, 2975. 2012-04-01 08:04:40 +00:00
Echelon9 ea8a0fafdc Xcode4: Add the common schemes 2012-04-01 04:58:26 +00:00
Echelon9 6cc390141d Remainder of Xcode4 project files 2012-04-01 04:44:45 +00:00
Echelon9 cc3cf865c3 Add Xcode4 compatable project file, along with SDL v1.2.15 that addresses Mac OS X 10.7 compatability 2012-04-01 04:28:04 +00:00
The_E 22d11ea641 As per discussion for Mantis 2633, Reverting revision 8544 due to timer drift. 2012-03-31 20:30:09 +00:00
zookeeper 82e427089c Fixed a screwup in $detail_sphere distance calculation. 2012-03-31 20:10:26 +00:00
The_E ce475bebc8 Adding a few newlines here 2012-03-30 16:25:06 +00:00
Goober5000 7cbb75e7aa revision 8155 inadvertently made ALL weapons area-effect... so don't add an automatic inner radius (for Mantis #2634) but still be careful about potential divide-by-zero 2012-03-30 05:58:55 +00:00
Zacam 6b7388669e 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
Sushi 1efb727a08 Gliding bugfix: only "decay" glide speed when actually thrusting. 2012-03-27 15:31:08 +00:00
The_E e233d70beb Removing -img2dds, since it's highly unlikely that anyone would run into issues with it. 2012-03-25 21:22:27 +00:00
zookeeper 3664cadad0 Fixed a typo ("$Fix Turret Collisions:" -> "$Fixed Turret Collisions:"). 2012-03-22 06:52:35 +00:00
zookeeper e5cfa781f9 Moved the features from r8621 and r8622 behind two game_settings.tbl flags. 2012-03-22 06:15:39 +00:00
Sushi 22673a77ae Make $Max Turrets per Target only affect small ships (we can add a separate one for large ships later, if needed) 2012-03-21 15:07:28 +00:00
zookeeper 1216084289 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 883fc4f869 Made hits to a turret's barrel count as hits to the turret subsystem itself. 2012-03-21 12:31:02 +00:00
zookeeper e10ba0c7c0 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
Goober5000 01cbe6ffd2 considering that both the HUD and sexp_replace_variable_names_with_values work with SCP_string, just use SCP_string directly and remove the character limit
also, MESSAGE_LENGTH isn't 32 characters
2012-03-16 04:09:30 +00:00
karajorma 84a5899b6c Fix a rather unhelpfully vague piece of the SEXP documentation. 2012-03-16 03:28:57 +00:00
Swifty eafb219fed Added hud-clear-messages. Clears active messages currently displayed. 2012-03-14 05:25:07 +00:00
Swifty f8783cbe3d Allowed hud-set-directive and hud-set-message to set custom gauge text up to MESSAGE_LENGTH instead of NAME_LENGTH. 2012-03-13 06:54:13 +00:00
niffiwan e837a94f13 Update to 8602 - an even simpler fix 2012-03-12 10:08:10 +00:00
Goober5000 58d193c8fa this isn't needed 2012-03-12 06:52:32 +00:00
Goober5000 c0cc50e06d redo the fix for Mantis #2627 so that we don't create temporary SCP_strings 2012-03-12 06:49:28 +00:00
Echelon9 1a0dcbbe60 Fix for Mantis 2629: PVS-Studio warning: The variable j is being used for this loop and for the outer loop. (controlsconfig.cpp 1613) 2012-03-11 11:19:06 +00:00
niffiwan b7ebe32b24 Fix for mantis #0002627: save filename to temp var in generic_anim_init 2012-03-10 04:01:51 +00:00
chief1983 9c71cd8cd8 This is probably a better way to add silent rules support. 2012-03-09 23:09:24 +00:00
chief1983 50eedbf300 Fix line ending issues from happening here too. 2012-03-09 18:32:17 +00:00
karajorma 34308fc992 Well I find it hard to believe that in over eight years three senior SCP coders couldn't find THAT!
Fix Mantis 0082 (Repeat count sexp does not work reliably)
2012-03-08 15:19:42 +00:00
niffiwan dc343bc603 Reorder setting of filename in game init to stop missions crashing in load screen 2012-03-08 10:55:33 +00:00
niffiwan 50ad494d4e Fix gcc compile error with yet more const ness 2012-03-08 10:55:22 +00:00
Goober5000 8b01673616 MOAR const-correctness! 2012-03-08 08:12:56 +00:00
Goober5000 3c7c49b12d sexp strings are now SCP_string 2012-03-08 06:48:44 +00:00
Goober5000 9423d17036 const-correctness and SCP_string which is useful for sexp string conversion 2012-03-08 06:46:25 +00:00
Goober5000 0722b297f9 fix a derp by Echelon9 (local variable was hiding the member field) 2012-03-08 03:09:40 +00:00
niffiwan ea5d3e7320 From Echelon9, fix for mantis #0002621 2012-03-07 09:23:34 +00:00
Goober5000 4f81f522b5 convert briefing and debriefing to use SCP_string 2012-03-07 05:23:21 +00:00
Goober5000 32e64206a1 one more bit of const-correctness 2012-03-07 05:22:55 +00:00
Goober5000 5c0234455f revert 8515 per Mantis #2607 2012-03-07 02:50:10 +00:00
Goober5000 f0dbc01cf5 per discussion with mjn.mixael, fix error function so that it doesn't break on messages that are too long 2012-03-07 01:52:30 +00:00
karajorma 4998ab0b19 Get the default chance of a pilot praising his own kills from mod.tbl rather than the hardcoded magic number it currently uses.
Switch mod.tbl to automatically read the default table first, then look for the one the mod uses. This guarantees that variables are initialised to something and simplifies the logic for mod.tbl a lot.
2012-03-07 00:45:28 +00:00
The_E e42ce96902 Mea culpa. I made a stupid mistake, goober's version was correct. 2012-03-06 12:35:12 +00:00
The_E a435fb435a Reverting 8581. If you are breaking freespace2.fc2, something is wrong with your code. 2012-03-06 12:20:59 +00:00
The_E cedeb0132b Switches -glow, -normal, -spec and -env to be on by default. Renames commandline options to -noglow, -nospec, -nonormal and -noenv. Also renames -flightshaftsoff to -nolightshafts for consistency. 2012-03-06 11:53:41 +00:00
karajorma f095db367f Allow modders to define a default campaign using mod.tbl 2012-03-06 11:21:29 +00:00
niffiwan d24804781f Fix for Mantis #0002604: using m_m's patch, allow swarm/corkscrew bank to keep firing if current bank changes 2012-03-06 10:09:04 +00:00
Goober5000 17b730f7a9 no need for this #define now 2012-03-06 05:16:16 +00:00
Goober5000 caa66f5eff fix the algorithm for trimming whitespace 2012-03-06 05:11:55 +00:00
Goober5000 56e0ad28c8 change command briefing text to use SCP_string 2012-03-06 04:58:45 +00:00
Goober5000 6ea5390207 another change to parsing of XSTR ids because an id can be one digit long 2012-03-06 04:52:14 +00:00
Goober5000 715221779a const-correctness which will be useful for SCP_string 2012-03-06 03:41:57 +00:00
The_E 82119c58fa Fix for Mantis 2619: Adds .png to FRED's list of recognized file formats for loading screens. 2012-03-05 23:00:06 +00:00
The_E 61e75c933b From casual_pilot: Fix for Mantis 2395 (incorrect index values passed to OpenGL) 2012-03-05 12:01:44 +00:00
The_E 3ebaaa3c5a Properly updating all the projects to VS11 beta. Also sets toolset property to use the VS2010 toolset; given that almost noone has the MSVC2011 redistributable installed. 2012-03-05 11:33:52 +00:00
Goober5000 2a017a4085 change fout routines to use SCP_string instead of large C string buffers 2012-03-05 09:23:01 +00:00
Goober5000 441725a204 enhance vsprintf for SCP_string to be more intelligent in how it handles specifiers 2012-03-05 09:09:15 +00:00
Goober5000 2664a91185 fix a bug in the way XSTR ids were interpreted 2012-03-05 08:18:11 +00:00
Goober5000 db2f2a7b40 use SCP_string internally in stuff_and_malloc_string to remove the need for huge temporary buffers
also fix a Volition derp with the function prototype: if you're mallocing a string, you don't need a maximum length
2012-03-05 06:20:23 +00:00
Goober5000 7be472a5c9 we might XSTR these at some point 2012-03-05 06:00:33 +00:00
Goober5000 6ecd39b66d use SCP_string for great justice 2012-03-05 05:55:43 +00:00
Goober5000 380908d59e just derping along 2012-03-05 05:49:25 +00:00
Goober5000 31004262ec a vsprintf equivalent is useful 2012-03-05 05:24:15 +00:00
Goober5000 ef2ebb1a5a mjn.mixael's required weapon feature 2012-03-05 02:37:09 +00:00
Goober5000 f3c2649e2c partial revert of 8561: vm_malloc should never return null, so the Assert is necessary, and will immediately flag the error as it happens instead of leaving a mine to be triggered later 2012-03-04 19:19:11 +00:00
zookeeper bf84568c0d Fixed the inability to use ship:TargetSubsystem to set the player's subsystem target during one frame even if the ship was not already being targeted. 2012-03-04 13:48:40 +00:00
Echelon9 aea3c11582 Fix for Mantis 2327 - Strange behavior with key-press, patch from Eli2 2012-03-04 13:05:41 +00:00
Echelon9 f0d3d1937c Fix for Mantis 2616 - Lua forward controls don't get applied to player controls, patch by m_m 2012-03-04 13:02:48 +00:00
Echelon9 18a87c2858 PVS-Studio fixes: Resolve some warnings about use of pointers before checking for a null pointer 2012-03-04 08:51:59 +00:00
Echelon9 cbd8de6e87 Fix SCP_string parselo code - std::string.c_str() function means it's a string being passed to Error(), not the whole std::string object 2012-03-04 07:50:47 +00:00
Goober5000 812af15ba4 derp 2012-03-04 06:54:56 +00:00
Goober5000 49fe0e06d7 add variants of replace_one and replace_all 2012-03-04 03:59:29 +00:00
The_E 0e05c36ca4 Mod.tbl adjustments for VS2011 2012-03-04 00:44:52 +00:00
Goober5000 8e21fb6d43 add SCP_string variants of parselo functions 2012-03-04 00:20:09 +00:00
Goober5000 067d46b4c9 small project fix 2012-03-03 08:05:20 +00:00
Goober5000 c03caaa424 const correctness for fhash 2012-03-03 07:57:54 +00:00
Goober5000 8c0e3d4c2c this is a fix that doesn't require #including another file 2012-03-03 02:02:32 +00:00
Echelon9 e5640c31e8 Fix Mantis 2620 - PVS-Studio warning: Consider inspecting the '(strlen(filename) > 6)' expression. A 5 year old bug. 2012-03-03 00:22:49 +00:00
Echelon9 c753863f23 PVS Studio fix: The conditional expressions of the 'if' operators situated alongside each other are identical (aicode.cpp) 2012-03-03 00:00:16 +00:00
Goober5000 e3ec7ced27 fix compilation for MSVC6 2012-03-02 22:00:33 +00:00
chief1983 fade4c627c stdint.h and inttypes.h moved, and let's fix some paths that VC6 botched up for us again. 2012-03-02 20:29:19 +00:00
Goober5000 41ad40751d mod_table project updates 2012-03-02 19:58:07 +00:00
Goober5000 8857d60a5c change stuff_vector to stuff_vec3d for clarity, since "vector" now refers to a dynamic list and "vec3d" now refers to the three-float struct 2012-03-02 04:26:44 +00:00
zookeeper f18b925642 Eli2's minimal timer fix patch(es) from http://www.hard-light.net/forums/index.php?topic=79070.0 2012-03-01 19:16:31 +00:00
karajorma e521c47118 Fix a bug where placing the host in team 2 of a TvT mission would cause the clients to crash out. 2012-03-01 09:58:39 +00:00
chief1983 b7d50c7c0e Add mod_table files to Xcode project. 2012-02-29 17:41:06 +00:00
Sushi 1cf18a80cd Update VS2010 project to work with mod_table stuff. 2012-02-29 16:07:31 +00:00
Echelon9 9a572b67ab Related to Mantis 2617 - there is no way this is correct, now we have a properly functioning constructor for mc_info 2012-02-29 14:13:22 +00:00
Echelon9 0d0cd57c2a Fix Mantis 2617: LLVM warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? 2012-02-29 14:09:42 +00:00
niffiwan a99e8cf141 Update makefile for new mod_table files 2012-02-29 10:33:58 +00:00
karajorma 056e53978e Commit game_settings.tbl / -mod.tbm 2012-02-29 07:13:49 +00:00
karajorma 5afd07e6e0 Fix ignore-keys not blocking joystick or mouse buttons. (Mantis 2611) 2012-02-29 06:07:08 +00:00
Echelon9 6f3c463afd Diaspora code: Fix for Mantis 840 - Sounds for DRADIS, patch by m_m 2012-02-28 14:19:34 +00:00
Echelon9 ab894e7f98 Diaspora code: Fix for Mantis 768 - Tabled explosion sounds for ships, patch my m_m 2012-02-28 14:17:07 +00:00
Valathil 12ac53b47a Fix for Mantis 2614: Remove that statement, it works fine without exponentiating the offset. 2012-02-27 16:45:29 +00:00
The_E 05d3311eca Forgot newlines 2012-02-24 23:51:03 +00:00
The_E f17e242857 Deprecating stuff: Good. Printing messages to the log: Good. Using Warning() instead of mprintf(): Bad. 2012-02-24 23:25:00 +00:00
zookeeper 6d882025da Added subsystem:NextFireTimestamp scripting variable, exposing the ship_subsys->turret_next_fire_stamp variable to Lua. 2012-02-20 10:10:50 +00:00
zookeeper ab2fcc40eb Added subsystem:TurretLocked scripting variable, providing a way of directly getting/setting the locked status of a turret (also without the random delay incurred by the turret-free SEXP). 2012-02-20 10:07:38 +00:00
zookeeper 9344204e3f Added weapon:ParentTurret scripting variable, providing a handle to the turret (if any) which fired the weapon. This allows $On Turret Fired hooks to easily get a handle to the fired turret. 2012-02-20 09:59:34 +00:00
zookeeper c138470b1a Fixed a few typos in scripting documentation. 2012-02-20 09:53:24 +00:00
The_E 4855ef8a95 Fix for 8515: Need to init Use_GLSL earlier 2012-02-19 18:04:15 +00:00
The_E be3c68526e From CommanderDJ: Fix for Mantis 2594 (FRED is unable to open mission files from the commandline or shell) 2012-02-16 13:54:45 +00:00
The_E a8a1f6a858 Fixes GLSL detection to switch off GLSL support if reported GLSL version is below 1.2 2012-02-16 13:00:18 +00:00
Zacam c3f927c389 Reported by ni1s: GCC complaint about missing .c_str() in the updated dynamic MAX_SHIELD_ICON dynamic change. 2012-02-15 07:58:46 +00:00
zookeeper e35a310834 Added the "no disappear" subsystem flag. http://www.hard-light.net/forums/index.php?topic=79093.0 2012-02-15 07:54:38 +00:00
niffiwan 5a2a34e506 From CommanderDJ, fix for mantis #0002601: create constructor for player struct 2012-02-14 10:27:03 +00:00
zookeeper babbee2644 Proper way to fix what was attempted in r8439. 2012-02-11 16:42:16 +00:00
The_E 13898c568b Not only did rev 8439 not do what it was supposed to, it also broke subsystem scanning 2012-02-11 12:37:39 +00:00
The_E 87fd9c03c2 Fix for Mantis 2603: Fullscreen_window window not centered. 2012-02-10 18:45:06 +00:00
The_E d8f0eb9616 Given that hitting this assert can cause crashes in release builds, it's probably better if it's turned into an Error() instead. 2012-02-10 18:09:43 +00:00
zookeeper 9872a7494c Added subsystem:getModelName() scripting function, returning the original subsystem name as it appears in the model file, which is useful for example as a unique subsystem identifier. 2012-02-09 19:51:23 +00:00
zookeeper d50ac11711 Made subsystems contain an objnum reference to their parent ship. 2012-02-09 16:06:37 +00:00
The_E 6b7e90df0c Amendment to 8431: Introduces AI Profiles flag "$countermeasures affect aspect seekers:", which governs the behaviour in 8431 2012-02-09 14:40:59 +00:00
Zacam 6a6f9554ff From CommanderDJ: Makes MAX_SHIELD_ICONS dynamic 2012-02-09 12:40:15 +00:00
Goober5000 03304a395b Mantis #2524 2012-02-08 07:28:27 +00:00
Valathil 1ee166d63b Don't wait for brackets for messages without a target. 2012-02-08 02:49:34 +00:00
Valathil 26dc29d495 Fixed the annoying OpenAL error messages in the log. AL_DOPPLER_FACTOR is only valid for alGet. Changed all instances to the correct alDopplerFactor. 2012-02-07 19:12:21 +00:00
zookeeper 8b8779ccb1 Slightly relocated the triggering of $On Turret Fired hooks as well as the setting of a few weapon variables. Makes sure that the variables only get set when a weapon is actually created and that all the weapon variables have been set before the hook is triggered. 2012-02-06 21:09:16 +00:00
Swifty 10909fcd66 Minor optimization when rendering tris that do not use distortion effects and therefore do not require calling glDrawBuffers. 2012-02-06 10:19:56 +00:00
Swifty 47ca6bfa6c Fixed Mantis 2413. hud-set-color changes to the HUD will no longer reset when pausing or entering options menu. Introduced Color entry fields for hud_gauges.tbl. 2012-02-06 10:01:01 +00:00
niffiwan fec6543aa1 Fix for mantis #0002597: fix some GCC compiler warnings 2012-02-05 04:27:18 +00:00
Swifty 0bd2945620 Removed configOverride from HudGauge class since we don't even use it. 2012-02-05 03:41:31 +00:00
zookeeper 7568fce888 Makes subsystem targeting brackets always get drawn in the right place in the targeting box. 2012-02-04 22:43:28 +00:00
The_E f0e5d87939 Make the OS_SUBSYS_ROTATION sound depend on the SSF_ROTATES flag 2012-02-04 22:08:45 +00:00
The_E 450721f3d2 Makes the $AliveSnd, $DeadSnd and $RotationSnd entries for subsystems work. NOTE: This will apparently not work correctly for nested subsystems. 2012-02-04 21:50:49 +00:00
The_E 4219d0f162 Removing superfluous SSM alert message spawning. 2012-02-04 21:05:02 +00:00
The_E abcda15c1f Ooops, I accidentally broke flaks. 2012-02-04 19:25:20 +00:00
Valathil 3565c7cfd4 Make $FlyBySnd actually do something and allow primaries as well. 2012-02-04 17:13:45 +00:00
The_E 3256751768 Make aspect lock weapons react to countermeasures the same way as heatseekers do instead of going dumbfire. 2012-02-04 17:04:40 +00:00
The_E 350cf96158 A bit of cleanup in flak.cpp. Removes #defines made obsolete by previous commits, especially the hardcoded need for the "flk2" animation, which wasn't referenced anywhere in the actual code. 2012-02-04 13:48:58 +00:00
The_E 8da5a52cc5 oops, forgot to remove this terminal command 2012-02-04 13:32:03 +00:00
The_E 4a281e415d A few parameters for Flak weapons as requested by fury. Changes:
-Arm Radius now determines how far a flak shell will have to travel before being able to detonate (used to be hardcoded to 10 meters)
-New weapons.tbl parameter "Flak Detonation Accuracy" to determine how far from a target a flak shell may explode (used to be hardcoded to 65 meters)
-New weapons.tbl parameter "Flak Targeting Accuracy" to determine the amount of jitter applied to turrets targeting other objects. Used to be hardcoded to 60 meters, applied as a radius around the target position
-New weapons.tbl parameter "Untargeted Flak Range Penalty" to determine the range penalty a flak weapon is subjected to when firing without a target. Used to be hardcoded to 20 meters.
2012-02-04 13:28:02 +00:00
niffiwan b403e02977 Fix for mantis #0002593: structs containing vectors don't like being memset to zero... 2012-02-04 11:01:18 +00:00
Valathil 50dc5d37c2 Fix for Mantis 2534: Separate Warp IN and OUT when checking if the thrusters are behind the clip plane and don't do any checks for the "Hyperspace" warp type 2012-02-03 19:05:01 +00:00
Valathil e03f768afa Add a random offset to the thruster distortion to make thruster clusters look better. 2012-02-03 15:27:24 +00:00
The_E 7980874708 Given how often the particle shaders are called, moving them up to the beginning of the shaders array makes sense. 2012-02-03 10:27:33 +00:00
Zacam ca60cf771b Apologies to Swifty, this line change got truncated from the Font Fix. 2012-02-02 00:41:02 +00:00
Zacam cb394af504 100ms was perhaps a bit too long. The answer is, of course, 42.
Wait, what was the question...?
2012-02-01 23:13:11 +00:00
Valathil cabe455bb9 Fix for Mantis 2588: Messages without voice files now show the target brackets for at least "Message Length" * 100ms 2012-02-01 20:27:25 +00:00
Zacam 92f0cd7d9c From Swifty: Alternative fix to the font distortion problem by glyph realignment at the font creation phase rather than by manipulating the draw stage.
http://www.hard-light.net/forums/index.php?topic=79807.0
2012-02-01 20:07:36 +00:00
Zacam e06b0023aa Fix for the Fix for Mantis #2374: Had only updated the Effect 2 portion of the missionscreencommon. Don't I feel silly now. Did a little housekeeping while at it. 2012-02-01 17:31:19 +00:00
Zacam b14f002ed0 Fix for Mantis #2374: Adds "+Closeup_pos:" and "+Closeup_zoom:" as entries following "$Tech Model:" for the weapons.tbl. For entries not using a dedicated $Tech Model, simply specify the $Tech Model as the same POF used in $Model to adjust Loadout Screen viewing position and zoom. 2012-02-01 14:11:45 +00:00
niffiwan c018150835 Fix for mantis #0002590: fix array overruns caused by starting wings have > MAX_WING_SLOTS ships 2012-02-01 09:23:05 +00:00
Goober5000 fd4378dc12 more robust saving of dockpoint indexes (again for Mantis #2587) 2012-01-31 04:53:37 +00:00
Echelon9 528795031c Adopt the mprintf() macro correctly. It needs the braces to wrap the format string and variables 2012-01-30 16:58:23 +00:00
Valathil f9f6f8bc81 Follow up to 8408: torename is a bad name since jnp is actually the jump node to be renamed 2012-01-30 15:24:46 +00:00
Valathil f1e8bfcbb4 Fix for Mantis 2523: Actually add the jump node to the vector after creating it and fix some new renaming code checks to work when you're trying to rename a node to the same name it had before. 2012-01-30 14:47:43 +00:00
Valathil 87fd38d8fa Fix for Mantis 2589: Deactivate the Special* buttons while no ship is selected 2012-01-30 12:53:16 +00:00
Valathil 22087d3ea2 Fix for Mantis 2458: Initialize stuff before calling the point_to_vec function so it has the right matrices for calculation, also fixed scripted sphere drawing 2012-01-30 09:29:32 +00:00
Zacam a3cacc929d Slight touch up to Trunk Commit 8401: (! switch to !( to resolve a C4806 warning in MSVC. 2012-01-29 17:38:50 +00:00
The_E 37007c8a2f Fixes issue where the jumpnode destructor would try to use obj_delete() on already deleted objects. Also changes obj_delete() to no longer assert when called on an already deleted object; will print a message to the log now. 2012-01-29 16:37:52 +00:00
The_E 5d9b991ad8 Adds weapons.tbl flag "ciws". This allows a flak weapons' blasts and shockwaves to damage bombs (essentially a reversal of the way the "takes blast/shockwave damage" flaks work) 2012-01-29 12:13:12 +00:00
The_E 21cb3849fe As requested by Diaspora: Adds "render flak" flag to weapons.tbl. This will allow the game to render flak shells. 2012-01-29 11:47:00 +00:00
Goober5000 360027b61e undo animations for undockings that happen from exploding or jettisoning cargo 2012-01-29 09:58:59 +00:00
Goober5000 01ea4f96d9 coded for Mantis #2587 but not actually used... this can allow a series of animations to be pushed and then popped 2012-01-29 09:19:40 +00:00
Goober5000 f40bf910c1 fix Mantis #2587 2012-01-29 09:19:07 +00:00
Goober5000 68f1be85c0 tweaks 2012-01-29 06:53:42 +00:00
Goober5000 521e0c68ec Vasudan Admiral's fix for the modelanim code 2012-01-29 05:05:59 +00:00
niffiwan e0fa95780b Fix for mantis #0002591: add braces based on code indentation 2012-01-29 04:38:45 +00:00
Goober5000 18e5acb881 remove another four warnings 2012-01-29 03:24:36 +00:00
Goober5000 4417e2638c remove warning 2012-01-29 03:23:12 +00:00
Goober5000 25d9af807f herp a big derp 2012-01-29 02:58:29 +00:00
Goober5000 5eff473f5c derp 2012-01-29 02:32:19 +00:00
Goober5000 663b1614d5 VA says this might work? 2012-01-29 02:26:26 +00:00
Goober5000 a4f427e10a wait until animation finishes before separating during undocking 2012-01-29 02:12:09 +00:00
Valathil dbc0c0c9dc Fix for Mantis 2521: Don't use the ship list for updating when we're in the middle of creating it. 2012-01-28 21:00:51 +00:00
The_E d0d187ee22 Given that there's an exit path available right here, changing this Assert() into a Warning() seems appropriate. 2012-01-28 19:32:09 +00:00
Zacam fed59d60d1 Fix for Mantis 2538: From Eli2, corrects for looping fade issue reported by FelixJim. 2012-01-28 15:48:19 +00:00
Zacam dad1e26b27 Getting annoyed by -mipmap being used when it doesn't need to be. Moving it out of general graphics and into troubleshooting where it more appropriately belongs. 2012-01-28 13:02:40 +00:00
niffiwan 584a2a9e70 Fix for mantis #0002370: ignore missing starting wing indexes during mission restart 2012-01-28 11:10:30 +00:00
Goober5000 fb1b67568d two new sexps, signum and trigger-submodel-animation
also, fix a smattering of missing sexp stuff from other people's commits such as argument types, validity checking, putting things in submenus, and using is_sexp_true
2012-01-28 07:56:26 +00:00
Zacam 28a442dd34 Fix to Trunk r8379, for want of a ; a compile was lost. 2012-01-28 07:07:07 +00:00
Goober5000 cee16a3873 update docking code some more
add code logic to (theoretically) set submodels instantly to initial or final positions
2012-01-28 02:51:42 +00:00
Goober5000 c4be61bda6 enhancement for bug 2582: trigger animations on BOTH ships undergoing docking 2012-01-27 07:42:13 +00:00
Goober5000 e2d7eac046 remove unnecessary warning 2012-01-27 07:40:23 +00:00
zookeeper a3b2543ae1 Added support for the $detail_sphere submodel prop. 2012-01-26 14:25:20 +00:00
Goober5000 1dc7be435e partial fix for Mantis #2582:
--add Vasudan Admiral's fix for setting submodels to their initial positions
--add trigger for moving submodels to their docked positions when an initially-docked ship arrives
2012-01-26 03:57:23 +00:00
Zacam 94110f3d4c From Eli2: Mantis #2538: Fade-in time limitation.
Testing in Multiplayer as well, no drastic incompatibility found. (If the host is patched but the client is not, then the timing returns are a little funny, but it doesn't cause for any crashes)
2012-01-24 05:54:55 +00:00
Valathil dc4746048a Fix for Mantis 2556: Check if the mouse cursor is really there before drawing it. 2012-01-24 04:11:13 +00:00
Valathil f3a9d70774 Fix for Mantis 2583: Reinitialize the timer right when changing selection modes. 2012-01-24 00:13:21 +00:00
The_E d8529236c5 Makes a very strangely coded warning more readable and useful. 2012-01-24 00:11:07 +00:00
Goober5000 bd96b6ccf9 upgrades to the docking system to incorporate docking animations -- incidentally, fixes Mantis #2581
also, remove DOCK_BACKUP_RETURN_VAL which never did anything even in retail
2012-01-23 23:27:06 +00:00
Valathil 72a9652251 Follow up to 8289 + 8310: Make the sprite rotation independent of the camera direction and revert the docking change and make it simpler 2012-01-23 22:50:01 +00:00
Valathil df5b874a8f Fix for Mantis 2580: Use the texture matrix in the vertex shader to support texture panning. 2012-01-23 19:12:16 +00:00
The_E 47c1fb23ac Followup to 8327: Texture names from pofs are provided without extension, so we have to make sure to account for it. 2012-01-23 13:51:13 +00:00
Goober5000 ce14a2a50a fix Mantis #2579 2012-01-23 02:48:33 +00:00
The_E f83c86699b Fix for Mantis 1997: "Filename too long" warning for nonexistant textures. 2012-01-23 01:25:08 +00:00
chief1983 9613ac329c Fixes #2578 - Change the < in these checks against NAME_LENGTH to <=. 2012-01-23 01:22:05 +00:00
Valathil 5a1db0be1f Follow up to 8289: Change the rotation back to relative cause of flipping out billboards at certain viewing angles and fix the dock rotation another way. 2012-01-22 14:01:18 +00:00
Echelon9 7ce16f9fb7 Fix for Mantis #2523: FRED Waypoints/Jumpnode Refuses Rename Leading To Unescapeable Loop 2012-01-22 12:00:08 +00:00
Echelon9 3bced32845 Fix LoopingSoundInfo constructor, as reported by Goober 2012-01-22 09:30:01 +00:00
Echelon9 e5b3b3d247 Fix for Mantis #2540 - confirmed by Goober to resolve the constructor warnings 2012-01-22 09:19:57 +00:00
Goober5000 7bb3304fff quash a warning 2012-01-22 09:19:22 +00:00
Echelon9 ad9345c694 Documentation: pedantic rename of this function to describe it better 2012-01-22 08:52:31 +00:00
Goober5000 8577ab138f follow-up to 8299: we need to check visibility for our own team in case we have a friendly-stealth-invisible ship covered by AWACS, or something 2012-01-22 06:51:53 +00:00
Echelon9 ef8d64d268 Documentation: Missionweaponchoice.cpp and related changes. Removed a few redundant functions. 2012-01-22 06:47:55 +00:00
Goober5000 d9b1484c3d don't remove the escort flag from invisible ships that aren't on the escort list (fixes Mantis #2057)
also, don't remove dead or dying ships from the escort list, because due to the design of the culling function, they were never removed previously
2012-01-22 06:40:12 +00:00
Goober5000 233b1d7fba the proper way to fix Mantis #2441 is by modifying the team_visibility_update function
also, clarify terminology: in-frustum/not-in-frustum replaces visible/invisible
and do some minor rewrites for additional clarification
2012-01-22 05:37:09 +00:00
Zacam 87c3ca1c7f From Valathil: Adjusts view point rotation in 3rd Person/chase view. This is especially apparent in Nebula missions where rotating in Chase View is radically different from cockpit view. This fix corrects that, and has additionally been tested in Multiplayer. 2012-01-22 03:13:33 +00:00
Zacam c2b58424e6 Purely aesthetic. I have no idea what a packlock is. 2012-01-22 02:30:02 +00:00
Goober5000 9a43d4a583 tie scramble-messages and unscramble-messages into the communications subsystem status so that they will affect all aspects of communications in a consistent way (squadmsg menu, dashed text, etc.)
also make hud_communications_state() be a pure function, i.e. one without side effects
also fixes Mantis #2577
2012-01-21 22:08:38 +00:00
Valathil d5a0bdc7f4 Fix for Mantis 2575: Don't increment array indices without checking for the maximum. 2012-01-21 19:52:00 +00:00
zookeeper d3af5f00d4 Small scripting documentation fix: modeltextures -> modeltextures_h. 2012-01-21 15:52:31 +00:00
zookeeper 86094df62a Added the $On Turret Fired scripting hook. 2012-01-21 15:16:53 +00:00
The_E 604f78e2d2 Fix a few unused variable warnings that popped up after recent commits by Echelon9 2012-01-21 12:40:53 +00:00
Valathil d3b5f7d954 Fix for Mantis 2522: Moved the calculation of the sprite rotation to get the updated orientation matrix after dock calculation. 2012-01-21 10:33:57 +00:00
Goober5000 2f10757898 project file changes for wxfred 2012-01-21 08:41:15 +00:00
Goober5000 1d89c1dc34 VC6 compatibility 2012-01-21 07:58:07 +00:00
Echelon9 e6be28000a LLVM Warnings fix: Value stored to is never read and related, in mission folder 2012-01-21 07:48:24 +00:00
Echelon9 79c1d6c6ba LLVM Warnings fix: Value stored to * is never read, in missionweaponchoice.cpp 2012-01-21 07:27:49 +00:00
Echelon9 2888da9127 LLVM Warning fix: Various warnings within hudtarget.cpp and ancilliary changes 2012-01-21 07:21:51 +00:00
Echelon9 6c2972b503 LLVM Warning fix: Value stored to goal_changed is never read 2012-01-21 06:44:12 +00:00
Echelon9 421e2d5936 LLVM Warning fix: Value stored to percent_left is never read 2012-01-21 06:42:29 +00:00
Echelon9 d92184e45c LLVM Warning fix: Value stored to num_offsets_on_this_line is never read. Btw no need to clear this specific variable as it is defined within the while() loop, unlike the others. 2012-01-21 06:36:52 +00:00
Echelon9 6993938594 LLVM Warning fix: Value stored to ship_is_ballistic is never read 2012-01-21 06:34:11 +00:00
Echelon9 38ca2cb63e LLVM Warning fix: Value stored to target_objp is never read 2012-01-21 06:27:54 +00:00
Echelon9 746366973b LLVM Warning fix: Value stored to enemy_ship_type is never read 2012-01-21 06:25:30 +00:00
Echelon9 106ddea040 LLVM Warning fix: Remove this dead code to ai_shipname 2012-01-21 06:18:22 +00:00
Echelon9 f8dcc16294 LLVM Warning fix: This is a dead store to the value done_reading. 2012-01-21 06:10:45 +00:00
Echelon9 66b5b4f9ad LLVM Warning fix: This is all dead code, removing. 2012-01-21 06:09:50 +00:00
Echelon9 d3fb863676 LLVM Warning fix: No need to assign value to entry.ship_class twice. 2012-01-21 05:57:42 +00:00
Echelon9 fb66bdf5ad LLVM Warning fix: Resolve an order of precedence issue with && and || 2012-01-21 05:40:58 +00:00
Valathil def5344dec Fix for Mantis 2576: Use the beam direction as the applied force vector 2012-01-21 04:07:27 +00:00
Goober5000 17fc1c4923 update to revision 8263: one should probably reset the special shields if you reset special hitpoints 2012-01-21 03:58:42 +00:00
Valathil 26593d45fe Fix for Mantis 2461: Check to see if the reduced damp timestamp is valid so we don't get ridiculous acceleration values. 2012-01-21 01:54:17 +00:00
The_E 39938e0060 These error messages need to be waay clearer 2012-01-20 14:55:06 +00:00
Zacam 182dadc6d3 From CommanderDJ: makes the maximum number of intercom sounds, misc anims and door anims dynamic (v2)
http://www.hard-light.net/forums/index.php?topic=78856.msg1574656#msg1574656
2012-01-20 02:13:38 +00:00
Valathil c6eb7728f8 Fix for Mantis 2574: Timestamps do not work that way, also fixed the rapid fire "Out of Energy" sound for fighter beams. 2012-01-20 01:35:19 +00:00
Valathil 7b6f63ef52 Fix for Mantis 2553: Fix overdrawing subspace glows by changing them from thrusters to normal bitmaps therefore avoiding a render time problem with the thruster geometry batcher. 2012-01-19 19:15:43 +00:00
The_E f178c90f6e Fix for Mantis 2573: Special Hitpoint settings get carried over when deleting and adding ships in FRED 2012-01-19 11:41:19 +00:00
Goober5000 384efc2241 need to use subsystem_stricmp for subsystems 2012-01-19 07:05:50 +00:00
Valathil 5b5804e8d7 Fix for Mantis 2572: Just dont render 0.0 Laser Length weapons 2012-01-18 19:21:38 +00:00
niffiwan 8427c69806 Fix for mantis #0002480: when emptying secondary banks use the standard function to select the next bank 2012-01-18 10:12:38 +00:00
Valathil 6caf2640ad Fix cockpit simulated brightness for lightshafts: Recalculate even if falloff is 1.0 and use the actual sample number 2012-01-17 17:13:01 +00:00
Zacam 81af3cd960 Slight update to unify the formating of the built in shaders. This behaviorally changes nothing, just their presentation. 2012-01-17 00:18:22 +00:00
chief1983 aa31a09f5e Fixes #2571 - Changes a value in each config to match the config name. 2012-01-16 01:34:01 +00:00
The_E 5f1ec8a220 Followup to 8232: Fixes slight mistake in the usage of boolean operators 2012-01-16 00:09:49 +00:00
Zacam 0ac770bc98 Update to Commit 8223: When adding more lines to an IF, brace it please. 2012-01-15 23:33:49 +00:00
The_E e992d27e5d Made the failure message for failed model loads include the model filename. 2012-01-15 17:07:37 +00:00
The_E 3db99b8e5a Fix for Mantis 2441: "friendly-stealth-invisible" flag doesn't work 2012-01-15 14:14:46 +00:00
The_E e4f6565877 Fix for Mantis 1768: Cutscene bars do not display properly. 2012-01-15 13:29:00 +00:00
Echelon9 a9fab380a4 Removing the redundant weapon_create_names(). If you want to find Weapons by name, the Weapon_names[i] approach is not the right one. Found by Eli2. 2012-01-15 12:08:31 +00:00
Echelon9 345b01078d Fix initialisation bug in the weapon_info struct, from within init_weapon_entry(). Patch from Eli2 2012-01-15 11:19:14 +00:00
niffiwan e2baed0260 Fix for Mantis #0002443: allow primary weapons to have fire_waits longer than 5 secs 2012-01-15 10:55:09 +00:00
Goober5000 1975d1334a yeesh... part of the original iff_defs feature that wasn't updated 2012-01-15 08:13:50 +00:00
Echelon9 8308827cbb 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
Echelon9 62f5ca2fa1 Ensure we don't leak memory on Mac OS X. Any object created with a CF*Create() function must have CFRelease() called upon it. 2012-01-15 07:27:41 +00:00
Echelon9 e946953946 Fix LLVM warnings in weapon folder 2012-01-15 07:05:20 +00:00
Valathil 5e077fad18 Fix for #2570: Changed the external camera messages to be IFF color and internal messages back to green 2012-01-15 03:11:12 +00:00
Valathil 76c2d57a92 Fix for #2549 & #2457 - Fixed rendering of bars and moved earlier in code so we dont overdraw the hud messages 2012-01-15 00:09:59 +00:00
The_E a1c72379cc Fix for Mantis 1803: Lensflares are rendered with no sun in sight 2012-01-14 23:20:05 +00:00
Valathil 9ad34846b9 Fix OpenGL errors caused by animated shaders when not rendering to a fbo 2012-01-14 19:24:29 +00:00
Valathil f3e9542d1d Fix "Unable to get shader uniform location" warning for distortion shaders 2012-01-14 19:03:55 +00:00
The_E f947687f8c Fix for Mantis 2568: "Fog Near/Far Mult:" being written to mission files even when in retail compatibility mode. 2012-01-14 10:55:13 +00:00
Echelon9 cb8cacb32d Fix for #2567 - LLVM warning: Semantic issue in lua.cpp 2012-01-14 00:31:14 +00:00
Echelon9 3bcc9206e8 Fix for #2566 - GCC warning: NULL used in arithmetic in lua.cpp (lua_getstack(L,n+1, ar) == NULL) 2012-01-14 00:22:58 +00:00
Echelon9 e6cd350554 Fix for #2565 - GCC warning: Use of unary operation that may not be intended in lua.cpp (type =- 1;) 2012-01-14 00:17:03 +00:00
Echelon9 085fc6873a Fix for #2564 - GCC warning: Use of NULL in arithmetic operation in ship.cpp (winfo_p->pre_launch_snd != NULL) 2012-01-14 00:13:25 +00:00
Echelon9 89a47efe90 Fix for #2563 - GCC warning: Equality comparison with extraneous parentheses in ship.cpp (Ai_tp_list[i].obj_type == -1) 2012-01-14 00:00:31 +00:00
Echelon9 8d77ff5b6f Fix for #2562 - Expression result unused in ship.cpp (ship_system->turret_swarm_num) 2012-01-13 23:54:19 +00:00
Zacam 74a379aa36 Okay. This was ridiculous running all these changes separately. This setts svn:eol-type across the board for types that were not previously set to LF as they should have been. 2012-01-13 18:44:18 +00:00
Zacam b748a3b7fe svn:eol-type set to LF. 2012-01-13 18:37:09 +00:00
Zacam 7ea8030b0b Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes. 2012-01-13 17:49:57 +00:00
The_E 189b1d2565 Various scripting patches from m!m:
--Eyepoint access to the model handle
--getCollisionDistance() to the collision info handle to get the precomputed distance to the hit point
--A Disabled variable for the ship handle
--getTimeUntilExplosion() for the ship handle to get the time until the ship finally explodes
--A change to the documentation of ad.play3DSound() to reflect that the function also takes position parameters
2012-01-13 17:46:36 +00:00
The_E 4821af58f6 Fix for Mantis 2561: Rotating guns don't rotate. Allows gun rotation property to be set by using "$gun_rotation". 2012-01-13 10:44:55 +00:00
chief1983 4f97dbe4a8 Fix for #2559 - new frameworks file that strips the metadata files out of the archive. 2012-01-11 17:43:26 +00:00
The_E d965da07d9 Make sure the FXAA pass only draws to COLOR_ATTACHMENT0 2012-01-11 17:41:52 +00:00
karajorma 93b23ba4dd Split the Locked flag in two so that you can lock Ships or Weapons independently. 2012-01-11 07:57:36 +00:00
karajorma a3829219a8 Change the define to one that is a little less confusing. 2012-01-11 01:46:50 +00:00
karajorma f4516f5bc2 Not that it matters much since it's that's what it's ending up as anyway but since the variable that uses it was switched to unsigned we might as well change this. 2012-01-11 01:44:24 +00:00
Zacam 20967549bc Fix for Mantis 0002558 : Resolves the issue by updating the libpng provided to version 1.5.7. 2012-01-10 21:43:30 +00:00
Valathil b7fc3c9780 Made WIF2_SMALL_ONLY weapons on turrets not fire on HUGE ships when grouped with other weapons that are not WIF2_SMALL_ONLY 2012-01-10 18:34:50 +00:00
Goober5000 9c56b4bf63 various minor changes that I had forgotten to commit 2012-01-10 03:45:04 +00:00
The_E 1019752616 Another Assert->Assertion change. Also changes parsing code to throw warnings when a shockwaves' inner radius is zero. 2012-01-07 00:44:48 +00:00
The_E 729f477ca0 Remove incomprehensible Comment 2012-01-06 18:20:44 +00:00
The_E 1eca4417b2 We were disabling the framebuffer a bit too soon here. 2012-01-06 01:03:37 +00:00
zookeeper ab02a387f0 Added support for a fourth targeting box render mode and re-structured some of the targeting box rendering code to make it easier to read and extend. 2012-01-05 20:13:14 +00:00
zookeeper 6f25788891 Added support for the $Targetbox Shader Effect option in hud_gauges.tbl. 2012-01-05 19:48:39 +00:00
Zacam 231a55a05b spotted by ni1s: Need an '#include <limits.h>' to make compilers happy when using MAX_INT. 2012-01-03 15:13:17 +00:00
The_E f9c1c17a7b Removed an unused #define 2012-01-02 15:51:04 +00:00
The_E f7ab7be87a Small fix to make gcc happy. 2012-01-02 12:28:58 +00:00
karajorma e5bad5c5df Remove a magic number. This number will probably become something defined in mod.tbl eventually but for now at least it's easy to find again. 2011-12-31 06:51:21 +00:00
karajorma 09fd7db874 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
karajorma 0af18faefc Switch from the directive-is-variable SEXP to the more powerful directive-value one. 2011-12-31 06:46:47 +00:00
Valathil 1fe1789b30 Fixed font rendering at high resolutions 2011-12-29 18:16:04 +00:00
zookeeper e2e26939de Fixed stupid mistake in previous commit. 2011-12-29 08:37:44 +00:00
zookeeper b6010f1bb2 Fixes ships not rendering during hyperspace warpin due to r7936. 2011-12-29 08:13:27 +00:00
IssMneur 8c013c2561 From CommanderDJ: - Fully vectorize and stringify mainhall.tbl internals
- replaces all arrays with SCP_vectors
 - replaces all c-strings with SCP_strings
 - depreciates +Misc Anim Handles: and +Misc Anim Flags: because they are just cruft
 -- +Misc Anim Handles: has not been hooked up for years
 -- +Misc Anim Flags: are dealt with automatically
2011-12-29 06:28:05 +00:00
The_E ae57ca0dfb Fixing an old mistake I made back in September 2010. Note: Assertions are optimized out of release builds, leaving this necessary skip out. 2011-12-29 00:53:49 +00:00
chief1983 1f8af1f7d9 Make sure to include the right lua headers on all platforms, as pointed out by rhl. 2011-12-28 19:53:50 +00:00
The_E 82fa8b1bb6 We do need to bind the correct depth buffer for rendering, else things get all confused. 2011-12-26 16:20:38 +00:00
The_E 15e1a57995 We only need to set up Scene_Depth_texture once, there must have been a merge gone wrong somewhere 2011-12-23 17:17:55 +00:00
The_E 4bfa3673f6 From m|m: Fix for Mantis 2400 (RTT rendering broken in current builds). Also changes GL_rendering_to_framebuffer to the more aptly named GL_rendering_to_texture. 2011-12-23 13:09:39 +00:00
Echelon9 ff40312d63 Adjust alignment when shader debug logs are written. 2011-12-23 00:15:46 +00:00
Valathil 47e469cf79 Added hardware accelerated YUV to RGB conversion with shaders to the ogg video renderpath. 2011-12-22 16:40:50 +00:00
The_E a2e07525c1 Adds an intermediate render target for FXAA to work against, this removes a previous reliance on undocumented behaviour in OpenGL. 2011-12-22 15:12:18 +00:00
Valathil ffc24779cc Allow for FS1 shader effect to be customized in post_process.tbl 2011-12-22 14:40:30 +00:00
Zacam 8f7169065f From CommanderDJ: SCP_Vector-izes some more of the Main Hall structures (intercom and misc anim mostly) 2011-12-22 00:13:31 +00:00
zookeeper f6f4810bdc Removed the unused "Ghost Save" entry from Object_type_names, because it was causing an off-by-one when using the getBreedName() scripting function. Also added "Beam" to the list since it's a valid object type. 2011-12-21 08:30:34 +00:00
The_E f4071e9682 Fix for Mantis 2498: Invalid species reference in ships.tbl is not detected. 2011-12-21 01:14:01 +00:00
Valathil 41182e4452 from zookeeper: make hv.Player availiable in "$On Gameplay Start" scripting hook 2011-12-20 21:50:38 +00:00
Valathil 39447e39b6 Fixed Swarm Salvo turrets Spamming their ordinance since 7981 2011-12-18 16:52:35 +00:00
The_E 729485d17c Removing two unused variables 2011-12-18 16:36:49 +00:00
The_E 43b6a8b540 Fix for Mantis 2545: Default ship in FRED is not the ship defined by #Default Player Ship 2011-12-18 16:35:10 +00:00
The_E f0d7aeae59 Fix for Mantis 2550: Text in multiplayer is rendered outside the textbox if custom fonts are in use 2011-12-18 16:00:26 +00:00
Goober5000 3f58c8d6f9 fix for Mantis #2547 2011-12-18 08:45:47 +00:00
Goober5000 449a9e1c55 make sexp category stuff accessible
fix Mantis #2551
2011-12-18 08:43:37 +00:00
Zacam 3f100ecf03 Tortoise Merge somehow screwed the application of the patch for Commit 8093, my apologies to everybody. 2011-12-15 18:53:41 +00:00
Valathil 62b5013ce0 Fix rendering of Sun Coronas and Lens Flares 2011-12-15 18:45:13 +00:00
Zacam 5deedda7f7 From CommanderDJ: Corrects the timing problem caused by commit 8079 regarding the playing of Main_hall misc_anim sounds. 2011-12-15 15:31:20 +00:00
Zacam 383a68717d Fix to the sexp_ship_effect causing an assert when used against ships that get destroyed before the event triggering it fires off. (From The E) 2011-12-13 16:32:17 +00:00
The_E b5cbaa5d57 Fix for trunkated command briefs when custom fonts are in use 2011-12-13 16:11:49 +00:00
IssMneur 4d355988c7 From CommanderDJ: parse the mainhall only on first load.
Adds -reparse_mainhall to enable the previous behaviour of parsing the mainhall on every viewing of the mainhall.
2011-12-10 17:56:15 +00:00
Echelon9 58840883ee Fix small compile issue on Apple OSX with new Valathil lightrays code 2011-12-09 09:48:35 +00:00
IssMneur 3483e50b19 From ni1s: Apparently gcc chokes on this without the space. 2011-12-09 07:23:36 +00:00
IssMneur 9e21aea439 Allow names in mainhall.tbl sound lists.
Allows sound names in addition to sound indexes in the sound lists:
 +Intercom sound:
 +Misc anim sounds:
 +Door sounds:
Extends parse_sound to search in the interface sound table instead of the main sound table.
2011-12-09 06:38:16 +00:00
IssMneur d1f4b435bf Fix breaking of FRED by revision 8069. Sun_spot was only declared in freespace.cpp which fred doesn't have linked in. 2011-12-09 06:24:07 +00:00
IssMneur 9b52db7a40 From CommanderDJ: add check_for_eoln() to parselo.cpp. 2011-12-09 05:48:35 +00:00
chief1983 a2794119e4 Fix stdint's existence breaking OS X compiling. 2011-12-08 23:05:56 +00:00
Valathil 4813d91751 Fix crash when framebuffer shockwaves are enabled but no weapon loads the standard shockwave animation 2011-12-08 21:58:16 +00:00
Valathil 94565d0170 Added Lightshafts as a replacement for sun glare. Look at http://www.hard-light.net/forums/index.php?topic=78923.80 for post_processing.tbl format 2011-12-08 20:57:11 +00:00
The_E 82bfe0ae23 Oops, infinite loops are bad in a sexp. 2011-12-06 17:09:00 +00:00
The_E 8bd4e3269d Adds a sexp to switch the thrusters on a given ship or list of ships on and off. 2011-12-04 17:29:02 +00:00
Echelon9 39ed7c8ad7 Fix r8054: Const char* to char* conversion was causing GCC compile errors 2011-12-04 03:16:56 +00:00
Echelon9 fb16d7ec0d Clear old commented out line 2011-12-04 03:06:24 +00:00
Wanderer 6d20e39964 fix to autoaim 2011-12-03 17:27:22 +00:00
The_E ef2db5f416 Hellzed's french keyboard layout stuff 2011-12-03 14:18:14 +00:00
Wanderer 14193ebe48 zookeeper's change to locating subsystem positions 2011-11-30 21:33:31 +00:00
karajorma 3c41afbcf8 Make it possible to localise a couple of extra sentences. 2011-11-30 03:12:06 +00:00
Wanderer e1c5a018b7 zookeeper's addition of new scripting hook that runs right before entering mission. 2011-11-29 21:32:57 +00:00
Wanderer e064b4c6a7 changes to the order in which autoaim/convergence modes are used 2011-11-29 20:44:39 +00:00
Goober5000 cebf56e863 make weapon parsing more robust for Mantis #2369 2011-11-29 06:03:15 +00:00
Zacam dc4032c86b From CommanderDJ: Since "neb2_eye_changed()" contains "Neb2_regen" why not use it instead? 2011-11-29 04:07:42 +00:00
Zacam 01bc1c70b7 From CommanderDJ: Nebula distance check for set-object-position's regeneration of local nebula. 2011-11-29 01:54:34 +00:00
Echelon9 da1e9d32ca Documentation: Changes such that the Doxygen log reports clean, in anticipation of 3.6.14 release 2011-11-28 13:03:38 +00:00
The_E e0cc6d265a Since the +RGBA Inner and +RGBA Outer options aren't used anywhere in the code, we can just remove them. 2011-11-27 18:37:48 +00:00
Goober5000 89f5a2fa41 fix revision 7971: Echelon9, if you add statements to a single-line if(), make sure you also add braces 2011-11-23 05:18:18 +00:00
Goober5000 f21143e1e0 add to the project file too 2011-11-23 04:26:20 +00:00
Goober5000 29568b39b1 approximate the standard function for MSVC6 compatibility purposes 2011-11-23 04:25:50 +00:00
Goober5000 3138c9d1f5 these ought to appear in the project file 2011-11-23 03:10:57 +00:00
Goober5000 e6b74f9f55 LOL and DERP, whoever coded this didn't even read his own comment 2011-11-23 02:47:43 +00:00
Goober5000 eb8d591e2f zookeeper's initial velocity patch
http://www.hard-light.net/forums/index.php?topic=79069.0
2011-11-20 19:48:53 +00:00
IssMneur 28c7c3cfef Fixes a crash when a jumpnode targeted by the player is hidden. See MANTIS#2541 2011-11-19 23:17:51 +00:00
The_E cda55f308b Another one from zookeeper: More fixes for thrusters 2011-11-19 19:14:57 +00:00
The_E e3ce4fe919 From zookeeper: Proper fix for thrusters attached to rotating submodels 2011-11-19 19:11:47 +00:00
The_E 2eba82ca22 Those filters are just too helpful 2011-11-19 17:43:57 +00:00
karajorma 00e83a4527 That's a rather pointless test when we don't have AI smart missiles. 2011-11-19 09:04:06 +00:00
Echelon9 53b34df439 Fourth part of fixing jump_nodes refactor, clearing FRED compile errors. 2011-11-19 05:59:41 +00:00
Echelon9 1612ae5ec5 Third part of fixing jump_nodes refactor, remove the union approach to linking Jump_nodes into Objects[]. First go at clearing the FRED errors. 2011-11-19 04:07:30 +00:00
Echelon9 3a245992a6 Documentation: Take out some old commented out code 2011-11-19 03:25:52 +00:00
Echelon9 9d2e9c6a9f Second part of fixing jump_nodes refactor, using cleaner attribute variables 2011-11-19 03:05:44 +00:00
Echelon9 3a11c793d5 Documentation: code/hud/hudtargetbox.cpp 2011-11-19 01:40:58 +00:00
Echelon9 7588208e35 First part of fixing jump_nodes refactor, use the set_name() function properly as it is available 2011-11-19 01:11:35 +00:00
Echelon9 dadfca089d Documentation: Code cleanup in weapons.cpp 2011-11-17 11:33:17 +00:00
Echelon9 8d728672e2 Cases of commented out Int3() indicate areas of old, redundant code. 2011-11-17 11:07:53 +00:00
The_E 553d2f3fc6 Patch for Mantis 2391 (again): Removes a few leftovers from the old HUD code that generated warnings unnecessarily. 2011-11-15 23:25:50 +00:00
The_E 17f0380c5e Fix for Mantis 2544: Crash when opening the "Class Variables" window for a weapon. 2011-11-15 22:54:21 +00:00
The_E 85fd3466c8 Fix for Mantis 2543: Windows in F3 lab aren't getting closed. 2011-11-15 21:50:41 +00:00
The_E 6ed5056a4a Slight fix for the "thrusters on rotating subobjects" thing: Only account for rotations that are actually happening. 2011-11-15 21:39:39 +00:00
Sushi 3effa423a9 Add $Armor Type support for missiles (table entry goes right after $Weapon Hitpoints) 2011-11-15 19:05:30 +00:00
Goober5000 4071e11f45 clean up ship maneuvers
significantly improve sexp help for those sexps
2011-11-15 09:36:27 +00:00
Sushi 0a87afaec8 Add "only target if can fire" turret flag 2011-11-14 18:26:55 +00:00
Zacam 73b7dc8715 From zookeeper: Correction to the getAnimationDoneTime in lua.cpp time_s calculation. 2011-11-14 09:45:20 +00:00
niffiwan 65f9df6b8b Fix for 7977 - explicitly include <algorithm> so gcc will compile 2011-11-14 03:55:08 +00:00
niffiwan fb315db82f cfile: change Assert to Assertion 2011-11-14 03:55:01 +00:00
Goober5000 2106a4754b add is-in-mission sexp 2011-11-13 09:59:10 +00:00
Goober5000 ab22033007 fix compilation on MSVC 6 2011-11-13 03:52:01 +00:00
niffiwan 010183a529 Documentation: cf*_string_len in cfile.h 2011-11-13 03:10:41 +00:00
Zacam 1f42422976 From zookeeper: allow thrusters to follow a rotating engine
http://www.hard-light.net/forums/index.php?topic=74290.msg1557431#msg1557431
2011-11-12 15:22:48 +00:00
Zacam 95964e7476 From zookeeper: mod-wide disable of the warp camera
http://www.hard-light.net/forums/index.php?topic=78748.0
2011-11-12 14:53:59 +00:00
Zacam da7fb66a9a From zookeeper: fix $Shots for turret-fired weapons
http://www.hard-light.net/forums/index.php?topic=78832.0
2011-11-12 14:39:02 +00:00
Zacam c6674c2912 From zookeeper: customizable warpout engage time
http://www.hard-light.net/forums/index.php?topic=78913.0
2011-11-12 14:36:31 +00:00
Zacam cdfd39f3a0 Small cleanup to last two commits, Tortoise Patch apparently decided to eat some line returns along the way. Additionally, some spacing adjustments to line things up a little better. 2011-11-12 14:20:25 +00:00
Zacam ad3a982ce5 From zookeeper: customizable asteroid death explosions and radius
http://www.hard-light.net/forums/index.php?topic=78762.0
2011-11-12 14:01:38 +00:00
Zacam 873b1a40ac From zookeeper: customized asteroid split rules
http://www.hard-light.net/forums/index.php?topic=78755.0
2011-11-12 13:51:22 +00:00
Zacam 351d76d59c Might as well include the missing inttypes.h file as well, just in case we ever come around to needing to use it, sine it's another file that MSVC doesn't ship with as part of it's C99 support. 2011-11-12 06:59:41 +00:00
Zacam de719e6dab As per commit message r7963, uint64_t is not supported on MSVC out of the box. This is because stdint.h is not shipped with MSVC, so <include>ing it doesn't do any good when it doesn't exist. Since stdint.h can be distributed without modification, it is now in globalincs and the include is ifdef'd to MSVC to use the globalincs version, all other platforms will use the C++ ISO standard library version. 2011-11-12 06:45:39 +00:00
Echelon9 ed0df5a9cf Documentation: More code cleanup of missionparse.cpp and missionparse.h 2011-11-10 13:46:11 +00:00
Echelon9 07fc2a1a9e Documentation: Code cleanup of missionparse.cpp 2011-11-10 13:21:03 +00:00
Echelon9 7c884a5a3e Fix Mantis 2343: Assert on arriving from destroyed ship 2011-11-10 12:21:34 +00:00
Sushi 5dcc4762e1 Add workaround so that AI landings consistently work 2011-11-09 18:24:12 +00:00
Echelon9 d024eff6b4 Documentation: General 2011-11-09 14:21:16 +00:00
Echelon9 15f674cf78 Mantis 2537: Help track down a memory leak problem 2011-11-09 14:01:06 +00:00
Echelon9 73c0c472a9 Fix Mantis 2539: Valgrind: Memory leak - parse_ship_values(ship_info*, bool, bool, bool) 2011-11-09 13:38:01 +00:00
Echelon9 a653e98b8c Documentation: Code cleanup of missioncampaign.cpp 2011-11-09 12:48:35 +00:00
Echelon9 d286530ed4 Documentation: Code cleanup in graphics/bmpman 2011-11-09 12:12:33 +00:00
The_E 7ede5e6574 uint64_t is not supported out of the box on MSVC. 2011-11-09 09:36:23 +00:00
The_E 50971919b3 Fix for Mantis 2533 from Eli2: Integer overflow in mission-time-msecs 2011-11-09 09:25:59 +00:00
Zacam 3af36a68e3 Originally spotted by zookeeper: "$gun_rotation:" should be set to "!= NULL" like the other entries around it. 2011-11-08 04:48:50 +00:00
Sushi bca6bf84bb Oops, committed the wrong version of the player autoaim patch 2011-11-07 20:58:29 +00:00
The_E bb8a49f11d Reverting the texture cache stuff due to issues with some models 2011-11-07 09:26:37 +00:00
niffiwan fab6cda862 Linux: remove -g (debug symbols) flag from release builds & switch optimisations from -Os -to -O2 2011-11-07 03:32:42 +00:00
Sushi 9700266d8d Add "$Player Autoaim FOV:" to AI Profiles (optionally allows autoaim only for the player on a per-difficulty-level basis) 2011-11-06 12:46:33 +00:00
Echelon9 d811ce6ff0 Documentation: General code cleanup of fireballs.cpp 2011-11-06 12:14:31 +00:00
Echelon9 35f0b5fe02 Documentation: Code cleanup in modelread.cpp 2011-11-06 11:25:15 +00:00
The_E 9ac24ea26f Eep, missed a "!" 2011-11-05 19:52:02 +00:00
Valathil 5005ea06b5 Fixed min(0) and max(0) being recognized as macros on Windows 2011-11-05 19:42:29 +00:00
The_E f738fed773 Changing opengl_render_pipeline_program to avoid unnecessary texture uploads. 2011-11-05 19:23:39 +00:00
The_E 55d5a48272 Reverting 7938: Bugfix breaks existing missions relying on old behaviour. 2011-11-05 19:20:17 +00:00
Echelon9 1717d171fb Documentation: General code cleanup for 64bit 2011-11-05 08:12:04 +00:00
Echelon9 0d1b230480 Fix Mantis 2535: Game crashes in player select menu, patch from Eli2 2011-11-05 07:09:58 +00:00
Echelon9 82468cd12b Bug fix: This looked to be an accidental copy paste. See further gamesnd_get_by_iface_tbl_index() and gamesnd_get_by_tbl_index() 2011-11-03 14:39:37 +00:00
Echelon9 068c8a8999 From Eli2: patch removes leftovers of the conversion from arrays to Vectors. 2011-11-03 14:32:52 +00:00
chief1983 09d2e16795 From niffiwan: Fix our linking order to work with --as-needed 2011-11-02 16:23:42 +00:00
The_E 547009074d From Eli2: Fix for Mantis 2533 (integer overflow in mission-time-msecs) 2011-11-02 11:40:51 +00:00
Goober5000 57029ea825 zookeeper's hyperspace patch
http://www.hard-light.net/forums/index.php?topic=65427.msg1558799#msg1558799
2011-10-29 22:22:39 +00:00
Echelon9 22fe26e516 Fix Mantis 2531: Issues with cockpit sounds, from Eli2 2011-10-29 03:09:05 +00:00
The_E a11f37328d Moving this up a bit more 2011-10-28 11:21:25 +00:00
The_E 842681b85e This line shouldn't have been removed in m previous commit. No idea how that happened, but I moved it closer to where it's actually used. 2011-10-28 10:41:01 +00:00
The_E dc5af99778 From zookeeper: Adds kill() function to asteroid objects 2011-10-28 10:01:54 +00:00
The_E 106ba35459 From m!m: Reworked scripting sound API 2011-10-28 09:59:31 +00:00
Goober5000 20162a5422 the ship copy flag needs to be able to recognize ships that appear later in the table 2011-10-26 07:51:31 +00:00
Goober5000 abab669ff6 we have some preconditions, so let's enforce them 2011-10-26 06:35:19 +00:00
Zacam 0659b7779d from zookeeper: [FotG] Fixes collision problem with the hyperspace warpin type introduced by r7889 2011-10-23 19:00:04 +00:00
Echelon9 fe572c205e Documentation: Code cleanup of shockwaves.cpp and ancilliary changes 2011-10-23 05:00:49 +00:00
Echelon9 907ffe31ec Documentation: Fix typo in the Doxygen comment block 2011-10-23 02:36:12 +00:00
IssMneur 4cb4e019c9 From m!m: patch to add support for customizable cockpit sounds. See: http://www.hard-light.net/forums/index.php?topic=78675.0 2011-10-22 22:11:31 +00:00
Echelon9 d11f491f1c Documentation: cleanup and documentation of gamesnd.h from Eli2 2011-10-22 10:29:48 +00:00
Echelon9 f1c1c7c7b5 Fix Mantis 2526: Valgrind: Conditional jump or move depends on uninitialized value(s) - init_anim_instance() 2011-10-20 20:25:39 +00:00
Echelon9 fde88484d9 Fix Mantis 2525: Valgrind: Conditional jump or move depends on uninitialized value(s) - parse_ship_values() 2011-10-20 13:37:58 +00:00
Zacam 41ffeacf97 From ni1s: -Wreorder warnings clean up for GCC output. 2011-10-19 07:36:21 +00:00
Echelon9 998a347267 And found another offender of the STL capacity() / size() / reserve() type 2011-10-17 13:10:17 +00:00
Echelon9 8cb082ce13 STL types again. Some of these are just inefficient, like reserving one extra slot for each additional element, and then pushing that element onto the STL type 2011-10-17 13:07:24 +00:00
Echelon9 2a21849cb5 STL types are tuned to handle their own memory allocations. Code like this is never going to be optimal in all situations, and likely to be sub-optimal in many situations 2011-10-17 13:01:48 +00:00
Echelon9 24406b34f2 Huh? This Assert() check doesn't make any sense 2011-10-17 12:58:31 +00:00
Echelon9 9f5881b1c4 STL types are tuned to handle their own memory allocations. Code like this is never going to be optimal in all situations, and likely to be sub-optimal in many situations 2011-10-17 12:56:47 +00:00
Echelon9 a336c7ba37 It's small, does lead to a slightly longer (but not necessarily less concise) code... but it is slightly faster. Tested on OS X, Intel Core 2 Duo, compiled with GCC 4.0 2011-10-17 12:42:34 +00:00
Echelon9 d51d82f6c8 Looks pretty unneeded now, odd commented out definition in cmdline.h 2011-10-16 05:27:03 +00:00
Echelon9 a8fccdba98 Convert the geometry map batcher lookup functions to use size_t, in line with the STL types 2011-10-16 05:22:34 +00:00
Echelon9 21de0c3b06 Clarify some aspects of the geometry map and distortion map batchers, as well as clarifying and making consistent the function calling conventions throughout the code. 2011-10-16 05:08:33 +00:00
Echelon9 8dfe06148e Fixing Eli2's commit in r7905. Where the -keyboard_layout commandline hasn't been used, the code was causing a CTD rather than handling gracefully the fallback option 2011-10-16 04:23:42 +00:00
The_E ac22e436d2 From Eli2: Allows adjustment of the keyboard layout on Linux/MacOS. Right now, only german layout is added in, use "-keyboard_layout qwertz" to activate it. 2011-10-14 13:58:50 +00:00
Zacam dd8a77de42 Wrong EOL type on these two. 2011-10-12 17:44:40 +00:00
niffiwan 13dc594133 Improve performance of jpeg byte swap operation 2011-10-12 10:37:27 +00:00
Valathil 74493457c5 Fix the transparency delay framework to work with submodel_render() 2011-10-11 15:55:43 +00:00
Echelon9 d05f10f807 min (lowercase) is not cross-platform, MIN (uppercase) is 2011-10-11 13:45:44 +00:00
niffiwan 20f5c20ba8 Add RGB / BGR byte swap to jpeg reading - libjpeg now doesn't need jmorecfg.h to be updated 2011-10-10 21:45:20 +00:00
Sushi 8fd51f30fd Remove unneeded warnings 2011-10-10 15:22:22 +00:00
Zacam 386cd06cb9 from zookeeper: [FotG] Makes adjustments to the Hyperspace warp type to allow the arrival/departure acceleration/deceleration rate to be controlled, $Warpout speed to be used as well as maintains initial velocity after warpin 2011-10-10 09:57:24 +00:00
Echelon9 06d79abb33 From m\!m: access to the Viewer_mode as I need to know if the view is currently in the cockpit or not 2011-10-09 12:57:39 +00:00
The_E 6c7c55857b Change the log message here to better explain what's happening. 2011-10-09 12:24:35 +00:00
niffiwan ab3846a9e2 From Eli2: fix for mantis 2517: loop sounds are always at 100% volume locked and afterburner fade out sound not work 2011-10-09 11:10:13 +00:00
Echelon9 99ed8a8294 Testing Assert() to track down a series of bugs reported by QuantumDelta 2011-10-09 10:52:24 +00:00
Zacam 0417995d74 found by Valathil; in "int obj_in_view_cone( object * objp )", codes=g3_rotate_vector(&tmp,&pt); works out better than running the check, then discarding it since g3_code_vector calls to run g3_rotate_vector anyway. 2011-10-09 10:37:27 +00:00
Echelon9 610575165d Documentation: Clean up of globals.h 2011-10-09 03:00:53 +00:00
Echelon9 aeeb72267c Documentation: Code cleanup of iff_deffs.cpp and related 2011-10-09 02:52:41 +00:00
Zacam fc0c9c0263 Adds Success/Average/Fail music selections to the Debriefing Editor.
http://www.hard-light.net/forums/index.php?topic=78504.0
2011-10-08 15:38:07 +00:00
Zacam 40b4717157 From zookeeper: [FotG] makes hyperspace warp type use a longer distance for the collision check 2011-10-08 15:15:46 +00:00
Echelon9 39076b8873 Fix for medal room crash reported by QuantumDelta 2011-10-08 07:31:06 +00:00
Echelon9 3c05a4bc93 Documentation: Code cleanup of bmpman.cpp and ancilliary changes 2011-10-08 06:22:41 +00:00
The_E 6ff0d4a5db Fixes issue with the mn.Asteroids and mn.Debris scripting tables, as these were accidentally 0-indexed instead of the Lua-standard way of starting indices from 1. 2011-10-06 15:09:26 +00:00
Echelon9 2b5abad874 Documentation: Code clean up of medals.cpp and medals.h 2011-10-06 12:51:15 +00:00
Goober5000 4824743ff0 enhance are-waypoints-done-delay to allow ships to complete waypoint paths multiple times
make count check more robust in has-docked-delay and has-undocked-delay; Assert shouldn't be used for mission data entered in FRED
2011-10-06 04:33:52 +00:00
Zacam b8a23f24c9 Remove the empty hudresource.cpp/.h files from /code/hud and all projects. 2011-10-05 09:14:19 +00:00
Goober5000 5a1b627951 PVS-Studio V581 in revision 7779 was actually a false alarm; overzealous cleanup created a condition where a negative array index could occur, triggering either an assert or a crash (Mantis #2514) 2011-10-04 06:34:47 +00:00
karajorma 64d17a7653 CommanderDJ's fix for Mantis 2276 set-object-speed SEXPs don't work in multiplayer. 2011-10-04 05:03:09 +00:00
Echelon9 01a94b09fb A few further changes for Windows support under the new jump_nodes STL refactor 2011-10-03 13:26:03 +00:00
Echelon9 fa2266cb35 Refactor of the jump_node code to use the STL's std::list, rather than Volition's in-house written linked_list. 2011-10-03 12:15:55 +00:00
niffiwan f3ff91f4d8 Fix: Mantis 2470 - $Flags: ("untargetable") does not work on turret subsystems 2011-10-03 10:37:30 +00:00
Echelon9 24164e5fae Use SCP_* types to access STL types wherever possible. This allows more complete memory monitoring 2011-10-03 09:06:56 +00:00
Echelon9 9a3bf7d603 Documentation: Code cleanup in modelinterp.cpp and ancilliary changes 2011-10-03 08:35:36 +00:00
Echelon9 88d2b0f755 Documentation: Only need update_min_max() because CLAMP() doesn't handle pointers 2011-10-03 07:46:04 +00:00
Echelon9 1065fc3ed8 Documentation: Code cleanup in aicode.cpp and ancilliary changes 2011-10-03 07:40:09 +00:00
Echelon9 624c777382 Documentation: Code cleanup in debris.cpp and ancilliary changes 2011-10-03 06:03:55 +00:00
The_E ebfb3b1dd5 From Eli2: Patch for Mantis 2489: adjust-audio-volume doesn't affect subspace 2011-10-02 11:08:41 +00:00
Zacam 828db47a68 Finish removing dbugfile.cpp/.h from the rest of the projects. 2011-10-02 08:09:04 +00:00
The_E 9fee426df0 Make force-jump cancel glide mode. 2011-10-01 20:09:00 +00:00
The_E 0c60452e31 From m!m: Allows per-ship customization of ship sounds in ships.tbl. See Wiki for details. 2011-10-01 19:16:38 +00:00
Echelon9 d182e281c7 PVS-Studio fix: V507 Pointer to local array 'title_str' is stored outside the scope of this array. Such a pointer will become invalid. 2011-10-01 06:54:43 +00:00
Echelon9 eb4021705d Remove the variables.cpp and variables.h redundant references from the Xcode project file 2011-10-01 04:32:55 +00:00
karajorma 0fa2bb1343 Remove dbugfile from VC2008 project files so that it will build. 2011-10-01 00:03:38 +00:00
The_E e8111cce25 Damn, wrong line changed. 2011-09-30 17:54:01 +00:00
The_E 7248a5efba Update to ad.playMusic to allow control over whether or not to loop the passed sound file. 2011-09-30 17:53:06 +00:00
The_E 62116b15f0 Removing dbugfile.cpp/.h from the project, since it doesn't seem to be useful. 2011-09-30 14:52:33 +00:00
The_E f2911191f7 Change this for loop to use an iterator for better performance 2011-09-30 10:22:34 +00:00
Goober5000 c467dd19a2 partial revert of 7825... don't remove the sound index 2011-09-29 06:03:30 +00:00
niffiwan 327f7300b0 Reapplying 7790, seems to have been mistakenly swatted by 7802 2011-09-28 11:23:27 +00:00
Zacam 93659646b2 This is now in the .14 Branch, we'll keep it there and leave the "final" code for putting to Trunk when AP is merged/Final is released. 2011-09-27 21:23:46 +00:00
Zacam 1217e19043 This file is not binary nor an application. Silly SVN. 2011-09-27 20:54:56 +00:00
Zacam df0d432834 What the? There were two Inferno Debug SSE/SSE2 project setups in libpng project file. 2011-09-27 07:02:25 +00:00
Sushi 0a0adcd054 Add set-docked SEXP 2011-09-27 03:32:05 +00:00
IssMneur 45c305194b A bunch of audio code hacks to address the concerns in http://www.hard-light.net/forums/index.php?topic=77889.0 until proper fixes of the sound code are completed.
+F -donotenforce = to turn off concurrent playback limit for sounds.
+F -percent_flashtobang = sets the default percentage of nebula flashes get converted to bangs.  Default is 50, max 100, min 0.
+T lightning.tbl +flash_to_bang_percent: = sets the percentage of nebula flashes that get converted to bangs for the storm type.
-- Audio gain of OpenAL is set to 65% of max.
2011-09-27 03:04:11 +00:00
niffiwan ebd3d53e02 Fix for mantis 2501 2011-09-26 11:17:06 +00:00
Zacam 8894d719f5 From CommanderDJ: Fix for Mantis 2224 "Chat messages may end up unreadable due to unfortunate color choice"
Allows for the specification of colors via a colors.tbl
(Wiki Documentation here: http://www.hard-light.net/wiki/index.php/Colors.tbl )
2011-09-26 05:40:07 +00:00
The_E 3ee845553f Aargh. NOW it's fixed correctly 2011-09-25 20:47:31 +00:00
The_E 781dadf1b7 And a final fix here 2011-09-25 20:46:22 +00:00
The_E 885ea9774d Fix for subsystem flags resetting erroneously. Thanks to zookeeper for noticing this. 2011-09-25 10:50:08 +00:00
Zacam bda6e7b7e3 Sync Drift: Apparently still some lingering ifdefs for OEM/Multiplayer_Beta and non-AP specific things not having made it to trunk for some reason. 2011-09-25 08:26:45 +00:00
The_E ac85d12a87 FRom CommanderDJ: Patch for Mantis 2307, set-object-position weirdness when in nebula 2011-09-25 07:50:07 +00:00
IssMneur 65b01ec829 Fixes Mantis 2510 - Rotation periods for submodels of less than 1.0 seconds cause uncontrolled rotation of submodel. 2011-09-25 04:00:06 +00:00
Echelon9 9dbc352777 Code cleanup: We should be really careful with using these scoring struct elements, as the types were changed from ushort to int at some point. 2011-09-25 02:42:27 +00:00
The_E 88b8ae2aa1 Redo 7777 without breaking anything else in the process 2011-09-24 19:47:47 +00:00
The_E 35db4c565b Revert 7791. Something went wrong there. 2011-09-24 18:31:20 +00:00
The_E 833b2255cd Revert 7789 2011-09-24 17:42:56 +00:00
The_E ad80cd3c31 Remove more useless encryption stuff. NOTE FOR PROJECT FILE MAINTAINERS: parse/encrypt.(cpp|h) should no longer be part of the project. 2011-09-24 17:37:12 +00:00
The_E da9ab83ba4 From niffiwan: Fix for Mantis 2477 2011-09-24 15:59:00 +00:00
The_E eb7eb802bb PVS Studio related: False alarms 2011-09-24 15:46:24 +00:00
The_E edd33d2734 PVS Studio fix: Rearranged struct to decrease size 2011-09-24 15:46:03 +00:00
The_E 84ec6090ea From eli2: Change the control defines into a more manageable enum 2011-09-24 15:45:13 +00:00
The_E 7a96e617cc PVS Studio fix: V547, <variable> >= 0 check on size_t variable 2011-09-24 14:26:04 +00:00
The_E e5cfa82140 Remove unused variable 2011-09-24 14:22:35 +00:00
Echelon9 f48ccc40f7 Xcode project file cleanup: Xcode 3 thinks these sections are unnecessary after the encrypt.cpp file was removed recently 2011-09-24 01:35:19 +00:00
Echelon9 6cd6dc7d46 Documenation: Code cleanup of keycontrol.cpp 2011-09-24 01:34:25 +00:00
Echelon9 94260b636e A small code cleanup patch from Eli2. Thanks. 2011-09-24 01:19:29 +00:00
Echelon9 1c105cec90 PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2056, 2061 (multiteamselect.cpp) 2011-09-23 20:28:06 +00:00
Echelon9 c5a3819490 PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2039, 2044 (multiteamselect.cpp) 2011-09-23 20:27:25 +00:00
Echelon9 f038362cb2 PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 2172, 2186 (sexp.cpp) 2011-09-23 20:26:32 +00:00
Echelon9 f49f32e329 PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 1977, 1986 (sexp.cpp) 2011-09-23 20:24:43 +00:00
The_E 37fd375bfb Fix for Mantis 2134: set-fov sexp has no effect at mission start. This moves the camera initialization stuff up a few lines to run before game_simulation_frame, thus ensuring the main camera is set up when sexps are evaluated.
Many thanks to CommanderDJ for tracking this down.
2011-09-23 19:09:23 +00:00
Swifty 6f83ae322b Fixed Mantis 2502. Messages gauge will no longer calculate string sizes using the incorrect font. 2011-09-23 09:14:02 +00:00
Echelon9 b4bffc5be8 PVS-Studio fix: V512 A call of the 'memset' function will lead to underflow of the buffer '&stackFrame' (mspdb_callstack.cpp). 2011-09-22 13:42:07 +00:00
Swifty 8360a41167 Further fix for Mantis 2500. Directives should now be using sexp overrides. 2011-09-22 06:28:49 +00:00
Echelon9 08b4d65cdd Documentation: Code cleanup of grbatch.cpp and work to prepare for 64bit with size_t 2011-09-21 14:37:36 +00:00
Zacam 708d8efc1c Revert enabling Speech and Voice Recognition, as it doesn't play well with Express versions of MSVC (at least not without a lot of work) 2011-09-21 06:37:56 +00:00
IssMneur f1b7c82709 - renamed +frequency to +period to reflect what the code actually does (as Valathil pointed out)
- +period: or +index: is no longer required for $substitute: (default is +index: 0)
- removed unnecessary check on +period: (1 is now a valid period)
2011-09-20 02:47:39 +00:00
The_E a587790168 Move this check outside the for loop for better performance 2011-09-19 18:01:56 +00:00
The_E 9ece193706 Small fix for the logic here 2011-09-19 15:53:11 +00:00
The_E 7aa2e80c0d As requested by zookeeper: Adds "play fire sound for player" subsystem flag 2011-09-18 17:31:41 +00:00
Echelon9 c60120cd38 From niffiwan: Fix for Mantis 2468 - Change-Ship-Class does not change armor type 2011-09-18 05:24:34 +00:00
Zacam b8080e0a46 Also from Eli2: Code cleanup 2011-09-18 01:03:23 +00:00
Zacam ac9e8a00ec Project cleanup for the removals of cryptstring, scramble, and crypt.cpp/.h. 2011-09-18 00:35:48 +00:00
Valathil 4c5e783c40 From Eli2_: Change cheat codes to not use that useless crypto function anymore 2011-09-17 23:00:58 +00:00
The_E 8eb5e6fedc Make sure ETS settings carry over when changing ship class, as well as making sure that weapon selection are still valid after the change. 2011-09-17 22:11:34 +00:00
The_E 5599c1cd54 Another case where one should use the case-insensitive check found and fixed. 2011-09-17 21:48:46 +00:00
Valathil fa8a075cb1 Reinitialize collision checks when executing the change-ship-class sexp 2011-09-17 21:02:33 +00:00
Valathil 4e36e5811b Reordered shaders for performance reasons 2011-09-17 20:55:03 +00:00
The_E 026dac6071 Since this header and cpp define a single function used in a single place, let's move the function to where it's used, and get rid of these files 2011-09-17 20:25:49 +00:00
The_E de73913b0c And another obsolete tool goes away 2011-09-17 20:08:13 +00:00
The_E 1b243d17cb These are unused as well. 2011-09-17 20:00:29 +00:00
The_E 308669601f These files are referenced nowhere, so away they go 2011-09-17 19:53:27 +00:00
The_E c28c4d8aed Little change to fix bug with external post shaders not loading 2011-09-17 19:36:24 +00:00
Valathil cfda8d1e98 Add Ships.tbl flag to disable lighting 2011-09-17 18:00:38 +00:00
Valathil 8b2b1f0a1c Don't do a boolean check on Floats could be -0.0 which is boolean true 2011-09-17 14:36:29 +00:00
The_E fd7cedb9d5 From m!m: Make the player object and mn.* table available in an $On Mission Start hook 2011-09-17 13:03:52 +00:00
The_E ea151715ea From m!m: Adds isTurret() and isAfterburnerActive() Scripting functions 2011-09-17 12:59:54 +00:00
The_E 14516074fd Highly experimental project files for the highly experimental MSVC 2011. 2011-09-16 21:17:02 +00:00
The_E 0b3ec16299 Reverting 7733. This is clearly not ready for primetime, let alone a release. 2011-09-16 10:01:10 +00:00
The_E b36876ce0b Adding support for the $On Weapon Fired: hook going off when turret weapons are firing 2011-09-15 11:46:33 +00:00
The_E bfdd343e7e Fix for the $On Weapon fired: scripting hook firing on every frame as long as the fire button is pressed 2011-09-15 11:35:32 +00:00
Zacam 237beb9cbc Enable Text-to-Speech (SVN Include) and Voice Recognition. (MSVC 2010) 2011-09-15 03:29:05 +00:00
Zacam ca2afc4f4a Enable Text-to-Speech (SVN Include) and Voice Recognition. 2011-09-14 22:44:50 +00:00
Zacam 921122985e EOL inconsistencies corrected to match the rest of the files. 2011-09-14 19:25:15 +00:00
The_E fe59dcf091 strcmp != stricmp. Using stricmp is necessary to avoid breaking old missions. 2011-09-14 18:49:06 +00:00
The_E bb9d7ae3f9 Fix for the $On Weapon Fired: scripting hook 2011-09-14 12:21:45 +00:00
Backslash 6e687ddd1b Add radar gauges to Hud_gauge_types list, so that hud-activate-gauge-type sexp can affect radar. Also a bit of code sorting to make it easier to make sure all gauges are accounted for. 2011-09-14 02:53:12 +00:00
chief1983 83b91e14d3 Update codeblocks project file. 2011-09-13 22:00:26 +00:00
The_E 69ea1d0727 Since this is the only place where r1 and r2 are variable, let's safeguard it. 2011-09-13 20:36:41 +00:00
The_E 899951bca3 Adding an exit path here. 2011-09-13 20:26:23 +00:00
Echelon9 339497f53a Documentation: Code cleanup in hudnavigation and hudobserver 2011-09-12 13:52:07 +00:00
Echelon9 bfdc0022af Documentation: Code cleanup in fvi.cpp 2011-09-12 13:31:38 +00:00
Echelon9 d2b3209f77 Documentation: Code cleanup in font.cpp and font.h 2011-09-12 12:52:33 +00:00
Echelon9 82f65e7959 Documentation: Code cleanup in flak.cpp and flak.h 2011-09-12 12:45:19 +00:00
Echelon9 2db8f26fd7 Documentation: Remove the old CreditWins from credits.cpp. These were unused for some time 2011-09-12 12:38:36 +00:00
The_E 4eadbc3487 A few fixes for the $Weapon Class scripting hook and associated actions 2011-09-12 12:35:08 +00:00
Echelon9 888e5df866 Documentation: Big code cleanup of the collide**.cpp files 2011-09-12 12:34:49 +00:00
Echelon9 d40078d9dc Documentation: Code cleanup of camera.cpp and camera.h, and removal of redundant function 2011-09-12 12:15:27 +00:00
IssMneur 139c4a28b9 Lets try this again without templates that VC6 doesn't like (this time for real).
Use const strings in split_str.
2011-09-12 05:14:58 +00:00
Goober5000 972e1b2483 revert 7705... it did, in fact, contain templates that VC6 doesn't like 2011-09-12 05:01:57 +00:00
IssMneur 261ac0bef0 Lets try this again without templates that VC6 doesn't like.
Use const strings in split_str.
2011-09-12 04:03:56 +00:00
Valathil 4ab74abd22 Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl 2011-09-12 03:59:45 +00:00
Echelon9 4cbefeef49 Documentation: Code cleanup of asteroid.cpp and asteroid.h 2011-09-11 13:56:10 +00:00
Echelon9 a93be9faf7 Documentation: Code cleanup of alphacolors.cpp 2011-09-11 13:38:17 +00:00
Echelon9 842669d90a Documentation: Code cleanup of afterburner.cpp 2011-09-11 13:36:33 +00:00
Zacam 75729980a2 Fix for Trunk r7677 causing map corruption on model cache rebuild. 2011-09-10 21:14:55 +00:00
Zacam 9d4ce3d1ba From Goober5000: Fix for model read for 'submodel_get_two_random_points' failing to find any points in the POF 'defpoints' as reported by Nighteyes. 2011-09-09 15:13:23 +00:00
Zacam c7240f4e85 Some more Parity/drift correction between Antipodes and Trunk: cfile update for better handling. 2011-09-09 14:06:29 +00:00
Zacam 190c881ed9 Part Three: Synchronization pass of Trunk and Antipodes Differences.
Catching on anything missed in the first two passes.
2011-09-09 10:38:14 +00:00
Zacam 1c820a6e8c 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
Zacam bc400c5d97 Part One: Synchronization pass of Trunk and Antipodes Differences.
Whitespace/tab mostly.
aicode does have a change of an Int3 to an Assertion.
bmpman has an update to bm_next_handle.
2011-09-09 09:37:45 +00:00
Zacam a9b7aac8f8 From Valathil: Fixes thrusters with -trans textures 2011-09-08 17:12:25 +00:00
Goober5000 fc5132fafa PVS-Studio fixes:
V506	Pointer to local variable 'Default_video_settings' is stored outside the scope of this variable. Such a pointer will become invalid.	code	2d.cpp	507
V506	Pointer to local variable 'pos' is stored outside the scope of this variable. Such a pointer will become invalid.	code	shipfx.cpp	1075
2011-09-08 06:55:50 +00:00
Goober5000 a12fe699c9 made show/hide jumpnode work on more than one argument 2011-09-08 06:41:38 +00:00
IssMneur 56a55da2a3 PVS-Studio fix: V512 A call of the 'memcpy' function will lead to overflow of the buffer '& x'. (pstypes.h:131) 2011-09-08 05:39:53 +00:00
IssMneur 247052efdf PVS-Studio: These are not false positives. Variable args can only be PODs, changing the "class" to a structure makes ade_odata a POD which should stop PVS-Studio from flagging this. 2011-09-08 05:38:21 +00:00
Echelon9 dd99044ad8 Documentation: Complete code clean up of the 3d/2d code 2011-09-07 14:33:26 +00:00
Echelon9 ca29cd7081 Documentation: Code clean up in 3dlaser.cpp 2011-09-07 14:26:25 +00:00
Echelon9 935ca2822a Documentation: Code cleanup of 3ddraw.cpp 2011-09-07 14:22:03 +00:00
Echelon9 285426467b Documentation: Code cleanup to 2d.cpp, 2d.h and 3d.h 2011-09-07 14:10:41 +00:00
Echelon9 2c36e4a233 PVS-Studio fix: V512 A call of the 'memcpy' function will lead to underflow of the buffer 'szcode'. 2011-09-07 12:46:35 +00:00
Echelon9 c978773027 Documentation: Code clean up of psnet2.cpp 2011-09-07 12:28:18 +00:00
Echelon9 fe9207f7f2 PVS-Studio fix (courtesy of niffiwan): V512 A call of the 'memcpy' function will lead to underflow of the buffer '& bit_24'. 2011-09-07 12:00:21 +00:00
Echelon9 ed4ccb54d2 PVS-Studio fix (courtesy of niffiwan): V512 A call of the 'memcpy' function will lead to underflow of the buffer (psnet2.cpp) 2011-09-07 11:58:47 +00:00
Zacam 3b9b3aca2e PVS-Studio fix (courtesy of niffiwan): V512 - A call of the 'memcpy' function will lead to overflow of the buffer '& ip_addr.sin_addr'. 2011-09-07 10:00:03 +00:00
Zacam 99b71b7820 MSVC Analysis: Local declaration of <variable> hides previous declaration at <line> of <file>: 'Scene_texture_width'/'Scene_texture_height' in gropengldraw lines 56 & 57. 2011-09-07 09:57:37 +00:00
karajorma dc23c3ca5e Fix Mantis 2497 (SEXP help text not available in the ships editor) 2011-09-07 02:50:05 +00:00
Valathil e426bfbbae Delay transparent texture rendering to fix z-buffer ordering issues 2011-09-06 17:17:58 +00:00
Echelon9 7d3b99a57e Documentation: Major code clean up of shield.cpp 2011-09-06 14:39:53 +00:00
Echelon9 19e20754e2 PVS-Studio fix: V524 It is odd that the body of 'multi_xfer_reset' function is fully equivalent to the body of 'multi_xfer_close' function (multi_xfer.cpp, line 185).
Remove duplicate, unused function
2011-09-06 12:29:56 +00:00
Goober5000 c934743c5d end string at hash symbol for jump nodes too 2011-09-06 08:59:29 +00:00
karajorma 8fbeae43fd Fix Mantis 2492 (Confusing help messages for the get-x-ammo SEXPs) 2011-09-06 02:29:47 +00:00
Goober5000 c3b1bdf452 remove unreferenced variable 2011-09-05 19:50:26 +00:00
Echelon9 2c729f8f9e Documentation: Major code cleanup of ship.cpp 2011-09-05 14:30:34 +00:00
Echelon9 b9b2517623 PVS-Studio fix (courtesy of niffiwan): V568It's odd that the argument of sizeof() operator is the '(short) method' expression. 2011-09-05 12:49:37 +00:00
Echelon9 73c17bab24 PVS-Studio fix (courtesy of niffiwan): This is a false positive, BUT IT REALLY SHOULD be rewritten with an STL container 2011-09-05 12:47:12 +00:00
karajorma c8ff836492 Fix the cloaked ship flag not saving. 2011-09-05 00:05:20 +00:00
Valathil e8c6a96a2a Fixed a little misunderstanding of the collision query framework in the sun occlusion test 2011-09-04 20:01:34 +00:00
The_E b96137cd02 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
Valathil 0bae11939b Implemented Sun occlusion for Cockpit models and shown Ship models 2011-09-04 15:48:05 +00:00
Echelon9 aa68f13fca PVS-Studio fix: Mark a false positive reported by niffiwan 2011-09-04 15:30:34 +00:00
The_E 0e4a9b67e0 PVS Studio fix: V535 The variable 'j' is being used for this loop and for the outer loop. 2011-09-04 12:36:33 +00:00
The_E 31f6d039f1 PVS Studio fix: Variable "item_index" was assigned values twice in succession 2011-09-04 12:35:14 +00:00
The_E 013b94cf28 Another false alarm from PVS Studio 2011-09-04 12:33:00 +00:00
The_E d02e2387e1 Marking a bunch of PVS Studio warnings as false alarms. While the warnings are technically correct, none of these are in places where performance matters. 2011-09-04 12:31:33 +00:00
The_E 21b6c7c768 PVS Studio fix: V803 Decreased performance. In case 'obji' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. 2011-09-04 12:14:35 +00:00
The_E 989309a0d6 More false alarms from PVS Studio 2011-09-04 12:13:31 +00:00
The_E 987259bfe8 PVS Studio related: Mark false alarms as such 2011-09-04 10:14:17 +00:00
The_E 0e8c42356d PVS Studio related: Mark false alarms as such 2011-09-04 09:35:08 +00:00
The_E 9fe9b9e4da PVS Studio fix: V510, class type argument passed to sprintf 2011-09-04 09:31:30 +00:00
The_E 11cf3b37aa Change batch_render_* to use iterators 2011-09-04 08:19:21 +00:00
Swifty 7535ca0e99 Thrusters render in the proper position when drawing an auto centered model. 2011-09-04 06:54:09 +00:00
Goober5000 93d85b1497 remove unneeded Assert 2011-09-04 05:43:42 +00:00
Goober5000 cbf90c2aef fix a bug from the waypoint conversion 2011-09-04 00:41:05 +00:00
Goober5000 98233fc374 d'oh... in most cases, atoi(CTEXT(n)) should be eval_num(n) 2011-09-03 21:46:49 +00:00
Valathil 9101003530 Fix tcache_set() OpenGL Errors by not using vertex attributes when drawing distortion Thrusters 2011-09-03 16:17:19 +00:00
Echelon9 66cc873369 Documentation: A few documentation fixes 2011-09-03 09:06:00 +00:00
Echelon9 2c6901f63d Documentation: A few documentation fixes so that Doxygen 1.7.5.1 outputs a clean log 2011-09-03 08:25:53 +00:00
Echelon9 e479f3e6dd PVS-Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 1281, 1312. 2011-09-03 05:38:28 +00:00
Echelon9 889b00939a Suppress a PVS-Studio false positive 2011-09-03 05:34:08 +00:00
Echelon9 50024816ca PVS-Studio fix: V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present (starfield.cpp). 2011-09-03 05:31:12 +00:00
Echelon9 e61ae01212 PVS-Studio fix: V592 The expression was enclosed by parentheses twice: '((cur_sep > 0.9f * desired_sep))'. One pair of parentheses is unnecessary or misprint is present (aicode.cpp).
I think this is the right fix. In addition the code comments did not reflect what was happening, so I've updated these to reflect the if() comparison.
2011-09-03 05:20:27 +00:00
Goober5000 7a66bd6e1e whoops 2011-09-03 04:30:23 +00:00
Goober5000 219c1fb3d2 The_E made the wrong fix; this is the right one 2011-09-03 02:34:14 +00:00
Goober5000 1000b45fef a bunch of small PVS-Studio fixes (mostly duplicate assignments) 2011-09-03 02:25:39 +00:00
Goober5000 22c3de75a9 wl_fury_missile_offset_hack was only applicable for FS1 2011-09-03 02:21:20 +00:00
Goober5000 2cc9f5223b PVS-Studio fix: V507 Pointer to local array 'name' is stored outside the scope of this array. Such a pointer will become invalid. code missioncampaign.cpp
(This is a Volition bug!  In all other locations, Campaign_file_names and Campaign_names are set using strdup.)
2011-09-03 01:48:06 +00:00
Goober5000 fd9a625db0 PVS-Studio fix: V506 Pointer to local variable 'terminus' is stored outside the scope of this variable. Such a pointer will become invalid. 2011-09-03 01:45:56 +00:00
Goober5000 97c6167421 PVS-Studio fix: V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string. 2011-09-03 01:32:07 +00:00
Goober5000 3e6f68096d PVS-Studio fix: V804 Decreased performance. The 'strlen' function is called twice in the specified expression to calculate length of the same string. 2011-09-03 01:15:20 +00:00
Goober5000 16443faa90 PVS-Studio fix: V805 Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) != 0' construct. A more efficient way is to check: str[0] != '\0'.
(and sorry Kazan, you don't get to call your for statement a work of art if you use strlen inefficiently)
2011-09-03 01:05:00 +00:00
Valathil 484d5f6c9f Changed Sun glow and lens flare rendering to not be obscured by objects 2011-09-01 19:35:17 +00:00
Valathil af1d8b05ee Enable alpha channel on render to texture targets and provide scripting functions with alpha capabilities 2011-09-01 16:16:03 +00:00
Echelon9 a27d8e07b0 Documentation: Code cleanup of missionbriefcommon.cpp 2011-09-01 13:50:37 +00:00
Echelon9 265330ca80 Let's have another go at this one... around we go again 2011-09-01 13:08:32 +00:00
karajorma f57fe25d48 Fix a mismatch. 2011-08-31 14:06:19 +00:00
Echelon9 1ce1aa93ad cppcheck fix: Memory leak in icon table parsing. 2011-08-31 13:53:14 +00:00
Echelon9 1bc5249211 Undo my rather silly patch, apply niffiwan's patch as a temporary measure (at least). 2011-08-31 13:48:23 +00:00
Echelon9 34f1a5bcbe PVS-Studio fix: V522 Dereferencing of the null pointer 'snd' might take place. Check the logical condition (autopilot.cpp) 2011-08-31 13:25:14 +00:00
Echelon9 d115a9317e PVS-Studio fix: V523 The 'then' statement is equivalent to the 'else' statement (psnet2.cpp).
This one was particular bad as it code have lead to remotely induced crashes over the network with oversize packets.
2011-08-31 13:12:46 +00:00
Echelon9 070fb1f595 PVS-Studio false positive: V581 The conditional expressions of the 'if' operators situated alongside each other are identical.(hudtarget.cpp) 2011-08-31 13:02:44 +00:00
Echelon9 f0ad71dcf2 PVS-Studio false positive: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. Check lines: 185, 189 (dscap.cpp) 2011-08-31 13:00:57 +00:00
Echelon9 6b0942ca94 PVS-Studio false positive: V537 Consider reviewing the correctness of 'y' item's usage (3dmath.cpp) 2011-08-31 12:58:58 +00:00
Zacam aca0fc5d77 Clean up the commented out code from niffiwan's PVS-Studio patches. (from niffiwan) 2011-08-31 10:58:33 +00:00
Zacam 39ef17743c MSVC Analysis C6244: Local declaration of <variable> hides previous declaration at <line> of <file>. (lock_world_pos; 31; hudlock.cpp) 2011-08-31 09:59:55 +00:00
Zacam b2fc3becca MSVC Analysis C6246: Local declaration of <variable> hides declaration of same name in outer scope. (wip, swp, objp, j) 2011-08-31 09:37:20 +00:00
Zacam 2c34810a18 Fix for 7590: Shipp can be NULL, which would lead to a crash. This resolves that crash from happening. 2011-08-30 22:59:57 +00:00
The_E 6e17a7f6ae PVS Studio related: Mark false alarms as such. 2011-08-30 17:46:49 +00:00
The_E 3e660d6bda Removing the RELEASE_REAL define from ye olde ✌️ days. We really don't need it anymore. 2011-08-30 17:46:03 +00:00
The_E f2a879ec99 PVS Studio fix: V581 The conditional expressions of the 'if' operators situated alongside each other are identical. 2011-08-30 17:40:00 +00:00
Swifty 03d8a06dca Engine glows no longer render when on the wrong side of a warp-in/out. 2011-08-30 17:39:48 +00:00
The_E 4a6aa010c2 PVS Studio fix: V576 Incorrect format. A different number of actual arguments is expected while calling 'Format' function. Expected: 2. Present: 3. 2011-08-30 17:29:56 +00:00
The_E 1ced7d6183 PVS Studio fix: V567 Undefined behavior. The 'index' variable is modified while being used twice between sequence points. 2011-08-30 17:28:39 +00:00
The_E 2a56a22e1b PVS Studio fix: V547 Expression 'character <= 127' is always true. The value range of signed char type: [-128, 127]. 2011-08-30 17:26:57 +00:00
The_E 3f34e456de PVS Studio fix: V541 It is dangerous to print the string 'base' into itself. 2011-08-30 17:24:50 +00:00
The_E c9d2e7c44c PVS Studio fix: V541 It is dangerous to print the string 'ani_name' into itself. 2011-08-30 17:23:01 +00:00
Echelon9 afcfc3ba05 PVS-Studio fix: V576 Incorrect format. Consider checking the [third] actual argument of the 'sprintf' function. The SIGNED integer type argument is expected.
Fixes a number of this class of issue with sprintf formats.
2011-08-30 15:39:29 +00:00
Echelon9 9b444f0006 PVS-Studio fix: V805 Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) == 0' construct. A more efficient way is to check: str[0] == '\0' (missioncampaign.cpp). 2011-08-30 15:17:28 +00:00
Echelon9 9eafab78ab PVS-Studio fix: V523 The 'then' statement is equivalent to the 'else' statement (shipfx.cpp).
Also take opportunity to clean up the BSG warp effect code. That duplice if() else() had been included since the original WMC commit in r5261.
2011-08-30 14:32:10 +00:00
Echelon9 d983133bd9 PVS-Studio fix: V803 Decreased performance. In case 'aip->wp_index' is iterator it's more effective to use prefix form of decrement. Replace iterator-- with --iterator. 2011-08-30 14:06:03 +00:00
The_E 384af3749f PVS Studio fix: V570 The 'end_angle.a1d [axis]' variable is assigned to itself. 2011-08-30 13:55:36 +00:00
The_E 517346b112 PVS Studio fix: V547 Expression is always true. Unsigned type value is always >= 0. 2011-08-30 13:48:56 +00:00
The_E 27c1b50322 PVS Studio fix: V535 The variable 'i' is being used for this loop and for the outer loop. 2011-08-30 13:46:00 +00:00
The_E e5cd1b8b63 PVS Studio fix: V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 279, 287. 2011-08-30 13:40:36 +00:00
The_E 6252826115 PVS Studio fix: "delete operator applied to non-pointer" 2011-08-30 13:38:33 +00:00
The_E 895b661166 PVS Studio fix: duplicated "!strlen(filename)" check 2011-08-30 13:21:28 +00:00
Echelon9 e5b36e686a PVS-Studio (courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (techmenu.cpp). 2011-08-30 13:12:51 +00:00
Echelon9 01292d26c3 PVS-Studio fix (courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (missiontraining.cpp). 2011-08-30 13:06:28 +00:00
karajorma 1e56c10d61 PVS-Studio fix: V512 A call of the 'memset' function will lead to underflow of the buffer 'type'.
Never really would matter but it's a waste of memory declaring an int buffer and then only using 1/4 of it
2011-08-30 11:50:23 +00:00
Goober5000 6f45a96d38 add fire-beam-at-coordinates, which is as awesome as it sounds 2011-08-30 07:29:57 +00:00
Goober5000 a609e4ebed having null iterators is apparently a no-no according to the C++ standard, so use a globally defined invalid iterator instead 2011-08-30 07:27:32 +00:00
karajorma a2d8bdd02c Gliding remains on when the player restarts a mission. 2011-08-30 04:12:55 +00:00
Goober5000 6a65e3cb11 waypoints and waypoint paths now have dynamic limits 2011-08-30 03:35:42 +00:00
karajorma 4868771688 Documentation for the Multiplayer SEXP system. 2011-08-30 00:18:32 +00:00
Echelon9 d440fba8e4 PVS-Studio fix: V515 The 'delete' operator is applied to non-pointer (hud.cpp). 2011-08-29 16:08:03 +00:00
Echelon9 4ddc8c2c13 PVS-Studio fix (Courtesy of niffiwan): V523 The 'then' statement is equivalent to the 'else' statement (barracks.cpp and missionhotkey.cpp). 2011-08-29 13:19:58 +00:00
Echelon9 0cbf367b93 Documentation: Code cleanup of sexp.cpp 2011-08-28 15:10:07 +00:00
Echelon9 f4707db787 Reverting 7545: Due to some odd errors coming through as Asserts in cfile.cpp 2011-08-28 12:48:20 +00:00
Echelon9 50bb16006f PVS-Studio fix: V516 Consider inspecting an odd expression. Non-null function pointer is compared to null: 'jumpnode_get_by_name == 0' (sexp.cpp).
Ironic that check_sexp_syntax() appeared to have a mistake in it's check functions.
2011-08-28 09:49:02 +00:00
Echelon9 dc347bca8f PVS-Studio fix: V555 The expression '(now - bi->last_down_check) > 0' will work as 'now != bi->last_down_check'.
Due to unsigned int type wrapping the former code would have always returned true.
2011-08-28 09:41:54 +00:00
Echelon9 c099802bc1 Documentation: Code cleanup in multi_obj.cpp 2011-08-28 09:36:18 +00:00
Echelon9 d57496c74f PVS-Studio fix: V519 The 'num_users' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 2296, 2297 (multi_pxo.cpp) 2011-08-28 09:34:09 +00:00
Echelon9 1cddeddc82 PVS-Studio fix: V519 The 'player_index' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1389, 1392 (multi_obj.cpp) 2011-08-28 09:32:55 +00:00
Echelon9 d0c132f5b0 PVS-Studio fix: V519 The 'list_size' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 597, 604 (gropenglpostprocessing.cpp) 2011-08-28 09:31:21 +00:00
Echelon9 6f5b934964 PVS-Studio fix: V519 The 'path_index' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 12782, 12809 (aicode.cpp) 2011-08-28 09:30:07 +00:00
Echelon9 4c4da1ed98 Documentation: Clean up lua.cpp 2011-08-28 08:54:10 +00:00
Echelon9 74bce78b0f PVS-Studio fix: V803 Decreased performance. In case 'tvs' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator.
For further discussion see, http://www.viva64.com/en/b/0093/

The scenarios where it will improve performance are under Debug builds. This improvement will however allow quicker use of other profiling tools that need to run on Debug builds.

Note. Code with size_t does not see the performance improvement comparison to iterators due to absence of array overrun check.
2011-08-28 08:31:25 +00:00
Echelon9 7fe02eac5d Revert r7546 -- will need more work. 2011-08-28 07:39:56 +00:00
Echelon9 d8cd159129 PVS-Studio fix: V501 There are identical sub-expressions '(stricmp (szCmd, "372") == 0)' to the left and to the right of the '||' operator.
and 

V501 There are identical sub-expressions '(stricmp (szCmd, "375") == 0)' to the left and to the right of the '||' operator.
2011-08-28 07:27:53 +00:00
Echelon9 515aed5d0b PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 80 to 76 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 07:16:42 +00:00
Echelon9 20e79c6453 PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 50 to 48 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 07:08:40 +00:00
Echelon9 d0d270f539 PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 52 to 48 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 07:03:57 +00:00
Echelon9 b4a344576f PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 40 to 32 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 07:00:38 +00:00
Echelon9 baa64b52d5 PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 24 to 20 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 06:55:00 +00:00
Echelon9 17b6ddf6b4 PVS-Studio fix: V802 On 32-bit platform, structure size can be reduced from 28 to 24 bytes by rearranging the fields according to their sizes in decreasing order. 2011-08-28 06:50:02 +00:00
Goober5000 c232db851f add dynamic vector stuffing 2011-08-28 03:31:46 +00:00
Goober5000 ecd0da397f add linked lists, woot 2011-08-27 05:27:24 +00:00
Goober5000 6268f46f0d return special exp values to ints, per discussion with Zacam awhile ago
while we're at it, change kamikaze damage to int since it's treated as such
2011-08-27 05:08:39 +00:00
Goober5000 2d7eb38777 enhance end-mission to possibly dump player to main hall 2011-08-27 04:39:18 +00:00
Goober5000 4768e4bda8 add infrastructure and parsing support for mission forks (vs. mission loops)
mission fork interface art and selection logic still needs to be written
2011-08-27 03:57:16 +00:00
Zacam ee8211ed50 Fix for Mantis 2467: untargeted heat seekers ignore ship protect
from niffiwan: http://www.hard-light.net/forums/index.php?topic=78001.0
2011-08-26 00:17:45 +00:00
Zacam d92c6ee2ae Alt Name field for ships not being set was interfering with displaying the ship class or name in the loadout screen when selecting a weapon said ship could not carry. This fixes that. From Wanderer, via Karajorma. 2011-08-25 07:33:49 +00:00
Zacam fba68a95b6 Slight update to optimize the built in main-f.sdr. 2011-08-25 02:42:05 +00:00
karajorma 8f93a7d1e2 I've already removed this section of code once! Let's see if it stays out this time! 2011-08-25 02:36:10 +00:00
Sushi 44a13466a1 Add "$Max Turrets per Bomb" and "$Max Turrets per Target" turret attributes. Allow per-turret control over maximum number of targeted bombs and ships (respectively). Works like "$Max Turret Target Ownage" but on a per-turret basis, and with the ability to affect incoming bombs as well. 2011-08-25 01:33:44 +00:00
Echelon9 bcd43ecb70 Documentation: Cleanup a few comments in pstypes.h 2011-08-24 21:27:07 +00:00
The_E dacf501440 Update for the ad.playMusic() function so that it accepts a volume parameter 2011-08-24 15:20:04 +00:00
Echelon9 e11c0fe088 PVS-Studio fix: V524 It is odd that the body of 'ds_eax_set_preset' function is fully equivalent to the body of 'ds_eax_set_environment' function (ds.cpp, line 2091). 2011-08-24 15:06:22 +00:00
Echelon9 64a2bf6aab PVS-Studio fix: V525 The code containing the collection of similar blocks. Check items 'Scene_color_texture', 'Scene_color_texture', 'Scene_depth_texture' in lines 2073, 2076, 2079. code gropengldraw.cpp 2011-08-24 14:56:48 +00:00
Echelon9 f64ca3550d PVS-Studio fix: V524 It is odd that the body of 'l_Object_getrvec_f' function is fully equivalent to the body of 'l_Object_getfvec_f' function (lua.cpp, line 4735). 2011-08-24 14:52:05 +00:00
Echelon9 743d61c643 PVS-Studio fix: V524 It is odd that the body of 'fireball_level_close' function is fully equivalent to the body of 'fireball_close' function (fireballs.cpp, line 970). 2011-08-24 14:48:17 +00:00
Echelon9 98a9293520 PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct 2011-08-24 13:37:01 +00:00
karajorma defea5fa74 Fix several SEXPs for multiplayer use. This should fix Mantis issues 2401, 2483 and 2382.
In addition, fix a bug caused by SEXPs that do a callback but don't send any data.
2011-08-24 08:37:11 +00:00
Goober5000 e333536f6a change the units on rotation acceleration to bring them in line with rotational velocity
this is not a compatibility break because acceleration didn't work until just a few days ago :D
2011-08-24 02:41:07 +00:00
Goober5000 dcc636dde4 supposedly these two checks were forgotten 2011-08-24 02:23:44 +00:00
The_E 622b21dcb8 Another FXAA change to stop it from murdering our pretty pretty starfields. 2011-08-23 19:07:58 +00:00
The_E c4479c93a0 Removing a preprocessor define from the fxaa fragment shader that we're not using. 2011-08-23 18:41:19 +00:00
Echelon9 0bdf334f8c Documentation: Minor tweaking to ai.cpp 2011-08-23 13:50:24 +00:00
Zacam b10df52991 Formating the shaders entries for soft particles to match the rest of the shaders. 2011-08-22 22:18:06 +00:00
Zacam bcf44ff181 From jg18: Platform flag exclusion, Soft Particles wiki link.
(reformatting/spacing is mine)
2011-08-22 22:17:34 +00:00
Valathil 01160f1595 Let's try this again. Adding Framebuffer distortion thrusters and explosions. 2011-08-22 17:57:01 +00:00
The_E 573a2840f9 object:checkRayCollision() for scripting, from m!m 2011-08-22 12:57:01 +00:00
karajorma 26cfdd7ec6 Add a version of the event-true-delay SEXP which works using milliseconds rather than seconds. 2011-08-22 10:44:41 +00:00
Goober5000 05819425df wow... it looks like the subsystem acceleration sexp never worked until now... 2011-08-22 08:38:02 +00:00
Goober5000 11348068d7 revert 7508, which MSVC6 doesn't like 2011-08-22 07:58:00 +00:00
IssMneur bb9891eb73 - make split_str use const strings were appropriate.
- make brief_color_text_init use const strings where appropriate.
2011-08-21 17:05:04 +00:00
Zacam 239ed185d0 Revert 7498: You should also test without optional command lines present, yellow disco screens of death in-mission are bad. 2011-08-21 04:04:45 +00:00
Goober5000 931bdab721 add an option to fire-beam to force the beam to fire
combine fighter_beam flag into flags field
2011-08-21 01:11:24 +00:00
Goober5000 5b8a1966fd fix string length 2011-08-21 00:43:31 +00:00
Goober5000 e36f2975da Zacam's patch for bringing MSVC 2005 up to date 2011-08-21 00:29:11 +00:00
Valathil f2de11fb77 Added thruster heat distortions and explosion framebuffer effects 2011-08-20 23:31:07 +00:00
Swifty a89d2f00b0 Soft sphere sprite rendering for particles, explosions, shockwaves, and thrusters. 2011-08-20 22:14:52 +00:00
Sushi e535197300 Add "Fog Near Multiplier" and "Fog Far Multiplier" options for missions. Allows the FREDder to tweak distances at which ships fade out in a nebula. 2011-08-20 15:06:18 +00:00
Goober5000 3511c27c19 rewrite facing and is-facing to be more clear; I think I also fixed a bug in the process 2011-08-20 08:25:39 +00:00
Goober5000 b943bc5e13 the key should be in the training category along with the other key sexps 2011-08-20 05:55:14 +00:00
Valathil 87fb9a316d Fixed a crash in the Ship effect SEXP so it doesn't crash the game if you try to cloak a wing with destroyed/departed/vanished ships. 2011-08-19 14:49:04 +00:00
karajorma d7db6ed6d8 Fix Mantis 2397 (Variables do not use more than one column when using replace data or replace variable unlike all other data) 2011-08-19 10:10:53 +00:00
karajorma bcd1144e9a Add options to send objects, shorts and ushorts via the multiplayer SEXP system. 2011-08-19 08:09:50 +00:00
Goober5000 d9c3c67bea add some sanity protections against overstuffing arrays 2011-08-19 04:39:12 +00:00
Goober5000 868ac2311d minor tweaks 2011-08-19 04:32:24 +00:00
The_E 80fe5c48dd Fix for Mantis 2484: Default text length for EFF files was far too short. 2011-08-18 20:21:05 +00:00
Echelon9 cce5ba7623 Documentation: General clean-up and function documentation 2011-08-18 16:47:54 +00:00
karajorma a862f9e9f8 Doh, missed one! 2011-08-18 07:56:31 +00:00
karajorma 882bf001c9 Fixes and clean up for the multiplayer SEXP packet system.
- Make the system more robust against accidental attempts to write data to the packet without proper initialisation. 
- Improve the error messages and function names to make clear the difference between the packet the game actually sends and the abstracted packets the coder seems to create and send in sexp.cpp
- Add a convenience methods to deal with SEXPs that don't need to write any data.
2011-08-18 07:48:59 +00:00
karajorma f384d6cfa4 Fixes for the multiplayer SEXP packet to prevent errors caused by the coder taking too little data out of the packet before reporting that they are done. 2011-08-18 05:24:27 +00:00
Echelon9 11025379fc Diaspora feature: Control configs override and default table 2011-08-17 14:40:13 +00:00
karajorma 2b2a074005 Halleck's bomb scoring code 2011-08-16 09:45:14 +00:00
Goober5000 f9f5ba40fe compilation fix 2011-08-16 04:55:47 +00:00
IssMneur d300f8fcd9 From jg18: Add some missing wiki urls in the flag file output. 2011-08-14 23:10:08 +00:00
Zacam 20fca613bc Fred2 Open debug log now records build version data, just like fs2_open.log.
Updated the fs2_open.log output to declare "FreeSpace 2 Open version" instead of just "FreeSpace version"
2011-08-14 16:42:47 +00:00
The_E 59bb804a51 When loading FXAA shaders, always use the built-in defaults. 2011-08-14 15:08:28 +00:00
Echelon9 52d0fbcda1 PVS-Studio fix: Expression 'b->type < 0' is always false. Unsigned type value is never < 0. 2011-08-14 14:07:11 +00:00
Goober5000 96619b9868 change warnings to mprintfs 2011-08-14 08:42:50 +00:00
Zacam d78350bcf0 Shader Update: main-f updated with latest cloaking code. small amount of cleanup done as well. 2011-08-14 02:36:33 +00:00
Echelon9 e3c11859a8 PVS-Studio fix: Duplicate comparison check for stricmp('FRED2_Open', scp->data.name). Instead use the second comparison to check for the same naming format as stricmp('FS2Open', scp->data.name) 2011-08-13 08:22:51 +00:00
Echelon9 4ebf68be7c PVS-Studio fix: Calling empty() on an STL vector does not modify the content of the vector in any way. To clear, use clear(). In addition, this commit also fixes the spelling of the containing function and turns on Doxygen documentation. 2011-08-13 08:19:55 +00:00
Echelon9 7bc500efa1 PVS-Studio fix: A call of the 'memset' function will lead to underflow of the buffer 'txt'. In HudGaugeMultiMsg::render() 2011-08-11 15:31:44 +00:00
Echelon9 5f57ba8906 PVS-Studio fix: The '&' operator is applied to bool type value. You've probably forgotten to include parentheses or intended to use the '&&' operator. In UI_SLIDER2::draw() 2011-08-11 14:59:16 +00:00
Echelon9 052020fb45 PVS-Studio: The '&' operator is applied to bool type value. You've probably forgotten to include parentheses or intended to use the '&&' operator. In process_event_update_packet() 2011-08-11 14:56:43 +00:00
Echelon9 f01c40ba04 PVS-Studio: A call of the 'memset' function will lead to underflow of various buffers in multi code. 2011-08-11 14:53:11 +00:00
Echelon9 638aaae0f4 PVS-Studio fix: Fix r5260 - A call of the 'memset' function will lead to underflow of the buffer 'Valid_builtin_message_types'. 2011-08-11 14:35:03 +00:00
Echelon9 5db97c985e PVS-Studio fix: Expression 'i >= 0' is always true. Unsigned type value is always >= 0. 2011-08-11 14:18:26 +00:00
Echelon9 584d6a7e65 PVS-Studio fix: Expression 'idx < 0' is always false. Unsigned type value is never < 0. 2011-08-11 14:15:05 +00:00
Echelon9 1aab341405 PVS-Studio fix: XYZ co-ordinated were not correctly copied and pasted in parse_ship_values() 2011-08-10 16:11:29 +00:00
Zacam 7c3cc2f30b Logging update: Major/Minor/Build update so that "Build" will always be available/log correctly even when "0" (ex: 3.7.0) without also needing "Revision" present. 2011-08-10 14:23:51 +00:00
Echelon9 e1b530a339 PVS-Studio fix: This if...then...else block was redundant in HudGaugeSupport::render(), as each 'then' block did the same thing 2011-08-10 14:01:15 +00:00
Echelon9 e0405636ae PVS-Studio fix: This if...then...else block was redundant in player_select_init(), as each 'then' block did the same thing 2011-08-10 13:58:25 +00:00
Echelon9 59a8f7d672 PVS-Studio fix: Incorrect logic within ping time colour indicator in multi_join_display_games() was overrepresenting yellow at the expense of red. Also replaced magic number with a definition. 2011-08-10 13:55:33 +00:00
Echelon9 12beca93ba PVS-Studio fix: No need to set sinfo variable again immediately after first assignment to a different value in send_secondary_fired_packet() 2011-08-10 13:51:31 +00:00
Echelon9 9be6c694fa PVS-Studio fix: No need to set Current_stage variable again immediately after first assignment to a different hard coded value 2011-08-10 13:49:42 +00:00
Echelon9 a821b1a082 PVS-studio fix: Ensure that both x and y of Player->current_target are reset correctly in hud_lock_determine_lock_point() 2011-08-10 13:47:06 +00:00
Echelon9 7048d243c3 PVS-Studio fix: Remove duplicate if...then conditional within fs2netd_get_pilot_info() 2011-08-10 13:45:14 +00:00
Echelon9 ad3614a380 PVS-Studio fix: Remove duplicate if...then conditional within ai_process() 2011-08-10 13:43:18 +00:00
Echelon9 18746ec665 PVS-Studio fix: Correct duplicate attempt to set the docker_aip->support_ship_signature in ai_do_objects_undocked_stuff() 2011-08-10 13:40:53 +00:00
IssMneur 92eddd165d From jg18: various polish details and a description clarification, based from descriptions within sandmanjack's launcher 2011-08-09 04:37:59 +00:00
Swifty df6299505a Shockwaves and death explosions will stay oriented independently of player's bank. 2011-08-07 09:55:18 +00:00
The_E 3d5f4f2199 ALtered according to feedback from Valathil. 2011-08-06 19:11:43 +00:00
IssMneur 33e4bc096e From Valathil: Fixes a problem with a min-max lifetime smart spawn weapons where it wouldn't fire except at close range 2011-08-06 18:20:34 +00:00
The_E 1ea086cafd Another sprite rendering fix from Valathil 2011-08-05 21:39:14 +00:00
Swifty d5c1d1776c Ship-specific gauges will only get preprocessed once. 2011-08-05 09:06:31 +00:00
The_E fc0ec8e3c0 Another sprite rendering fix from Valathil 2011-08-04 21:46:21 +00:00
The_E 2fb0fa3428 Patch for sprite orientation from Valathil 2011-08-04 16:25:19 +00:00
Zacam 8d2b93e6aa Resolves MSVC complaint about "'i' : unreferenced local variable" for the size_t in "void game_render_hud(camid cid)" 2011-08-04 13:58:46 +00:00
The_E c15384dc48 Ooops, meant to use a pointer there. 2011-08-04 13:34:33 +00:00
The_E 0a756a4d2a Resolve an "uninitialized Variable" warning 2011-08-04 13:33:35 +00:00
The_E c4544da184 And another one. 2011-08-04 13:17:55 +00:00
The_E 8904189e2a Slight correction to make nvidias GLSL compiler happy 2011-08-04 13:16:32 +00:00
The_E ce0355e27a From m!m: Adds access to collision data to the Lua API. 2011-08-04 11:05:25 +00:00
Swifty 8ff509f1e6 Let's try this again without breaking the orb radar: Optimized BSG radar and cockpit displays. Fixed cockpit models not switching when changing ships. 2011-08-04 11:01:28 +00:00
The_E 6ddf6d7794 Adding the function "ship::addShipEffect(string name, int duration)" to the LUA API. 2011-08-04 10:58:28 +00:00
IssMneur c9e30b9804 Move clear-subtitles to the camera subcategory in FRED. 2011-08-03 04:12:46 +00:00
The_E 854f21a3fc Reverting 7411 due to it breaking the standard 3D radar. 2011-08-02 13:02:34 +00:00
Swifty 54b25ae177 For Diaspora: Optimized BSG radar rendering and cockpit displays. Fixed cockpit models not switching when changing ships. 2011-08-02 10:49:51 +00:00
The_E 36a7bd38a3 Fix for issue with the weapon select sound not playing when weapon_choice_3d was active 2011-08-01 20:39:31 +00:00
IssMneur 860c4bbeac Complain correctly about pilot name length (actually say that the name is too long rather than just an assert). 2011-08-01 20:10:51 +00:00
The_E 144063a811 Updating the internal shaders a bit 2011-08-01 18:38:04 +00:00
The_E 746110c1a5 Correcting a little oversight with the $Selection Effect: tbl entries 2011-08-01 18:06:58 +00:00
The_E 15d325bcff Make external weapon models cloak when the mothership is cloaking. 2011-08-01 11:56:06 +00:00
The_E ad0ebee977 From Valathil: Allow shader effects to be less wrong if the Post-processing framebuffer is not active 2011-07-31 20:37:42 +00:00
The_E 75ffac5872 Request by MjnMixael: clear-subtitles sexp 2011-07-31 20:35:34 +00:00
The_E 741213d0aa Moving ai_profiles parsing up a few lines to fix issue with $Default Weapon select effect 2011-07-31 20:21:35 +00:00
Echelon9 c1cbce6bae Picked up by MSVC analyser: Lock down these cases of unsafe string operations 2011-07-31 13:41:13 +00:00
Echelon9 0d1f70b118 Fix Apple support for vglDrawBuffers, part of the new shader code 2011-07-31 08:03:04 +00:00
The_E 5299759410 Updating the sexp description 2011-07-30 23:21:28 +00:00
The_E 662d7001e7 Fixes issue with post_processing.tbl parsing 2011-07-30 22:45:53 +00:00
The_E 2584bcc9c8 This is the correct version now. 2011-07-30 22:39:49 +00:00
The_E 4ca3d83ba8 Reverting due to bugs 2011-07-30 22:32:09 +00:00
The_E 935bef97f4 This should have been committed as well 2011-07-30 21:43:30 +00:00
The_E 3210b5edb5 Adding support for the new cloaking effect. 2011-07-30 21:13:02 +00:00
The_E 971da652f2 Fixes issue regarding UI sounds and built-in retail ship/weapon effects being of different length. 2011-07-30 19:49:49 +00:00
karajorma fbace772dd Ignore-key SEXP and the changes needed to support it. 2011-07-30 18:54:02 +00:00
The_E 2a28c47cc3 Slight fix for issue with SSMs hitting the player ship 2011-07-30 07:31:24 +00:00
The_E a68799dc60 Fixes issue with Default ship/weapon select ai_profiles entries. 2011-07-29 13:53:35 +00:00
The_E d106e447b6 Woops, built-in shader was incorrect 2011-07-27 14:44:43 +00:00
The_E d8a484287a Adding the realtime ship/weapon select effects by Valathil. 2011-07-26 22:02:12 +00:00
Zacam 3febbd7214 From Plombo: sets "force_s3tc_enable" for some linux drivers to be able to render DDS textures.
http://www.hard-light.net/forums/index.php?topic=77196.0
2011-07-25 22:10:32 +00:00
The_E 7cef6531ce Update to FXAA 3.11 2011-07-23 10:14:36 +00:00
Echelon9 0659e0b90d Documentation: Resolve a Doxygen warning on the unpack_frame() and unpack_frame_from_file() functions 2011-07-23 04:38:16 +00:00
Zacam b88a23cc8f Resolves SSE detection issues on #including <xmmintrin.h> for GCC/G++ and MSVC6.
GCC/G++ users (Apple, Linux) should look to adding intrinsics to their compile options. (-msse)
2011-07-23 02:07:19 +00:00
The_E ae855ad257 Another change to make compilers happy. This time, it's ATi's turn. 2011-07-22 20:54:46 +00:00
Zacam 1ae49935ba If we declare inv2A as a float up top, we no longer need to brace out any instances which resolves cross initialization as well as still allowing MSVC6 to remain operational (per 7372). Minor formating cleanup as well.
Thanks to Goober and Plombo for feedback.
2011-07-22 18:32:22 +00:00
Goober5000 e5b8d61088 fix compile problems on MSVC6 2011-07-22 05:56:46 +00:00
Goober5000 1fb02d39bd fix Mantis #2474 2011-07-22 05:55:04 +00:00
Goober5000 ecd280e064 revert 7368: these are most certainly not graphics options 2011-07-22 05:13:28 +00:00
The_E a87bc484bd Small change to make nvidias' GLSL compiler happier 2011-07-21 20:44:26 +00:00
The_E cfacf0bc0f Moving the -window and -fullscreen_window cmdline options to the "Graphics" section 2011-07-21 16:29:49 +00:00
The_E c3654b567b Update FXAA to 3.10. Also changes the fxaa preset selection method to recompile shaders when preset changes, should yield some speed improvements. 2011-07-21 12:18:37 +00:00
Zacam 2bd1793cb1 This is not a repeat of 7340/7344. It is necessary however that we be able to tell users the value found before we reset it to zero, otherwise the warning will only ever return 0 instead of the bogus value. 2011-07-21 06:02:42 +00:00
The_E 8c81e1c220 Valathil's code cleanup patch. 2011-07-20 18:04:43 +00:00
The_E d37af167b7 Remove unreferenced variable. 2011-07-20 15:54:28 +00:00
The_E 89be484de9 More lighting patches from Valathil 2011-07-20 15:27:59 +00:00
The_E 3b35086ae6 Changing this Warning to an mprintf. We really do NOT want to generate warnings with retail data, don't we? 2011-07-19 22:00:27 +00:00
The_E 5740f91e83 Split the fxaa shader in two for better compiler compatibility 2011-07-19 21:51:37 +00:00
The_E 5e1c5fc897 Updating the built-in fxaa shaders to 3.9 2011-07-19 18:23:32 +00:00
Echelon9 b0d0d8eb8b For Valathil: Fix distance check in beam.cpp 2011-07-19 13:25:42 +00:00
The_E 4ae387e92c From m!m: Gives scripting access to debris chunk size data 2011-07-18 17:58:49 +00:00
Sushi d87d0566c2 Revert 7340 and 7344, since they derped hard. (Kept 7341) 2011-07-18 14:54:41 +00:00
Zacam 62647118f5 Update:
libpng now at 1.5.2 (with update to pngutils)
zlib now at 1.2.5
(Files are in "LF" instead of "CRLF" this time around.)
MSVC6-2010 and XCode project updates included.
2011-07-17 05:46:14 +00:00
Zacam 51fd45a1a9 Update to Post_Processing for split controls on Brightness and contrast.
Spacing/formatting clean-up.
2011-07-17 04:39:10 +00:00
Zacam 182dc87e79 From Valathil: Beams now use Tube lighting. Updates to main shaders accordingly. 2011-07-17 04:36:00 +00:00
Swifty f2e2fcd1d9 Corrected directive gauge to use both X and Y offsets. 2011-07-14 07:08:53 +00:00
The_E 804a92d36b From Valathil: Do light sorting only once per object 2011-07-13 09:03:03 +00:00
Goober5000 b8fe8e74aa Valathil's fixes for #weak weapon variants
http://www.hard-light.net/forums/index.php?topic=77060.0
2011-07-13 07:33:29 +00:00
Zacam 362b141e9a Copeh Pasteh does not make for al dente. 2011-07-11 19:09:10 +00:00
Goober5000 d26d831477 deal with string truncation on MSVC6 2011-07-11 02:10:48 +00:00
Goober5000 57ae284508 Valathil's method will fail on a string that is less than 60 chars and does not contain a :, so use memset, which is the historical technique 2011-07-11 02:05:27 +00:00
Zacam 96e2fbea00 Additional warning messaging for parsing the ai_profiles.tbl or -aip.tbm. 2011-07-10 17:21:33 +00:00
Zacam 71561acde4 From Valathil: ai_profiles tbl/tbm will now parse set_flags and warn on unrecognized declarations when found.
Credits to Spoon and WoD for unveiling this over-sight.
2011-07-10 17:05:57 +00:00
The_E 26c351d33f Reverting 7334 and 7333, following feedback from valathil 2011-07-09 13:14:49 +00:00
Echelon9 698ac44458 Fix r7325: Asset() =/= Assertion() 2011-07-07 12:59:38 +00:00
Zacam a3b34bacf1 Directional Lights sorting probably should not have been flipped, the rest seem to be okay though.
(Sun facing sides of ships were going pitch dark when lots of beams were active)
2011-07-06 23:07:09 +00:00
Zacam 83e412d160 From Valathil: Correction to commit 7292. Light sorting now takes place in the proper order. 2011-07-06 20:55:45 +00:00
The_E 9b5eacba37 Major change to FXAA. Now doing a prepass to convert the main shaders' RGBA output into RGBL. Also enables minor speedup for OpenGL 4/4.1 capable chips. Default preset changed to 6. 2011-07-06 10:48:56 +00:00
Goober5000 b094820d73 a wee bit more is needed 2011-07-06 05:06:22 +00:00
Goober5000 e947d4919c make things compile 2011-07-06 04:44:25 +00:00
Goober5000 8e929cfc7c don't assert on a benign conflict 2011-07-06 04:39:40 +00:00
IssMneur 4d4a2d40f8 From Valathil: Vary the intensity of lighting from warp fireballs (wormhole) based on the radius of the fireball. 2011-07-06 04:22:09 +00:00
The_E 5de4cd9efd New FXAA shaders. These have an increased preset range, going from 0 to 9 inclusive. Presets 0 - 4 use the "Console" version of the algorithm, 5 - 9 get the "PC" version 2011-07-05 12:35:18 +00:00
The_E d0dfa12cc3 Wasn't supposed to change this 2011-07-04 14:59:12 +00:00
The_E e5c78d507e Reverting, due to unforeseen consequences 2011-07-04 14:55:07 +00:00
The_E 774cb9fe91 Small update to the FXAA shaders. Also adds a function for shader uniform access that was previously missing. 2011-07-04 13:59:02 +00:00
karajorma 545b134e9e Add a separator between paste and add paste in the event editor. 2011-07-04 02:22:26 +00:00
Zacam d387a025de I should sleep more. 7307 was to add a "{ "glUniform4fARB", 0 }," not another v. 2011-07-03 14:44:16 +00:00
The_E 2fd6637272 Updating these to current official versions 2011-07-03 08:40:21 +00:00
The_E df711c1831 And -oldfire, which does nothing, goes to the grave. 2011-07-02 19:45:46 +00:00
The_E 3aaf723acf And -safeloading bites the dust too. 2011-07-02 19:43:02 +00:00
The_E b9abac3072 Removing several deprecated/unused cmdline options. Victims this round are: -cell, -timerbar and -d3d_bad_tsys 2011-07-02 19:33:23 +00:00
Zacam 4139974206 Fix for SSM usage causing Assert. If warp lifetime must be 4 seconds or greater, how about we warn them (in parsing) before they try and use it (and thus set it to at least 4.0) instead?
Thanks to bigchunk1 for catching this one and to IssMneur for the assist and review.
2011-07-02 05:07:57 +00:00
Zacam 246364ef5d This is the right way to do it.
Correct version of 7304.
2011-07-02 01:02:26 +00:00
Zacam 71b86cde82 ...but apparently not that way. 2011-07-02 00:14:04 +00:00
Zacam 7681cbc2b1 OGL_UNIFORM4FV should be (and now is) preceded by OGL_UNIFORM4F. 2011-07-01 23:37:30 +00:00
The_E c79a5ef0bc Built-in bloom shader adjusted for higher quality 2011-07-01 19:09:25 +00:00
The_E da4fc0fcb5 Minor typo correction. Thanks to Valathil for finding it. 2011-07-01 19:00:57 +00:00
The_E cee76bd773 Swifty's collision detection improvements. 2011-07-01 17:00:31 +00:00
The_E 3cf76d5f10 Another small change to the built-in shaders 2011-07-01 11:33:09 +00:00
The_E 8138e4c653 From Valathiel: enables light sorting. Reduces light flickering in some cases. 2011-07-01 10:00:55 +00:00
The_E 8be3544245 Minor adjustment to the built-in shaders 2011-06-30 10:06:01 +00:00
The_E c450e0ea2e Fix for Mantis 2395: Introduces troubleshooting flag to switch between using glDrawElements and glDrawRangeElements 2011-06-28 20:20:25 +00:00
The_E 3e5c99e280 Fix for Mantis 1983: Do not process lightning info when in standalone mode 2011-06-28 19:48:20 +00:00
The_E 682ca6fb76 Fix for Mantis 2424: Crashes in multiplayer when <Wingname> 1 is not a player ship 2011-06-28 19:24:13 +00:00
The_E d6451e8b5b When will I get it right.... 2011-06-28 14:13:21 +00:00
The_E d40cc1f9df Aaaargh, messed up AGAIN. 2011-06-28 14:10:23 +00:00
The_E bab2992423 Ooops, fucked this one up a bit. 2011-06-28 14:07:34 +00:00
The_E 1ffa308519 How did these values start colliding all of a sudden? Must have been my fault, sorry. 2011-06-28 09:38:06 +00:00
The_E 1cff27d3cc Adds sexps to manipulate a ships' collision groups. If two objects are members of the same collision group, they will not collide with each other. 2011-06-28 08:36:54 +00:00
Goober5000 5056a94af0 add string-get-substring, string-set-substring, and string-get-length; needed for Blue Planet 2011-06-28 04:08:59 +00:00
Zacam 43b84007b6 Some "\n"'s to help with logging during multi. "Scoring:" wasn't using any, so it would run on the next item right at the end. 2011-06-28 01:03:03 +00:00
The_E 9320f86315 Adding a piece of sanity checking here, to avoid crashing the release build under certain strange circumstances 2011-06-27 22:16:41 +00:00
The_E b48cbd6f36 Disable warning that is meaningless ("why are G_predicted_pos and G_fire_pos the same?"), and only serves to confuse people. 2011-06-27 13:52:45 +00:00
The_E d3d80139df Patch for Mantis 2050: Renaming the log file may cause crashes 2011-06-27 13:45:19 +00:00
The_E d45a78188b From m!m: Patch for Mantis 2459 (Calling ts.createParticle with an invalid effect handle causes an Int3()) 2011-06-27 12:49:42 +00:00
Sushi 79e05869f7 Add "wait for animation" turret flag (turret won't fire until associated animation completes) 2011-06-26 18:10:54 +00:00
The_E 4fc74f172b Patch from m!m to give scripting access to debris metadata 2011-06-25 14:15:44 +00:00
Swifty 8cb697aacf Introduced the preprocess() method in HudGauges. Allowed the HUD to peek at the HUD message buffer when HUD is disabled. 2011-06-25 09:30:47 +00:00
The_E e77f5e4da3 Patch for Mantis 2326: Standalone server crashes when ship classes are changed in loadout.
I hope.
2011-06-25 08:03:52 +00:00
Zacam 08772f1ed7 Standalone execution now creates it's own log file (fs2_standalone.log) 2011-06-21 19:23:56 +00:00
Goober5000 cc81dd37af fix GUI 2011-06-20 08:51:26 +00:00
Goober5000 edab99175a make the installer node tokens future-proof! 2011-06-20 08:51:14 +00:00
The_E 7937652477 Fixes issue with padlock view messages not appearing 2011-06-19 12:57:26 +00:00
The_E 909ec96d06 Fix compiler warnings re: signed/unsigned mismatch 2011-06-18 21:36:05 +00:00
Sushi 4754849a2f Halleck's glide sound patch (mantis 2452) 2011-06-18 00:44:41 +00:00
The_E dd11cdd17b Bumping the max number of files CFile can handle to 2^16 2011-06-16 17:09:30 +00:00
Zacam 2c679d48f5 Adds "/MP" as an Additional compiler Option for MSVC 2008. 2011-06-16 15:59:59 +00:00
Sushi 5256d928fe Added is-in-box SEXP 2011-06-16 02:59:44 +00:00
chief1983 7147fafa7f Update OS X Ogg libraries in the Frameworks archive. 2011-06-15 20:04:07 +00:00
karajorma 6a5c3f9ecc Get and set SEXPs for countermeasures. 2011-06-15 12:46:02 +00:00
The_E 1ca1a7e37c Oops, small typo 2011-06-14 16:45:35 +00:00
The_E 93beff1db2 This will make various text boxes react correctly to changes in font height. 2011-06-14 16:40:20 +00:00
Goober5000 a1411f997e add mjn.mixael's credits image specification feature 2011-06-13 03:42:24 +00:00
The_E 04d0250287 Adds "$disable weapon damage scaling for player:" AI profiles option, which does what it says on the tin. 2011-06-11 19:26:56 +00:00
Sushi f06d5443f5 Halleck's pre-launch sound patch (mantis 2451) 2011-06-10 04:52:35 +00:00
Zacam 49b93f3605 Back port from AP: removes a couple of Unreachable NULL returns 2011-06-07 02:30:00 +00:00
Sushi 3e88cb2685 Merged from Diaspora: Slight bump in contrail limit and max reinforcements 2011-06-04 16:42:43 +00:00
Sushi c2ccb3c80c Merged from Diaspora branch: Make "+Shield_Hit_ani" optional 2011-06-04 16:02:21 +00:00
Sushi 13125c5c8a Turn Z-buffering back on for BSG warp effect. 2011-06-03 23:54:30 +00:00
The_E 47dd5e3c3f A small change to make Apple's GLSL compiler happy 2011-06-03 18:02:29 +00:00
chief1983 c8307a4747 Fix a typo reported by ElGuillermo. 2011-06-03 16:53:39 +00:00
Zacam 20279182d1 In crawling through XT Branch, noticed this.
"%sÀÄ%s" should be "%s:%s"
2011-06-03 05:18:10 +00:00
Sushi 306ff41a2d Fix nasty pointer bug 2011-06-03 03:02:48 +00:00
The_E ffdbfeda16 Another Assert -> Assertion conversion to help in mission debugging. 2011-06-02 09:36:24 +00:00
The_E 8bdd4c98f7 Patch for Mantis 2421 from m!m: Adds scripting controls for particles. 2011-06-01 19:41:07 +00:00
Goober5000 a0d6672ec8 extra small enhancement 2011-05-30 21:20:32 +00:00
Goober5000 2cf0db9ee3 add ability to set the duration of the ship death roll 2011-05-30 21:06:11 +00:00
The_E e5775a6039 From m!m: Patch for Mantis 2446: Scripts not pausing when game is paused. 2011-05-30 18:47:27 +00:00
Goober5000 516560eb90 fix sanity check for too-long messages (Mantis #2412) 2011-05-30 06:47:27 +00:00
Goober5000 d593da4911 reverting 7211 because it is not a proper fix 2011-05-29 06:56:17 +00:00
Goober5000 732450428e reorder HashTriple arguments and also allow them to be on one line 2011-05-28 22:44:27 +00:00
The_E 7d832b1122 Adding a code comment here to remind people about necessary bumpings 2011-05-28 14:37:48 +00:00
Zacam bb11ce1f73 Back in r6952 "HUD_OBJECT_PING," was added to "static int retail_gauges[] = {" but "int num_default_gauges = 43;" was not bumped up, resulting in "HUD_OBJECT_FIXED_MESSAGES" not displaying. 2011-05-27 23:38:14 +00:00
Sushi d7f886ac68 Fixing some HUDs showing from other ships when they shouldn't, take 2 2011-05-27 14:36:14 +00:00
The_E 1502504d15 Patch for Mantis 2441 (friendly-stealth-invisible" flag doesn't work) from pyro3d 2011-05-27 09:11:51 +00:00
The_E 82729027bd Reverting commit 7203. If you wish to exclude certain gauges from rendering depending on camera mode, you need to edit that gauges's constructor function, NOT the canRender() method. 2011-05-26 20:45:12 +00:00
Goober5000 5029c4aef1 break strings into bite-size pieces for ease of compiler digestion 2011-05-26 03:58:00 +00:00
Goober5000 dc673e5451 fix minor pierce-shields table flag bug (Mantis #2442) 2011-05-26 03:40:07 +00:00
Sushi e7e8a352a0 Added an Assertion to help track down a sound error 2011-05-24 15:03:09 +00:00
Sushi 25fea7c2a9 Fix some HUD gauges being rendered while viewing other ships externally 2011-05-24 14:40:57 +00:00
Sushi 8987413493 Update thruster rendering (consistently render based on acceleration instead of speed, don't render distant/tiny thrusters) 2011-05-21 20:25:14 +00:00
The_E 7e390c1dea Adding the FSU main shaders, FSU post-processing.tbl, as well as the post-processing and FXAA shaders to def_files. 2011-05-21 17:07:41 +00:00
The_E 0b2b742d24 Since bloom can now be changed in-game, we always need to compile the shaders. 2011-05-20 15:56:30 +00:00
The_E b4776aaa6c Patch for bug encountered by Zacam: Ship model instance data was not being reset correctly when changing ship classes. 2011-05-19 21:32:02 +00:00
The_E 3305cf4ba7 This will make the lab more useful, as it is now possible to adjust the bloom intensity on-the-fly by pressing b (for more bloom) or n (for less bloom). 2011-05-19 14:51:51 +00:00
Zacam 710fa24268 Stupidest typo ever. "GS_STATE_END_OF_CAMPAIGN" not "_EMD_" 2011-05-19 12:20:22 +00:00
Sushi 4263a7ed25 Fix BSG warp effect shockwave 2011-05-19 00:50:27 +00:00
The_E c83be79d9f Adding a bit of configurability to the FXAA business. This alters the F3 Lab so that the number keys correspond to FXAA presets (with 0 being lowest and fastest, default being 3). Also adds the "-fxaa_preset" commandline argument, which accepts a single int parameter. New Shaders needed to take full advantage of this, see forum thread (http://www.hard-light.net/forums/index.php?topic=76145.0) for details. 2011-05-18 11:37:27 +00:00
The_E a3cb805d96 Adding an error message in case FXAA shader compilation fails. 2011-05-17 16:29:43 +00:00
The_E 50be17b87d This will enable FXAA support in FSO (Read: Antialiasing as a post-process stage). In order to use it, the shaders found here: http://blueplanet.fsmods.net/E/stuff/FXAA-shaders.7z need to be in data/effects. 2011-05-17 14:57:33 +00:00
The_E 7fefc7b1dc Converting a few more Asserts to Assertions. Also added a graceful exit path. 2011-05-15 08:38:22 +00:00
Sushi 71b1f8cd5e Fix clipping problems with deathcam and cutscene bars. 2011-05-14 16:58:29 +00:00
Echelon9 8ad4b38935 Documentation: First pass of AI code functions 2011-05-12 13:44:20 +00:00
Echelon9 4523800cc2 Documentation: 3D clipper functions 2011-05-12 13:43:42 +00:00
Echelon9 f61199fee4 Documentation: Animation code function documentation 2011-05-12 13:43:00 +00:00
The_E c3389b3a23 Fixes issue where both the 2D and 3D radars were visible at the same time. Code should now respet the commandline flags properly. 2011-05-10 15:26:46 +00:00
Goober5000 529e8059f6 new images courtesy of Zacam 2011-05-08 19:20:20 +00:00
The_E 8f0484be65 This makes the "Form on Wing" AI order accessible to FREDers as an AI goal. 2011-05-08 11:17:34 +00:00
Sushi ec5b25c965 Updated "alt1" path mode so that it respects the cap-waypoint-speed SEXP. 2011-05-07 11:31:30 +00:00
The_E c4f5e8b8ff Aargh, this might have been catastrophic 2011-05-01 15:05:01 +00:00
The_E 3f579a4df5 Fix compile warnings here. 2011-05-01 15:00:53 +00:00
Echelon9 4ab7ed9908 ds.cpp: Back this change back out until the wholesale change can be made at once 2011-05-01 14:59:31 +00:00
Echelon9 9ed5d2c96f Fix Diaspora Mantis 772: Player is able to fire countermeasures when player-use-ai SEXP is used. Also document. 2011-05-01 13:03:39 +00:00
Echelon9 f5f03d11f5 Two small comment typo corrections for model.h and ship.cpp 2011-05-01 12:00:26 +00:00
Echelon9 995fef8cff Documentation: Commentary for modelanim.cpp|h 2011-05-01 11:59:40 +00:00
Echelon9 470e237678 Fix Valgrind report: Use of uninitialised value &freq in alcGetIntergerv(); requires braces to address GCC crosses initialisation error due to the goto in this function 2011-05-01 11:07:26 +00:00
Echelon9 db8e2ca2da Documentation: Help save some trees 2011-05-01 09:06:12 +00:00
Echelon9 5be507401d As we don't do Unicode properly yet, this character corrupts. In French it still means Hat Back (joystick control) 2011-05-01 08:53:13 +00:00
Echelon9 206c2167fc Documentation: hud.cpp and hud.h files 2011-05-01 06:05:48 +00:00
Echelon9 a98ddb3f1b Documentation: Fix a few syntax errors reported in Doxygen's log 2011-05-01 03:54:01 +00:00
The_E ad65cf3b6b Change syntax and help text of the set-jumpnode-model sexp, as it was rather broken before. 2011-04-30 16:23:05 +00:00
Echelon9 1a59364697 Xcode project file: Generate debug builds with a DWARF plus dsym file, so that analysis tools can retrieve source code line numbers 2011-04-30 06:24:08 +00:00
Echelon9 a036f6d560 Documentation: sound/ds.cpp 2011-04-30 06:18:03 +00:00
The_E 3fafa6395d And now set-jumpnode-name is even multi compatible. 2011-04-29 14:54:38 +00:00
The_E ab083122de Added warning to the sexp help for set-jumpnode-name 2011-04-29 14:10:52 +00:00
The_E 526795fb0b set-jumpnode-name, as implemented by CommanderDJ 2011-04-29 14:05:45 +00:00
karajorma fbb505315f Fix for Mantis 2427 (Directive-Is-Variable SEXP doesn't allow you to change the variable name. 2011-04-28 12:46:01 +00:00
Sushi 4ad189fc89 Add $Path Metadata and +departure rvec to ships.tbl 2011-04-27 14:22:22 +00:00
The_E a298a81b7c Okay. No more screwing around with this. 2011-04-26 11:13:56 +00:00
The_E c5da6ab2d0 Ooops, this armor type business isn't ready yet 2011-04-26 11:09:19 +00:00
The_E 82600af1ff Fix for Mantis 2428: Decal parsing deprecation error 2011-04-26 09:24:54 +00:00
The_E d8cfd4966b Fixes issue with custom HUD gauges not resetting to their default values between missions. 2011-04-24 17:19:21 +00:00
Wanderer f8c5dde568 fixes to turret rotation handling (swarm issue) and to secondary turret angle checks 2011-04-23 21:53:19 +00:00
Wanderer ec5bec4f13 fix for mantis 2309's corkscrew issue 2011-04-23 12:18:30 +00:00
The_E 4e66d27edf Guarding against a null vec3D in vm_vec_normalize here. 2011-04-21 16:12:54 +00:00
Wanderer c744baf157 related to mantis 2406 - ai profiles option to make beams deal damage to weapons 2011-04-20 15:40:29 +00:00
Wanderer de136e11d0 Fix for mantis 2406 for weapon vs. weapon collisions (not beam vs. weapon collisions however) 2011-04-20 08:17:24 +00:00
IssMneur 94056da6b7 Make this a more useful error message. 2011-04-20 04:16:42 +00:00
Sushi 8c4e311364 Add "$ai path mode:" to ai_profiles. This allows an alternate method of path following that works better in some cases, such as with high-damp ships. 2011-04-18 14:08:31 +00:00
karajorma e9bab7059d Add a SEXP to allow variables to set the counter in a directive. 2011-04-18 05:34:18 +00:00
Echelon9 e28e084bda DOC: Amendment to frand_range() 2011-04-17 00:33:51 +00:00
Echelon9 2d71100cf3 DOC: Documentation of floating.cpp 2011-04-17 00:18:59 +00:00
Wanderer 03e1a3151e fix for issue noticed by Zacam in the particle effect changes 2011-04-15 14:34:31 +00:00
The_E 0448c7bbdd Woops, this shouldn't have gone in 2011-04-15 12:44:24 +00:00
The_E 472a790f40 Fix for Mantis 2416 (Messages do not display when in padlock view) 2011-04-15 12:34:11 +00:00
The_E 8114bf522a Fix for Mantis 2240 (HUD anis and training messages do not display if hud_disable_except_messages is active) 2011-04-15 12:16:17 +00:00
Goober5000 74f20d658b make the selection look more like a wizard selection (I used the MySQL Setup Wizard as a pattern to follow)
this should finish ChoicePage
2011-04-15 05:41:12 +00:00
Goober5000 cf63cd6f66 consistency 2011-04-15 05:40:49 +00:00
Goober5000 e640ddd68e hmm... grammar... 2011-04-15 05:39:25 +00:00
Goober5000 83bf67ecab modify label 2011-04-15 05:38:38 +00:00
Goober5000 ce86c005f4 typo 2011-04-15 05:32:18 +00:00
Wanderer b6d871e2f8 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
Goober5000 f09b24411a fix NPE 2011-04-13 03:08:49 +00:00
Zacam bb63b4d516 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 9d6720a4d7 Of course, I did it wrong. However, this works now. 2011-04-12 13:32:27 +00:00
The_E c6b0e639d5 Requested by Axem: Allow beams to tag targets. 2011-04-11 15:44:33 +00:00
Echelon9 98816cedc6 Documentation: hud_sensors_ok() function comment 2011-04-10 13:09:24 +00:00
Echelon9 796f88262b Second go at patch r7110 2011-04-08 13:00:51 +00:00
Echelon9 713b9df027 Fix two buffer overflows: missionweaponchoice.cpp(3580): warning C6386: Buffer overrun: accessing 'slot->wep', the writable size is '28' bytes, but '4194244' bytes might be written & missionweaponchoice.cpp(3585): warning C6386: Buffer overrun: accessing 'slot->wep_count', the writable size is '28' bytes, but '4194244' bytes might be written 2011-04-08 12:38:19 +00:00
The_E d5c2fbefd0 Removing an Assert in favour of more elegant error handling. 2011-04-06 10:25:18 +00:00
The_E 909d6db1cd Fix for issue with the "no ETS" flag where subsystems were not getting recharged properly. 2011-04-05 12:05:32 +00:00
The_E 9e7e694ef4 2011-04-05 09:44:43 +00:00
The_E ac70f01aa8 FSF's fix for Mantis 2371 (Hotkey selection does not work for additional wings) 2011-04-04 14:48:27 +00:00
The_E 74ceaea68d Fix for Mantis 2409 (Directive gauge is rendered despite hud-disable-except-messages) 2011-04-04 13:07:17 +00:00
The_E ba942ac745 Fix for Mantis 2391 (Erroneous warning about missing assets due to changd HUD loading mechanisms) 2011-04-04 13:03:29 +00:00
The_E ccdd655c8c Fix for Mantis 2422 (Target Shield indicator behaves like a duplicate of the player shield indicator) 2011-04-04 12:56:59 +00:00
The_E 4ee94e1807 Correction: Previous commit broke AWACS behaviour. 2011-03-30 09:42:52 +00:00
The_E 90814c1fd4 Add a sanity check here. 2011-03-29 18:06:04 +00:00
The_E 16c3bcbd84 Change an Assert to an Assertion for better debugging. 2011-03-29 17:17:15 +00:00
Zacam 2c8798857c 7092/7093 were meant for Antipodes, not Trunk. 2011-03-29 13:55:04 +00:00
Zacam 6fb25efa6d Reported by rsaxvc (Probably due to MAX_INT being used)
http://www.hard-light.net/forums/index.php?topic=75332.0
2011-03-29 13:50:17 +00:00
Zacam fddb06dc30 Pull the "demo" dir out of the makefile. 2011-03-29 13:42:57 +00:00
Echelon9 3cd37f09fc DOC: Update some documentation in missionbriefcommon.cpp 2011-03-24 12:53:44 +00:00
Goober5000 5d190cdaf8 handle pre-selecting a group of checkboxes according to whether we chose BASIC or COMPLETE
disable Next button until we actually choose
select proper executable according to OS version
only allow BASIC selection if all BASIC mods are present (as determined by basic_config.txt)
miscellaneous optimizations and bulletproofing
2011-03-21 07:36:51 +00:00
Goober5000 12f144da19 ConfigPage layout shouldn't stretch components
allow easy changing of Next button
add the Choice page before the Custom page
add placeholder icons
2011-03-21 03:55:32 +00:00
Goober5000 66619fecd0 remove requirement for file to end with newline
parse more than one mod in a single mod file
2011-03-21 00:31:13 +00:00
Goober5000 e7316355b5 automatically select and deselect child mods 2011-03-20 19:34:15 +00:00
Goober5000 8061f38bc7 keep track of node parents and user-specified objects 2011-03-20 19:33:18 +00:00
Goober5000 c95f6cc213 enhance checkbox panels for mods 2011-03-20 09:55:01 +00:00
Goober5000 b3092e176d download all mod information from mod URLs 2011-03-20 09:12:31 +00:00
Wanderer c8d1caf35c feature commit - damage and impact particle spew controls, control for setting a multiplier for propagating explosion radius. 2011-03-19 22:37:32 +00:00
The_E 76d4e16985 And more from m!m, as seen here: http://www.hard-light.net/forums/index.php?topic=44821.msg1487355#msg1487355 2011-03-19 21:49:42 +00:00
The_E 72496f412f A few tweaks and additions by nuke 2011-03-19 21:37:51 +00:00
The_E 9368cd1d8f m!m's corrections to subsystem:fireWeapon() as seen here: http://www.hard-light.net/forums/index.php?topic=44821.msg1486751#msg1486751. Slightly adjusted to use model instances. Also tweaked ship_get_global_turret_gun_info() to use model instances. 2011-03-18 21:47:17 +00:00
Sushi ae91cb4efb Add "$Detail Distance Multiplier" 2011-03-18 14:33:50 +00:00
Goober5000 ec2030bd3a we want to output hashes as well as input them
make order of tokens consistent
2011-03-17 00:39:48 +00:00
Goober5000 7e13a9cb89 keep track of hashes, in case we want to validate the files we download 2011-03-16 08:43:20 +00:00
Goober5000 1320937ba7 tweaks 2011-03-16 06:46:57 +00:00
Goober5000 2e9244c3d9 add ThreadSafeJOptionPane so as to conveniently do JOptionPane stuff on the event-dispatching thread without cluttering up client code
update ConfigPage to use ThreadSafeJOptionPane
also, fix a sneaky event queue omission
2011-03-15 03:44:17 +00:00
Goober5000 5eef342f94 increase thread-safety of ProgressBarDialog initialization
also, remove the window decoration so people don't think the close button is broken
2011-03-15 02:14:23 +00:00
Goober5000 402ad8bb29 all resources are now loaded from the resources folder
refine MiscUtils.invokeAndWait exception handling
2011-03-15 02:12:53 +00:00
Goober5000 85f1e67f7c move Configuration to the main package and make it thread-safe, as it manages global state
load the application title from the properties file, if applicable
the UIManager code should go on the event dispatching thread too
2011-03-15 02:11:24 +00:00
Goober5000 8f572cf82d make the ConfigPage validation asynchronous, using the ProgressBarDialog
this makes the interface nice and crisp, but the code is now quite a bit messier :-/
fortunately, ConfigPage should be pretty much ready to go at this point
2011-03-14 07:50:06 +00:00
Goober5000 6f31168969 changes to support a new Properties file if one does not yet exist
also, some tweaks to ProgressBarDialog
2011-03-14 07:48:42 +00:00
Goober5000 4e8ca90e86 installer will now check remote version and filename info 2011-03-14 06:22:01 +00:00
Goober5000 d50c1f2c71 add ModSelectPage, which isn't really finished yet 2011-03-14 03:52:38 +00:00
Goober5000 0a2872bffd woohoo, useful utilities 2011-03-13 09:32:28 +00:00
Goober5000 cd2a8c7807 gui and other changes to support first page of installer, yay! 2011-03-13 02:08:09 +00:00
Goober5000 e899946e53 let's not have validation side-effects (don't create the directory) 2011-03-13 02:07:04 +00:00
Goober5000 9026157b8f separate proxy creation from connector creation 2011-03-13 02:05:41 +00:00
Goober5000 fcc0aaacc7 make parse work better 2011-03-12 23:18:29 +00:00
Goober5000 47709fc787 oops... PropertiesUtil itself uses a logger, so that won't work 2011-03-12 21:32:48 +00:00
Goober5000 5c5b8abec2 enhancements for keeping track of installer configuration 2011-03-12 21:20:54 +00:00
Goober5000 e3ab352f19 since the Swing framework dispatches all events on the Event Dispatching Thread, let's do the same for Downloader
also, let's use CopyOnWriteArrayList because it appears to be better than explicit synchronization for listener lists
2011-03-12 03:45:52 +00:00
Goober5000 9736345291 use a common function for getting images 2011-03-12 03:43:25 +00:00
Goober5000 3be593e714 I think we want to set the root logger level before we do anything else 2011-03-12 03:39:58 +00:00
Goober5000 6bc41507c9 improved version of hud_squadmsg_wing_valid(); fixes Mantis #2415 2011-03-11 07:21:27 +00:00
karajorma 14abce952e Remove a few annoying compilation warnings 2011-03-10 00:26:45 +00:00
Goober5000 0a6604f2e4 add another ship class to the list of FSPort changed names 2011-03-09 04:04:33 +00:00
Goober5000 f4df55cdc9 robusto 2011-03-08 08:23:24 +00:00
Goober5000 0ede5cd9cc now the installer should look a little familiar 2011-03-08 08:19:02 +00:00
Goober5000 e0b45748f0 add some useful utility classes and functions 2011-03-08 08:18:29 +00:00
Goober5000 93c2499957 add JDirectoryChooser for later use 2011-03-08 08:16:15 +00:00
Goober5000 a005c2b124 add new Logging wrapper, with log4j-compatible API
add new InstallerPage shell
Javadoc comment tweak
2011-03-08 06:45:43 +00:00
Goober5000 f805637a38 downgrade from log4j to Java logging, ugh... all for the sake of a license 2011-03-08 06:44:49 +00:00
Goober5000 50b7c26090 remove CJWizards; it's not mature enough 2011-03-08 06:43:55 +00:00
Goober5000 6d9aeb54cb cleaner way of merging everything into one jar 2011-03-05 07:25:26 +00:00
Goober5000 8cb6059e06 some stuff 2011-03-04 06:32:38 +00:00
Goober5000 c35e0e1874 better jar building 2011-03-04 06:32:08 +00:00
Goober5000 04d6aa116a finish patching subsystem comparison 2011-03-03 07:00:42 +00:00
Swifty 76f4e1d0a7 Memory leaks involving Polymodel_instances plugged. 2011-03-02 14:08:22 +00:00
Goober5000 5852f95c6d use subsystem_stricmp where appropriate 2011-02-28 08:27:52 +00:00
Echelon9 fa3e5fac31 Update SVN ignore keyword so we don't get documentation output in SVN 2011-02-26 01:18:16 +00:00
Echelon9 6ab2d49781 First version of our Documentation system, using automated Doxygen source code comments 2011-02-26 01:15:51 +00:00
Echelon9 e103980c2a Effective STL: Use Container.empty() instead of Container.size() == 0 in if() statements 2011-02-25 14:38:28 +00:00
Goober5000 bf4e108b34 change the subsystem warning to an nprintf, since it's a pretty benign notification and sexps don't notify you anyway 2011-02-23 05:09:24 +00:00
Echelon9 4b3dd6326b DOC: Further instructions on initialisation of the pseudo random number generator 2011-02-22 12:05:31 +00:00
Echelon9 6281941fc0 Accompanying changes to aicode.cpp following staticrand.cpp 2011-02-21 14:15:34 +00:00
Echelon9 2b8fa77c42 A couple of other small changes to staticrand.cpp|h to address readability 2011-02-21 14:13:23 +00:00
Echelon9 80c3a65a16 Initial testing of something very exciting for the coders... 2011-02-21 12:50:16 +00:00
Goober5000 be8239354d add slash and backslash 2011-02-19 04:51:02 +00:00
karajorma 0c7897f445 Add the Num-Valid-Arguments SEXP. 2011-02-15 08:18:58 +00:00
Goober5000 ee0bfbaec2 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 f98ba06c10 More lua stuff from m!m 2011-02-13 19:45:12 +00:00
Sushi 608eec136e Fix a bug with friendly shield manage/cm usage 2011-02-12 17:02:23 +00:00
Goober5000 68dee88e5e activate the OF_IMMOBILE flag, and clean up the obj_move_all loop slightly 2011-02-12 05:00:13 +00:00
Goober5000 122d004b6d gaaaah, fix a whole bunch of bugs with the no-ets flag:
checkbox ui settings were incorrect
checkbox wasn't hooked into the event loop
resource #define's overlapped
FRED never saved the ship flag
ship flag did not have an equivalent parse flag
sexp(s) to modify ship flag did not use the existing ship flag sexp architecture
2011-02-07 09:08:39 +00:00
Goober5000 1fffcec52c fixed compilation error 2011-02-06 08:18:26 +00:00
The_E fe5a61150e More fixes for Mantis 2372. Should now allow longer descriptions. 2011-02-05 09:18:04 +00:00
The_E 3d7fb2eec7 Minor whoopsie. This shouldn't have been committed just yet. 2011-02-05 08:59:26 +00:00
The_E cdaa5fb9d5 Adding patch for Mantis 2385. This adds a "+sub_name" option to the animation code, which comes after/replaces "+sub_type" for a few triggers, such as the "weapon fired" trigger. 2011-02-04 17:18:39 +00:00
The_E 1f9d145e24 Adding a bit of verification here to catch a very strange bug 2011-02-04 17:12:48 +00:00
The_E 6b6ea9309c Adding a few error messages 2011-02-04 17:02:49 +00:00
Echelon9 12ea95e326 Remove last references to the redundant Intel_anim_filenames array 2011-02-04 15:31:44 +00:00
Zacam 1b5b46735d Nukes Particle Code update (for more particle types)
http://www.hard-light.net/forums/index.php?topic=74165.0
2011-02-04 14:10:59 +00:00
Zacam 6b122a7973 Karajorma's "Clean up" code. (Not for credit, but because I'm trying to reduce the "open" number of "Code Reviews" so that we don't get too backlogged with them)
http://www.hard-light.net/forums/index.php?topic=74066.0
2011-02-03 07:41:16 +00:00
FUBAR-BDHR 3ce0a1dc25 Add node-targeted sexp 2011-02-02 06:26:21 +00:00
Goober5000 ca4236176e --the behavior of cargo index -1 (which can only happen for capships) and cargo index 0 is substantially the same, so let's standardize on index 0... this prevents crazy stuff happening with bitwise operators on negative numbers :-/
--also, remove the restriction on capship cargo where ships must have the "scannable" flag
--because of the above constraints, "nothing" cannot be a meaningful subsys cargo, but then again, scanning a subsystem with "nothing" didn't do anything in the old code, so this doesn't change anything
2011-01-31 10:04:37 +00:00
Goober5000 662d9bea73 fix for Mantis #2390
errors in handling the CARGO_NO_DEPLETE flag for ship subsystems
2011-01-31 09:18:21 +00:00
Goober5000 9e502c95d0 fix some errors with sexp numbering that free up 2 Change slots
merge the Nav operators into other categories
add the new Change2 category and set up hacks so that its operators will display in Change's menu
2011-01-30 09:17:15 +00:00
Goober5000 b0a1941b63 commit the "immobile" flag, requested by Black Wolf, Diaspora, etc. This is just the infrastructure; the flag doesn't actually do anything yet. 2011-01-30 08:19:17 +00:00
Goober5000 339bfb5825 fix ship flag dlg layout, which got messed up in The E's commit 2011-01-30 08:12:42 +00:00
Goober5000 eb093873d3 someone made a bug here! 2011-01-30 07:55:05 +00:00
Goober5000 04a0982f78 fix compilation 2011-01-30 07:07:33 +00:00
Zacam e9b03ef26b It would have been NICE if Tortoise had actually _deleted_ the files when it asked if I wanted them removed. Stupid !@$^*&# Tortoise. 2011-01-30 06:09:42 +00:00
Zacam 08c0adfd8b Resolves LNK4221 under MSVC. multi_oo and psnet are not actually linked/used, so references pointing to them now go to multi_obj and psnet2 respectively. (Same as Antipodes 6881)
http://www.hard-light.net/forums/index.php?topic=73147.0
2011-01-30 05:59:36 +00:00
Zacam c5272743d4 Microsoft Visual Studio 6/2005/2008/2010 project updates to use newer libjpeg code committed on 6980. 2011-01-30 01:40:18 +00:00
Echelon9 891a602cdd Update libjpeg in source to v8c (16-Jan-11) from 6b (27-Mar-98). For more details see http://www.hard-light.net/forums/index.php?topic=74110.0 2011-01-30 01:33:52 +00:00
Goober5000 5f8778f310 this should fix the weird crashes in localization 2011-01-29 09:41:13 +00:00
IssMneur afcd8b6d1f Allow a primary or secondary weapon shot be substituted with any other weapon in any arbitrary pattern.
http://www.hard-light.net/wiki/index.php/Weapons.tbl#.24Substitute:
2011-01-27 05:35:13 +00:00
Echelon9 0a04cdff92 Resolve circa 800 warnings that occur on Xcode due to symbol visibility scoping issue. 2011-01-26 11:30:56 +00:00
Echelon9 c38a35ee1b Small fix: Correct the spelling of a NavPoint function 2011-01-25 14:37:43 +00:00
Echelon9 6eae9a96d2 Chase down radardradis.h from the same location in Xcode 2011-01-25 13:10:37 +00:00
Echelon9 2ae1c9d35c What's radardradis.cpp doing in that spot of the Xcode project file? 2011-01-25 13:05:58 +00:00
Echelon9 803ece845b We don't need a specific Copy Bundle Resources stage to put the Info.plist file in the Mac .app bundle, as well as setting the INFOPLIST_FILE setting. Using Copy Bundle Resources doesn't use the C preprocessor and then puts the file in the wrong location anyway. 2011-01-25 13:03:00 +00:00
Echelon9 14e3e7a13e shipfx_large_blowup_init() function can have the void return type, as the caller never checks. 2011-01-25 12:25:59 +00:00
Zacam 290d7677b1 A tiny over-sight. Now incorrect values on "hud_speed_multiplier" will actually report as such. 2011-01-25 07:51:02 +00:00
The_E 0ee47bea78 Fix for Mantis 2372 (+Description field in Ships.tbl is being ignored) 2011-01-23 21:20:04 +00:00
The_E a0c9343414 Fix for Mantis 2380 (Setting target subsystem through scripting doesn't work) 2011-01-23 17:10:53 +00:00
The_E ded9b5170c Resolves a few signed/unsigned warnings 2011-01-23 17:06:58 +00:00
The_E c995fcfa42 Adds "no ets" ships.tbl flag. 2011-01-23 16:03:04 +00:00
Echelon9 434f93100b Fix: warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. 2011-01-23 12:47:08 +00:00
Echelon9 8422a6d2a2 Revert this change to size_t; will require the wholesale update of the weapon code indices at the same time 2011-01-23 12:30:06 +00:00
FUBAR-BDHR cddd9f302b Fix for FRED not compiling with new nebula lightning from r6958 2011-01-23 06:56:01 +00:00
FUBAR-BDHR 5d1bcc9ade Fix bug in sexp_ship_set_damage_type() 2011-01-22 06:52:43 +00:00
Echelon9 9bf6c8f25c Refactored nebula lightning & removed limits on Lightning.tbl 2011-01-22 05:35:43 +00:00
Sushi 56acb531fc Add "starts locked" subsystem flag (that turret starts out locked by default and needs to be turret-freed before it will fire) 2011-01-22 00:44:44 +00:00
Goober5000 215478baf1 add turret-protect-ship and turret-unprotect-ship 2011-01-21 08:55:26 +00:00
Goober5000 ae13aa6a85 get-object-speed-* are status sexps, not change sexps! 2011-01-21 08:49:54 +00:00
IssMneur 391fc4bd10 get-object-speed-{x,y,z} added. 2011-01-21 06:28:37 +00:00
Swifty 80197bf559 Resolved some issues involving the Ping Indicator not displaying. 2011-01-19 09:21:22 +00:00
karajorma b06d66f797 LuaPineapple's fix for Mantis 2322.
Some comment clean up.
2011-01-19 08:24:26 +00:00
The_E 6f4234ad01 FUBAR's damage type sexps. Tested ad nauseum by BP. 2011-01-18 16:21:36 +00:00
Goober5000 fc0a8ca7a7 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
Goober5000 d7a7bf452d add if-then-else and perform-actions 2011-01-16 08:18:09 +00:00
Echelon9 abf0297081 Fix Mantis 2379: Last available nebula storm type in Lightning.tbl wouldn't be used in game 2011-01-15 03:54:50 +00:00
Echelon9 3c2c5cbb58 Cleanup cmeasure.*: Remove dead code, use size_t as for loop array index not a signed int 2011-01-15 03:05:01 +00:00
Echelon9 6985398815 Prevent potential overflow of Escort_ships[] array 2011-01-15 02:33:34 +00:00
Sushi b5893b66d8 Add "hide from radar" weapon flag to force bombs not to show up on radar 2011-01-12 16:51:38 +00:00
Goober5000 114d625717 fix a return value error
also, cut down on the number of warning messages shown for background bitmap loading
2011-01-12 10:03:45 +00:00
Goober5000 f02b7b1f30 change xor (but not bitwise-xor) to use any number of arguments, not just 2
enhance string-to-int to ignore non-numeric characters (so turret07 becomes 7)
2011-01-12 02:10:22 +00:00
Goober5000 3c6c3942a0 commit string-concatenate and int-to-string 2011-01-12 01:37:03 +00:00
Swifty 048bea1caa Eliminated pesky bug involving some gauges not being properly updated with necessary HUD config data. Took a while to figure out. 2011-01-11 07:58:03 +00:00
Goober5000 a374aab716 stupid brain fart
fix Mantis #2375
2011-01-11 01:03:48 +00:00
The_E 8e3b7a89ba There is no function with the signature "double pow(int, int)" in math.h 2011-01-10 16:10:54 +00:00
Goober5000 93c2434079 remove for-each-of
add a note regarding string-to-int to for-counter
supernova-start takes a positive argument
2011-01-10 11:55:15 +00:00
Goober5000 eb688e9ee4 Added the following sexps:
pow (power function)
xor (logical operator)
set-bit, unset-bit, is-bit-set (for working with individual bits in integers)
bitwise-and, bitwise-or, bitwise-not, bitwise-xor
2011-01-10 11:29:24 +00:00
FUBAR-BDHR 8e29636fc1 Add the ability to define detail distances for weapons. 2011-01-09 22:35:02 +00:00
FUBAR-BDHR 8c9bc5a541 Fix for Mantis 2368. Subsystems with vanish flag still play sound from player ship 2011-01-07 22:01:36 +00:00
Goober5000 878f73f0c9 the repeated messages get really annoying, so log them and display one message 2011-01-07 10:16:10 +00:00
Goober5000 188d09c74b added two awesome sexps, for-each-of and for-counter
as part of the sexp infrastructure, add test_argument_vector_for_condition so that argument sources are not limited to sexp nodes
2011-01-07 09:11:02 +00:00
chief1983 ee2bb897f3 Fix for #2365: Assert to Assertion so we can tell the user a little more about the crash. 2011-01-06 05:07:51 +00:00
Swifty a8472b96b6 Support for PNG/JPG/TGA based EFFs for the HUD and other graphics that previously required ANI/PCX. 2011-01-05 08:54:14 +00:00
Zacam d7e3b95a64 GLSL version Detection fix.
http://www.hard-light.net/forums/index.php?topic=73712.0
2011-01-05 07:12:48 +00:00
FUBAR-BDHR 0c1e2b03ac Add flag that applies damage to subsystem as if it were the hull. 2011-01-05 00:12:01 +00:00
Goober5000 7622e7127d resolve a conversion warning pointed out by FUBAR 2011-01-02 00:35:05 +00:00
Goober5000 24bf8a1e53 re-add Echelon9's commit, with proper logging, and also with parallel fix to bmpman.cpp 2011-01-01 09:17:36 +00:00
Sushi a0b244852a Add "$ai aims from ship center:" and "$allow primary link delay:" AI profiles flags 2010-12-31 20:03:16 +00:00
Goober5000 49bc4fb1a0 add sexps for object orientation 2010-12-31 07:41:01 +00:00
Goober5000 da66b66880 missed one file 2010-12-31 04:28:37 +00:00
Goober5000 4a3453bc6c change fl_radian to fl_radians so as to be consistent 2010-12-31 04:02:41 +00:00
chief1983 bbc7be3fb1 Fix the DirectInput commit r6902 breaking compiling on nix 2010-12-29 18:18:44 +00:00
Echelon9 658d17635c Remove from Xcode project file two non-existant source code files 2010-12-29 07:45:10 +00:00
chief1983 67d0f7d308 Fix stoprevision 2010-12-28 21:00:40 +00:00
chief1983 2311f35b1e SMF 2.0 support for the nightly build script. 2010-12-28 20:58:14 +00:00
Zacam 6162f96e47 Thanks to Goober5000, this is the correct way to be doing this. 2010-12-28 04:49:05 +00:00
Zacam 575e861761 Fixes the index so that Player Main Hall changes will actually save properly. Should have caught this back in 6860. 2010-12-27 20:59:16 +00:00
Sushi 70b27b81df Add -disable_di_mouse command-line option to force the game to use Windows mouse input instead of DirectInput. For some people, this results in more reliable mouse input. 2010-12-27 16:17:54 +00:00
Zacam 6d38740bb6 Fixes reports of Retail data showing "0 ms" for ships Velocity in Ship Selection Screen. When multiplying an INT by a FLOAT, setting the fl2i() on the float is a good idea. 2010-12-27 15:27:48 +00:00
Swifty a91f06c435 Clear the active display list when this ship is beleeted. 2010-12-27 09:28:17 +00:00
Echelon9 05adbf4f0b Fix a small typo in Diaspora feature's comment 2010-12-27 08:26:04 +00:00
Echelon9 33f1c7cb1d Correct 2 comment typos 2010-12-27 08:18:39 +00:00
Echelon9 3741959d15 Fix: Mantis 2351 - Animated subsystems not counted as rotating allowing max to be exceeded 2010-12-27 08:00:31 +00:00
Echelon9 1f99df4eda This check can go back in, the real cause was fixed in r6893. Good work Assert() 2010-12-27 07:48:31 +00:00
Swifty 2fb94559cc Get Lua ray tests to use model_instances for collision detection. Fixes the failed assertion associated with this. 2010-12-27 07:36:49 +00:00
Echelon9 122b29b4eb Fix a comment typo 2010-12-27 06:47:03 +00:00
Swifty 0853da0f5b Limit the setup of cockpit displays to only the player ship. 2010-12-27 05:52:33 +00:00
Swifty 303e1178b9 Fixes the weapons list gauge bug where a blank space would render when no secondaries are loaded. 2010-12-27 05:43:52 +00:00
Zacam f83fce145a Revert 6884. Not a good thing to do apparently. 2010-12-26 19:46:00 +00:00
The_E b3d6e4f1c6 Fix for Mantis 2350 (Sound assignments get lost/become bogus when changing ship class) 2010-12-25 15:15:28 +00:00
Zacam 809e992e02 Fix: MSVC signed/unsigned mismatch. 2010-12-25 13:15:55 +00:00
FUBAR-BDHR 5a93ebe54a Fix for mantis 2356: Turret-free-all in an every-time acts as turret-lock-all
Fixed turret-free, beam-free-all, and beam-free as well
Removed generic subsystem argument from those as well as turret-tagged-specific as they do not have code to process it.
2010-12-22 18:39:40 +00:00
The_E 3042436f29 Swifty's go-swift stuff. Makes collision detection slightly less insane. 2010-12-22 14:42:21 +00:00
The_E bdaf8d302f 2010-12-20 19:53:52 +00:00
Sushi a73592811f Fix oversight from AI.tbl overhaul a while ago 2010-12-20 16:57:13 +00:00
Echelon9 e1075b0bd6 A further two spots where the MSVC 2008 compiler doesn't like SAFE_STRINGS changes 2010-12-20 07:50:23 +00:00
Echelon9 15c7b2cfdf Mantis 1889: Utilise all three hud target box rendering styles (inclusion of a rendering style with proper lighting) 2010-12-20 07:46:38 +00:00
Echelon9 d3ffc47eb5 MSVC compiler doesn't like some of these SAFE_STRINGS changes, GCC does... 2010-12-20 06:14:08 +00:00
Echelon9 95d3e7952f Fix: Convert a further subset of strcpy() to the SAFE_STRINGS strcpy_s() version 2010-12-20 04:28:01 +00:00
Echelon9 84fa09c2ac Guarding against array out of bounds error, ahead of conversion to STL type 2010-12-20 03:04:54 +00:00
Echelon9 8f23d7ea9b Clean up redundant checks 2010-12-19 02:03:41 +00:00
Echelon9 a48a67dba5 Two further cases of typo referenced in r6861 fixed 2010-12-19 01:28:38 +00:00
Echelon9 b959830fc4 Remove redundant Invalid_demo_keys[] and associated control_config_valid_action() 2010-12-19 01:24:50 +00:00
Echelon9 6e3b4ff864 Remove redundant #ifdef check 2010-12-19 01:09:38 +00:00
Echelon9 e08d7d20bf Correct typo in comments 2010-12-19 01:06:58 +00:00
Echelon9 24409ead19 Fix: Local declaration of 'i' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '786' 2010-12-15 12:51:51 +00:00
Echelon9 0598dbe5b5 Fix: Local declaration of 'i' hides declaration of the same name in outer scope. 2010-12-15 12:48:24 +00:00
Echelon9 02bf14be4f Clear out commented #IFDEF INTERPLAYQA section 2010-12-15 12:39:11 +00:00
Echelon9 a2687ef892 Fix: Local declaration of 'retail_gauge_loaded' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '392' 2010-12-15 12:27:14 +00:00
Goober5000 b61d5845ac set certain flags that used to be in ship_info via ship_set and change_ship_type, which is the correct thing to do, rather than in the middle of parsing, which was a red herring
(fixes Mantis #2169)
2010-12-13 07:33:35 +00:00
Goober5000 cbe55c42ec bypass weird compiler error 2010-12-13 07:24:38 +00:00
Zacam 19b19a38d8 Reverts commits 6681, 6683 and 6684. Adds C4101 Warning suppression for Release Builds (only) so that "catch" doesn't cause an unreferenced parameter warning. 2010-12-13 05:51:49 +00:00
The_E 1adf497988 Fix for Mantis 2349 (Invalid number of arguments not detected by FRED). This adds a new function to sexp.cpp (check_operator_argument_count()), which can be used to handle cases like send-message-list.
Also adds a warning to change-iff-color in case the FREDer supplied an invalid rgb argument (Mantis 2256)
2010-12-13 04:10:08 +00:00
Zacam 6f29bdecd6 Antipodes 7 Merge: HUD Overhaul, by Swifty. 2010-12-12 20:34:15 +00:00
Echelon9 e2c4f58344 Fix: Local declaration of 'template_id' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '1062' 2010-12-12 01:09:02 +00:00
Echelon9 c2d5e5edd5 Clean up up logic check on packet length overrun 2010-12-12 01:08:10 +00:00
Echelon9 cb286185b8 Fix: Local declaration of 'wip' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '5444' 2010-12-12 01:07:03 +00:00
Echelon9 01002a803b Fix: Local declaration of 'rship' hides declaration of the same name in outer scope. For additional information, see previous declaration at line '6450' 2010-12-11 13:49:06 +00:00
Echelon9 827c973f2f Fix: Buffer overrun: accessing 'struct NavPoint * Navs', the writable size is '352' bytes, but '396' bytes might be written: Lines: 1597, 1600 2010-12-11 12:54:02 +00:00
The_E 8c990de76d Fix for Mantis 1647 (Message brackets linger around when player turns traitor) 2010-12-11 06:03:45 +00:00
Goober5000 68f5f5ba35 use standard font to output the "more" indicator 2010-12-10 08:39:21 +00:00
FUBAR-BDHR 6d6e0e935c Fix for mantis 0002337: lock-rotating-subsystem affects more than it should 2010-12-09 23:30:04 +00:00
The_E c4f3da404e Partial fix for Mantis 2277. This moves the "Turret Firing" animation trigger so that it only triggers when the turret really is firing. 2010-12-09 23:13:46 +00:00
The_E 092b615d38 Fix for Mantis 2306 (Destroy subsystem cheat does not work in release builds) 2010-12-09 20:28:16 +00:00
The_E 27e1a7928b Genghis' fix for Mantis 2164 (Better feedback and error handling for invalid muzzleflash definitions) 2010-12-09 19:55:46 +00:00
The_E 500148755d Aaaand done. Now it's fixed. 2010-12-09 18:54:28 +00:00
The_E 8a0d802008 Fix for Mantis 2111 (Bank indicator alignment issues in weapon loadout select screen) 2010-12-09 18:07:44 +00:00
The_E 01ea771724 Fix for Mantis 2055 (Allow/break/never/fix-warp sexps don't work on the AI) 2010-12-09 16:24:54 +00:00
The_E 4b2c627b69 Fixes issue with "external model launcher" flag, where secondary weapons would use the models for primary weapons noticed y Droid803 2010-12-08 20:08:25 +00:00
The_E 606d784b0e What in the nine hells is happening here? Did noone ever use set-armor-type to reset an armor type? 2010-12-08 04:25:14 +00:00
The_E b45d934492 Fix for Mantis 2257. This adds the options "+HUD Message:" (Boolean, whether or not firing this SSM generates a notification on the HUD), and "+Custom Message:" (if you want to use something other than "Firing Artillery!") to ssm.tbl. 2010-12-07 16:33:58 +00:00
Goober5000 8d0cbeaded follow-up to 6804... fix secondary as well as primary 2010-12-07 07:57:00 +00:00
FUBAR-BDHR cda3e91ff8 Oops on the use of /n instead of \n. Good catch IssMneur 2010-12-07 06:31:53 +00:00
The_E 02c1e1b531 Fix for Mantis 2336 (Countermeasure type assignment doesn't survive ship class change) 2010-12-06 23:27:46 +00:00
FUBAR-BDHR b29b5a127e Fix backward LOD warning message. 2010-12-06 22:00:14 +00:00
The_E 0b3f8f22d5 Turning this assert to an Error, after feedback from Goober 2010-12-05 18:07:28 +00:00
The_E dc71cc2c85 Turning these Warnings into Assertions, as it's something that really needs to be fixed. 2010-12-03 23:27:58 +00:00
The_E b67d139a84 Converting this Assert() to an Assertion() for better feedback 2010-12-03 22:41:44 +00:00
The_E 8193164fae Taylor's fix for Mantis 2172 2010-12-03 17:44:23 +00:00
Sushi 793173eff6 Fix an additive weapon velocity bug (main symptom: collision detection going wonky sometimes). 2010-12-03 15:37:44 +00:00
The_E 5136c0df98 Okay, I'm disabling this Int3(). It's far too easy to hit, even with perfectly valid data. 2010-12-02 21:06:32 +00:00
Echelon9 1565439f55 Fix 2339: Intermittent crashes in add_sexps 2010-11-29 10:28:47 +00:00
Goober5000 3c8be3af91 add_data_dup when we're working with a temporary string 2010-11-29 08:36:31 +00:00
The_E f5fa9bd7ce Adding a break here 2010-11-27 08:13:53 +00:00
Goober5000 807d3fe947 bump number of misc anims to 32 2010-11-26 04:03:56 +00:00
Goober5000 6b7a041ead add feature to select a random animation from a miscellaneous animation group 2010-11-25 23:51:22 +00:00
The_E 9b39e4546b Thanks to Goober for noticing the right way to do this. 2010-11-25 20:48:07 +00:00
Goober5000 793c0f077c move the error nprintf to a place where it will trigger before the crash it tests for
fix a loop boundary check
2010-11-25 20:10:13 +00:00
The_E eebc9cd65b Fix for Mantis 2344 (Post-processing sexps don't show correctly in FRED) 2010-11-25 18:48:00 +00:00
The_E 6a2b570093 Moving post processing flag back to graphics section 2010-11-25 15:11:04 +00:00
The_E 7aa2087fb8 Adding a return and Warning in case of a null pointer here 2010-11-24 11:35:21 +00:00
Goober5000 b169a76547 add error detection for arrays that exceed maximum
num door sounds = num door animations
(how did that ever work before?)
2010-11-24 07:18:05 +00:00
Goober5000 56372860f3 how was that accidentally deleted? 2010-11-24 06:39:22 +00:00
Goober5000 27fc907b8f remove #defines that were obsolete since after FS1
fix an nprintf bug
change the method of pausing anims so that more than one anim can play in the same spot
(this means that the first frame of an anim won't be drawn until the anim actually starts playing but I think that's okay; it is really only noticeable for the crane animation in the Bastion main hall when the "new player tips" box appears)
2010-11-24 06:33:53 +00:00
Goober5000 b90c4e8045 ugh; formatting ftw 2010-11-24 04:53:41 +00:00
Goober5000 c3ed724025 slight cleanup 2010-11-24 04:35:10 +00:00
FUBAR-BDHR 862125a6d4 Fix issue with beams not doing damage due to the traitor beam fix. 2010-11-24 02:22:46 +00:00
Goober5000 d856d71ffc revert Echelon9's commit 6754 which needs to be discussed first 2010-11-23 08:27:18 +00:00
The_E 6145ada5f6 Fix two instances where an object instance number was used as an index into Weapon_info[] 2010-11-23 08:20:56 +00:00
Goober5000 2751654721 corrected Echelon9's correction of Zacam's ... correction?
Anyway, sexp variables are only ints or strings, not floats. Therefore we need to print them to the file correctly.
2010-11-23 08:11:16 +00:00
Goober5000 284c6f8c17 fix some things that Zacam noticed 2010-11-23 07:30:36 +00:00
chief1983 6eb5fc37b8 Finish matching vm_mallocs and vm_frees 2010-11-22 17:21:12 +00:00
Echelon9 a9a8dad093 MAGIC numbers aren't for hiding in code... 2010-11-22 13:01:41 +00:00
Echelon9 b3fe5ddfda Fix: Local declaration of 'i' hides declaration of the same name in outer scope. 2010-11-22 12:51:59 +00:00
The_E 81271669e7 Fix for commit 6756: -1 is a perfectly valid value for current_secondary_bank at that point. 2010-11-22 06:14:11 +00:00
FUBAR-BDHR 0102639e4c Fix for Mantis 2190 - Player beams do not cause traitor. 2010-11-21 06:34:27 +00:00
Echelon9 6d0c3f4078 Fix: Local declaration of 'num_lines' hides declaration of the same name in outer scope. 2010-11-20 18:45:34 +00:00
Echelon9 ee7bdb735a Corrected sprintf format, as 'Changed from 'int' to 'float' by Zacam 10/2010' 2010-11-20 17:27:45 +00:00
Echelon9 bc60d500a6 Fix: Use of swp->current_secondary_bank when equal to -1 as an array index. Very broken. 2010-11-20 16:25:33 +00:00
Echelon9 bd6c281c3c Fix: Invalid data: accessing 'Text_line_size', the readable size is '80' bytes, but '4194244' bytes might be read; Invalid data: accessing 'Text_lines', the readable size is '80' bytes, but '4194244' bytes might be read 2010-11-20 15:10:14 +00:00
Echelon9 b8767484a8 Fix a range of potential NULL dereferences 2010-11-20 12:22:03 +00:00
Echelon9 cea5c79872 Fix a few malloc/vm_malloc changes to properly track memory usage; fix a potential NULL dereference in parse/lua.cpp 2010-11-20 08:25:16 +00:00
IssMneur 0e7a9c7905 Back to how the no configure worked before, because it does work just IssMneur is a dummy. Thank you ni1s for pointing it out :P
Added a clarifying comment to autogen.sh.
2010-11-15 21:13:53 +00:00
IssMneur 2c63726404 Modify autogen.sh so that it can be run without running configure. To run autogen.sh without running configure pass --noconfigure as first parameter. 2010-11-15 20:40:25 +00:00
Goober5000 071b097213 include log4j.xml in deployed jar 2010-11-14 08:43:22 +00:00
Goober5000 1c47cdc2d0 commons-logging is a subproject 2010-11-14 08:33:54 +00:00
Goober5000 dad17aca3b trivial implementation of installer gui using the CJWizard example 2010-11-14 08:31:18 +00:00
Goober5000 0c42f0a8fc remove the mprintf per discussion with taylor 2010-11-14 05:42:47 +00:00
Goober5000 6200faf1c0 add SCP_string variants of sprintf, sexp_replace_variable_names_with_values, replace_one, replace_all, and lcl_replace_stuff
change the death message to use an SCP_string
change the set-death-message sexp to accept actual messages
2010-11-14 02:07:45 +00:00
Goober5000 e9ad80ea2a add missing files to MSVC 2005 project 2010-11-14 01:53:21 +00:00
Goober5000 662a7a18c7 Bad IssMneur! No biscuit! 2010-11-13 22:49:22 +00:00
IssMneur 7e60680054 Remove redundant weapon_name_lookup().
Make the parameter to weapon_info_lookup a const char* (like it should be).
2010-11-13 07:27:45 +00:00
FUBAR-BDHR 796b3ec78d Fix for mantis 2174: ERANGE: String error in multiui.cpp 2010-11-12 23:46:24 +00:00
The_E c7e0d63bd3 Reverting that again to help tr5ack this down further 2010-11-11 09:54:18 +00:00
The_E 1b6495f3c8 Adding proper FRED-side support for special message source "<none>" 2010-11-11 08:45:25 +00:00
The_E 417beac25b Replacing a few asserts with proper error handling (in this case, simply CLAMPing the offending values to valid ranges). 2010-11-11 08:41:34 +00:00
The_E 466c375a54 Fix for Mantis 2333 (Random crashes caused by snd_get_duration()) 2010-11-08 23:04:34 +00:00
The_E 21ebf78162 Adding a few checks here to guard/catch Mantis 2333 2010-11-08 01:36:43 +00:00
The_E 3b315ba46b Fix for Mantis 2329 (Malloc fail on invalid sound files) 2010-11-06 04:44:17 +00:00
The_E 33fc099c40 Woops. This fixes screwed up test for MOI validity 2010-11-05 00:34:29 +00:00
FUBAR-BDHR 6198eca3a6 Remove sexp_turret_subsystem_targeting_disable() and sexp_turret_subsystem_targeting_enable() and changes them to use the new generic function. 2010-11-04 05:28:39 +00:00
FUBAR-BDHR a568561ef4 4 new sexps to control Wanderer's subsystem flags from r6581
Fix for Mantis 2330 subsystem targetable/untargetable in multi.
2010-11-04 05:17:52 +00:00
chief1983 176a07f5b0 More compatibility fixes for Solaris 2010-11-02 21:20:09 +00:00
The_E f38df78827 Remove bogus debug warning from the :V: days 2010-11-01 15:25:27 +00:00
The_E 8ffa5db7e4 Adding check for invalid MOI values 2010-11-01 15:24:07 +00:00
chief1983 b04501b021 This should fix a OS X 10.5 crash, possibly others. 2010-10-29 19:09:26 +00:00
The_E 0f0b09b29d Woops. How did I screw this up? 2010-10-29 04:14:13 +00:00
The_E 7184f0b219 Fix for faulty check 2010-10-29 02:44:14 +00:00
The_E a03da495b1 Adding a warning and proper error handling to the "/" operator in order to catch div-by-zero scenarios. 2010-10-29 02:22:51 +00:00
The_E 7229a6c4bf Patch for minor snafu, from FUBAR 2010-10-29 01:10:19 +00:00
The_E af6506b59c 2010-10-26 23:42:14 +00:00
The_E a92a0e715a Changing this sanity check to pop up a warning in FRED, but print to log in FS. 2010-10-26 22:56:58 +00:00
The_E 3e38bf2670 Fixes issue with the wrong mainhall being loaded on startup. Note: If a value gets initialized to -1, don't change it to a ubyte and init it to 0, even if that fixes a conversion warning. In this case, casting explicitly is a valid course of action, and should be taken. Here endeth the lesson on refactoring. 2010-10-26 22:23:56 +00:00
The_E b62ece0eaf Removing lua.c from the VS2010 project 2010-10-25 15:09:17 +00:00
chief1983 757eed0f66 Let's get rid of lua.c for Xcode then too 2010-10-25 14:57:53 +00:00
karajorma efcd3af9f8 Looks like we forgot to update the save functions when we changed the special_explosion to use floats. 2010-10-25 13:53:31 +00:00
Zacam 5fbd8dc854 ...and then it helps to actually initialize it to something. 2010-10-25 03:59:15 +00:00
Zacam ba9abb7936 Should have paid more attention on that last one, need to define what 'err' is outside of where it is. 2010-10-25 03:54:48 +00:00
Zacam 1ae5ada120 Let see how unreachable all this really was. 2010-10-25 03:48:01 +00:00
Zacam cadaaa6d20 Fix for Release Build warning for 'err' 2010-10-25 03:43:02 +00:00
Zacam 4a2e589863 'lua.c' not needed for liblua. 2010-10-25 03:34:33 +00:00
Zacam 2d538a74d1 Clears up the rest of the type conversion warnings listed in MSVC. 2010-10-25 03:26:03 +00:00
Zacam 894ab0cd1e Warnings Resolutions: 'int' to 'ubyte' conversion warnings.
Some formatting cleanup done on the affected files.
While not necessary, some {} put in by suggestion of output from GCC and to improve readability.
2010-10-25 00:03:29 +00:00
karajorma b882e02439 Not 100% a bug fix but this will have the effect of making it harder to hit the bug and will warn when it hits it. See http://www.hard-light.net/forums/index.php?topic=72160.0 for more details 2010-10-24 05:28:30 +00:00
Wanderer b7a89e21d8 adding blank scripting state to the game 2010-10-23 19:54:39 +00:00
The_E 915fdc80cf Adding special message source "<none>" 2010-10-22 23:17:44 +00:00
Echelon9 61a879fba6 Update project file listing 2010-10-22 22:53:48 +00:00
The_E b0e5b362be m!m's function to access the "affected by gravity" flag 2010-10-22 20:43:27 +00:00
The_E e99c04c5b9 Fix for Mantis 2171 (documentation out of sync for gr.getVectorFromCoords) 2010-10-22 13:45:33 +00:00
The_E 584c7a44ed Thank you code analysis. This could have been ugly.... 2010-10-20 20:06:55 +00:00
The_E afa17c5ef7 Change an Assert to a more elegant way of handling this. 2010-10-20 19:38:34 +00:00
Sushi f4b24acaeb Fix bug where changing AI goals while gliding can cause them to get stuck in glide 2010-10-20 05:21:51 +00:00
chief1983 0234d8a324 Wrong way with this fix, should have gone from trunk to antipodes 2010-10-19 22:16:26 +00:00
chief1983 0faf2ea40f Use appropriate line endings 2010-10-19 22:14:52 +00:00
Zacam 96d0d71a7f From FUBAR: Turret ROF Sexp
http://www.hard-light.net/forums/index.php?topic=71884.0
2010-10-18 21:23:16 +00:00
chief1983 94b721156e Pedantically correct a comment 2010-10-18 21:18:10 +00:00
Zacam 16db146ae7 The hell...? Missed one somehow. 2010-10-18 20:55:08 +00:00
The_E 27a11fe031 Warnings done properly. Thanks, chief 2010-10-18 20:17:01 +00:00
The_E d223cbb8a4 This case shouldn't ever be hit, but it's still bad form to Int3() there. 2010-10-18 19:57:12 +00:00
Zacam b08623e3ce Sun OS compatibility: "Sun" is a reserved word, so (*sun) becomes (*sun_ptr), (bool sun) becomes (bool is_a_sun), etc.
Also: void stars_delete_instance_FRED is now void stars_delete_entry_FRED in the CPP to better match the H.
White-space clean-up took place too.
2010-10-18 19:29:38 +00:00
Zacam 58ad43cff1 go_faster from Antipodes 6. Everybody, say "Thank you, taylor!" 2010-10-18 18:32:37 +00:00
chief1983 9d5254865f FORCE:MULTIPLE for VC6 in advance of Antipodes 6 2010-10-18 18:08:52 +00:00
chief1983 4c7990950d FORCE:MULTIPLE for VS2005 in advance of Antipodes 6 2010-10-18 18:03:10 +00:00
IssMneur b6eaf97c0c Reimplement VerifyEx to soothe any concerns about the WinAssert use and remove any potential problems for non-VC. 2010-10-18 06:33:54 +00:00
IssMneur 490249bf08 Extended Verify to allow a developer to give a more detailed message. 2010-10-17 22:27:04 +00:00
Goober5000 179639433f sanity check +Team: values, because older versions of FRED saved crazy values like 1301728 2010-10-17 20:12:09 +00:00
karajorma c4fc987715 Fix the camera-shudder SEXP to work in multiplayer. 2010-10-17 09:33:08 +00:00
karajorma 8ed01ee2e9 Add the -parse_cmdline_only option to prevent the command line being parsed in FRED (and FSO for that matter). 2010-10-16 05:17:46 +00:00
The_E bbab34e2cf m!m's team:getColor() function for scripting. 2010-10-15 19:45:02 +00:00
IssMneur c4213b11c3 Added a couple of mprintf lines to help diagnose where exactly Openal fails to load. 2010-10-15 17:20:50 +00:00
IssMneur 8b6bf3c8b5 Fix a crash that occurs when the player turns off auto-targeting. 2010-10-15 16:39:43 +00:00
chief1983 e39d62f28d Add the FORCE:MULTIPLE option to the linker for VS2008 and VS2010, in advance of the Antipodes 6 merge 2010-10-13 16:47:12 +00:00
karajorma a8d1efb206 Mantis 2324 (Missiontime-msecs gives the wrong value after SHORT_MAX milliseconds) 2010-10-13 06:18:36 +00:00
karajorma 0d2b1647e6 Change Alt_Type into an int to fix a compiler warning.
Move the multi_sexp_ship_change_callsign function (Multi_ functions should sit directly below the server side function that calls them so that they can be updated at the same time).
2010-10-13 02:16:34 +00:00
Zacam c669b87b87 Output name updated to "fred2_open_3_6_13" in MSVC2005. 2010-10-12 23:40:48 +00:00
Zacam e6631ff764 Project Synchronization: Trunk vs Antipodes
2005: Set PDB and Map Exports to explicitly FALSE on Release builds.
Removed <File Configuration> lines (save for in the case of phrases.xml) as they are unnecessary bloat.
2008: Set PDB and Map Exports to explicitly FALSE on Release builds.
2010-10-12 22:37:50 +00:00
chief1983 ad5fb71d6e Pull this fix for VC6 from Antipodes since it's unrelated to go_faster 2010-10-12 16:06:27 +00:00
IssMneur caf3c975b3 Add some variable verification to hud_cease_subsystem_targeting. 2010-10-12 04:27:17 +00:00
Zacam 3fd9a7ba04 Warning Fix: in "opengl_make_gamma_ramp"
'int' to 'ushort' conversion addressed.
2010-10-08 23:32:54 +00:00
Zacam 4483726381 Warning Fix: (audiostr.cpp "WaveFile::Read" / ds.cpp "ds_load_buffer")
Sets 'float **pcm' to start as NULL
2010-10-08 23:30:15 +00:00
Zacam 5bf0540ca7 Warning Fix: in "bool message_filename_is_generic"
signed/unsigned mismatch
2010-10-08 23:24:36 +00:00
Wanderer bcea48c6fb feature commit - diaspora subsystem options 2010-10-08 21:32:48 +00:00
Wanderer 3383fc4495 feature commit - diaspora turret related patch 2010-10-08 21:05:40 +00:00
The_E 28ac7d93d4 Patch for Mantis 1963 (Optional argument for set-object-facing and set-object-facing-object doesn't work) 2010-10-08 12:01:11 +00:00
The_E 6a722bdba5 Fix for Mantis 1817 & 2323 (Glide does not get reset on mission restart/player respawn) 2010-10-08 10:15:40 +00:00
Zacam 6b2a719f9e Warning Fix: "sexp_show_subtitle_text"/"sexp_show_subtitle_image"
No more 'float' to 'int'. (not the best way, but it is expedient and doesn't risk breaking things)
2010-10-07 02:21:15 +00:00
Zacam 9371777c57 Warning Fix: in "void beam_get_binfo"
"miss_factor" is a 'float', not an 'int'.
(some odd 'tab' spacing cleaned up in the function as well)
2010-10-06 20:03:05 +00:00
Zacam 6379148dca Warning Fix: for "set_special_explosion"
Corrects conversion of 'float' to 'int', by setting set_special_explosion related entries to 'float'
2010-10-06 19:18:38 +00:00
Zacam ae660ee08c Warning Fix: in "object *ship_find_repair_ship"
"min_time_till_available" is a 'float', not an 'int' and so is "howlong" that it is compared to.
2010-10-06 18:45:58 +00:00
karajorma 385e92f2ef FUBAR's fix to allow the callsign SEXP to work properly in multiplayer. 2010-10-06 08:53:28 +00:00
Goober5000 11c5d9fe06 fix some old fat-fingering from r1601 (Mantis #2226) 2010-10-06 03:58:21 +00:00
Wanderer d5775924d6 fix to corkscrew missile emitted particles issue 2010-10-05 08:01:23 +00:00
karajorma c250d3b603 Missed one. 2010-10-05 06:45:51 +00:00
karajorma 32d1586075 Some minor future-proofing/magic number removal. 2010-10-05 06:44:02 +00:00
karajorma 0e87119684 Fix Mantis 2321 (Weird values for Team when saving events). 2010-10-05 06:08:31 +00:00
Zacam 05813cdb90 Double-Trouble: Noted by FUBAR, somebody made a copy-paste mistake 2010-10-04 23:14:27 +00:00
IssMneur 5d8cbb3ab5 Make VS2010 copy *every time* that it rebuilds the binaries, not just when a change is made to a file in Freespace2 or Fred2 projects (ie. when it inserts code changes from code.lib into the binary). 2010-10-04 04:27:55 +00:00
The_E 9ebed843c6 More checking to guard against Mantis 2205 2010-10-03 20:35:48 +00:00
Echelon9 18a77b5444 Second case of mprintf fubar this week. MSVC thought this was valid? 2010-10-03 09:06:47 +00:00
Wanderer 7d13820471 Feature commit - option to adjust turret ROF by multiplier or by the number of firepoints. 2010-10-03 07:19:43 +00:00
The_E e13bc7bc21 Adding a better explanation here. 2010-10-03 03:45:01 +00:00
Echelon9 fb49cf5f68 Correction to r6555 to use mprintf correctly 2010-10-02 07:06:17 +00:00
The_E 11549b60b1 Adding the ad.stopMusic() function to scripting 2010-10-01 22:27:37 +00:00
The_E 9f0e6abfe1 Print warning here as well. 2010-10-01 19:14:24 +00:00
The_E 722acb57ba Adding a deprecation warning to the log 2010-10-01 19:09:17 +00:00
The_E 8b86b27843 Readding parsing for decals so we don't break stuff unnecessarily. 2010-10-01 18:12:31 +00:00
taylor 6db744f2f8 allow duplicate when same file exists as both 2D and 3D in sounds.tbl 2010-10-01 16:42:06 +00:00
taylor dfc948a183 easier to follow debug messages for sound loading 2010-10-01 16:42:05 +00:00
taylor 732840dc67 only need half size for mono buffer memory 2010-10-01 16:42:04 +00:00
taylor 44c2f1b099 remove decal files 2010-10-01 16:42:03 +00:00
The_E 43852509ec Adding a sanity check here. 2010-10-01 07:53:03 +00:00
Sushi b639593a56 Get rid of compiler warnings 2010-10-01 04:20:40 +00:00
Zacam 4004a02ee3 Removed "grammar.h" and added to 'ignore' list. Also added phrases.cfg to 'ignore' list. 2010-10-01 04:10:03 +00:00
The_E c4ddba1265 Another compilation warning fix. 2010-10-01 03:06:09 +00:00
The_E 8334af5705 Fix compilation warning 2010-10-01 01:36:44 +00:00
The_E ccd14be286 Adding the "force-glide" sexp by request of Axem 2010-10-01 00:38:58 +00:00
The_E 4d216917eb Fix for Mantis 2289 (Invalid commandline arguments passed to FRED) 2010-09-30 17:22:58 +00:00
Zacam 7b7027d228 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 fd60c9ffc4 Bumping MAX_SPOOLED_MUSIC to 50. 2010-09-30 00:00:49 +00:00
The_E f73bfc5eb1 Removing an Int3() that isn't as impossible to hit as expected. Since we can exit gracefully here, we should. 2010-09-29 19:01:04 +00:00
Wanderer ed62a87163 Fix for mantis 2304 - 2nd take 2010-09-27 11:55:21 +00:00
Goober5000 bd78724f87 use the warning loop, same as the other half of the if() block 2010-09-27 05:51:28 +00:00
Goober5000 2b26f42c6f fix redefinition of local variable 'i'
remove unused local variable 'wip'
2010-09-27 05:27:27 +00:00
The_E ed73f84b6d Ooops. Now this is a proper sanity check. 2010-09-27 04:46:08 +00:00
The_E d776351971 Hopefully fixes an Int3() encountered by FUBAR, where the AI submode of a ship was set incorrectly. 2010-09-27 04:03:06 +00:00
The_E 6908e52199 Better error checking for adjust-audio-volume, fixes Mantis 2314. Thanks to Echelon9 for noticing this. 2010-09-26 15:54:19 +00:00
Wanderer 9650faaffb Fix for mantis 2303 and related issue in lua.cpp 2010-09-26 11:32:18 +00:00
The_E 400e8e10d2 Reverting 6513 due to errors found in the implementation 2010-09-25 21:38:37 +00:00
Wanderer 37e5699fe9 Fix to prevent global damage (shockwaves etc) from creating debris shards that spawn in empty space 2010-09-25 20:50:33 +00:00
Wanderer 10fa60a1a5 Fix for mantis 2304 - non standard uvec/fvec turrets did not have proper collision detection 2010-09-25 20:49:05 +00:00
The_E 83097efa86 Adding the "On Weapon Selected", "On Weapon Deselected", "On Weapon Equipped" and "On Weapon Fired" scripting actions. 2010-09-25 19:43:45 +00:00
The_E e55b6aa38e Moving this assert to a better place 2010-09-25 19:08:27 +00:00
The_E 9985ee392b Less ugly hacks is good as well. Why compute the object index, when it's passed as a function argument? 2010-09-24 06:31:52 +00:00
The_E b9f85233cf Added an Assertion() to further narrow down the cause of the "ai_find_path tries to find path that doesn't exist" bug 2010-09-24 06:29:46 +00:00
The_E 9cdb278674 Avoiding a possible Int3() due to invalid data being passed; since the documentation for get-object-* doesn't specify that you need to give all 3 "relative coordinate" arguments, this needs to be checked. 2010-09-24 06:28:25 +00:00
Zacam 12d11ca5a6 Add a description to config.h as to what 4290 is. (Thanks Goober for catching that) 2010-09-22 22:59:06 +00:00
Zacam b3ae5ba005 Adding 4290 to the pragma warning(disable:) list for easier testing of some code changes. 2010-09-22 21:13:10 +00:00
IssMneur 6f7f0a47cb Fix bug in the new support ship sexp noted by Goober5000. 2010-09-22 03:05:57 +00:00
The_E 08f3e17bba Same here. 2010-09-22 00:41:52 +00:00
The_E 6dc1da33c0 And another variable declaration overwriting a declaration in an outer scope. 2010-09-22 00:38:08 +00:00
The_E 22b903da10 Moving this counter variable to be declared as local for the loops. 2010-09-22 00:32:39 +00:00
The_E 97e98c4792 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
The_E 6f05c87da6 Avoiding a name collision between a global and a local variable 2010-09-22 00:15:29 +00:00
The_E 6121ea9077 Flags are bitfields, so an "&" needs to be used instead of an "&&" 2010-09-22 00:06:20 +00:00
IssMneur a7c99492fe Removes the hard restriction (compile time) on the maximum number of "active" support ships per team. Controlled by an optional seventh argument to set-support-ship. Also fixes glitch where only "max concurrent ships" number of support ships would actually respond to support requests. 2010-09-21 05:16:23 +00:00
The_E 15869aae76 Another Assert()->Assertion(). 2010-09-17 20:59:39 +00:00
IssMneur 638ff6932e I thought I fixed that typo before committing. 2010-09-17 03:59:11 +00:00
IssMneur c3190b6c73 Converted 4 Asserts into Warnings. 2010-09-17 03:54:46 +00:00
The_E bc0777dbc0 Changing a string literal to the proper XSTR lookup 2010-09-17 00:01:58 +00:00
The_E 5942f8c205 Fixing typos noticed by FUBAR 2010-09-16 21:41:10 +00:00
The_E 3af82c904a Another assert->Assertion conversion. 2010-09-15 22:00:51 +00:00
Sushi 23756b39f0 Fix a typo 2010-09-15 05:06:23 +00:00
karajorma 5d81f86aca Mantis 2159 - Add the last of Ghengis' code with a switch from debug output to a warning. 2010-09-15 00:53:15 +00:00
karajorma c078578345 Fix Mantis 2278 (Adding a variable can mess up team loadout variables) 2010-09-15 00:50:28 +00:00
karajorma f0693a0469 More SEXPs fixed for multiplayer. 2010-09-15 00:49:14 +00:00
karajorma 9a05536503 Add the has-primary/secondary-weapon SEXPs 2010-09-15 00:47:08 +00:00
The_E f7e6195ba1 Averting a potential div by zero 2010-09-14 23:56:26 +00:00
Sushi 7cde4fb682 Re-added collision physics, added basic landings support (still needs some work) 2010-09-13 14:27:42 +00:00
The_E 58102c80b9 ...For real 2010-09-12 19:38:48 +00:00
The_E db35d99a25 Fix for is-facing (hopefully) 2010-09-12 19:30:10 +00:00
The_E 35650ec82d ... right this time. 2010-09-11 16:55:10 +00:00
The_E 3ab44c0ee6 Adding ship:getEMP() for scripting. 2010-09-11 16:52:36 +00:00
Goober5000 1b17451693 partial revert on 6444... don't forget, someone recently fixed a five-year-old bug in the countermeasures code :) 2010-09-11 00:08:57 +00:00
The_E 2997fc36a5 Adding object:getrvec() and object:getuvec() for completeness' sake 2010-09-10 23:11:28 +00:00
The_E 5146f74430 Adding the vector:getNormalized() and object:getfvec() functions 2010-09-10 20:51:55 +00:00
karajorma 31b99032ce Fix sexp_show_subtitle_image to work properly in multiplayer. 2010-09-10 10:42:12 +00:00
The_E 0c16dba8e4 ....And another fix for is-facing. 2010-09-08 16:42:58 +00:00
The_E bc113a7259 Thanks to Goober for the warning. 2010-09-08 14:58:41 +00:00
The_E ed8f7870ab Two more Asserts turned into Assertions() for better explaining 2010-09-08 10:56:31 +00:00
The_E 5f96d63bc3 Another int3() -> Assertion() conversion 2010-09-07 15:14:36 +00:00
The_E 6fe7347413 Bah, stupid typo (!= is != <!) 2010-09-07 15:11:01 +00:00
The_E a54c6c5131 Adding the is-facing sexp, as per Axem's request 2010-09-06 22:11:25 +00:00
The_E 8ca6436cad 2010-09-04 13:56:02 +00:00
Goober5000 bb5b4e6d15 make the if check simpler, cause part of it was redundant 2010-09-04 06:55:10 +00:00
Goober5000 ff0429487f made the AWACS hack less ugly, by making the filename replacement much more efficient
--this also allows stuff to be added past the #End of messages.tbl
improve message_filename_is_generic to consider #Simulated Speech Overrides specified in messages.tbl
2010-09-04 06:51:50 +00:00
Goober5000 589ad4e9be none.wav is redundant in this check 2010-09-04 06:40:46 +00:00
The_E 7001db65b9 Ooops. 2010-09-03 22:51:42 +00:00
The_E 72277ad7e5 More cleanup 2010-09-03 22:45:18 +00:00
The_E e0d38c7d69 More dead code be gone. 2010-09-03 22:41:08 +00:00
The_E 10cb26bb80 Dead code removal 2010-09-03 22:31:25 +00:00
Goober5000 f9eaed5d2d disable the warning about Assertion since it clutters the build output 2010-09-03 21:44:54 +00:00
chief1983 d1bdc8d48d MSVC, why on FSM's green earth does this compile? 2010-09-03 15:04:05 +00:00
Goober5000 748c30b421 don't simply assume that something is a ship! 2010-09-03 02:57:49 +00:00
Goober5000 b449ffd2a8 no need to check if other_objp is a capital ship in these if statements, since the first capital+ check would have already returned the function
this also removes the assumption that other_objp is always a ship!  it isn't!
2010-09-03 02:50:54 +00:00
Goober5000 e0efd2cdab yeah, asteroids and debris are pretty much the same thing 2010-09-03 01:26:49 +00:00
Goober5000 96c3debe2e maintain the original hull, shield, and subsystem percentages when changing ship class, since we might be changing it from a briefing loadout (Mantis #2301) 2010-09-03 00:34:38 +00:00
Goober5000 6412f55b38 partial revert (just one file) of Sushi's collision physics feature as it causes all kinds of crashes in asteroid fields 2010-09-03 00:16:45 +00:00
Goober5000 16add5664f fix polymodel gettage since heavy_obj could be an asteroid 2010-09-03 00:14:10 +00:00
The_E e36c0f935b ...and here. 2010-09-03 00:08:31 +00:00
The_E 06113b9760 ...and here... 2010-09-03 00:07:50 +00:00
The_E 326861070e Better feedback here, as well 2010-09-03 00:06:52 +00:00
The_E 11c2e22b69 Another Assert() redirected to more useful things 2010-09-03 00:06:01 +00:00
The_E e0dfede43c ...Aaaaand another Assert()->Assertion() to make modellers happy 2010-09-02 21:48:53 +00:00
The_E 867946aced And another int3() turned to something more useful 2010-09-02 21:25:54 +00:00
The_E 44b4024fe4 A useless int3() turned into a useful Assertion() 2010-09-02 20:27:33 +00:00
The_E 51299a39df More asserts turned to assertions. 2010-09-02 19:57:18 +00:00
The_E 3f157f03f9 Removing game_load_palette(). It was useless and commented out anyway. 2010-09-02 07:47:09 +00:00
Goober5000 963461d390 fix the passengers tag so that it works more like the cargo tag 2010-09-01 06:43:08 +00:00
Zacam dfee80d0e6 -timerbar now has the same message as -decals and is a disabled launcher command. Launcher will (or should) no longer list it as an available command and a msgbox will pop-up if in an existing command line anywhere. 2010-09-01 03:17:10 +00:00
The_E 5f7dd5b3a3 weapon_info::subtype is not a bitfield 2010-08-31 22:40:30 +00:00
chief1983 f068257a5b Fix Assertion on GCC to support 2 arguments, and revert hacked calls to their 2 argument state 2010-08-31 21:09:15 +00:00
Goober5000 cfdb68784f update project file 2010-08-31 19:55:12 +00:00
Goober5000 0e95113304 don't generate debug information on release builds 2010-08-31 18:18:15 +00:00
chief1983 a55053f548 Actually fix the Assertion instead of just disabling it. 2010-08-31 17:41:50 +00:00
The_E 11c9f75d9b Change assert to assertion. Also allowed usage of non-anis or effs as muzzleflashes. 2010-08-31 13:12:45 +00:00
The_E 388f5c8320 Changing Assert() to Assertion() again. 2010-08-31 12:52:50 +00:00
The_E cd58e5961c Change Assert() to Assertion() for better feedback to modders 2010-08-31 12:43:04 +00:00
The_E d0e1aa1067 Several minor touchups. 2010-08-31 12:42:39 +00:00
Goober5000 e8a7e3fedf add +Tech title for ships.tbl 2010-08-29 06:07:22 +00:00
Goober5000 707b1eb932 fix compile errors 2010-08-29 04:51:15 +00:00
Goober5000 3ab482a54f handle clearing alt-name too 2010-08-29 04:45:51 +00:00
Goober5000 0f79a6f942 add a #define 2010-08-29 04:30:21 +00:00
Goober5000 ce8f892d96 FUBAR's change-callsign patch 2010-08-29 03:46:48 +00:00
The_E 7ac5658dc8 Ooops, slight typo 2010-08-26 23:42:04 +00:00
The_E ee145b4284 From FUBAR: Patch to redirect a warning popup to the log when in standalone mode. 2010-08-26 22:56:36 +00:00
The_E 56dc1e37ad Change Assert() to Assertion(), again to better explain why it fails. 2010-08-26 12:17:51 +00:00
The_E 8cb660b9ce Fixes a crash when "Test Load Ship" was used with a ship that has turrets with rotation sounds defined. 2010-08-25 20:24:34 +00:00
The_E 781d36fed7 Change Int3() to assertion for better explaining and stuff. 2010-08-22 12:59:01 +00:00
The_E 9d77871011 Remove hardcoded piece of interface code in favour of something generated dynamically. Fixes issue with too many pilot names being displayed in the pilot select screen if a custom font is in use. 2010-08-21 20:19:48 +00:00
Sushi 7a26d62fa8 Updated random sidethrust ($Random Sidethrust Percent) to include strafing attacks vs big ships, as well as making it a bit more situational for fighter vs fighter. 2010-08-21 19:55:44 +00:00
The_E ebd00c9477 Adding a bit of sanity checking here... 2010-08-21 16:22:57 +00:00
The_E 8aad0fcce9 Fix issue reported by droid803 where non-player ships that have an afterburner need shield icons as well, causing debug warnings. Changed the check so that it only triggers on player ships. 2010-08-20 23:13:44 +00:00
The_E a0b09eac9d Adding the adjust-audio-volume sexp. 2010-08-19 19:45:28 +00:00
IssMneur e33686a431 Adds support to Voice Acting Manager in FRED for putting the speaker's name into the generated file name.
Also makes the "Generate Filename" function set the modified flag for FRED if any file names get changed.
2010-08-17 23:52:20 +00:00
IssMneur 4af1e0dd15 Fixes mantis 2275: Improving remove-background-bitmap and remove-sun-bitmap so that they issue an Error if an invalid index is passed via the sexp. 2010-08-17 05:42:55 +00:00
IssMneur e99469cca1 Clarify the help text for set-object-speed-x, set-object-speed-y, and set-object-speed-z 2010-08-17 05:37:38 +00:00
The_E 13fae34e35 And of course, I screwed it up a bit. Reading the documentation is A1 SUPAR. 2010-08-16 23:18:10 +00:00
The_E b0468c8ccf Allow scripting to override turret AI target selection 2010-08-16 22:04:23 +00:00
The_E f67f6e49dc Fix for assertion encountered with the warp-effect sexp. Also updated sexp help to indicate correct usage. 2010-08-11 13:08:51 +00:00
The_E eefa87c552 Remove requirement for SM3. While this will not allow cards that are only capable of SM2 to use the standard shaders, now shaders can be written for them. 2010-08-10 18:41:12 +00:00
Goober5000 d2ace97645 commit this to add the additional tests 2010-08-10 08:22:51 +00:00
Sushi beaa0d5ea2 Support for allowing bombs to be destroyed by weapon blast and/or shockwaves. Weapon flags are "takes blast damage" and "takes shockwave damage" 2010-08-05 14:17:20 +00:00
chief1983 12a8951cb2 Whoops hangovers and VNC don't go well together, did not mean to commit this at all. 2010-08-04 19:38:29 +00:00
chief1983 0487df77fb 2010-08-04 19:33:54 +00:00
karajorma 250a444c1b Fix 4 more SEXPs for multiplayer. 2010-08-04 17:44:40 +00:00
Sushi b4fb342c46 Added to ships.tbl:
$Collision Physics: 
+Bounce 
+Both Small Bounce
+Friction
+Rotation Factor
2010-08-04 02:08:14 +00:00
taylor 1e4b0665d2 various FS2NetD fixes:
- increase sleep time during reconnect
 - better handling of disconnects from connection errors
 - proper disconnect in case of login failure
 - log stats request calls
 - don't try to read stats from packet when there aren't any to read
 - allow proper connection resetting with standalone
 - change auto-reconnect timeout from 30 minutes to 5
 - count server traffic among activity instead of just client traffic
 - reduce uneccessary client->server traffic
2010-08-03 08:22:02 +00:00
taylor 1084866224 fix debug message 2010-08-03 08:21:59 +00:00
Goober5000 d60151851c don't generate debug/pdb/map info for release builds on VC6 2010-08-02 04:07:28 +00:00
Goober5000 544d3bb2bd revert using motion debris in asteroid fields 2010-08-02 03:52:16 +00:00
Zacam 48ee913a65 This is the same as 6335, but for FRED. 2008 and 2010. 2010-07-30 16:21:21 +00:00
Zacam 831d95187e Removes /DEBUG from the Linker Properties, no longer Generating PDB files for Release builds. This should also resolve the "no disk in drive" issues. MSVC 2008 and 2010. 2010-07-30 16:13:46 +00:00
The_E d1f4bd22f6 Patch for issue with ai-waypoints not working correctly. The ship's goals were accidentally cleared after a single run through the waypoint path. 2010-07-29 22:30:02 +00:00
Sushi 66901585c9 Changed "big ships manage shields" to "all ships manage shields." No difference in behavior, just named more accurately. 2010-07-29 00:30:57 +00:00
The_E e9d6bc9dfd Fix/Workaround for Mantis 2272 (Int3() in hudtarget.cpp) 2010-07-27 15:28:09 +00:00
The_E d8d185ea7d Change short to ushort to avoid issues with high-poly models. 2010-07-25 23:30:18 +00:00
Echelon9 4c33fb614a Fix for reinforcement menu bug - Mantis 2246 2010-07-25 05:04:14 +00:00
Goober5000 74a839881b add feature requested by BWO: group send-message-list messages at beginning of script 2010-07-22 07:51:32 +00:00
chief1983 6f73e4dc01 Should allow INT_MAX to be visible on POSIX-compliant systems 2010-07-21 18:50:19 +00:00
chief1983 6389773bc8 IssMneur's fix for Mantis #2240, allow gaps after the hardcoded retail sound entries. 2010-07-20 21:59:36 +00:00
chief1983 795107a1d3 Per IssMneur, fix the root directory detection on *nix systems. 2010-07-19 15:50:50 +00:00
The_E dab83811e3 Fix for the "is-ai-class" sexp. Previously, the sexp would compare the given AI class against the ship class' tbl default AI class, which produced erroneous results. 2010-07-19 02:12:43 +00:00
The_E 5554248b6d No wonder it didn't really work. I was looking in the wrong array. 2010-07-18 02:18:40 +00:00
chief1983 b998b1e9cc Bump to MAX_SHIP_FLAGS and a subtle reminder for posterity 2010-07-17 22:27:14 +00:00
chief1983 80cc932d25 One more autopilot fix for 3.6.12, per IssMneur 2010-07-17 22:18:20 +00:00
The_E 583b3dfe45 Fix for Mantis 2263 (Objectives list is still displayed despite disable-hud-except-messages being active) 2010-07-17 14:59:32 +00:00
The_E d6d65a69d5 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 2bbdecca67 Updated the credits after god knows how long 2010-07-16 16:16:27 +00:00
The_E 315a32f1cf 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
chief1983 a203caf51c Fix an Assertion usage issue on *nix platforms. 2010-07-14 15:31:17 +00:00
chief1983 500735de45 IssMneur's autopilot fixes (hooray\!) 2010-07-13 22:45:54 +00:00
chief1983 a0eda59822 Nightlybuild 1.6.0
Add stoprevision support
2010-07-13 17:21:28 +00:00
The_E 5b867c33ec Patch for Mantis 2205 (Division by zero in do_random_sidethrust()) 2010-07-10 15:06:33 +00:00
Sushi 5f7947ed66 Added "$big ships manage shields:" AI profile/AI class flag 2010-07-09 13:11:37 +00:00
Zacam 2c1c5c3653 Added the following (recursively) to the svn:ignore: .ncb, .suo, .user, desktop.ini, thumbs.db. 2010-07-08 03:51:39 +00:00
Zacam f4f0601090 From blowfish: Mac Icon update based on: http://www.hard-light.net/forums/index.php?topic=44371.0 2010-07-08 03:35:57 +00:00
The_E 40edac4d0e While the other code that was commented out might be unnecessary, this fvec still needs to be set up properly 2010-07-07 15:27:37 +00:00
The_E 49bf9589bd If lock-perspective is active, the perspective should stay locked. 2010-07-07 02:19:06 +00:00
The_E e11dc4e297 Reverting 6279, and making it more intelligently (Thanks Goober for the heads-up) 2010-07-07 00:04:32 +00:00
Goober5000 846eb737a2 fix a bug noticed by The_E: object types are not bitfields 2010-07-05 05:43:08 +00:00
Goober5000 ea5c11c2c9 use motion debris in asteroid fields, per Galemp 2010-07-05 05:41:57 +00:00
The_E 698e8a77e2 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
Echelon9 4c69853ade Update Lua interpreter to 5.1.4 (patch 2) to fix the following bugs http://www.lua.org/bugs.html#5.1.4 2010-07-03 02:48:03 +00:00
The_E 4e530490cf A few more dialogues added 2010-06-27 21:46:50 +00:00
Goober5000 0bbf8019c6 make FRED be intelligent about mission directory (Mantis #2236) 2010-06-27 08:30:45 +00:00
Goober5000 63081a0e05 remove unreferenced variables 2010-06-27 07:13:33 +00:00
Goober5000 3b4e3343b4 use 2_ animations in the tech room, just as in the command brief (Mantis #2231) 2010-06-27 07:05:01 +00:00
Goober5000 279225692e remove a bit of code that should no longer be necessary due to previous upgrades/fixes 2010-06-27 06:04:48 +00:00
Backslash 47469d5dd7 Add a $Max Directives: option to hud_gauges.tbl -- works just like $Max Escort Ships 2010-06-26 19:34:59 +00:00
Wanderer 40873c59e6 fix for potential null vec issue when using limited base rotation turrets 2010-06-24 18:21:31 +00:00
Wanderer 6399330505 fix for salvo + check hull bug found by fubar 2010-06-24 17:56:19 +00:00
Sushi 0c662a9f3b Removed unpopular circle strafe changes to make circle-strafing AI more aggressive (like in RC2) 2010-06-24 02:33:48 +00:00
Goober5000 dd62264f4a this is just a bit cleaner 2010-06-23 06:56:45 +00:00
Goober5000 16e7bc1bef remove not-kamikaze, since it was never implemented, and since its behavior is incorporated into the kamikaze sexp 2010-06-23 06:19:43 +00:00
Goober5000 9e6f279e73 fix for Mantis #2056 (sexps may not want to process every ship)
also, account for the fact that Command may not be "#Command"
2010-06-23 03:05:26 +00:00
Goober5000 7ce632686a fix a silly bug noticed by karajorma
also, slightly compact the knossos check
2010-06-22 02:29:53 +00:00
The_E 8e35e6b988 Fix for null vec3d error mentioned in Mantis 1888 by Woolie Wool 2010-06-22 00:51:12 +00:00
Wanderer 8a7646a3a4 allow lua to track if ship is 'dying' during the frame (bugfix for flashy deaths script) 2010-06-21 22:06:49 +00:00
Wanderer ab37303d80 fix for the ai profile issue (mantis 2228) 2010-06-21 19:25:00 +00:00
chief1983 f76ced7778 Fix the Assertion to not break Macs and Linux. 2010-06-21 17:12:23 +00:00
chief1983 3ab0cb4e7a IssMneur's fix for #1888 (finally): Much better autopilot behavior. 2010-06-21 14:59:36 +00:00
Goober5000 cca7c62963 minor modification of karajorma's warp effect so that Knossos can be used for both warpin and warpout; Babylon5 still switches appropriately 2010-06-21 07:41:26 +00:00
Goober5000 2d5a1c7e87 fix some problems with set-explosion-option (viz. all options need to be set if a special explosion is being used) 2010-06-21 07:14:54 +00:00
Goober5000 82043bcf9f add set-explosion-option to edit explosions (needed after karajorma's new special-exp code) 2010-06-21 01:21:40 +00:00
Wanderer 9639cf1cd6 Fix lua ray collision checks against debris pieces 2010-06-20 14:07:30 +00:00
Wanderer 107f1980d3 add a null vec check - hit by fubar 2010-06-20 14:06:34 +00:00
The_E 07faf45b83 Stopgap fix for Mantis 2224 (Black text is unreadable in the multiplayer chat). Turned black into pink (as that colour wasn't used before). 2010-06-18 18:18:27 +00:00
karajorma da02e0d07b Remove the -tbp command line. 2010-06-18 05:03:32 +00:00
Zacam 3338629f7f Commit of PNG Data fix as suggested and supplied by Armchair Commander and marvn.
(Read: http://www.hard-light.net/forums/index.php?topic=68405.0)
2010-06-17 19:46:46 +00:00
Goober5000 b453a2d3ff add awesome logical operators
(I wonder why nobody added these until now)
2010-06-16 02:38:24 +00:00
Goober5000 7c64139b09 add mission-time-msecs 2010-06-16 02:10:48 +00:00
The_E b8ba384b47 Fix for Mantis 2212 (Interface animations start at frame 1, not 0) 2010-06-15 17:24:03 +00:00
The_E 33523dcaf6 Fix for Mantis 2210 (Ship models in ship selection do not always show up properly) 2010-06-15 12:04:50 +00:00
Echelon9 5550784ab8 Project file update to include bitarray.h 2010-06-14 14:12:45 +00:00
The_E 7e6d82c032 Project file update to include bitarray.h 2010-06-14 07:36:07 +00:00
Goober5000 a079982c65 revert portej05's removal of the bitstring code 2010-06-14 06:56:52 +00:00
The_E 1f8999e160 Don't increase the total number of loaded menu music files if a tbm with +nocreate is loaded.
This also neatly fixes the somewhat screwed up music selection list in FRED (remember all those empty lines?), albeit not completely.
2010-06-14 01:59:15 +00:00
Goober5000 b6288af517 sync file for proper string length 2010-06-12 21:23:56 +00:00
Goober5000 853a337ab1 sync case 2010-06-12 20:47:22 +00:00
Wanderer b266c56ce9 related to mantis 2187 - fix to improve autoaim accuracy if additive velocity is enabled 2010-06-12 16:10:31 +00:00
The_E 1a24a6fb18 Some stuff for wxFRED. Slowly making progress. 2010-06-10 01:29:17 +00:00
Wanderer e509bf65b2 better handling of 'dying' weapons for lua scripting.cpp
added lua controls for accessing beams
2010-06-09 16:49:20 +00:00
Goober5000 9029b1f7d9 add OPF_SOUND_ENVIRONMENT for Taylor's sexps
also, some tweaks for sexp checks and for SEXP_NONE_STRING
2010-06-09 07:38:27 +00:00
Wanderer 339ca5020f fix for target priorities and sif2 flags issue 2010-06-09 05:19:54 +00:00
The_E 71f8aee807 Project File for wxFRED. 2010-06-09 05:18:45 +00:00
Wanderer fef49299da fixes for the external weapons patch (accidentally uploaded outdated patch) 2010-06-07 12:48:53 +00:00
Wanderer 71164e5958 changes to external weapon model handling 2010-06-07 12:22:54 +00:00
The_E c5bbfc2afa Not quite sure how this one went broken for so long....( FSO specific .libs were not loaded on non-SSE2 configurations, leading to broken builds.) 2010-06-07 11:10:11 +00:00
Wanderer 8be04ee2dd mantis 1988 - error checking for the targeting priorities 2010-06-07 10:53:34 +00:00
Goober5000 3a95edd350 ignore generated file 2010-06-07 07:02:18 +00:00
Goober5000 493fe51654 adjust coordinates for The E's latest 640x480 art 2010-06-07 06:35:40 +00:00
Goober5000 fc33893c5d FUBAR's feature for LOD naming: http://www.hard-light.net/forums/index.php?topic=68901.0 2010-06-07 03:58:47 +00:00
Goober5000 33c65166e9 tweak fiction viewer coordinates 2010-06-07 02:13:44 +00:00
The_E 6fcca0b14c A missing ) is bad for parsing. 2010-06-06 18:12:29 +00:00
taylor 7beb318bb1 make sure to stop deathroll effect too (Mantis #2215) 2010-06-06 14:50:38 +00:00
taylor 39fb9feede add some missing safety checks for Snds[] (Mantis #2216) 2010-06-06 14:50:36 +00:00
Echelon9 9a03589fee Removed defined but unused variables 2010-06-06 08:35:19 +00:00
taylor fc13d94a1a make sure to always close context and device when searching through valid devices 2010-06-06 03:10:40 +00:00
taylor 334c82753e fix OS X compile issue 2010-06-06 03:10:38 +00:00
The_E b18f94486d Same here. 2010-06-05 02:45:13 +00:00
The_E 899aeafc32 Remove unused files from the project file 2010-06-05 02:36:41 +00:00
Goober5000 4055d82f7a minor fix to the -wcs flag removal 2010-06-03 06:28:06 +00:00
karajorma 5990e56b86 Kill the -wcs flag. Should have done this years ago. 2010-06-02 12:01:13 +00:00
The_E afc14649f4 Fix for Mantis 2214 (toparc2 and toparc3 hud anis [The Enemy Missile threat and Enemy Missile lock indicators] may have a length > 2 now, instead of being fixed at 3 frames) 2010-06-02 11:49:24 +00:00
taylor 62c870bbbe revert r6151
Per source doppler factor is part of the EFX spec, which means all full 1.1 implementations.
2010-06-01 02:44:15 +00:00
The_E 7d6e5172b9 According to the OpenAL programmer's guide, AL_DOPPLER_FACTOR is not a valid parameter for alSourcef 2010-05-31 10:38:00 +00:00
Wanderer fc49b9170e Certain fixes for Bobs animation code issues. Please report if this renders any current anims invalid. 2010-05-30 19:28:21 +00:00
Echelon9 a25a1cdb8b codec1.cpp and codec1.h included in Xcode project file when no such source files present 2010-05-30 05:14:00 +00:00
The_E fc37a875fa Project file update for new sound code. 2010-05-30 02:17:21 +00:00
taylor 1398c8f4d5 more sane memory reserve 2010-05-29 15:53:28 +00:00
taylor 8b94ae6ddf fix endless loop 2010-05-29 15:53:27 +00:00
taylor 2a43c05c44 disable doppler for the time being 2010-05-29 15:53:24 +00:00
taylor 79308797d1 new sound code
- Mantis #58
 - Mantis #1769
 - many other fixes and improvements
2010-05-29 15:53:18 +00:00
taylor 118723ba5a fix view skew math issue (Mantis #2213) 2010-05-29 14:55:04 +00:00
taylor 03d96f9deb bah! remove debug code that slipped in with safety fixes 2010-05-29 10:55:33 +00:00
taylor db2bc4b03c support for newer versions of automake (Mantis #2145) 2010-05-29 10:55:30 +00:00
The_E 62c91c9216 Fictionviewer interface adjusted for new, official interface art found here: http://blueplanet.fsmods.net/E/FictionViewer.7z 2010-05-28 20:07:05 +00:00
Wanderer 03d80b9628 add read access for lua to weapon and ship info index. enable to check 'weapon_armed' status 2010-05-28 19:15:05 +00:00
karajorma 7c4c96f0c3 Swap the engage enemies messages over. 2010-05-28 06:09:53 +00:00
Sushi 9218cce15a Fixed a parsing bug in AI.tbl that scaled Glide Attack Percent, Glide Strafe Percent, Circle Strafe Percent, and Random Sidethrust percent between 0 and 1 instead of 0 and 100 (as is the case for AI profiles.tbl) 2010-05-25 18:09:59 +00:00
Sushi dfbf9a3338 Fix a bug where additive weapon velocity would sometimes cause primary shots to pass through a target 2010-05-25 16:25:41 +00:00
The_E f456379639 Altered the project file to allow FRED release compilation on VS2010 2010-05-25 01:11:46 +00:00
Goober5000 5048de1e27 remove message from queue the correct way, thus fixing the training message crash 2010-05-19 04:28:43 +00:00
Sushi 351cab7783 Added $Random Sidethrust Percent to AI Profiles and AI.tbl. Allows ships with sidethrust capability to sometimes randomly use it in dogfighting situations to make life more miserable for the player. 2010-05-17 19:10:34 +00:00
Goober5000 8d165a7d93 reverted fix. It has problems, which is why I'm going over it first. 2010-05-16 22:26:58 +00:00
The_E 9980e63db0 Committing IssMneur's fix for Mantis 2183. 2010-05-16 15:40:11 +00:00
Goober5000 3007df3871 better handling of missing models 2010-05-15 22:53:41 +00:00
Goober5000 005df32e71 misc silly fixes 2010-05-15 21:48:23 +00:00
Goober5000 e7fba4186a fix subsystem alignment on ship class change (Mantis #1181)
fix a bug with Bobboau's external missiles feature
2010-05-15 21:31:32 +00:00
Sushi 7348b2deb8 Added $No extra collision avoidance vs player flag. Makes the AI less likely to didder around like an idiot at close range. 2010-05-14 20:43:32 +00:00
Sushi eddda56776 Small fix for circle strafe 2010-05-14 18:57:58 +00:00
Sushi fe305aafd3 Fix for Mantis 2099 2010-05-12 19:40:09 +00:00
The_E 6b0c84f0f0 Swarm weapons should respect "$Free flight time" as well 2010-05-10 17:17:49 +00:00
The_E a208740aad Patch for Mantis 2202 (Children of swarm weapons do not inherit parent target) 2010-05-09 14:53:29 +00:00
Echelon9 0979cdffa0 Remove commented out code (still in SVN history if needed) and the overhead of an empty function call every frame 2010-05-09 06:12:06 +00:00
Echelon9 63970b5b47 Benefit from our use of STL vectors be removing a now unnecessary variable in cutscenes.cpp and making code cleaner and easier to read 2010-05-08 15:09:08 +00:00
Sushi c63d7bd534 Some fixes/updates for the Circle Strafe behavior. The AI should use it a bit more effectively now. 2010-05-07 17:03:23 +00:00
chief1983 04ec1749d5 Quick fix for the WarningEx breakage on *nix 2010-05-05 16:47:12 +00:00
karajorma 770405c2e1 Fix compilation under OSX and Linux with WarningEx 2010-05-04 12:34:05 +00:00
The_E 3723946ceb Genghis' fix for Mantis 2162 (Thruster cones have collision detection) 2010-05-03 12:32:42 +00:00
karajorma 11e36b487e Add the (in)validate-all-arguments SEXPs 2010-05-03 12:03:57 +00:00
karajorma ab2e0de58b Genghis' fix for Mantis 2159 (Certain parsing errors are never reported) 2010-05-02 10:24:48 +00:00
karajorma 0c40afe228 Genghis' fix for Mantis 2157 (Invalid subsystems not properly detected on mission parse). 2010-05-02 06:00:50 +00:00
karajorma e2b9073b1e GencGenghis' fix for Mantis 2155 (No error checking for certain ship problems in the lab that FRED does pick up). 2010-05-02 05:54:26 +00:00
karajorma c84efe1f72 Genghis' fix for Mantis 2151 (No error checking for incorrect engine wash entries). 2010-05-02 05:53:02 +00:00
Sushi cb0e0c5611 Reverted commit 5656, due to side effect of changing AI behavior (see mantis 1982) 2010-05-01 20:39:41 +00:00
Goober5000 43664a6f64 prevent HUD formatting from destroying subsystem names - Mantis #2195
also made hud_targetbox_truncate_subsys_name return void to lessen the chance of people making the mistake in the future
2010-04-30 06:33:38 +00:00
Goober5000 9e414f7fad fix rounding formula (Mantis #2194) 2010-04-30 04:03:24 +00:00
karajorma 803eccc9d3 Fix Mantis 2194 (FRED incorrectly calculates the wrong number used in wings). 2010-04-30 03:24:30 +00:00
Sushi a7145f34c6 Fix for bug causing AI to not fire secondaries, as well as a fix for other minor AI bugs 2010-04-29 18:56:11 +00:00
karajorma 04939a6084 Switch to using the Macros for Multiplayer modes whenever possible. 2010-04-27 13:42:59 +00:00
Sushi 3f9afd3af6 Fix for Dynamic Glide Cap so that the cap ramps max speed in the same way as normal flight when turning afterburners on/off or changing the overclock (what it should have done in the first place). Also removed some old, unused glide code. 2010-04-26 13:38:36 +00:00
Sushi bbbd963801 Fix for 6057 (game sometimes crashes if $Turret Max Aim Update Delay not set) 2010-04-26 13:36:08 +00:00
The_E 5720a9c595 Fix for Mantis 2189 (camera FOV may get corrupted by malformed commandline argument) 2010-04-21 21:14:08 +00:00
karajorma 9a4b6c97aa FUBAR's Fix to allow Explosion-Effect to use any explosion in fireball.tbl 2010-04-20 13:05:29 +00:00
Goober5000 528a463e3a make sure Fred knows its base directory before loading the command line... this will allow it to load cmdline_fso.cfg which will allow Fred to recognize mods (Mantis #2185) 2010-04-20 05:37:34 +00:00
Goober5000 25f94315a6 fix parsing of miss factors (Mantis #2185) 2010-04-20 04:37:44 +00:00
chief1983 d241d0499f No 2-arg asserts on Linux. 2010-04-19 23:32:52 +00:00
Goober5000 c760551d98 add beam miss factor by team, requested by Blue Planet 2010-04-19 05:17:57 +00:00
Goober5000 2a64a9615d merge Iss_Mneur's fix for Mantis #2173 (better error message in cmdline.cpp) 2010-04-19 03:51:05 +00:00
Goober5000 8526b36b4f merge Iss_Mneur's fix for Mantis #2178 (Assertion in missiontraining.cpp) 2010-04-19 03:49:09 +00:00
Goober5000 0703210f2e merge The E's fix for Mantis #2182 (NaN propagation leading to rendering wonkiness) 2010-04-19 03:40:13 +00:00
Sushi bf91f920d0 Added $Turret Max Aim Update Delay (same as $Max Aim Update Delay, but affecting turrets instead). 2010-04-15 20:03:01 +00:00
chief1983 b23561810b Add a VS2010 project file, made from VS2010 Ultimate RC1. Added tweaks after conversion from 2008 to make the output file names and target names more dynamic. This should be the basis for getting FRED release builds to compile. The three other executables per config work fine. 2010-04-14 20:07:08 +00:00
karajorma 92430488b3 Fix the end-mission SEXP to make it possible to test if the player is alive or not. 2010-04-13 11:15:18 +00:00
karajorma 5b163d511e Remove a hack which wouldn't allow players to skip the penultimate FS2 mission if they failed it 5 times. 2010-04-13 11:14:20 +00:00
karajorma 4218c7060e Iss Mneur's mission-set-subspace and hud-display-gauge SEXPs 2010-04-13 11:12:28 +00:00
Goober5000 e05347f3fb fix Mantis #1953 (departure locations and anchors destroyed by ship editor dialog) 2010-04-13 06:51:06 +00:00
Goober5000 2e19c25f1f consolidate and fix the resetting of time compression (Mantis #2180) 2010-04-13 03:54:30 +00:00
Sushi 6d439fadd8 Fixes a bug where paths generated by exit paths aren't garbage collected. This can cause the game to crash in missions where a lot of ships launch from fighterbays. 2010-04-11 18:36:30 +00:00
Goober5000 3c3d81cf54 prevent an endless loop if someone tries to assign a variable to itself 2010-03-31 20:31:02 +00:00
Goober5000 3612dafb11 IssMneur's patch for Mantis 2161 2010-03-31 05:33:55 +00:00
Goober5000 5e442d74f3 The E's patch to apply capital+ to secondary weapons 2010-03-31 05:31:23 +00:00
Goober5000 945d3990f0 patch some holes in the handling of string variables 2010-03-29 09:39:26 +00:00
karajorma 1327294aa3 Fix Mantis 2000 (Skip Mission Dialog appears even when mission is successfully completed). 2010-03-24 10:49:28 +00:00
Echelon9 5890127d46 Fix Mantis 2158: Increase Intelligence limit from species.tbl 2010-03-21 06:22:35 +00:00
Goober5000 9927dfc4ba a couple of small but important fixes to the subtitle code, including (finally) the complete fix for Mantis #2152 2010-03-20 06:37:26 +00:00
Echelon9 05615da610 Fix Mantis 2156: Crash within outwnd_printf2(char*, ...) on non-Windows platforms 2010-03-20 00:20:47 +00:00
Goober5000 591f4004e4 handle variables in show-subtitle 2010-03-19 07:39:51 +00:00
Goober5000 e9f9f0ffb2 Genghis's fix for too many cargo names (Mantis 2132) 2010-03-19 06:45:05 +00:00
Goober5000 4a835b7222 allow specification of fonts via show-subtitle 2010-03-19 06:31:15 +00:00
Goober5000 4cfb86ebc0 sexp help now scrolls 2010-03-19 05:47:56 +00:00
Goober5000 9c02a6c045 a few things here...
--add space for font argument which will be in post-3.6.12 builds
--fix round-off error in coordinate conversion, discovered by genghis
--use is_sexp_true() instead of WMC's comparison
--fix images not appearing in show-subtitle (Mantis #2152)
--fix invalid character in change-soundtrack sexp help
2010-03-19 04:03:49 +00:00
Goober5000 ea424e8a1d approximate the beam whack from retail FS2 2010-03-16 06:43:05 +00:00
Goober5000 7643e804d7 this is a long-overdue rewrite of WMC's show-subtitle sexps 2010-03-15 01:55:40 +00:00
Goober5000 eb4c391e32 move the -post_process flag to the experimental section 2010-03-14 22:38:37 +00:00
Echelon9 59bcf0bdf3 Fix Diaspora Mantis 537: Successfully killing a ship hidden from sensors should count towards your kill count 2010-03-12 23:19:42 +00:00
karajorma be2644e782 Fix Mantis 2140 (Set-primary-ammo/weapon result in the ammo being set to 0 in some mods) 2010-03-10 14:49:50 +00:00
taylor 14680469a2 no comment. (nothing nice to say) 2010-03-10 10:05:42 +00:00
karajorma bea3e84b0e Refactoring the Special Explosion and Special Hitpoints/Shield code and saving methods. 2010-03-10 08:50:28 +00:00
Wanderer 650338fec5 mantis 2122, fix for hud_gauge string comparison problems. 2010-03-09 07:09:40 +00:00
Wanderer be773479f3 mantis 2138, fix game crashing if using ships with secondaries but without primaries, allow ai ships armed only with secondaries to attack & shoot 2010-03-08 14:53:48 +00:00
Wanderer b98de5305c mantis 2113, make autoaim independent from lead indicator status 2010-03-08 14:52:24 +00:00
Wanderer 829ec21028 feature commit - alternate lead indicator based on komet's code changes. 2010-03-06 14:23:13 +00:00
Goober5000 60185c49b8 allow multiple interface patterns (FS2 plus WCS) to be used in fiction viewer 2010-03-06 11:39:11 +00:00
Wanderer 1de150f9a3 Fix for mantis 2131:
prevent for time compression caused vector scaling errors
changed time compression related beam assert into nprintf.
2010-03-05 11:48:19 +00:00
Wanderer ab2cca65d9 Fubars fix for mantis 2141 2010-03-05 05:47:23 +00:00
Wanderer ffb7dc4d06 fix for mantis 2125 2010-03-04 20:34:52 +00:00
Wanderer fd22aa4c55 fix for mantis 2105 2010-03-04 19:39:48 +00:00
Wanderer bb718fb737 fix to attach muzzleflashes on ship to weapon firing points - mantis 2135.
also related fixes - fix attached particle rendering, allow all particles to exists at least 1 frame
2010-03-04 10:10:57 +00:00
taylor 4a3f9770a0 use system versions of JPEG, PNG and LUA (per Mantis #1663 discussion) 2010-03-04 05:58:54 +00:00
taylor ab7e6a34c8 add detection of OpenAL and OpenGL (Mantis #1663) 2010-03-04 05:58:53 +00:00
taylor 974542077c fix memory issues with arg parsing 2010-03-04 05:58:52 +00:00
taylor 923fbb7d20 reduce minimum sound volume value for OpenAL compatibility (Mantis #1854) 2010-03-04 05:58:50 +00:00
taylor 73a58d5550 cycle back to normal music is hostile ships leave without battle (Mantis #1632) 2010-03-04 05:58:49 +00:00
taylor 6de05387ec updated Ogg/Vorbis/Theora libs 2010-03-04 05:58:45 +00:00
taylor d4b49a4781 handle cmdline_fso.cfg files of any size 2010-03-04 05:58:18 +00:00
taylor 491d2ea654 clean up launcher flags
- update easy flag settings (Mantis #2074)
 - remove -res, it requires an option
2010-03-04 05:58:17 +00:00
taylor ed2ebf5728 properly close out mission when end-mission sexp is used (Mantis #2144) 2010-03-04 05:58:16 +00:00
karajorma f6eb425708 Fix an issue with the multi_sexp system if you ever had to send two full packets in a single frame. 2010-03-03 14:11:59 +00:00
Swifty 7d4a8f2695 Fix frame buffer objects from rendering upside down after calling gr_opengl_set_clip and gr_opengl_set_projection_matrix. 2010-03-03 12:47:08 +00:00
Goober5000 6c57639902 comments and minor cleanup 2010-03-02 07:26:43 +00:00
karajorma 70041d6e43 Remove "disarm or disable cause global ai goal effects:" from AI_Profiles as promised and replace it with a new object types table setting. 2010-03-01 15:59:47 +00:00
karajorma b61f328236 Fix Mantis 2137 (Play-Sound-From-File doesn't loop correctly). 2010-03-01 13:44:25 +00:00
karajorma f07300411b Ironically OF_REFERENCED isn't referenced anywhere in the code. 2010-02-28 14:07:49 +00:00
Goober5000 1893682dfb mitigate the cost of seeking to the end of a stream by being intelligent about where we put the buffer 2010-02-28 11:42:30 +00:00
Goober5000 01c39758c1 fix ArrayOutOfBoundsException caused by the 7zip wrapper signalling "OK" for items it doesn't even extract 2010-02-28 11:41:25 +00:00
Goober5000 8eafa47267 Downloader now works with SevenZip! still needs performance evaluation though :-/ 2010-02-28 07:14:14 +00:00
Goober5000 5b5a29b2cc allow optional exception to be specified 2010-02-28 07:14:04 +00:00
Goober5000 f203bc002f add OutputStreamSequentialOutStream
fix some important bugs in InputStreamInStream
2010-02-28 07:12:41 +00:00
Goober5000 da8f3e51f0 add files for working with 7zip library 2010-02-26 04:59:22 +00:00
Goober5000 05205286f0 fix handling of thread interruption
remove unnecessary method in WorkerThread
2010-02-26 04:58:38 +00:00
Goober5000 d86c5f108c tweaks and header comments 2010-02-26 04:58:11 +00:00
Goober5000 e3d2440706 replace At4J with 7-Zip-JBinding 2010-02-26 04:08:15 +00:00
karajorma abd2fb1ae2 FRED should base the list on the selected object and not simply the first marked one. 2010-02-24 09:13:47 +00:00
Goober5000 6c80fc439c fix bugs in VC2005 project files, probably caused by VC6 import 2010-02-24 05:11:22 +00:00
karajorma 461794eb0d Change an assertion into a warning and auto-fix the data in release builds. 2010-02-23 01:53:55 +00:00
Zacam b15dc9370f For 3.6.12 RC: resolves the text "Monitoring" not showing on the HUD Escort monitor box. [Mantis 2133] 2010-02-20 22:24:28 +00:00
chief1983 c8c1c17fc5 Get rid of one place we have to update the version. 2010-02-19 20:41:19 +00:00
Zacam 117c75b85f Increase Trunk tagging and version to 3.6.13. 2010-02-19 19:57:22 +00:00
chief1983 feb8aeabd6 SVN will ignore .git and .gitignore files now. 2010-02-18 03:55:41 +00:00
Goober5000 c67581dcaa reconvert MSVC_2005 project from MSVC_6 2010-02-17 10:27:23 +00:00
Goober5000 91ddc22e75 remove MSVC_6_Release which is now redundant, and MSVC_2003 and MSVC_2005 which are old and need fixing 2010-02-17 10:16:33 +00:00
Goober5000 daa2f28afd sync with MSVC6_Release 2010-02-17 10:13:54 +00:00
chief1983 f2fb160b45 Fix VS 2008 compiling of FRED. 2010-02-16 05:22:14 +00:00
Zacam ec45135828 Some *nix compilers (and potentially Mac in the near future) are dying on the build process regarding this comma. 2010-02-15 22:04:45 +00:00
taylor 814213754f fix coop kill limit check when set to none (Mantis #2014)
cleanup coop validation checks a little, particularly if future checks are added
2010-02-15 19:53:33 +00:00
taylor 8a608181cc Merge branch 'misc' 2010-02-15 19:01:14 +00:00
Goober5000 c45eb0123e clarify difference between knossos warpin and warpout in the code -- this should fix Mantis #2128
"mabye" -> "maybe"
2010-02-15 11:01:29 +00:00
Goober5000 c2f30e5a3e add Fiction Viewer dialog
FRED will now save fiction viewer information properly
FRED will now also save "hidden" debriefing information properly
2010-02-15 10:22:20 +00:00
Goober5000 aa2e717596 sync png and zlib changes with MSVC6 2010-02-15 10:08:20 +00:00
Zacam 41b7795144 Well, this is embarrassing. Forgot to apply "is_a_word_separator" in the briefing text coloring fix for Mantis 1992. As a result, it wasn't stopping coloring unless and until a whitespace was being hit, instead of stopping on valid word separators like it should have been. 2010-02-14 00:46:13 +00:00
Echelon9 2d92fbb9b5 Mantis 2108 Fix (Mac Inferno build configurations do not correctly set INF_BUILD in Xcode) 2010-02-13 12:07:00 +00:00
karajorma 147ae88a6e FUBAR's Mantis 2053 fix (Fix a few holes where invalid names could leak through.) 2010-02-13 09:10:40 +00:00
Wanderer dc65069bef fix for potential (and real) null vec issue caused by sexped explosions 2010-02-13 09:01:07 +00:00
chief1983 b4706b69c7 Fixes for Mantis #2071: Color inheritance and child gauge IDs, per KK. 2010-02-12 17:42:31 +00:00
karajorma 016fe65c8c Better fix for Mantis 2106 (set-object-position crashing multiplayer) 2010-02-12 11:23:23 +00:00
karajorma c019118334 Bump the server version (should have done this when I broke the packet earlier this week). 2010-02-12 11:19:56 +00:00
karajorma fc1139fe12 Whoever designed a comparison function that reports false when the arguments are the same should be shot! 2010-02-12 07:42:23 +00:00
karajorma 37842c2ff0 Deprecate <any support ship class> in favour of something that does exactly what it says on the tin. 2010-02-12 07:14:34 +00:00
karajorma f7cb3db682 Fix Mantis 2094 (Set-Support-ship results in support ships that can't rearm even though present in the mission). Thanks to FUBAR for the spading on this. 2010-02-12 06:42:19 +00:00
Zacam 150341d455 Patch for Mantis #2001: Primary weapon loadouts with text names no longer show # or anything to the right. Works with $Alt Name: as well. 2010-02-11 16:47:19 +00:00
chief1983 e71aff459d Patch for Mantis #2071: color inheritance and pan or static option for custom gauges 2010-02-11 16:32:45 +00:00
chief1983 f935f372a3 Fix Mantis #2120: is-primary-selected now returns true for any bank when primaries are linked. 2010-02-11 16:31:25 +00:00
Zacam 83fcfb4dcc Potential Fix for Mantis 2114 as suggested by The_E and tested by myself. Not only set "static int bm_next_handle" to 0, but also conditioned the Asserts (hopefully) a bit better and cleared out commented code blocks.
(Note: It seems I got Notepad++ to convert ushort and uint into "unsigned" short and int. Doesn't break anything and frankly, I hate unnecessary typedefs anyway).
2010-02-11 02:12:15 +00:00
Zacam ea387f9355 Resolves "conditional within an assignment" warnings that could cause problems. 2010-02-11 01:42:36 +00:00
Wanderer 5f3029186e Commit of lua debug patch. 2010-02-10 21:50:15 +00:00
Wanderer 834916cff7 commit of beam piercing patch (allow beam tooling to occur simultaneously to the effects) 2010-02-10 21:38:01 +00:00
Zacam 1b0caf14bf From The_E: "This adds the optional string "$End Campaign Cutscene:" to the list of possible cutscenes; once end-campaign is called, all of those scenes will be played if their requisite trigger conditions are met, in the order in which they are defined in the mission file". 2010-02-09 20:03:57 +00:00
Zacam 7de925f112 From The_E: Capital+ flag "AI will not use this weapon on fighters or bombers" for use against Capital class Targets ( SIF_BIG_SHIP | SIF_HUGE_SHIP ). 2010-02-09 20:01:54 +00:00
karajorma dd9f4afad8 Fix for Mantis 2106 (Set-object-position crashes in multiplayer). 2010-02-06 11:20:32 +00:00
karajorma f1a22aafb5 Packet breaking fix for Mantis 2011 (Send-Message-List sends all messages at once for clients). 2010-02-06 11:19:31 +00:00
Echelon9 4562f0a471 Updated Xcode project file to reflect the non-inclusion of some redundant png source code files that weren't actually needed in Antipodes 5 2010-02-06 06:52:12 +00:00
Zacam 80827f51a5 From Antipodes #5: PNG File Format support.
Adds PNG to Maps (should only be used for Nameplates), Interface, Effects, HUD (still needs HUD Rewrite to implement), Player/Squad Images, Multi Players, Multi Cache, CB Anims and Intel Anims.
LIBPNG: Version 1.2.42, current and highest usable version (MAX_VERSION), Linux can use any 1.2.2x-1.2.42, but should NOT use 1.4.0 under any platform for ANY reason (will require rewriting pngutils)
ZLIB: Version 1.2.3.
2010-02-06 02:35:41 +00:00
taylor 2694046f51 fix damage lightning (from Xt tree) 2010-02-06 01:02:24 +00:00
Wanderer bffbd8aa85 fix couple of model handle related bugs in lua.cpp 2010-02-05 23:14:34 +00:00
Wanderer fa2b662bf1 allow armor entries exists even without any calculations. 2010-02-05 19:04:12 +00:00
Wanderer b8ef047740 fix for mantis 2110 2010-02-04 21:18:19 +00:00
Zacam 3110b777fd Multi-platform resolution for "signed/unsigned mismatch" warning on aiturret.cpp via ship.h 2010-02-04 05:36:04 +00:00
Zacam a7d809cfb7 Not multi-platform, but it doesn't break other platforms and removes 11 warnings from nebula.cpp. 2010-02-04 05:02:07 +00:00
Zacam 3deec8f1a3 Multi-platform resolution for "unused variable" warning on shiphit.cpp 2010-02-04 04:44:42 +00:00
Zacam 81b7498d90 Multi-platform resolution for "signed/unsigned mismatch" warning on ship.cpp 2010-02-04 04:42:04 +00:00
Zacam 4d4f50056e Multi-platform resolution for "signed/unsigned mismatch" warning on gropenglstate.cpp 2010-02-04 04:27:43 +00:00
Zacam 835d8131c8 Fix for cutscene.cpp "signed/unsigned mismatch" multi-platform warning. 2010-02-04 04:12:45 +00:00
Zacam f1f8d6340b Proper fix for Mantis 2039. Nebula poof debris ANI usage now based on using any ANI/EFF on nebdeb01-nebdeb04. Doesn't exist on retail but also doesn't conflict or break Retail as these (nor the original "Neb01-64") actually exist, but allows for the same flexible range for the effect as non-nebula has for motion debris. 2010-02-04 04:04:17 +00:00
Goober5000 df1df83f5d add some Javadocs
convert InternetUtil to Connector; make it more robust
make Connector and Downloader thread-safe for parallel downloading of multiple files
add WorkerThread for proper thread priority
2010-02-04 01:27:08 +00:00
taylor 9df7dfcaca particle updates from the Xt code base 2010-02-03 02:18:22 +00:00
Goober5000 9617c252a8 add licensing boilerplate to the new Java files
add license files to the docs folder
add At4J libraries
2010-02-02 08:12:44 +00:00
Goober5000 e0ade063b6 some edits 2010-02-02 07:16:59 +00:00
Goober5000 b7b4cba23d move some files
deleted Codecs, which is unused
2010-02-02 07:08:51 +00:00
Goober5000 9ef0ab3e4e add folder 2010-02-02 07:08:05 +00:00
Goober5000 463185168c fix jar generation
add svn::ignore item
2010-02-02 05:24:38 +00:00
Goober5000 6da56d55d2 improve URL handling
installer can now read and write an identical file
2010-02-01 07:50:31 +00:00
karajorma 4586443ac6 FUBAR's special hits fix. 2010-02-01 04:49:09 +00:00
karajorma ba4528a2d4 FUBAR's bump for the number of docks a ship can have in FRED. 2010-02-01 04:35:29 +00:00
karajorma b00f816479 FUBAR's Corkscrew Limit bump 2010-02-01 04:15:23 +00:00
Zacam 875155c100 Crap. Fixes SparK's Reverse AB. Now with a ship defined with Reverse AB, forward AB still responds as normal. 2010-02-01 03:37:14 +00:00
Zacam c60dbbd7b1 From Antipodes #5: Corrections for errors and warnings to SPHelper.h for speech compiling for WSVC (specifically 2008), especially when done on Vista/Win 7. 2010-01-31 01:22:56 +00:00
Zacam 20c27ce07a From Antipodes #5: new TBM option '$Alt name:'
For ships and weapon tbms - renaming existing tbl entries in mods
2010-01-31 01:19:58 +00:00
Wanderer 419d43a1eb bah, bah, bah, bah - fix my own stupid bug in lua raycollision function 2010-01-30 11:45:22 +00:00
Zacam f03448bec2 SparK's Reverse Afterburner code, for FringeSpace (Tachyon) project Feature Request. 2010-01-30 03:38:53 +00:00
Goober5000 cb398f0d6b Zacam's project fixes 2010-01-30 00:50:08 +00:00
Goober5000 71aa82d661 change the other DSPs too 2010-01-30 00:12:45 +00:00
Goober5000 dd291925ca fix the MSVC6 project files 2010-01-30 00:04:54 +00:00
chief1983 27af3458f2 Fix a VC6 compiling issue with multiple declarations of i 2010-01-29 22:21:33 +00:00
Wanderer 517aa9c021 The_E's fix for preventing lua On HUD Draw hook from being run when HUD is not visible 2010-01-28 20:28:29 +00:00
Wanderer 279ea30645 adding 'retail' type piercing (no piercing effect, but normal beam tooling effect) 2010-01-28 20:24:39 +00:00
Wanderer c789f7b81d added improved controls for piercing effects. fixed shield armor type bug. 2010-01-28 16:05:15 +00:00
Wanderer 9041d4620e lua function for checking the state of a ship when the ship is dying 2010-01-28 08:05:43 +00:00
Wanderer a87fd45a6b Lua additions/bugfixes, fixed drawmodeloor function for drawing models in game, new model loading helper functions (slow). 2010-01-28 07:37:31 +00:00
Goober5000 08b03b19b9 add new source tree (for starters)
bump version number in build.xml
2010-01-28 02:55:01 +00:00
Goober5000 527a429cca rename old source directory 2010-01-28 02:47:42 +00:00
Sushi 661586e6c8 Added $Damage Lightning Type and +Lightning Arc Percent (under $Debris) to ships.tbl. Allows damage lightning effect to be changed (current options are default and none) on a per-ship basis. The percentage of debris pieces with lightning arcs can also be controlled via +Lightning Arc Percent. 2010-01-27 18:55:37 +00:00
Goober5000 aaf4648806 remove redundant definitions from modelinterp.cpp 2010-01-26 01:47:35 +00:00
Goober5000 d9bf01a9b8 thanks to Zacam for noticing the edge case; max flags should actually be 31 2010-01-26 01:47:29 +00:00
Wanderer 4486fdafb9 fix for certain lua control problems, data was read and copied at 'wrong' time. 2010-01-25 12:01:01 +00:00
Goober5000 e01a53f9f8 Mantis #1992 - enhanced briefing token support; credit to Pedro with modifications by Zacam 2010-01-25 03:25:41 +00:00
Goober5000 770172f3a8 bump MAX_SHIP_BAY_PATHS per Mantis #1917 2010-01-24 21:50:57 +00:00
Goober5000 b761e88613 trackIR change for MSVC6 project file 2010-01-24 21:50:29 +00:00
chief1983 926d253d23 Fix for Mantis #1936: Third time's a a charm. Let's see if this doesn't help things a bit. Per KK. 2010-01-24 18:45:16 +00:00
chief1983 72280e3a3d Fix for Mantis #1936 part 2: Some stuff that was fixed exposed more broken stuff. Now should be fixed too. Per KK. 2010-01-23 21:58:57 +00:00
Wanderer 0b60ebde07 separate beam flash from dinky explosion (was not a good idea). Enable beam width setting to affect all beams. 2010-01-23 19:34:59 +00:00
Wanderer e080ec3ba4 fix to lua escort ship indexer 2010-01-23 09:02:32 +00:00
Wanderer 55b04884ce fix for the new effects with shield impacts and with missiles exploding without impacting 2010-01-23 07:58:31 +00:00
Wanderer b49c54ca81 some changes to beam pierce effect, blob pierce effect, new settings for them both 2010-01-22 15:50:54 +00:00
Wanderer 609277cf01 fury's request, option for huge beams not to draw impact effects when hitting specified type of ship. 2010-01-19 14:28:50 +00:00
Wanderer d49a4e654b more chase view mode fixes 2010-01-19 07:28:17 +00:00
chief1983 baa8adcf47 Fix for Mantis #1936: Per ship gauges should now work properly. From KK. 2010-01-18 16:06:35 +00:00
Wanderer bd736a3cbb potential fix for mantis 2041 2010-01-18 14:58:45 +00:00
Wanderer dd8713456b weapon info flags: targetable weapon, show weapon on radar, show friendly weapon on radar 2010-01-17 13:52:34 +00:00
Echelon9 055b845053 Provide a simpler way to set the CFBundleName key in the Xcode project file. 2010-01-16 18:26:05 +00:00
Echelon9 812e0732b4 Add to Xcode project file LSMinimumSystemVersion key for future work 2010-01-16 17:55:10 +00:00
Echelon9 3977ca1dad Simplify the Xcode project file's CFBundleExecutable key to be truly extensible 2010-01-16 16:51:43 +00:00
Wanderer 5801ab45d7 enable another bitfield for ai profile flags, add ai profiles fix for turrets targeting too distant enemies in certain cases. 2010-01-16 16:14:21 +00:00
Wanderer 9ef172cd7b fix for issue when ai is selecting big attack points 2010-01-16 16:06:32 +00:00
Wanderer 3bc9551e76 Lua control for getting the full button control data 2010-01-16 13:10:55 +00:00
Wanderer f126423f54 fixes for various lua wings and wing ship indexer bugs. 2010-01-14 18:05:48 +00:00
Echelon9 2405421a99 Cleanup Xcode project file 2010-01-13 09:12:41 +00:00
portej05 b53a5c94d3 trackir static library no longer needed 2010-01-13 06:53:31 +00:00
Sushi 48176d5173 Added "$Expl Visual Rad" to ships.tbl. This controls the visual size of the main fireball for ship explosions. 2010-01-12 18:51:36 +00:00
Wanderer de7d09099e make sure the debug data is only used in debug builds (not initialized in release builds) 2010-01-11 21:15:27 +00:00
Wanderer a349e3a320 Enable missing controls lua control info. Force fireprimary lua function to work regardless of stream status of the weapons. 2010-01-11 10:39:40 +00:00
Wanderer 2835f99e5f Fix for subsystem existing without table entries. Rewrote old disabled warnings related to this issue. 2010-01-11 10:38:00 +00:00
Wanderer 5b5a20daf8 lua access & related functions to enable player button controls to be operated via scripting 2010-01-10 20:59:31 +00:00
Echelon9 dd3f7f0114 With the removal of final Direct3D references, there are no remaining uses of the NO_DIRECT3D definition in the code base 2010-01-10 08:08:26 +00:00
Wanderer e70f99f2ce fix for a case when player dies before his weapons hit the target (target hit by ghost) 2010-01-09 20:12:03 +00:00
Goober5000 619033dd3e ignore transient folders 2010-01-08 06:26:44 +00:00
Goober5000 ce60127cb4 add turey's installer for real 2010-01-08 06:26:05 +00:00
Goober5000 f9c70fa8c6 this import is the correct way 2010-01-08 06:23:08 +00:00
Goober5000 e12d4abc34 fix a bunch of compile problems 2010-01-08 04:37:28 +00:00
Goober5000 6d63df8a02 commit current state of launcher 2010-01-08 03:23:33 +00:00
Echelon9 daf27f3f1d Complete reversion 2010-01-07 17:30:44 +00:00
Echelon9 6cb2e0b292 Revert r5760 training_message_queue changes 2010-01-07 17:21:44 +00:00
Wanderer a68219f224 model:checkRayCollision lua function to allowed certain collision checks be done with lua 2010-01-07 15:23:25 +00:00
chief1983 de70c5f6cd Fix Xcode compiling for reals, tested to currently work. 2010-01-07 04:48:25 +00:00
chief1983 6638247a4e Fix for Mantis #1934: Secondaries now work when changing from a ship that had none, and FRED won't complain when you can't equip secondaries to a ship. 2010-01-07 04:16:44 +00:00
taylor 67f5fa1759 fix broken trackir compiling on non-Windows
eol fixage
2010-01-07 02:48:31 +00:00
portej05 78be9be19c Remove trackir directory from VS2008 solutions 2010-01-06 17:03:13 +00:00
Echelon9 7b2ada923f Complete update to Xcode project file 2010-01-06 12:10:24 +00:00
Goober5000 bb7b000f02 add external_dll files to VC6 project
alphabetize the project modules at the same time
2010-01-06 01:21:35 +00:00
Goober5000 25da10a90a change ExternalDLL to external_dll for cross-platform friendliness
(yes there aren't any errors currently, but this has been a convention since the beginning of cross-platform compatibility)
vcproj and xcode projects are updated accordingly
2010-01-06 01:18:31 +00:00
Wanderer 967fd28c94 lua handled collision groups and lua bitwise ops library 2010-01-05 18:00:01 +00:00
Hery 2111df1543 Fix for bloom using outdated mipmaps 2010-01-05 17:51:57 +00:00
Hery d927bc0f5d Fix for mantis 2078, two pass bilinear downscaling in order to reduce artifacts 2010-01-05 12:56:33 +00:00
Wanderer b1d86b6f2e Fix for mantis 2063 from warfull 2010-01-05 09:41:35 +00:00
Wanderer e3e2ea3578 fix for mantis 2077 2010-01-04 11:21:56 +00:00
Goober5000 8673047cd9 location oops 2010-01-03 20:20:49 +00:00
portej05 7a4f660151 Fix TrackIR compile errors 2010-01-03 14:27:39 +00:00
Echelon9 090b5309eb Update Xcode project file for portej05's code 2010-01-03 09:46:14 +00:00
Echelon9 0a03f3aad8 Update Xcode project file to reflect removed .cpp/.h source code files 2010-01-03 08:52:46 +00:00
Goober5000 c8bdae118d hooray for function prototypes 2010-01-03 05:55:17 +00:00
portej05 7189f1b7d2 TrackIR DLL loading implementation. You need scptrackir.dll in order to run (on internal beta at present). 2010-01-02 14:12:22 +00:00
Echelon9 8668939fee Rename function to correctly reflect what it does 2010-01-02 13:32:43 +00:00
Echelon9 70e16037bb Make Training_Message_Queue dynamic with SCP_vector 2010-01-02 13:28:56 +00:00
Echelon9 1b05a3206a 2010 2010-01-02 06:33:49 +00:00
Echelon9 e605476fca Some how the removal of the OpenAL.Framework to address GCC 4.2 issues got reverted 2010-01-01 20:02:47 +00:00
Goober5000 8d5943022f Zacam's extra colors for briefings (Mantis #2059) 2010-01-01 08:30:53 +00:00
Goober5000 9ec554064e Zacam's fix for Int3 in mission briefing (Mantis #2059) 2010-01-01 08:27:25 +00:00
Goober5000 6eb561007e adjust number of lines according to font, per KeldorKatarn 2010-01-01 07:52:22 +00:00
Goober5000 8b86c7b5cb fix ui window using the same font as fiction_viewer 2009-12-30 21:04:58 +00:00
Goober5000 a7a0405f86 fix mission load error message
remove deleted files from project
2009-12-30 21:04:00 +00:00
Echelon9 64810c33d9 Update SDL from 1.2.13 to 1.2.14. The changelog can be found at http://www.libsdl.org/release/changes-1.2.html 2009-12-30 19:14:05 +00:00
portej05 ab8167f484 safe_strings requires you to specify the size of the destination buffer in some way. (fix build for all non-VC6 builds) 2009-12-30 18:09:39 +00:00
Goober5000 460353a827 allow up to two additional fonts using fonts.tbl
allow specification of fiction viewer font
2009-12-30 08:02:37 +00:00
Sushi 7e623732cd Fixed a problem in the glide code where thrust was not proportional to framerate. Also made glide ramping more consistent in behavior with normal speed ramping. 2009-12-29 23:10:26 +00:00
portej05 5344b3a8f0 ifdef trackir pending new trackir interface code 2009-12-28 18:06:36 +00:00
Wanderer 80611070cb table defined support ship shield, hull and subsystem repair rates 2009-12-28 16:10:11 +00:00
Hery 59f6970e41 shader manager and post-procesing files need svn:eol-style set to LF 2009-12-27 16:35:39 +00:00
portej05 2b6ccabbba Locking for PDB_DEBUGGING (multithreadedness will need it) 2009-12-27 15:14:55 +00:00
Hery 180115a692 fix problems with nebula background 2009-12-27 13:20:51 +00:00
Hery 68e0ab504c fix problems with lua scripts and post-processing 2009-12-27 13:01:42 +00:00
Hery b7be6f86d5 fix for mantis 2081 2009-12-27 12:42:11 +00:00
portej05 c9dc3ea466 Remove NEW_MALLOC code
Add strcpy_s where needed in vm_strdup
2009-12-26 07:59:01 +00:00
Echelon9 7ba152b80b Complete the removal of the now redundant Info-debug.plist 2009-12-24 08:06:38 +00:00
Echelon9 0d7fc3b052 Fix Mantis 2079. This change utilised Xcode's Info.plist Preprocessor Definitions to consolidate the .plist files into one; which is dynamically generated for the chosen Build Configuration (Release, Debug, Inferno_Release, Inferno_Debug) 2009-12-24 08:02:27 +00:00
Goober5000 fc0ac76835 clean out some old font stuff 2009-12-24 04:52:56 +00:00
chief1983 e1659fbca6 Fix the makefile to work with the new executable filenames 2009-12-23 06:45:43 +00:00
chief1983 47ec40280d Update Linux makefile with recently added/deleted files from post processing and the vampire list 2009-12-22 21:50:06 +00:00
Echelon9 f147997ae1 Reduced size of Frameworks.tgz by removing the unused OpenAL.Framework (it is linked from the system version, this one was redundant). Mac developers will have to reextract the Frameworks folder to take effect. Preparation for the pending update of out of date SDL, Ogg, Theora and Vorbis frameworks for OS X. 2009-12-22 15:18:41 +00:00
Echelon9 7ecc202a87 Remove the Xcode project's references to Makefiles 2009-12-22 14:31:46 +00:00
Echelon9 1d2b9e5ff5 Hopefully last step to resolve OS X issues from Hery 2009-12-21 20:03:54 +00:00
portej05 ec30bfcdf8 Updated to VC6 release files for code commit removing empty sound code files 2009-12-21 11:42:07 +00:00
portej05 9abea9fd58 Mantis 1900 patch from Hery 2009-12-21 11:28:16 +00:00
Echelon9 7968f03d6f Cleanup Xcode project file for *.cpp/*.h that have been previously removed 2009-12-21 09:23:45 +00:00
portej05 59b5cdca93 Removal of empty files/unused files (sine OpenAL is now used in all builds) 2009-12-21 09:12:56 +00:00
Goober5000 11da5a0fce rewrite code to bypass bizarre internal compiler error 2009-12-21 03:19:13 +00:00
Goober5000 9be6bb75f7 VC6 project file updates 2009-12-21 03:18:45 +00:00
Echelon9 cd4ccf8ad7 Commit of Hery's update to the new shader code to address GCC/Xcode compilation issues 2009-12-19 18:39:32 +00:00
Sushi 14be3ab5f5 Fix for mantis 2031 2009-12-18 17:22:01 +00:00
Wanderer 5fdb75f324 Patch from FUBAR - set armor type sexp 2009-12-18 10:11:48 +00:00
Wanderer ad6e608425 Patch from FUBAR - turret direction preference, turret optimum range & turret target priorities sexps 2009-12-18 09:34:23 +00:00
Wanderer 05bbe2aacd fix to portej's fix to particle code 2009-12-18 07:43:43 +00:00
portej05 981f431ac7 Make particles go a lot faster! (until a better system is implemented) 2009-12-18 04:28:13 +00:00
Wanderer 2c33fd63e5 weapon based targeting priorities for turrets 2009-12-17 11:45:08 +00:00
Wanderer e2614b1226 making countermeasures function like retail countermeasures. 2009-12-16 07:29:56 +00:00
Echelon9 c427c1e874 MIN() is defined as capitalised at pstypes.h:274 2009-12-15 06:16:04 +00:00
portej05 bef5e404ff Potential fix for mac issues caused by inclusion of postprocessing in trunk 2009-12-15 02:56:15 +00:00
portej05 71ba619611 Resolve macro definition warning for MAX_MONITORS (renamed MAX_VARIABLE_MONITORS in FSO) 2009-12-15 02:23:23 +00:00
portej05 28886b8d81 Woops - missed the two important files! 2009-12-14 17:17:29 +00:00
portej05 cd3f71b94c Antipodes #4 - Post Processing from Hery 2009-12-14 13:57:33 +00:00
Goober5000 e45bc9844b the reason for the return statement no longer exists 2009-12-14 05:28:06 +00:00
Goober5000 a6f1a7ed29 fix warnings Zacam noticed 2009-12-13 07:24:59 +00:00
Wanderer b2f2b75261 hery's patch for mantis 1945 2009-12-11 08:38:39 +00:00
Wanderer f6b211e0fa make the +override option use the flags set during the current parse tbm event 2009-12-10 14:54:13 +00:00
Wanderer 8051f8e775 commit of aardwolf's clearOrders sexp function 2009-12-08 18:32:40 +00:00
Wanderer eb9efdee18 Fix for mantis 1998 2009-12-08 18:25:50 +00:00
Wanderer 36471bdd2c Added proper functions and warnings as requested for mantis 2018. 2009-12-08 09:59:05 +00:00
Wanderer 3536f09da4 added a warning to prevent issues like mantis 1946 2009-12-06 10:32:11 +00:00
Goober5000 2a3b4abcae remove ai_get_subsystem_type as it's redundant
clean up all sorts of subsystem stuff in sexp.cpp (in particular, use ship_get_subsys when possible)
weapon / sensor subsystem types should work for "weapon" and "sensor", not "weapons" and "sensors" to be consistent
2009-12-06 10:06:51 +00:00
Goober5000 6421772251 add hits-left-subsystem-generic and hits-left-subsystem-specific
deprecate hits-left-subsystem
2009-12-06 08:48:03 +00:00
karajorma 2e4d28204a Fix an issue with the client side section of sexp_deal_with_ship_flag. 2009-12-06 07:15:36 +00:00
Goober5000 8955d3ac02 commit the revision patch originally inspired by Zacam 2009-12-05 22:53:04 +00:00
Wanderer c94a704497 fix for mantis 1976. 2009-12-05 19:15:31 +00:00
Wanderer d7a61e0cb0 fix for mantis 2016 2009-12-05 12:01:03 +00:00
Goober5000 0633a77154 project file fixes 2009-12-05 07:17:18 +00:00
portej05 e37058ddd0 Turns out enableWindowsKey/disableWindowsKey isn't defined for all platforms 2009-12-05 00:50:09 +00:00
portej05 ea08546f1c MSPDB fix for VC6 users. 2009-12-04 06:58:22 +00:00
Goober5000 69f6de983a fix for Mantis #2044 2009-12-04 06:19:02 +00:00
portej05 a16df8d8d9 Fix "SymRefreshModuleList" symbol not found error on platforms without dbghelp.dll v6.5+ (we really should distribute that monster) 2009-12-03 10:23:59 +00:00
portej05 c751d88e61 Running as standalone no longer disables windows key (Mantis #2047) 2009-12-03 07:01:48 +00:00
portej05 addbb67c53 Commit to update PDB_DEBUGGING in preparation for new allocator system 2009-12-02 17:16:33 +00:00
Wanderer ac762539b5 fix to make sure turret matrices (and turret normals) are properly setup from the start 2009-12-01 08:58:40 +00:00
chief1983 a358a890fb Fix an issue with linux's build options too. 2009-11-30 03:18:08 +00:00
chief1983 ecaa69bcc5 Fix issues with VS2008 building since update. 2009-11-30 02:41:15 +00:00
chief1983 98b6cef831 Add support for groups of configs and separate archives, and grab PDB files for VC builds. 2009-11-29 20:45:39 +00:00
Goober5000 3ae542dc25 fix a bunch of problems where sexps with multiple arguments might not work on all of them
fix problem with beam-free-all and beam-lock-all only working on the first ship in a list
2009-11-28 19:15:53 +00:00
Wanderer 541e01d87a fix to prevent formation of badly setup turret rotation matrices. 2009-11-27 10:09:20 +00:00
chief1983 034e1aa6c4 Change the filename for Linux Inferno builds. 2009-11-25 06:20:19 +00:00
chief1983 fa75c9bb52 Use the config name and not the string for the build drop 2009-11-24 20:55:11 +00:00
chief1983 0fdd6fafa2 Set the Inferno configs to output a different filename than the regular counterparts. 2009-11-24 20:05:06 +00:00
chief1983 0192468324 The_E's 720p hi-res interface art patch. Use hi-res interface stuff at vertical res of 600 and higher instead of 768 and higher. 2009-11-24 03:19:19 +00:00
portej05 f72301a0cf Remove bitarray.h and substitute with simpler functions (tested via Zacam, Flaming_Sword and portej05) 2009-11-23 12:12:09 +00:00
portej05 8958d4de72 Strip missed CVS comment 2009-11-23 06:11:24 +00:00
karajorma 49e37a8df5 Add the ability to specify ships or wings to the num-ships-in-battle SEXP (In collaboration with FUBAR). 2009-11-23 04:57:42 +00:00
portej05 2bd0ef65aa Fix for Mantis 2042 2009-11-23 04:45:51 +00:00
Goober5000 f2b678d510 warning fixage 2009-11-23 03:41:40 +00:00
Goober5000 4372187283 more warning fixage 2009-11-23 03:24:10 +00:00
Goober5000 8d354d9f58 spacing
fix build warning
2009-11-23 03:23:11 +00:00
portej05 a96e70737a Remove name concatenation issue from cfilesystem (hopefully mantis 2042 solved, but that callstack changes depending on whether dbg_filter.cfg is there) 2009-11-22 15:05:33 +00:00
Goober5000 ee235e4a40 fix Mantis #2043 - variable-array-set needed extra sexp_tree management
also, improve type safety for checking for sexp operators (compare the constants rather than using stricmp on the names)
2009-11-22 11:55:40 +00:00
chief1983 9ff060c61e Fix for fix for #1945 and #1768: Previous fixes didn't play nicely together. Per Hery. 2009-11-19 17:31:48 +00:00
chief1983 2eed78396f Fix for #1768: cutscene bars should now be fully functional again. Something about cubemaps, ask Hery :) 2009-11-19 06:06:52 +00:00
chief1983 d53dcd2b8d Fix for #1914: Add a Skybox CLAMP flag to FRED that forces clamped textures instead of tiling. 2009-11-19 05:51:26 +00:00
chief1983 82c6f40164 Fix for #1945: Finish adding the proper rectangle drawing code. Cutscenes now combine FOV change + rectangles. From Hery. 2009-11-19 05:49:23 +00:00
Goober5000 b5a9fbb4e7 bump MAX_ASTEROIDS (I can't believe nobody else has yet) 2009-11-18 09:33:31 +00:00
Goober5000 2a70f3348c add two awesome sexps that allow treating sexp variables as arrays 2009-11-18 09:17:01 +00:00
Goober5000 6f875452a1 add useful parselo function 2009-11-18 08:59:35 +00:00
Goober5000 14f22e5c78 remove unused variable 2009-11-18 08:17:26 +00:00
Goober5000 c0888e8414 sexp subcategorization 2009-11-18 06:34:09 +00:00
chief1983 92c4e2f545 Add back in:
_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0; 
until we can fix the code that is visibly broken by removing those.  Per Zacam.
2009-11-18 05:58:11 +00:00
Goober5000 873d2132b1 Zacam's "oops" patch 2009-11-17 04:41:35 +00:00
Goober5000 db92c76729 fix knossos animations rendering backwards for ships warping out in certain orientations
(taylor's hack isn't actually needed; the parent_obj can - and probably should, for consistency - be the warping ship, not the knossos)
2009-11-16 07:04:06 +00:00
Goober5000 248bedbd73 remove this extra friendly-stealth-invisible check; it's redundant and incorrect 2009-11-16 07:01:49 +00:00
karajorma 119572296f Trim out some warning messages. 2009-11-14 11:57:35 +00:00
karajorma c872fb3981 Pedro's Mantis 1982 Fix (Afterburners are used from several places in the code for ships with no afterburners). 2009-11-14 09:51:24 +00:00
karajorma 8e401ecf0b FUBAR's percent-ships-arrived SEXP. 2009-11-14 09:13:45 +00:00
portej05 2eb14588e9 FRED Learns to write in its own log file! 2009-11-14 04:11:16 +00:00
chief1983 829033db09 VS2008 remembers how to build
Zacam fixed the broken merge from Antipodes of the project file updates.
2009-11-13 23:35:08 +00:00
portej05 aeab521d02 Fix for issues caused by memset and _HAS_ITERATOR_DEBUGGING.
Some ugliness involved (placement new - yuck!), however given that a lot of our structures are allocated with vm_malloc, I haven't got a better way around this at present.
2009-11-13 18:06:27 +00:00
portej05 dae86c91a5 Fix more incorrect uses of memset causing crashes 2009-11-13 13:22:59 +00:00
portej05 c8d39636bd Fix mistake with globally defined symbols (_SECURE_SCL=0 and _HAS_ITERATOR_DEBUGGING=0)
Add PDB_DEBUGGING to default 'code' builds
2009-11-13 10:09:10 +00:00
Goober5000 39732c6aa3 fix Mantis #1967 (spurious warning about custom wing names) 2009-11-13 08:26:12 +00:00
Goober5000 94da664d39 allow changing of case for ship, wing, waypoint, and reinforcement names per Mantis #2017 2009-11-13 08:07:48 +00:00
portej05 35c85500b1 Remove _HAS_ITERATOR_DEBUGGING=0;
Remove _SECURE_SCL=0;
Remove _CRT_SECURE_NO_DEPRECATE;
Add Zacams icons patch
2009-11-12 16:40:27 +00:00
Goober5000 0cd7293ee6 load hi-res cbanis, if we have them (Mantis #2029) 2009-11-11 06:33:26 +00:00
karajorma b0740049ef Change the Galactica warp effect name to a more neutral term. 2009-11-09 02:18:34 +00:00
portej05 c46e5b93cd Added SCP_string, SCP_stringstream, SCP_map, SCP_multimap and allocator equality operators to vmallocator.h (Hery) 2009-11-08 10:28:35 +00:00
Sushi 395c4baffd AI Profiles entries in AI.tbl are now overrides instead of multipliers. 2009-11-05 22:46:54 +00:00
karajorma e039bc3e89 Doh x2 2009-11-05 06:16:15 +00:00
portej05 cb690890e5 Fix for memory debugging functions.
Totals are now more accurate!
2009-11-04 13:03:02 +00:00
portej05 92d0b38dcc Fix Assert in WMCGUI.cpp (Vector subscript out of range) 2009-11-03 07:28:25 +00:00
portej05 1f276d16c3 Fix stupid VC6 variable scoping for for loop in memory debugging routines 2009-11-02 08:00:58 +00:00
karajorma 1d9b2e02bf Switch to a more neutral name (which fits better with the others too) for the BSG warpout effect.
Add FUBAR's fix for a radius issue affecting BSG style jumps.
2009-11-02 06:28:28 +00:00
karajorma 1f1339cb3c FUBAR's bump for MULTI_PXO_MAX_PAGES (it was causing issues for Diaspora). 2009-11-02 06:25:23 +00:00
karajorma 57492dabd8 Minor unused variable clean up. 2009-11-02 03:44:57 +00:00
karajorma 1bd1ab0677 Bump MAX_OBJECTS, WEAPONS, SPLIT_PLANES, and SWARM_MISSILES. This stuff has been tested by Diaspora for months now so it should be fine. 2009-11-02 03:37:36 +00:00
Goober5000 266fac1659 remove constructors as the init functions will always be called
make sure init functions init all struct fields
fix keyframes for weird FS1 anims
remove "dodgy frame skipping code" since frames should be skipped in certain circumstances
2009-11-02 03:10:19 +00:00
karajorma 80f307767b Might as well improve this message while fixing Respawn Delay. 2009-11-02 02:24:08 +00:00
karajorma 4bb0dc1d0e Error message is back to front. 2009-11-02 02:23:16 +00:00
karajorma 29f78e14d7 Fix Max Respawn Delay properly. 2009-11-02 02:21:42 +00:00
Goober5000 5c79188fd1 Zacam's & Flaming_Sword's patch for ANI streaming, audited by Goober5000 2009-11-02 01:45:26 +00:00
Goober5000 fb07f99f9d removed an unused variable
fixed saving of mission fiction
2009-11-01 09:52:04 +00:00
Goober5000 b4dc8e7451 fix FRED choking on respawn delay by making it default to 0 instead of -1; this does not appear to break anything 2009-11-01 09:51:36 +00:00
taylor 8d55dfa94d spew table/mission crcs to CSV 2009-10-21 11:12:36 +00:00
Wanderer e0ba59eba0 2009-10-12 14:46:54 +00:00
Sushi 745187e87e Fixed bomb-firing delay scale bug (actually applied to all secondaries) 2009-10-10 19:25:04 +00:00
portej05 d97b43d9c5 Fixup debug_int3 (until a better solution can be found) 2009-10-06 10:53:08 +00:00
karajorma 2c55e02fff Fix for Mantis 1996 (Missing support ship builtin messages) 2009-10-01 06:45:02 +00:00
Sushi 01b2bee1b2 Moving the ships.tbl +Use Newtonian Dampening flag out of the $Glide flag's tree. 2009-09-28 23:00:04 +00:00
Sushi 3ce6555a24 Fixed a bug that caused the AI to use afterburner too much (in the past 50 revisions or so) 2009-09-28 22:18:35 +00:00
Goober5000 17d7629eaf pretty sure the parent objects here have to be -1, not 0 2009-09-28 01:55:14 +00:00
Goober5000 38016919d5 don't create duplicate waypoints 2009-09-28 01:54:06 +00:00
Goober5000 2b1a095ff6 major goof from me a while ago; ship_info data isn't supposed to be modified 2009-09-27 20:53:23 +00:00
portej05 c2e7ba6864 Fix for error introduced in Antipodes 3 which caused animations not to repeat 2009-09-26 11:22:26 +00:00
portej05 e740086bee Antipodes 3 from Flaming_Sword 2009-09-26 05:52:17 +00:00
Sushi d652bdbc0a Fix decade-old AI class bug... including AI_Profiles.tbl flag ($fix AI class bug) to avoid breaking retail compatibility. 2009-09-24 20:40:56 +00:00
Goober5000 054fb7a8a0 improved some retarded setup code in aicode.cpp
moved create_waypoints() into waypoints.cpp and called it at mission post-process
2009-09-20 08:30:50 +00:00
Goober5000 4ee62c29c8 remove python files from MSVC6 project 2009-09-20 08:28:44 +00:00
Goober5000 c6b0592821 remove an entirely redundant check that WMC added that has the unfortunate side-effect of screwing up any disabled ship that warps in 2009-09-20 08:03:01 +00:00
Goober5000 c5627bf691 fix compilation problems 2009-09-20 00:39:42 +00:00
Wanderer 890798a0d4 fotg request - lua support for reading turret fovs and turret matrix 2009-09-19 08:03:07 +00:00
Wanderer f9e31f976c wanderer's ai control system setup (both sexps and lua) 2009-09-17 21:27:45 +00:00
Sushi 95383ca414 Fix for Linux build bug reported by Shadow95 2009-09-17 17:43:14 +00:00
karajorma 34cefa1f73 Add the remove-weapons SEXP. Fix add-waypoint-nav to work properly in multiplayer missions. 2009-09-15 13:47:38 +00:00
karajorma d973560b34 Add the option to set a maximum delay before a player is automatically respawned in multiplayer games. 2009-09-15 13:43:13 +00:00
portej05 5ad97c72b1 Removal of ASSUME macro behaviour 2009-09-13 15:46:34 +00:00
portej05 cc90af2aff Fix to make the stubs error function have a const parameter 2009-09-12 14:43:11 +00:00
Wanderer c91d00855a fixes to various things listed in the prefast log 2009-09-11 15:52:18 +00:00
portej05 5d6ea7ad6c ifdefing out of global exception handler pending removal. 2009-09-10 15:53:07 +00:00
portej05 3ecf9db217 _asm int 3; replaced with DebugBreak for MSVC users 2009-09-10 15:49:56 +00:00
portej05 e2497ea797 If -fps is specified, the framerate should always be shown. 2009-09-10 15:49:13 +00:00
portej05 def4c8e120 ASSUME macro for preFAST noise suppression and optimisation hints (through Assert macros) for VS2005+ 2009-09-10 15:44:25 +00:00
portej05 47b6928d6d Change to make safe_strings show asserts in release.
safe_strings is now used regardless of whether the CRT supports it (except if you're using VC6).
2009-09-10 07:44:08 +00:00
Wanderer d3045687ad fixing a logic error from the previous fix 2009-09-09 15:41:07 +00:00
Wanderer 6fa41c70fd commit for glowpoint issue reported by darius 2009-09-09 15:26:28 +00:00
portej05 22b13c269e post-frame-shaded subtitles! Pass an argument 13 which is either (true) or (false) in order to make use of this.
Fix for multimonitor focus loss issue associated with the mouse at the initialisation of the mainhall
2009-09-09 11:52:42 +00:00
Wanderer 7e549c9536 add lua functions to get and set individual HUD gauge color 2009-09-09 09:19:33 +00:00
Sushi 06dfe8dda3 Fixed an oversight in my last commit 2009-09-09 04:44:23 +00:00
Sushi c4738cf501 Added $Max Aim Update Delay to AI_Profiles.tbl (and AI.tbl). $Max Aim Update Delay allows AI aim to "lag" somewhat, making it more possible to evade high-velocity weapons. 2009-09-08 23:32:03 +00:00
Wanderer 62fb68d283 re-enable both interface and game sound playing from audio lib. 2009-09-08 15:33:34 +00:00
Wanderer 85bfad294c fix for detonation_radius issue reported by FUBAR_BDHR 2009-09-08 06:57:05 +00:00
Wanderer abf4fe87c0 from prefast log.. add missing casts 2009-09-07 16:15:35 +00:00
portej05 dcb77ea51a preFAST noise reduction - these will get optimised out in a release build. 2009-09-07 11:40:02 +00:00
portej05 29a62d8047 Fullscreen window request from QuantumDelta 2009-09-07 11:39:32 +00:00
portej05 60bebe921c Logic bugs - ((state != blah) || (state != blah2) ) is always true, so that || should be a &&, and !blah.state & flag != !(blah.state & flag) 2009-09-07 11:13:52 +00:00
Wanderer 672b37ba89 reverting code change - seems only to make things worse 2009-09-06 15:16:23 +00:00
Wanderer 16e79f3b4b fix for mantis 1944 2009-09-06 13:40:01 +00:00
Wanderer c43cd1c30d FUBAR-BDHR's fix for 'knossos device' string appearing twice as 'knossos device device' in default objecttypes table 2009-09-06 08:25:37 +00:00
Wanderer 76d5b3576c fix to allow missiles not fired directly at the enemy to home on random spots on the target ships hull. 2009-09-06 08:21:57 +00:00
portej05 898e56f5e0 Fix for WiH crashes - I reckon this might be the cause of a few peoples problems (using bitwise & instead of logical &&) 2009-09-06 07:41:14 +00:00
Wanderer 03bca98f4e option to prevent missiles from losing lifetime if they miss their targets 2009-09-04 17:08:24 +00:00
Wanderer 7cd9ccbb29 fix for occasional turret locking issue 2009-09-04 17:07:47 +00:00
Echelon9 794b644519 Correct grammar 2009-09-04 08:36:46 +00:00
Wanderer 0e7f4567d0 commit of 'turret direction preference' (int - percentage) - meant to allow turrets to prefer targeting the targets close to the previous target. 2009-09-02 18:17:21 +00:00
Wanderer b2434418cd weapon flag to allow weapons (including player weapons) not to home on subsystems 2009-09-02 18:14:46 +00:00
Wanderer db3e2bb7bb debris hitpoints (min/max), debris ship collision damage multiplier. 2009-09-02 08:32:43 +00:00
Wanderer 2da01ec33f Change to collision prediction when using additive weapon velocity. Change to allow 'arm_radius' to sue homing position instead of homing object pos as distance measuring point. Allow weapons with arm_radius to count as armed if they collide with intended target. 2009-09-02 08:13:39 +00:00
Wanderer a57577658c Optimum range setting for turrets to help with turrets re-targeting objects inside their minimum range 2009-09-02 08:09:18 +00:00
Wanderer e291ec196d fix for debugging CTD in clean_filename function 2009-09-02 05:17:30 +00:00
Echelon9 6663129ab5 Force GCC 4.0 as the compiler (for those who've updated to Snow Leopard and Xcode 3.2) while we sort out GCC 4.2 deprecation 2009-09-01 08:16:44 +00:00
Wanderer f5627b3d78 fix for shockwave and 'carry no damage' flag - addition of 'carry shockwave' flag for subsystems 2009-08-31 17:13:58 +00:00
Wanderer 7d325ee934 improvements to how subsystems and armor interact 2009-08-30 21:16:48 +00:00
portej05 060d8847df Fix for interface weirdness in the multi ui (Props to Flaming_Sword and The_E) 2009-08-30 12:09:46 +00:00
Wanderer 0e99f26d67 fix for a null vec issue which fubar hit. 2009-08-30 07:51:55 +00:00
karajorma 26bfb46230 Fix Mantis 1987 (Too many calls to good-secondary-time causes an Int3() ) 2009-08-30 04:24:09 +00:00
karajorma 9be493833a Fix a typo, remove some unreachable code, add some missing casts. 2009-08-29 09:32:36 +00:00
Sushi aea5dfa6df Updates to ai.tbl to allow AI behavior to NOT use the index of the AI class in its logic. In other words, added stuff so that you can create AI classes where their order in the file doesn't affect how they perform.
AI now uses the (previously unused) "Patience" attribute to determine how quickly to break out of a "stalemate" situation (higher patience means willing to endure stalemate for longer). Only matters if the stalemate detection stuff is used as well.
2009-08-29 01:20:11 +00:00
Wanderer 0418d9a54f option to always allow hull armor type to be used (fix for mantis 1973) 2009-08-28 13:48:24 +00:00
portej05 f56be03205 Hery's shader unification patch (from Antipodes #2) 2009-08-28 13:16:53 +00:00
karajorma 1c954ccdff Allow bombs to use their actual radius when working out collisions rather than doubling it. 2009-08-28 07:59:31 +00:00
Wanderer 35c7903d54 runsexp debug console functions - runsexp lua scripting functions 2009-08-28 07:53:45 +00:00
karajorma 498595f0da Don't bother with any other AI checks for afterburner use when the ship doesn't even have an afterburner. Might fix Mantis 1982. 2009-08-28 00:04:25 +00:00
Wanderer b1475afed2 Fix for mantis 1986 2009-08-27 15:34:51 +00:00
karajorma 5f62aadcc8 FUBAR's Fix to make debugging message errors a little easier. 2009-08-26 08:39:41 +00:00
karajorma 151e97890e Fix Mantis 1984 (Using sexp_deal_with_ship_flag() on anything ship-vanished causes an Int3() ) 2009-08-26 06:03:11 +00:00
karajorma a295e82f12 Fix an issue with the location of the Number Used In Wings label. 2009-08-25 14:49:40 +00:00
karajorma a85a152028 Fix Mantis 1974 (Muzzleflashes don't show up in 3.6.11 builds). 2009-08-25 14:48:18 +00:00
taylor 01413396bb ensure init_scoring_element() initializes properly (Mantis #1827) 2009-08-25 01:09:32 +00:00
taylor 1e96a1e0a0 fix resetting of mission stats when reconnect of FS2NetD happens 2009-08-25 01:09:30 +00:00
taylor 012465fad7 remove libreadline dependency since we don't need it and can't use it anyway (redo of r.4603) 2009-08-25 01:09:28 +00:00
chief1983 38910242d4 portej's safe strings fix for OS X problem 2009-08-24 16:58:46 +00:00
Sushi fa825454e2 Fix so that checking subsystems that are allowed cargo is case-insensitive 2009-08-24 16:05:32 +00:00
Sushi 97b5fb67e8 Fix for bug reported by Spoon (http://www.hard-light.net/forums/index.php?topic=65285.0) 2009-08-24 14:16:55 +00:00
Wanderer c79555b923 split 'is_vec_null' macro into normal and 'safe to square' macros. 2009-08-23 11:36:44 +00:00
Wanderer 11609710ba fix for code trying assign 'light laser' and 'rockeye missile' to the weaponbanks if ship class didn't have enough weapons defined for it 2009-08-23 09:33:48 +00:00
Wanderer f25a2e156f option to force beam turrets to use same FOV limits as the rest of the turrets 2009-08-22 09:25:34 +00:00
Wanderer e2de4ac5fb turret fov check improvements 2009-08-22 09:00:33 +00:00
Wanderer 481afca109 commit of set of vm_vec_normalize_safe functions to modelread.cpp 2009-08-22 08:41:53 +00:00
Wanderer 4348b41e22 nuke's scripting and submodel animation changes 2009-08-22 06:32:11 +00:00
Wanderer 1917c2b039 lots of fixes to the earlier burst fire mode 2009-08-21 18:20:28 +00:00
Wanderer bc4e580a77 fix for shield armor issue reported by Qent 2009-08-19 17:19:37 +00:00
karajorma 697bf69f06 Bump the number of manoeuvring thrusters again. This probably should be made dynamic at some point. 2009-08-19 06:58:46 +00:00
Sushi 00569ca4ec Major expansion of AI.tbl. AI.tbl now allows per-AI-class changes to AI settings in AI Profiles. Numerical values (such as $Glide Attack Percent or $Predict Position Delay) are handled as multipliers. YES/NO flags are overridden if set for a specific AI class. All of these multipliers and overrides are optional, and only active if explicitly specified for an AI class. 2009-08-18 04:32:40 +00:00
Wanderer daf822a99e fix for low res medals screen (by flaming sword) 2009-08-17 11:41:59 +00:00
portej05 1d9ff4e7c3 Another offsets fix from Flaming_Sword (optionsmenumulti.cpp Line 471 20->31)
What appears to be an indexing error (cheers wanderer!)
2009-08-15 16:40:29 +00:00
portej05 fdb4fcf160 Flaming_Swords Interface Fixes "fixed popup dialog button errors" 2009-08-14 15:42:19 +00:00
portej05 995fbfb8db Windoze->Windows
(Another) Fix (Attempt) for Mantis 1090. Make the IS_VEC_NULL now check small ranges, not just == 0.f
2009-08-14 12:18:58 +00:00
Wanderer 324817c3d9 lua virtvar to check and control hud draw status 2009-08-14 11:39:30 +00:00
Wanderer 72c81118c6 fix for the support ship issue 2009-08-13 17:23:23 +00:00
Echelon9 00ed41c120 Modified version of blowfish's FSAA implementation for OS X. Enabled in ~/Library/FS2_Open/fs2_open.ini with OGL_AntiAliasSamples 2009-08-13 12:41:47 +00:00
portej05 7de6f4a4ed Quick update to mspdb_callstack.cpp to handle 64bit windows more correctly (I think - nobody has actually managed to compile FSO on 64bit windows successfully yet.)
Offset fix from Flaming_Sword for the music slider in optionsmenu.cpp (281->279 on line 189)
2009-08-13 04:25:50 +00:00
karajorma 5ae3fd514a That really needs to be more than just an assertion. 2009-08-09 11:49:21 +00:00
Echelon9 10dcd2afe8 Proposed change for a OpenGL GLint fix in Snow Leopard 2009-08-08 06:02:00 +00:00
Sushi 235ee25e9e Some fixes/improvements to AI glide stuff, cleaned up some comments and notes 2009-08-05 05:36:45 +00:00
portej05 228259cdc1 Get rid of confusing magic numbers and boolean logic that is confusing on non-0 or not numbers. 2009-08-03 15:31:36 +00:00
Wanderer b6ce6600dc Fix for the 'carry-no-damage' subsystem flag, feature commit of shield armor types and shield armor type based piercing percentage setting. 2009-08-02 12:56:26 +00:00
Wanderer 346e6b337e fix to allow live debris from static subsystems 2009-08-02 12:20:36 +00:00
portej05 4331f3fa5e Fix for pdb debugging not showing the symbols on subsequent warnings. 2009-08-02 09:22:40 +00:00
portej05 d2dfbccfba Fix crash when no cutscenes are defined (NULL pointer dereference through vector [] overload) 2009-08-02 06:32:38 +00:00
Wanderer 13f644a81a variable lead prediction missiles & untargeted heat seekers (aka 'primitive sensor' heat seekers) 2009-07-31 17:26:55 +00:00
Wanderer 4f60675aa3 commit of target highlighting options mostly for radar icons 2009-07-31 17:25:29 +00:00
portej05 0886535b80 ifdef logic correction for safe_strings (VS2008 release build)
Full logic description is included in comments - please check!
2009-07-31 15:02:56 +00:00
Echelon9 da02d73702 Well yes, but the issue is that strcpy_s was out of scope though 2009-07-31 11:07:10 +00:00
portej05 8397823cfc Update to asserts that come from safe_strings - now they print out what they're trying to concatenate - still some ways to go on how pretty they are though (strcat_s will not show the current contents of the buffer, so a short filename might appear to cause the assert, but it's being concatenated with a very long directory structure - the buffer size shown is the full buffer size, not the remaining size) 2009-07-31 09:45:50 +00:00
portej05 fbd79c954a safe_strings is actually safe here (copying stack buffer to stack buffer) 2009-07-31 09:30:03 +00:00
Wanderer a3961a1321 fix for BP assert due arm_radius 2009-07-30 12:40:52 +00:00
portej05 7f65400e77 Change taylors change for readability in version.cpp (char buffer initialisation)
safe_strings now spits more, but can be turned off using NO_SAFE_STRINGS (spits during build)
2009-07-29 16:03:15 +00:00
taylor a9f0e99df7 fix strcpy_s() changes where they didn't need to be or just can't be used 2009-07-29 15:13:34 +00:00
portej05 6bc7f30d78 safe_strings - from Antipodes build #1 2009-07-27 16:06:24 +00:00
portej05 1908402d27 Restrict semantics for VC2005+ and GCC (not actually used anywhere yet) 2009-07-26 10:13:39 +00:00
karajorma c165d9d283 Add support for ammo low builtin messages when there is no support ship in the mission. 2009-07-25 16:31:51 +00:00
karajorma 1f3313d691 Ugly hack for the player ordered disarm/disable issue WCS have been experiencing. 2009-07-25 14:58:25 +00:00
Echelon9 cedb033724 Clarify a code comment re:GCC 2009-07-24 17:26:43 +00:00
portej05 a60b7b8ed4 Fix mistake in extended safe_strings for VS2008 macro expansion 2009-07-24 07:54:35 +00:00
Goober5000 496996c9f4 that was somewhat less epic, but still a fail 2009-07-23 04:17:21 +00:00
Goober5000 9e297e3d78 holy crap, that was an epic fail 2009-07-23 04:10:43 +00:00
Echelon9 9d7b81eb48 Cleanup Xcode project file post DirectX purge 2009-07-22 14:46:35 +00:00
Echelon9 da1775f8f4 Fix use of uninitialised variable reported by valgrind 2009-07-22 09:48:01 +00:00
Echelon9 b25a64520b Reflect the change to 3.6.11 in Xcode 2009-07-22 09:13:25 +00:00
portej05 dadcf9c26d Fix for Rodos long, single-word hud message issues. Seems that hudmessage.cpp didn't correctly handle all the possible return values from split_str_once 2009-07-22 05:08:49 +00:00
taylor 01d6fa011e bump buffer to allow for more tables (99 minimum) during validation 2009-07-22 02:21:24 +00:00
chief1983 2c6361eb31 Add Zacam's changes (slightly modified) to the VC2008 config - adds Inferno configs and cleans out some kruft 2009-07-21 22:52:19 +00:00
Sushi 532d51745a Changed ranges for "$Glide Attack Percent," "$Circle Strafe Percent," "$Glide Strafe Percent", and "$Vaporize Percent Chance" to be between 0-100 instead of 0-1. 2009-07-20 19:52:41 +00:00
chief1983 1ac5b35b7e VC6 updates - add safe_strings, remove Python, remove other vestigial non-existent D3D files 2009-07-20 17:56:01 +00:00
chief1983 90d3a68876 Fix odd VC6 complaint about a string that was too long. Guess that's what all those double quotes are for. 2009-07-20 17:55:06 +00:00
chief1983 671c9e0195 Likely unnecessary removal of non-existent files from makefile. 2009-07-20 15:56:41 +00:00
chief1983 360c786e82 Add safe_strings to linux makefile. 2009-07-20 15:53:07 +00:00
Wanderer aeaa1b395e Commit of thruster effects for ship and weapon flame and for weapon glow effects 2009-07-19 16:07:23 +00:00
portej05 e4b29d5cf0 More safe_strings fixes. 2009-07-19 15:54:59 +00:00
portej05 031ff6f616 Update to safe_strings to give information while in debug mode under VS2005+ (uses scp_str*_s instead of str*_s in debug mode) 2009-07-19 11:15:33 +00:00
portej05 481cd602ea Missed another one. 2009-07-19 08:07:48 +00:00
portej05 a62b0479c1 Missed a buffer. 2009-07-19 07:57:39 +00:00
portej05 5d8962eb0f Bump buffers causing safe_strings asserts 2009-07-19 07:56:04 +00:00
chief1983 ea4828f741 Port from 3.6.10 branch of fix for dropping issues in the mod warning system, r5458. 2009-07-18 21:34:31 +00:00
Echelon9 40d2fa4a8d Small fix 2009-07-18 18:13:52 +00:00
portej05 72b4cc89cd Debug versions of safe_strings now show where the error occurred 2009-07-18 18:02:58 +00:00
portej05 b19c9fb398 Added some new strcpy_s calls 2009-07-18 17:15:17 +00:00
karajorma 069d27aa9d GUI and mission saving stuff for Chief's Force-Shields-On Parse flag. 2009-07-17 21:18:22 +00:00
portej05 8be885ea83 Some VC6 builds apparently borked by SCP_vm_allocator. VC6 now uses std::vector without a custom allocator. 2009-07-17 12:10:36 +00:00
Echelon9 4a72ac8a30 Apply some of portej05's recent changes to the Xcode project file 2009-07-17 08:15:40 +00:00
chief1983 cf2be7008a Add the phrases.xml and its file configuration so that grammar.h and phrases.cfg get generated for VC2008 builds.
This is a necessary step for FS2_VOICER builds to be built, even by 2008 Pro.
2009-07-16 19:58:51 +00:00
portej05 ad9d99eed0 Some safe_strings in use!
Note that I couldn't figure out the buffer size for some of them, so they haven't been changed. The buffer size should be passed as a function argument in future.
2009-07-16 15:18:11 +00:00
portej05 36c12e9510 Fix for embarrassing bug in safe_strings. 2009-07-16 12:48:11 +00:00
portej05 a1c81cc47e Fix possible compile error on VC6 platform 2009-07-16 10:14:58 +00:00
portej05 abf2793323 Fix the broken comment in safe_strings.h
Add safe_strings.h to pstypes.h
2009-07-16 10:00:50 +00:00
portej05 e58149a22c Checkin of files related to safe_strings, and adding to the project tree (VS2008) 2009-07-16 09:50:34 +00:00
karajorma c5136f8d9e Fix a couple of typos other people made. One minor, one not so minor. 2009-07-15 21:49:15 +00:00
Sushi a85f3f24fb Added $Vaporize Percent Chance flag to objecttypes.tbl and ships.tbl. This flag (which takes a value between 0 and 1) allows ships to sometimes explode instantly instead of going through a death roll. 2009-07-15 21:23:46 +00:00
Sushi fc51494d9c Added burst-fire for ballistic primaries (controlled with the $Primary Ammo Burst Multiplier flag in AI_Profiles). 2009-07-15 19:29:49 +00:00
karajorma 6c267353db Really need to remove the mission stuff from those too. 2009-07-15 15:19:31 +00:00
Echelon9 dc7bf4ae0f Ensure Sushi's latest AI changes work with gcc, as well as Visual Studio 2009-07-13 20:33:43 +00:00
Sushi 06728a5b6c Additional AI code, including stuff taking advantage of glide and sidethrust. Includes: Flag for allowing fighters to dodge vertically as well as horizontally, "stalemate detection" to help AI break out of circle fights and other stalemate situations, "glide attack" where AI fighters will use glide to fly away while shooting back at you, "circle strafe" where AI fighters will use sidethrusters to jink around while shooting, and an (incomplete) version of "glide strafe" that allows fighters/bombers to use glide to attack capital ships. All new stuff is off by default, and can be turned on with AI_Profiles flags. 2009-07-13 20:08:32 +00:00
portej05 db0ec69171 NEW_HUD Removal commit 2009-07-13 15:48:38 +00:00
portej05 68bce55db3 Python Stripping. Can't promise to have gotten the whole lot though. 2009-07-13 14:11:24 +00:00
chief1983 f825ff5673 Fix a goof in Windows 2009-07-13 05:15:13 +00:00
chief1983 b4822e0d28 Fix 1959, the shockwave flag. Again. Hopefully this one doesn't have any other repurcussions. 2009-07-13 01:20:36 +00:00
Echelon9 845c908527 Another instance of std::vector, converted to SCP_vector 2009-07-12 09:36:31 +00:00
karajorma f88ae51bbe A couple more vectors that slipped the net. 2009-07-11 17:52:33 +00:00
karajorma 1183f4d61a Make messages dynamic. 2009-07-11 17:40:46 +00:00
karajorma 65ec2e0b25 Looks like one SCP_Vector was missed. 2009-07-11 14:18:29 +00:00
portej05 d8079622b6 Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
Watch it go up AND down in mission.
2009-07-11 07:07:57 +00:00
karajorma f67f0fe4d5 Add the Get-throttle-speed SEXP. 2009-07-10 17:07:07 +00:00
Echelon9 c9535ddefc Reflect 3.6.11 version string in Xcode 2009-07-09 12:43:36 +00:00
portej05 83f5a766e4 Removal of DirectX from the codebase.
VC6 and VC2008 solutions have been updated.
2009-07-09 11:35:43 +00:00
portej05 01c38afa5c Fix VC6 string too long compile error (props to Flaming_Sword) 2009-07-09 11:16:49 +00:00
karajorma 8885843dda Fix Mantis 1957 (Too many subsystems crash FRED). 2009-07-09 10:55:13 +00:00
Wanderer 6aabf9af30 Non-swarm type burst fire firing mode commit 2009-07-07 17:08:50 +00:00
Wanderer 054de4f53c ai profiles flag to allow turrets to ignore hardcoded fov limits 2009-07-06 20:49:51 +00:00
karajorma febdb1798d Fix the Primary/secondary-fired-since SEXPs 2009-07-06 17:36:44 +00:00
Wanderer 48a34a59ba moved ai's missiles fired at player limit to ai_profiles.tbl 2009-07-06 15:40:21 +00:00
karajorma 7e0b23b45c Can't say for certain this will cause a speed up but it definitely places the faster check first. 2009-07-06 13:28:33 +00:00
karajorma dfe896adeb Looks like the previous SEXP code optimisation didn't take into account the fact that the game tramped values as well as operators through that function so it could call eval_num(). Fixing that gets rid of another few million needless calls to stricmp. 2009-07-06 11:27:31 +00:00
karajorma 9bd007c1ff Allow clients to pass variable changes to the server (when using lua). 2009-07-06 10:04:19 +00:00
karajorma b803ed7b5a Change the way the game figures out the current SEXP Operator in-game as the old method was a massive slowdown. 2009-07-06 10:03:03 +00:00
Goober5000 4f5304feee documentation per KeldorKatarn's request 2009-07-06 05:57:17 +00:00
portej05 ee01e3edb0 Fix bug in vmallocator. 2009-07-05 15:03:05 +00:00
portej05 426da621b3 Fix potential undefined behaviour bug. 2009-07-05 06:53:29 +00:00
portej05 4be4ce589d Customised STL allocator (uses vm_malloc and vm_free) - not actually used anywhere in this commit. 2009-07-05 04:21:55 +00:00
portej05 512fcbdb35 Removed more memset(this ... ) statements. 2009-07-04 14:48:16 +00:00
portej05 6b27987568 Missed a few! (CVS Comment blocks) 2009-07-04 13:39:58 +00:00
portej05 9d373be08d Browse information turned off for VS2008.
Doesn't affect intellisense, only affects View->Object Browser (not commonly used)
2009-07-03 17:49:01 +00:00
chief1983 b3c289ee9f KeldorKatarn's fix for Fire Down Normals flag. 2009-07-03 17:08:33 +00:00
portej05 3cba81a689 Fix for Mantis 1949 - Aardwolf has tested this patch. 2009-07-03 15:37:31 +00:00
portej05 77655fd27c Got rid of the memset(this,0,sizeof(species_info)) in species_info - defined constructors for a bunch of structs that species_info depends on 2009-07-03 14:29:58 +00:00
chief1983 5e7fc979df No primary linking ship flag. Good thing Kara did 5395 or this would be one more that caused problems. 2009-07-02 23:23:55 +00:00
karajorma 4c8ec21048 New bug uncovers old bug. Neither particularly serious but both were annoying Diaspora debug builds. 2009-07-02 17:32:32 +00:00
portej05 f6666d0228 Warning now makes sense when it is displayed. 2009-07-01 14:31:32 +00:00
Echelon9 68a7f34535 Addition of get-fov SEXP 2009-07-01 11:09:06 +00:00
Goober5000 57fcb5ddec remove the three additional options from possible squad msgs for support ships; but thanks to WMC's feature they can be added for mods
synchronize comments on the comm menu and flags
2009-07-01 03:47:54 +00:00
karajorma a6c34d862b Colour in the ship names in FRED since no one uses wireframe mode to see what is marked these days. 2009-06-30 22:01:39 +00:00
karajorma 2be1d31792 Well that shouldn't have always been saved! 2009-06-30 22:00:24 +00:00
portej05 d92a50aadf Fix the FRED crashing on startup problem 2009-06-30 20:18:21 +00:00
Echelon9 ac0c51bac3 Cleanup sexp_set_fov() 2009-06-30 10:39:54 +00:00
Goober5000 4d589d45cf fix for Mantis #1942 (support ship message using wrong persona)
made the message selection more robust and cleaner while I was at it
this also fixes Kara's multiple-builtin-message feature, as I don't think it would have worked properly in the previous revision :D
(it would have bailed after finding the first message match)
2009-06-30 04:24:15 +00:00
Goober5000 452be8628f better checking of wingmen persona headz
fix Mantis #1874 (Command messages check for existence of ship)
2009-06-30 03:34:26 +00:00
Sushi 219ac99af4 Added "$nocollide_this_only" and "$collide_invisible" submodel flags. The first one is like $no_collisions, but not recursive on submodels. The second one allows weapon impacts on the special "invisible" texture (normally only ship collisions are allowed). These two flags can be combined to implement invisible collision meshes, which can save a lot of FPS for complex models. 2009-06-29 18:55:20 +00:00
chief1983 d370dd57c9 Fixed some config issues with the new export method 2009-06-29 06:17:55 +00:00
karajorma ff93a37793 This should only have caused problems with corrupt missions but given that it does that with the final FS2 mission it should be fixed. 2009-06-27 08:15:40 +00:00
chief1983 da1238ce4e Complete the gutting of safe_strings. 2009-06-24 17:27:09 +00:00
portej05 0599e3b914 Removal of safe_strings code - not VC6 compatible :P 2009-06-24 16:56:11 +00:00
portej05 e1a72b6eac KeldorKatarns Shield Checking Code. 2009-06-24 16:17:46 +00:00
chief1983 d4b200f037 Fix a Lua function so the scripted mainhall works with multiplayer 2009-06-22 23:23:07 +00:00
portej05 2dce97ced8 This simple change means that speech works under VC2008.
I suggest getting the PSDK (rather than relying on the files in /speech/), and defining FS2_SPEECH in both code and Freespace2.
Then you're good to go!
2009-06-22 16:09:27 +00:00
portej05 a92ae98545 Just->Error in windebug 2009-06-22 06:37:32 +00:00
Echelon9 6f348db7df Adopt Assertion in safe_strings.h 2009-06-21 19:09:02 +00:00
Echelon9 5997aec352 Update Xcode project file for safe_strings.* 2009-06-21 18:52:21 +00:00
Echelon9 da047aa403 Cleanup includes 2009-06-21 18:36:34 +00:00
Echelon9 bfd995779a Small change to safe_strings.cpp 2009-06-21 18:22:40 +00:00
Echelon9 b050b51c50 Updating portej05 str*_s implementation 2009-06-21 18:01:11 +00:00
portej05 863eb440a6 Add safe_strings to pstypes.h - forgot to do it in the last checkin 2009-06-21 17:27:24 +00:00
portej05 bbbd3f17f0 Fixed up some indentation in pstypes.h - the assert section is now readable
Added a space after the ! in the stack tracing using DbgHelp
Added the str*_s basic functions. Note the licence in the top. (also, this only updates the VC2008 project)
2009-06-21 17:08:18 +00:00
portej05 8f19d68a8b Callstacks now work under VC2008 - define PDB_DEBUGGING to use. (you need the PSDK to make this work)
See the post in SCP for what/why.
2009-06-21 15:39:13 +00:00
chief1983 636ad57731 Zacam's enhancement for briefing text colors. 2009-06-20 18:28:13 +00:00
chief1983 e64cd63cec Undo the HKCU change here too just to prevent any confusion. 2009-06-20 17:55:26 +00:00
karajorma b49127be6d KeldorKatarn's Capship screams fix. 2009-06-20 16:50:18 +00:00
karajorma 38117af0a4 Add the Trigger Count setting to allow events to repeat a certain number of times rather than simply be tested as with Repeat Count. 2009-06-20 11:27:50 +00:00
Echelon9 9b6b07291c Fix for required_string_4() and readability in ship.cpp 2009-06-20 09:59:04 +00:00
portej05 2a09ecc89b 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
portej05 61d2c86b6a Fix for mantis 1933. Despite the huge ugly looking changes, there's only really 2 lines of code changed and indentation has been added. 2009-06-20 07:40:04 +00:00
portej05 7c386772a0 Fix for Mantis 1938. Has been tested against plain mediavps and blueplanet by Sushi 2009-06-20 07:38:02 +00:00
portej05 69902bc6c1 Fix one of the static analysis errors Wanderer reported (leaking handle in cfilearchiver.cpp write_index) 2009-06-20 07:36:40 +00:00
portej05 48f63b87a9 remove-goals sexp commit. This has received testing, however it hasn't been pushed to the limit.
http://www.hard-light.net/forums/index.php/topic,63249.0.html
2009-06-20 07:24:46 +00:00
portej05 9d2709d495 Fix the CTD in aicode.cpp when autopilot is engaged, but not in AP_CINEMATIC and wing_leader == NULL. Probably does not fix all the autopilot woes. 2009-06-20 07:21:41 +00:00
karajorma 7724d15f9f Plug a memory leak. 2009-06-19 18:43:20 +00:00
Goober5000 1ddd0b06ca clean-up the end-campaign sexp logic and fix the end-of-campaign movie playing
this leaves room for possible future specification of end-of-campaign movies
2009-06-16 04:14:27 +00:00
karajorma 195ce55d1c Commit Sushi's improved glide changes. 2009-06-14 15:57:45 +00:00
Wanderer a9eeeff007 move the bomb delay timer to its proper place in internal ai_profiles.tbl 2009-06-14 09:38:49 +00:00
karajorma 82012b6773 A few minor fixes. 2009-06-13 18:08:54 +00:00
Wanderer b9d17cf059 commit of Nuke's and Aardwolf's lua functions 2009-06-12 11:38:18 +00:00
chief1983 684a2cdad1 Whoops. 2009-06-11 04:30:13 +00:00
chief1983 eea0260111 intrinsic no shields flag for ships.
force-shields-on p_obj flag for mission ship object (overrides intrinsic no shields, don't use with no shields).
No FRED checkbox yet for force-shields-on yet.
2009-06-10 20:19:01 +00:00
Wanderer b2252b54ec Echelon9's update to bring lua to version 5.1.4 2009-06-10 09:46:20 +00:00
Wanderer cd2d21b7b0 change mouse_force_pos call to mouse_set_pos call in forceMousePosition lua function 2009-06-10 07:54:52 +00:00
karajorma 3043bbb984 Commit Echelon9's flag to prevent the addition of noise to thrusters. 2009-06-06 10:46:10 +00:00
Goober5000 8aa3485402 clarify op_submenu comment (it had been moved from sexp_tree.cpp to sexp.cpp)
reorder weapon, shield, and engine sexps for consistency
2009-06-03 04:11:42 +00:00
Goober5000 396437dae2 fix bug found by RedDwarf which would overflow the array if (e.g.) Alpha wing ever had six ships 2009-06-03 03:59:50 +00:00
Wanderer db7859cc78 joystick sensitivity change to improve the accuracy of the controls 2009-06-01 20:33:32 +00:00
chief1983 e6f1a56fff Add the new FRED files to the VC6 projects too. 2009-05-30 21:54:52 +00:00
karajorma aabdf01708 Fix yet another VC6 only issue. 2009-05-30 21:22:05 +00:00
chief1983 e73876e7b8 Add multi_sexp files to Xcode project 2009-05-29 15:47:55 +00:00
chief1983 9ca77104eb Add multi_sexp files to the VC6 projects. 2009-05-29 15:28:04 +00:00
chief1983 31a365c0b9 One more tweak to the export method 2009-05-29 00:38:35 +00:00
chief1983 268d6b097e Can't clean right after building, gotta reorder things a bit. 2009-05-28 22:30:54 +00:00
chief1983 6e212d89d8 Comment a debugging print statement 2009-05-28 21:38:05 +00:00
chief1983 a37c0eda59 Committing for Karajorma since he's occupied - fixes Assertion code from breaking Linux now 2009-05-28 21:32:46 +00:00
karajorma a73f875a3e Fix compilation of Assertion on MSVC 6 and compilation of multi_sexp stuff on Mac OS X 2009-05-28 13:00:26 +00:00
chief1983 cbfd59d672 some more tweaks, goof on last log message, meant before building not commit 2009-05-27 20:33:32 +00:00
chief1983 ca18e814ed Version 1.4, now exports before commit 2009-05-27 20:09:18 +00:00
chief1983 ce04d72e50 First commit of nightly build script to SVN. 2009-05-26 18:06:23 +00:00
Wanderer d3004c4b57 fixing vector rotation issue in subsystem targeting 2009-05-25 21:16:00 +00:00
karajorma 52bae28414 Portej05's second set of preFAST fixes. 2009-05-24 21:38:22 +00:00
Wanderer 3da3f29147 fix for the release build crash reported by HT 2009-05-24 07:09:16 +00:00
Wanderer 122a8fabad fixing the number of lua enumerations 2009-05-23 19:22:05 +00:00
Wanderer 31ebd74f9a merge from wanderer branch - additional options for lua mouse control 2009-05-23 07:29:56 +00:00
Wanderer 534565f894 merge from wanderer branch - lua flight control option 2009-05-23 07:06:11 +00:00
Goober5000 b91d244912 add a folder for chief1983's nightly build scripts 2009-05-21 21:58:33 +00:00
karajorma eeb30aa582 Bobboau's Skybox flags code (via Wanderer then me) 2009-05-21 14:57:33 +00:00
karajorma c9a0479530 A piece of WMC's warp code that somehow missed being committed. 2009-05-21 14:15:41 +00:00
Wanderer 007101c4d0 merge from wanderer branch - trail & contrail leading edge fade out option 2009-05-21 08:50:31 +00:00
Wanderer 73c31a57a4 merge from wanderer branch - emp protection option for weapon, emp resistant option for ships 2009-05-21 08:37:48 +00:00
Goober5000 cff12b7b16 add Taylor's fix for Mantis 1768 (cutscene bars) 2009-05-21 08:33:02 +00:00
Goober5000 236892853d fix ship-to-ship collisions; they should be disabled iff the ship has a no_collide flag, not iff the ship is a navbuoy
(fortunately, in retail, all navbuoys also have no_collide flags)
2009-05-21 08:31:31 +00:00
Wanderer 53df0f56e7 merge from wanderer branch - fix inconsistencies with subobj_name and name 2009-05-21 08:19:51 +00:00
Wanderer a6dd68c9c7 merge from wanderer branch - additions to alt subsys name from r5125 2009-05-21 08:05:46 +00:00
Wanderer 7321bda587 merge from wanderer branch - alt subsys name for damage popup 2009-05-21 07:31:43 +00:00
Wanderer e281315beb merge from wanderer branch - turret target priorities setup 2009-05-20 20:43:01 +00:00
Wanderer 378a79a371 merge from wanderer branch.
option to allow all hitpointed weapons to be hit.
allow 'safe from weapons' time of bombs be set.
2009-05-20 20:11:15 +00:00
Wanderer 2c10e60900 fix swarm issue - again 2009-05-20 19:44:18 +00:00
Wanderer 249ebb2658 merge from wanderer branch - limited rotation turrets, reset idle turrets option 2009-05-20 18:03:14 +00:00
Wanderer 47efdf2601 addition to the rotate sound to toggle it on if rotation is re-enabled via sexps 2009-05-20 14:23:19 +00:00
Wanderer 726032bd97 merge from wanderer branch - autoaim/convergence improvements and variants 2009-05-20 14:13:58 +00:00
Wanderer cd6cd2cae6 merge from wanderer branch - fixed firingpoint and 'fire on target' subsystem flags 2009-05-20 13:24:57 +00:00
Wanderer b0c938e2e5 merge from wanderer branch - subsys/turret sounds 2009-05-20 12:24:45 +00:00
Wanderer c1387ef46b merge from wanderer branch - no subsystem targeting flag for turrets 2009-05-20 09:46:45 +00:00
chief1983 74ee2346a7 Bump linux version to 3.6.11 2009-05-19 22:13:12 +00:00
chief1983 ef9b4860e2 Convert these to UNIX again, hope they compile this time... 2009-05-19 22:02:48 +00:00
Wanderer 78aedf81ae merge from wanderer branch - alt iff colors 2009-05-19 21:17:48 +00:00
Wanderer 252e345cc6 merge from wanderer branch - phreak's inherit parent target weapon flag 2009-05-19 19:40:06 +00:00
Wanderer 80cd85927a merge from wanderer branch - smart spawn weapon flag 2009-05-19 19:29:41 +00:00
chief1983 bc79d6eedd Add SEXP stuff to Linux Makefile.am 2009-05-19 18:17:31 +00:00
Wanderer e35624e1da merge from wanderer branch '$Turrets prioritize ship target:' objecttypes flag 2009-05-19 17:20:18 +00:00
Wanderer 01827ac08f quick jury rigging to prevent stream of null vec warnings caused by r5261 2009-05-19 16:53:05 +00:00
Wanderer 3d882677a0 merge from wanderer branch. 2d and 3d radar images support 2009-05-18 22:08:13 +00:00
karajorma a62467f91a Fix Mantis 1926 (Piranha submunitions home in on the ship that fired them in dogfight mode) 2009-05-18 22:00:01 +00:00
Wanderer 8b54300138 initial merge from wanderer branch - fixes to corkscrew missile effects 2009-05-18 20:36:11 +00:00
karajorma 35c4e2621a Fix Mantis 1925 (Loadout lists may contain ships and weapons which are not been flagged as player allowed). 2009-05-17 12:35:52 +00:00
karajorma ba647216ab Portej05's preFAST warning fixes. 2009-05-17 11:50:48 +00:00
karajorma a6cab00337 Commit Wanderer's Salvo Fire mode changes. 2009-05-16 19:41:05 +00:00
chief1983 a3bb1ce476 Update Xcode's Info.plist to 3.6.11 2009-05-16 19:09:55 +00:00
karajorma 17867379aa WMC's shipFX changes. Some other minor fixes. 2009-05-16 18:01:08 +00:00
karajorma d3b7cef26b AddAdd support for multiple builtins of the same type and new builtin message types Praise Self, High Praise and Primaries Low 2009-05-16 17:32:53 +00:00
karajorma aa586fbbbb Switch network variables over to the SEXP packet except for when called from lua 2009-05-16 16:58:22 +00:00
karajorma f8ee8f43b5 Add the set-ambient-light SEXP 2009-05-16 16:38:49 +00:00
karajorma 5f42bb2cb3 Allow multi-docking in multiplayer. 2009-05-16 16:29:41 +00:00
karajorma 2f26669316 More minor fixes. 2009-05-16 16:20:45 +00:00
karajorma 5e18eeae90 Add a ship and parse flag to lock all turrets initially. Fix the Lock Primary/Secondary checkboxes to work for multi-selection. Add a checkbox for lock afterburner. Add the weapon fired since SEXPs 2009-05-16 14:06:23 +00:00
karajorma 6eb9f37884 Break up the status SEXPs into sub-categories. 2009-05-16 13:03:59 +00:00
karajorma ffe043832a Fix a bug where the order of SEXP arguments was reversed. 2009-05-16 12:56:26 +00:00
karajorma 845b24a9a2 Add SEXPs to set weapon, shield and afterburner energy. 2009-05-16 12:55:11 +00:00
karajorma 5f7ddb364a Echelon 9's fix for a potential buffer overrun. 2009-05-16 12:32:46 +00:00
karajorma 990df0c316 Auto-expand branches after pasting, add-pasting or replacing SEXPs. I really don't know why someone didn't get rid of that petty annoyance years ago. 2009-05-15 18:38:24 +00:00
karajorma 2f5a5b9b9e Fix an assertion that crops up when you have no selected message but click on delete message. Has the side effect of making the message editor much less annoying too. 2009-05-15 18:36:47 +00:00
karajorma 4136560308 Commit the SEXP packet code.
Add the set-respawns SEXP.
2009-05-15 18:32:46 +00:00
karajorma 0389778969 Move the repair penalty to an AI profile setting. 2009-05-15 17:53:38 +00:00
karajorma 0ce84acef2 Looks like that icon was needed after all. 2009-05-15 17:34:46 +00:00
karajorma 6ab0e487ca Add the validate-argument SEXP.
Fix a minor initialisation error with the ship-tag SEXP.
Fix Mantis 1907 (Error in the get-damage-caused description)
2009-05-14 17:12:23 +00:00
karajorma 279a677455 Fix Mantis 1859 (FRED crashes if an unknown ship type is detected in the loadout). 2009-05-14 16:52:56 +00:00
karajorma 923447bede Due to a merge, delete a file which was never in trunk anyway. 2009-05-14 16:38:02 +00:00
karajorma 70ea774844 Add new sexps to determine the amount of afterburner and weapon energy remaining. 2009-05-14 16:37:11 +00:00
karajorma ce6c06f8e4 Add support for cutscenes before the various briefing and debriefing sections (FRED support for this feature will come later, but it will load and save correctly for now). 2009-05-14 16:27:36 +00:00
karajorma 5164ecf540 Fix a bug where the log displays incorrect percentages for kills. 2009-05-14 16:26:37 +00:00
karajorma 893ecefb19 Changes to allow more data to be used from exited_ship. Make ship_exited dynamic too.
Get-Damage-Caused SEXP and a couple of functions for counting the number of variables of a certain type. 
Commit the new team loadout code and FRED changes to support it.
2009-05-14 15:06:52 +00:00
karajorma 56a40cc893 A couple of new parsing functions for dealing with variables in fields that previously only accepted integers or strings. 2009-05-14 14:08:07 +00:00
Wanderer efb77a29a2 tweak to keep all 3d radar dots inside the retail radar bitmap area - Mantis 1908 2009-05-13 22:03:30 +00:00
karajorma b242a6eaef Allow wireframe for the targetbox to be set from hud_gauges.tbl. 2009-05-12 22:05:43 +00:00
karajorma a3f51bce57 Allow the boilerplate traitor debrief to be turned off even if the player did turn traitor. 2009-05-12 22:03:39 +00:00
karajorma 4d6aaa1f34 Fix Mantis 1538 (special hitpoints not updated properly on deletion) 2009-05-12 21:55:49 +00:00
karajorma 2380391ba3 Fix Mantis 1913 (Characters after # are visible in the wings and reinforcements comms menu) 2009-05-12 21:53:12 +00:00
karajorma e63dacc787 Fix the FictionViewer truncating anything with more than 70 lines. 2009-05-12 21:49:41 +00:00
karajorma 6ef587ed1a Allow players to filter who they send messages to when using the chatbox 2009-05-12 21:30:17 +00:00
Goober5000 ce9e23d042 more launcher changes 2009-05-12 07:36:40 +00:00
karajorma 0e5faa0469 Fix Mantis 1911 (Add Data doesn't show the <argument> option)
Fix Mantis 1813 (Negative number constants could be added in FRED for SEXPs which expected OPF_POSITIVE, often resulting in crashes).
Fix (part of) Mantis 1677 (cap-subsys-cargo-known-delay doesn't list the correct ships)
Fix Mantis 1909 (Can't paste variables in FRED)
2009-05-11 09:00:40 +00:00
karajorma 69d629bfc8 Fix a typo in disable-builtin-messages 2009-05-11 08:54:52 +00:00
karajorma 6566f5aa55 Fix Mantis 1884 (Entering the name of an invalid operator in any dialog other than events editor would crash FRED) 2009-05-11 08:54:28 +00:00
karajorma b387c6b30f Fix Mantis 1910 (Assist Percentage resets itself when ships are multi selected) 2009-05-11 08:48:05 +00:00
karajorma 0c3b696f95 Fix an issue with homing capship missiles not tracking correctly in multiplayer. 2009-05-11 08:45:58 +00:00
karajorma cfc5088957 Fix Mantis 1753 (Using " or ; in briefings and messages causes them to either vanish or truncate the message)
Fix a bug that prevented lcl_replace_stuff() working properly when a message had two or more replacements of the same type.
2009-05-11 08:41:51 +00:00
karajorma 0fc761a9c7 Allow beams on any player ship to count for kills. Not just fighters and bombers. 2009-05-11 08:41:09 +00:00
Goober5000 4a705aad72 more launcher work 2009-05-11 08:07:25 +00:00
Wanderer a17bf7b529 fix for mantis 1902 2009-05-10 19:09:21 +00:00
karajorma 518862ad9a Fix compile issue with GCC. 2009-05-10 13:03:41 +00:00
karajorma efbb04d7de Bump version to 3.6.11. Bump debug warning level to 4 2009-05-10 09:52:05 +00:00
karajorma 7bdece0adf Fix Mantis 1371 (Can target target's target even if it is stealthed or hidden from sensors). 2009-05-10 09:06:00 +00:00
karajorma 664feabd5b Fix Mantis 1916 (Can't change the dockpoint a ship is initially docked to without undocking it) 2009-05-10 08:58:16 +00:00
karajorma 8d8268059e Add the Assertion Macro as an alternative to Assert.
Switch a couple of Asserts to Assertions.
2009-05-10 08:53:57 +00:00
karajorma 5fe85e2085 Fix Mantis 1883 (spaces at the end of ship and wing names can cause errors) 2009-05-10 08:32:08 +00:00
karajorma 87f6c525a9 Fix Mantis 1620 (Replace Number/String don't work in FRED) 2009-05-10 08:26:17 +00:00
Wanderer 9779bfb872 Fix for mantis 1915 and related collision detection issues 2009-05-09 10:45:04 +00:00
Goober5000 78e4e53284 massive conversion of old hackish ini bookkeeping to new encapsulated bookkeeping
nobody try to run this yet; it's not debugged and doesn't even compile
2009-05-08 04:40:16 +00:00
karajorma 055861ff02 Nope. That won't fix the error. Reverting. 2009-05-04 13:43:48 +00:00
karajorma 4dec419edb Maybe fix a crash in the voice recognition code. Maybe fix a lock when going into the option menu while respawning. 2009-05-01 17:48:15 +00:00
chief1983 b82c473b5b Nobody here but us chickens (really I don't think anyone uses this but FotG) 2009-05-01 16:14:32 +00:00
Goober5000 a7f7edb9d1 fix bug in voice messaging 2009-04-30 23:55:42 +00:00
Goober5000 8c3d96d7d7 activate voice recognition 2009-04-30 23:45:14 +00:00
chief1983 079c1a5fb0 This is why we can't have nice things. 2009-04-18 19:37:20 +00:00
chief1983 791f6da527 Pretty FRED icon (and new 256x256 FS2 icon to boot) courtesy of Axem 2009-04-13 20:50:59 +00:00
Goober5000 28e4b45dfc tweaks 2009-04-10 08:40:28 +00:00
Goober5000 9bfb2821fb add a vertical scroll bar 2009-04-10 08:20:35 +00:00
Goober5000 edb2c48c7a add apostrophes to contractions, lol 2009-04-10 08:16:17 +00:00
Goober5000 bf425498e0 whoops, guess strchr doesn't work on NULLs 2009-04-10 07:51:05 +00:00
Goober5000 57cab322b4 add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00
Goober5000 9ba5c0ad79 fix the -mod problem in TabMOD->CheckModSetting
change strcpy_malloc to strdup
change Freespace to FreeSpace
spelling and grammar fixes
2009-04-10 07:46:09 +00:00
chief1983 c7709c9d3b Add Inferno configs to Xcode project 2009-04-08 17:48:46 +00:00
chief1983 f914cf288c Changes launcher to use HKEY_CURRENT_USER instead of HKEY_LOCAL_MACHINE - needs associated changes in FSO exe to function 2009-04-08 17:23:05 +00:00
chief1983 bc6c8613d0 Switch back to LF instead of CRLF 2009-04-08 17:07:40 +00:00
Goober5000 aa5e008b5a add warning system for mods with bad data files 2009-04-08 04:58:12 +00:00
chief1983 8c09a62fab Manual inspection to make sure my new VC6 project was essentially the same as the old one, and wouldn't you know, I found a bug in the wxFred project too :) 2009-04-02 21:57:12 +00:00
chief1983 8e9dd3523a Amazing what you can learn from reading SVN logs. Really. Old. SVN logs. 2009-04-02 21:32:15 +00:00
chief1983 47fb20a0a3 This MSVC6 project has additional defines to build Inferno builds, and also utilizes the speech SDK by default which was previously committed. I'm committing this so that anyone with VC6 can make a release build with little to no hassle. 2009-04-01 21:05:12 +00:00
chief1983 10ceb27c05 We include every other SDK just about...why not speech 2009-04-01 20:29:09 +00:00
chief1983 9b6f23f8e5 Missing comma revealed with FS2_VOICER 2009-04-01 20:25:49 +00:00
chief1983 4768ecbb08 Grammar fix 2009-03-31 18:32:09 +00:00
Wanderer ded9f03aa7 fix for mantis 1899 2009-03-31 06:11:09 +00:00
Wanderer 880695ef07 fix for mantis 1900 2009-03-26 08:18:46 +00:00
Goober5000 0d9cebc35c final tweak to callsign feature 2009-03-26 01:43:26 +00:00
Goober5000 9be06dbd9e change warning 2009-03-26 01:42:47 +00:00
karajorma 69e6cdaf7e Bit of a hack but it should stop the function from going over MAX_PACKET_SET_SIZE 2009-03-25 00:49:21 +00:00
karajorma 0bf8debff9 Made this change in my branch but it never made it over here. 2009-03-21 23:06:37 +00:00
karajorma 0e20fd8939 Fix Mantis 1661 (Ships leaving via the fighter bay don't disappear on multiplayer clients). 2009-03-17 20:28:41 +00:00
karajorma 55811201ea Fix multiplayer for Inferno builds. 2009-03-17 20:25:36 +00:00
karajorma 7b977c4fd3 Various fixes needed to allow multiplayer to use over 255 weapons. 2009-03-17 20:20:48 +00:00
karajorma d435d4d3c6 Fix Mantis 1486 (Pressing F4 crashes multiplayer) 2009-03-17 20:14:31 +00:00
karajorma 845ac7e4f5 Fix a series of bugs with generic subsystem types and non-standard names in the ship model. 2009-03-17 17:44:28 +00:00
karajorma 14e31492ca Fix Mantis 1729 (Pressing glide keys while warping out locks up the game) 2009-03-16 22:22:48 +00:00
karajorma 0f8d554369 Fix Mantis 1838 (Latency information obscures the messaging menu) 2009-03-15 17:19:45 +00:00
karajorma c24923b2b5 Fix Mantis 1898 (Names with a # are not truncated correctly in the message menu). 2009-03-12 20:25:09 +00:00
karajorma 0dd317f043 Fix Mantis 1896 (Two support ships crash the game) 2009-03-10 21:24:07 +00:00
karajorma f5aa916add Doh! x2 2009-03-09 11:50:38 +00:00
karajorma 41cb2dbedc Doh! 2009-03-09 11:46:44 +00:00
karajorma b316f8c5a9 Fix Mantis 1872 (Fiction Viewer crashes/locks up.)
Allow FRED to save fiction if the mission file already has some.
2009-03-07 22:53:07 +00:00
chief1983 3fec029741 speech.cpp was missing a closing > on an include
Launcher.dsp now has the include paths for the d3d and speech headers and libs
Version bumped to 5.5e (but we still need to get the joystick fixes from 5.5d, at least)
2009-03-07 18:04:03 +00:00
chief1983 318fb188b1 Just a log, not needed in SVN. 2009-03-07 17:48:14 +00:00
karajorma cbd329351e Add the speech sdk files too. 2009-03-07 17:41:56 +00:00
karajorma f8a7766ccf On reflection Mantis 1861 is also going to affect creating a new mission as well. Might as well fix that too. 2009-03-06 20:53:26 +00:00
karajorma 7e24dc08d4 Fix Mantis 1861 (Texture Replacements don't initialise properly in FRED). 2009-03-06 19:03:51 +00:00
Wanderer 9597b33967 add 'missing' casts 2009-03-06 15:08:16 +00:00
karajorma cf20b6d145 Fix a warning where ai_do_objects_docked_stuff was being called twice on clients during multiplayer mission load. 2009-03-05 20:43:34 +00:00
karajorma 09616bc10c That should only be called once per mission. 2009-03-02 20:41:31 +00:00
karajorma 3deba7e85a Add the DX files needed for compilation. 2009-02-26 11:27:23 +00:00
chief1983 d9917da402 Karajorma missed one 2009-02-26 03:16:16 +00:00
karajorma 39763689f4 Allow compilation without SAPI 2009-02-25 21:28:24 +00:00
karajorma 0f0a6be3b7 Some minor fixes including getting rid of the vestigial Determination setting from everything except the mission file itself. 2009-02-25 15:41:23 +00:00
Wanderer 17e5a8c9ae possible fix for the missing thruster glow names.
changed phrasing of unrecognized type subsystem issue to less severe.
forced game to warn only once if exceeding max ship classes.
2009-02-25 14:50:59 +00:00
chief1983 df1e619696 Taylor's fix for the OpenGL error in the debug log
http://www.hard-light.net/forums/index.php/topic,61170.msg1207696/topicseen.html#msg1207696
2009-02-23 17:10:14 +00:00
Wanderer 238550c1de fix for mantis 1862 2009-02-03 13:42:30 +00:00
karajorma 4241153b27 Serves me right for saying it was working. 2009-02-03 00:12:18 +00:00
karajorma 974d2348c3 Argument SEXPs shouldn't be included when searching the tree for arguments. 2009-02-02 17:17:31 +00:00
Wanderer bbe61ffa4c fix for mantis 1875 2009-02-01 13:13:18 +00:00
karajorma 0f6f9fc861 Fix a bug with in-sequence and invalidate-argument. 2009-01-28 22:41:57 +00:00
karajorma d182723dd0 Fix Mantis 1867 (String-equals didn't work with nested arguments) 2009-01-24 22:36:45 +00:00
Goober5000 b5aad67d77 being meticulous 2009-01-20 05:49:27 +00:00
phreak b474b09f01 Cutscene bars fix, try #2 2009-01-20 05:19:35 +00:00
Goober5000 d4c560728c fix for Mantis #1851 2009-01-20 04:18:14 +00:00
Goober5000 95af84bb91 possible fix for Mantis #1853 2009-01-20 03:46:49 +00:00
Goober5000 407788c80e don't CTD on sexps that are too long (Mantis #1852) 2009-01-20 03:38:09 +00:00
Goober5000 61f51cd529 preserve texture replacement upon name change (Mantis #1695) 2009-01-20 00:35:58 +00:00
Goober5000 ba1e3fc5f1 hopefully final revision of the callsign code 2009-01-19 20:56:36 +00:00
phreak 36d547ce9a Cutscene bars fix using gr_set_clip instead of gr_rect. 2009-01-19 03:48:45 +00:00
Goober5000 738a438842 just for sanity's sake, default to 0% limit for support ships repairing hull 2009-01-18 04:01:09 +00:00
Goober5000 1edca14fad revert changes to close out issue #1870 2009-01-18 04:00:15 +00:00
karajorma 557f32bf20 Get rid of the ping message when the HUD is turned off 2009-01-15 21:33:32 +00:00
phreak 96be683c18 Fix for Mantis #1870 2009-01-15 01:07:35 +00:00
karajorma 2ec7cab786 Make the player orders error message a little clearer. 2009-01-05 17:51:02 +00:00
karajorma 4530429c4f Mantis 1633 (No orders for player ships) appears to have been due to two different bugs. This should fix the one I missed earlier. 2009-01-04 17:10:51 +00:00
karajorma 449d612234 Add a 3rd save format to FRED thereby making the current forward compatibility of save game optional. 2009-01-03 14:54:15 +00:00
chief1983 24a2449a76 OpenGL tweaks from Taylor's 3610 patch and a big fix for OS X graphics - Thanks Echelon9! 2009-01-03 02:39:11 +00:00
chief1983 5f609df9f7 Standalone GUI minimize from Taylor's 3610 patch 2009-01-03 02:37:45 +00:00
chief1983 9bd0604790 Fix for movie playback from Taylor's 3610 patch 2009-01-03 02:36:59 +00:00
chief1983 5f2fa0e826 Fix for fighter beams from Taylor's 3610 patch 2009-01-03 02:36:22 +00:00
karajorma 98e4b9fc1d Fix a bug whereby initial orders were being ignored on the standalone. Maybe fix Mantis 1815 (Starting wings play dead on standalone). 2008-12-30 21:33:35 +00:00
taylor 0ae8750532 change eol-style to CRLF on the project files 2008-12-30 15:42:46 +00:00
taylor 3d9b1af01f Oops! ;) 2008-12-29 09:52:39 +00:00
taylor 12fa2dfb6f add Launcher from old CVS (history NOT preserved!) 2008-12-29 09:50:57 +00:00
phreak f77abd333b Change FRED version and title bar from 3.6.9 to 3.6.10 2008-12-25 04:13:43 +00:00
Goober5000 e8c69129cc choose the last persona found as the Command persona, not the first, since that's how retail does it 2008-12-22 05:30:21 +00:00
Goober5000 c87843ee8b bah 2008-12-21 21:36:42 +00:00
Goober5000 0f58111ed0 this ought to fix bomber+ according to the way $smart secondary weapon selection was set up 2008-12-21 21:34:37 +00:00
Goober5000 9c5662760b roll back Wanderer's fix 2008-12-21 21:18:00 +00:00
Wanderer dfb6dd28a7 fix mantis 1802
fix possible issue with subsystem fixup
fix - via ai_profiles - AI with bomber+ flag
2008-12-21 19:46:38 +00:00
karajorma e5f2e24d48 Use fout_version for +Use Table Score and +Assist Score Percentage 2008-12-21 13:08:12 +00:00
Goober5000 af8f8d4fb7 we probably only want to use fout_version when we have actually pushed a FSO version
(hopefully this should fix the sprawling version-specific commenting)
2008-12-21 07:45:38 +00:00
karajorma 41d1516ef6 Fix a multiplayer bug where names like Alphabet were assumed to be in Alpha wing 2008-12-20 22:10:29 +00:00
Goober5000 364fc4ec15 skybox model should be 3.6, not 3.6.10 2008-12-20 19:53:55 +00:00
phreak 616f547b8e Fix crash due to revision 5006 2008-12-20 16:54:24 +00:00
Wanderer ada1b553bd possible fix for Mantis 1802 2008-12-19 22:23:31 +00:00
chief1983 0c788a7347 Commit WMC's fix for icon briefing lines that don't get deleted (Mantis 1763). 2008-12-17 07:54:55 +00:00
chief1983 910f57cb12 Revert changes done to fix bug 1645 (it'll have to wait) 2008-12-17 07:38:38 +00:00
phreak ac34b748c5 Made the cutscene list dynamic 2008-12-16 22:07:21 +00:00
karajorma 3dfb7706ba Restore Assist Score Percentage saving. 2008-12-15 22:11:57 +00:00
Wanderer a936a1f4fa warn the user of 'div by 0' issue 2008-12-15 20:25:49 +00:00
karajorma d76edea235 That's probably had a rather large knock on effect with the version saving code. 2008-12-15 18:47:43 +00:00
phreak 5787b8e77d Add code project as a depedency of the Freespace2 project 2008-12-14 21:44:27 +00:00
phreak 2a4cfc2b08 Fix a bad memset 2008-12-14 21:33:53 +00:00
Goober5000 e7d0087007 fix algorithms for any-of, every-of, and number-of to align with or and and, respectively 2008-12-14 08:47:27 +00:00
phreak eee9976cc0 Possible fix for mantis #1843 2008-12-14 08:11:14 +00:00
Goober5000 903e340c60 whoever made this change forgot about operator precedence 2008-12-14 07:20:56 +00:00
phreak 6a2e0778c0 Edit workspace file to use relative paths 2008-12-13 17:25:16 +00:00
karajorma 83be21262f Fix the <argument> option not appearing when there were no other options on the list 2008-12-13 10:09:59 +00:00
karajorma 133d8899e0 Fix a bug where you could supply add-background-bitmap or add-sun-bitmap with a string variable which then couldn't be used. 2008-12-12 17:38:23 +00:00
phreak 4de0351c46 This stops the crashing as demonstrated by Mantis #1844, but I don't know why or if it is correct. Could someone please look at this? 2008-12-12 14:38:28 +00:00
chief1983 6cc6f866cd Must have fatfingered some keys when I wasn't paying attention. 2008-12-10 17:48:29 +00:00
chief1983 584eb59fdd Hopefully this will actually let it load the 2d without breaking WCS again 2008-12-09 23:51:13 +00:00
phreak c71749a2f9 Turning an Int3() into a Warning() 2008-12-09 13:02:30 +00:00
chief1983 9349ee36a1 Only PCX and DDS work for Squad Logos.
Slight tweak of the open file dialogs.
2008-12-08 16:45:07 +00:00
phreak 16a68b1b50 Add code::blocks support. To compile you will need to install the following library packages SDL, openal, ogg, vorbis, vorbisfile, theora, lua5.1, jpeg, GL, GLU. Currently, it has two types of outputs: Debug (standard debug build), and Release, which optimizes using -O3 and -march=core2 (because my laptop is a core2). Probably could experiment with additional compiler options to improve speed. 2008-12-06 21:24:14 +00:00
chief1983 d72787091c Add Ship Choice 3d for TBP flag as well since lack of will crash debug builds, and fixed whitespace on that particular section of code. 2008-12-06 20:23:24 +00:00
chief1983 fbef533049 Force 3d Shockwave and 3d Weapon Selection command line option when The Babylon Project command line option is on, since their default launcher.ini does not have those and not having these options breaks things in TBP. 2008-12-06 00:44:44 +00:00
karajorma 003b308710 Fix the FRED undo function. 2008-12-05 23:06:17 +00:00
chief1983 93bf5d9d0b Allow DDS, TGA and JPEG files for squad logos (TGA and JPEG need testing) 2008-12-04 23:15:18 +00:00
chief1983 fa2c8ea7ce Add 3d Shockwave to All Features On and Default Off lists 2008-12-04 20:47:45 +00:00
chief1983 f221c436f2 Redo that fix again - tolower wins, but don't chdrive on non-Windows platforms
Made a variable more semantically correct
2008-12-04 20:17:51 +00:00
karajorma dffb31d6da Fix Mantis 1835 2008-12-04 19:32:21 +00:00
chief1983 a8dcf55ffa Fix the cause of the problem in Mantis #1748 in both chdir functions in case it becomes a problem elsewhere down the line 2008-12-04 17:56:53 +00:00
chief1983 6282d1f1bb Rest of the different fix for 1278 (only my second commit and I already goofed) 2008-12-04 17:40:28 +00:00
chief1983 8d3d2d97c0 Different fix for 1278 - It's a bit more flexible. Use ai_profiles to allow/disallow entering multi with no primaries or secondaries 2008-12-04 17:38:11 +00:00
chief1983 5aed7b1b65 Fix for disabled 3d shockwave flag when 2d shockwave doesn't exist - fallback to 3d anyway 2008-12-04 17:27:26 +00:00
phreak afee41b28f Possible fix for mantis #1748 (FRED2 Crashes when squad logo button is pressed). 2008-12-03 05:40:35 +00:00
karajorma 64fa2bbb2a Fix gibberish entries in file dialogs. Maybe fix Mantis 1748 2008-12-02 21:42:04 +00:00
karajorma d89f4623dd Since the player ship is the default for most of these SEXPs they should not be greyed out just cause it is a player start rather than a ship 2008-12-02 21:14:23 +00:00
karajorma 50fd773105 Fix Mantis 1733 (String variables required a valid default value when used in SEXPs even if that value would never be used) 2008-12-01 22:34:38 +00:00
karajorma f0bd1d899c Fix Mantis 1822 (Cannot use variables in add-background-bitmap or add-sun-bitmap) 2008-12-01 17:29:24 +00:00
karajorma 0f110585f2 Widen the primary and secondary combos in the weapons editor. 2008-11-30 20:00:02 +00:00
karajorma c20bac9b5a Typo 2008-11-30 14:56:45 +00:00
karajorma 092cf1afa4 Print an error to the log when too many messages are in the queue rather than breakpointing. 2008-11-30 14:55:58 +00:00
phreak 3f166ab38e whoops 2008-11-30 14:13:28 +00:00
karajorma ed9bc1fa40 Fix add-background-bitmap and add-sun-bitmap to display a list of bitmaps from the tables properly. 2008-11-30 13:01:30 +00:00
phreak 3137c9132b fix the message variable parsing the right way (mantis #1831) 2008-11-27 01:38:28 +00:00
karajorma b863267139 Fix Mantis 1825 (Int3() when trying to change a ship flag on a ship which self destructed) 2008-11-26 23:19:31 +00:00
phreak e43ac0c839 Fix Mantis #1831 2008-11-25 22:05:39 +00:00
Goober5000 a86162a5ec add ai_profiles flag for Mantis #1422 2008-11-24 02:35:20 +00:00
Goober5000 a240f1c458 if a ship or weapon is allowed, allow all its # equivalents (further insurance against the Interceptor#Weak problem) 2008-11-24 02:13:13 +00:00
Goober5000 8b37423105 prevent form-on-wing goals from overriding everything else
this should fix the AI bug that revision 2170 applied to all wings (not just starting wings)
this should also fix the bug where Alpha wing couldn't be issued orders via sexp, even in retail
2008-11-24 00:01:00 +00:00
phreak a6b6830eda Add some preprocessor macros to aid in debugging. Nothing is on by default, but when enabled, the macros will force windowed mode at various resolutions. 2008-11-22 20:56:30 +00:00
karajorma c5f7987bac Fix Mantis 1823 (Rand SEXP only has 16-bit precision) 2008-11-20 20:03:14 +00:00
phreak 29cd09b8a8 Apply the time limit check when starting a co-op game to the kill limit as well. 2008-11-19 23:45:43 +00:00
phreak 4567e88c25 Fixed Mantis #1675 2008-11-19 16:12:05 +00:00
phreak 24d0472dcd Fix Mantis #1278 2008-11-19 15:31:30 +00:00
karajorma 612d2e88d1 Fix Mantis 1824 (Cargo containers disappear when using change-ship-class SEXPs) 2008-11-19 08:00:05 +00:00
phreak 03c7ef7e7a more fixes that deal with mantis 1564 2008-11-18 03:30:13 +00:00
karajorma 92475e2488 Allow AI-goals to be assigned to a ship represented by an <argument> 2008-11-17 17:57:45 +00:00
karajorma 9eabed2772 Fix the Decline error message that crops up in multiplayer sometimes and get rid of the PAIN! entry in the log. 2008-11-14 09:15:19 +00:00
karajorma bce4c85137 Fix Mantis 1633 (Initial orders for multiplayer Player Starts that end up AI controlled are ignored). 2008-11-13 21:21:00 +00:00
taylor 6f5984f566 standalone changes:
- add score/kill values to Player Info tab
 - add multi.log out to the Debug tab
 - add minimize-to-tray functionality
 - fix messaging problem with property sheet handled messages
2008-11-11 01:09:01 +00:00
taylor 596925fd50 remove bad checks for loadout info (we are screwed if the info is bad regardless, so making it Assert() is cleaner)
fix bug that screwed up TVT if more than 4 ships on team
2008-11-11 01:03:38 +00:00
taylor edb2c41a53 make sure that a positive hull precentage doesn't hit 0 due to rounding error (Mantis #1720) 2008-11-11 00:59:19 +00:00
taylor 5fa96f9eb1 give multi clients a short delay on briefing music to reevaluate goals if needed (should fix/reduce Mantis #1465) 2008-11-11 00:58:19 +00:00
phreak 148ab42e26 Got rid of goto statements 2008-11-11 00:09:30 +00:00
karajorma ac5de9e5f8 Fix Mantis 1812 (Ship-Deaths reported incorrectly for player starts controlled by AI ships) 2008-11-10 19:31:07 +00:00
taylor dc885b57d0 address some rounding issues with integer based percent values (Mantis #1807) 2008-11-09 05:09:51 +00:00
taylor 74ffc7face sync up to current FS2NetD code (fixes so many little problems/issues that it's not even funny) 2008-11-09 05:08:19 +00:00
karajorma a9ad6fdbc3 Fix Mantis 1044 (Campaign Editor crashes in release builds but not in debug) 2008-11-06 20:42:23 +00:00
phreak 8bf8bee4f5 Apply Spicious' patch from http://www.hard-light.net/forums/index.php/topic,57573.0.html 2008-11-04 05:21:00 +00:00
phreak dc8f703644 Mantis #1800, take 2 2008-11-03 00:04:26 +00:00
karajorma 346047b429 Surprised this wasn't committed before. 2008-10-30 20:39:47 +00:00
phreak a157dd11fc Possible fix for mantis #1800. Don't ask me how I came up with the numbers I used, I'm not too sure myself. 2008-10-30 04:04:54 +00:00
taylor c1b66a0ac3 put a 1/2 sec delay on the next secondary so we don't fire immediately after respawn (Mantis #1118) 2008-10-28 18:18:12 +00:00
taylor 78c3cfb6aa make disband wing work properly (Mantis #1680) 2008-10-28 18:16:08 +00:00
taylor a915d123c1 fix weapons carry check to work properly for multi (Mantis #1624) 2008-10-26 14:42:03 +00:00
phreak 7180331b53 Possible fix for mantis #1564 2008-10-26 02:57:36 +00:00
Goober5000 35a006138c fix another spawning weapon bug 2008-10-24 22:57:40 +00:00
Goober5000 83801d00b9 fix bugs caused by missing parent when weapon-create creates missiles 2008-10-24 22:17:02 +00:00
Goober5000 eae40d9f93 fix a bug in weapon-create argument validation 2008-10-24 21:14:24 +00:00
karajorma c53eedef9b Set the type correctly for modify-variable (it used to assume all variables were numbers). Fix setting string variable to the value of another string variable (again). Solve a couple of other minor assertions and crashes. 2008-10-24 16:54:59 +00:00
taylor 16616ea80e make sure that we update our subsystem in-use count when removing subsystems
(fixes bug where it just keeps wanting more memory but doesn't really need it)
2008-10-24 09:05:54 +00:00
taylor 339994fd7e more if-statement fixing
fix the fix so that it's actually fixed (re: Mantis #1676)
2008-10-24 09:03:46 +00:00
Wanderer 1b498298f3 patch to improve turret subsystem targeting 2008-10-23 15:38:57 +00:00
taylor 62c973d997 mode if statement fixage 2008-10-23 13:27:21 +00:00
taylor 6c6c8908ce fix bogus ml_printf strings
use ml_string over ml_printf where possible
remove newlines from ml_* calls, since it gets added already
2008-10-23 13:26:35 +00:00
taylor ee31355117 be sure that we sort the mission list properly for a host that isn't the master (for consistency with host-master behavior) 2008-10-23 13:25:19 +00:00
taylor 3292a32b5a output warnings, errors and asserts to debug log for Linux/OSX
allow -no_warn to skip asserts like it does on Windows builds (for consistent behavior)
2008-10-23 13:23:45 +00:00
taylor 347ffbb854 this assert will happen during normal multi play, nothing ingame related 2008-10-23 13:22:11 +00:00
taylor deb9b3021e restart sounds/music on game browser screen (Mantis #1279) 2008-10-23 13:21:02 +00:00
taylor 23072c10c0 final part of the fighter beam fix; freaky as it is, it actually managed to not break anything :D (Mantis #1795) 2008-10-23 13:00:21 +00:00
Wanderer 0bdb95558b added 2 missing newlines to debug spew 2008-10-23 10:09:12 +00:00
Wanderer 2d830be190 improved readability per taylor's suggestion 2008-10-23 06:47:12 +00:00
taylor f4f09987d8 fix stupid bug that messed up last flight date (Mantis #1274) 2008-10-23 04:51:02 +00:00
taylor 8bd91fcaac set player speed after respawn to be initial velocity specified in mission (Mantis #1198) 2008-10-23 04:49:24 +00:00
taylor 8216e715f7 basic fixing for cmeasure handling over the network, not 100% without packet breaking though (Mantis #1098) 2008-10-23 04:47:41 +00:00
taylor e6e0705de2 ingame join related crash fix (the correct value is put in after mission sync) 2008-10-23 04:44:25 +00:00
taylor 8a5f180bbb pass correct object to primary cycling (fix for multiplayer) 2008-10-23 04:43:19 +00:00
taylor 1b14e5e6b0 fix V's "hack" so that it actually works and doesn't leave unused objects hanging around 2008-10-23 04:41:19 +00:00
taylor 8c6bc2a227 fix some NaN that gave invalid values in the standalone UI 2008-10-23 04:39:54 +00:00
taylor 8e00bdf226 fix some weird signature checks from retail code 2008-10-23 04:38:17 +00:00
Wanderer 8da5c35705 allow option to prevent turrets from targeting too distant bombs 2008-10-23 04:30:09 +00:00
Wanderer 449012a413 fix for surface shields selecting wrong hit quadrant 2008-10-22 13:56:19 +00:00
Goober5000 cc3329a165 one last fix 2008-10-21 21:37:37 +00:00
Goober5000 b8c5d0d87d hopefully this should be the last on Mantis #1785 (the callsigns) 2008-10-21 06:17:44 +00:00
Goober5000 c357bf4a9e Keldor's fix for callsigns not getting translated 2008-10-21 06:05:30 +00:00
Goober5000 0f11dbd800 fix a warning 2008-10-21 02:20:18 +00:00
Wanderer 81499de8ee added +noreplace to ships flags to allow adding flags
added +override to muzzleflash.tbl
added +override to weapon flags
2008-10-20 18:51:51 +00:00
Goober5000 34c994271e try to keep up with Nature producing bigger idiots :( 2008-10-19 20:25:30 +00:00
Backslash 3de1318983 My bad. No need to cap the ammo here. I had used the wrong variable anyway. Fixed. 2008-10-17 10:12:48 +00:00
phreak 787e68697c Fix Mantis #1799: Crash on "Mystery of the Trinity" 2008-10-16 04:09:38 +00:00
taylor 3d7001b445 make sure that we don't re-save a deleted pilot in the barracks (Mantis #1794)
fix pilot deletion proceedure to not provide useless failure handling (if it fails to delete once, it will fail every time)
2008-10-16 00:41:35 +00:00
taylor ba91e44465 make debris render properly in wireframe mode in hud targetbox and in ships lab (Mantis #1797) 2008-10-15 22:15:24 +00:00
Backslash b60ba5f79d Fix 'cycle' behavior when $Shots is more than 1. 2008-10-15 06:31:18 +00:00
taylor 1d95238c91 fix bug where changing turret_targeting_order[] to have asteroids earlier in the order would skip further checks 2008-10-14 17:09:09 +00:00
taylor f90e40b576 get rid of some useless/annoying debug messages 2008-10-14 16:58:26 +00:00
taylor a49e42134d fix for fighter beams in multi (Mantis #1795) 2008-10-14 16:57:23 +00:00
taylor bba8045d94 better version of the earlier ab_count fix 2008-10-14 16:42:33 +00:00
taylor a0d7d9d41d when sorting the mission/campaign list be sure that we keep our current selection
when loading the mission/campaign list for the first time make sure that we always select the first element in the list
2008-10-14 16:40:42 +00:00
taylor 60029e1361 add exports to map file
generate program database for release builds (doesn't make build bigger, .PDB allows finding of source/line given error address)
2008-10-14 16:38:39 +00:00
taylor e63feac992 fix some bad if statements 2008-10-14 16:35:49 +00:00
taylor 53f6c315eb update to build with current code (Mantis #1796) 2008-10-14 08:30:54 +00:00
taylor 0c322bc3f6 disable const string warning (that thing was just plain annoying) 2008-10-13 06:38:03 +00:00
taylor 0cab4aae17 only load tbls from tables/ (Mantis #1725) 2008-10-13 06:34:48 +00:00
taylor a4e38c366c bunch of out-of-bounds fixage 2008-10-13 05:57:57 +00:00
Goober5000 34cf79ad28 fixed a number of bugs with Electronics missiles that were present ever since 2003 :( 2008-10-12 21:57:40 +00:00
Goober5000 e5245c2586 move the Electronics tag to its proper place 2008-10-12 19:44:27 +00:00
Goober5000 bee38e4287 fixed "bastion" debug console command to work for all main halls
added "medals" debug console command for testing
2008-10-12 19:44:06 +00:00
phreak cf6bce2299 Add additional filename extension filters to fix Mantis #1484 2008-10-11 12:08:09 +00:00
karajorma f5f89754a5 Fix Mantis 1791 (invalidate-argument did not work with multiple matching arguments) 2008-10-09 21:13:26 +00:00
Turey f87d47ad90 Mantis 1584: Enabled F(n) keys during popups. 2008-10-08 03:02:15 +00:00
taylor 0a22c46b5c more class_type fixage from r4638 2008-10-07 20:47:03 +00:00
taylor 97c259e966 don't call gr_activate() in Assert macro
log asserts properly when using the -no_warn flag
(though asserts aren't really warnings and should not be turned off, it could be argued that many of our asserts don't belong)
2008-10-07 20:31:04 +00:00
taylor 3276e31ffa make sure that we reset the state properly after an ident failure (Mantis #1735) 2008-10-07 16:28:22 +00:00
Wanderer 858f727c76 fix for ab_count crash issue on mission reload 2008-10-06 18:05:37 +00:00
taylor e4fad6e87d fix fs2netd shutdown/cleanup code to work better (gets rid of various little issues) 2008-10-06 05:52:25 +00:00
taylor c6bfcb95b3 don't really need to bother with MAX_SERVERS any longer since it's ultimately dynamic 2008-10-06 05:51:20 +00:00
Goober5000 9d8f34b947 if ship names are hidden but a callsign is supplied, use the callsign 2008-10-05 21:58:16 +00:00
Goober5000 bd3b9a6df1 alt names should now work in FRED (including the voice acting manager) 2008-10-05 21:29:45 +00:00
Wanderer 8edc84991f Added warning to help preventing invalid ship types. 2008-10-05 13:50:44 +00:00
taylor 9fd9cdfbfb a fix/workaround for Mantis #1692
bunch of standalone fixage for error reporting and various little signon issues
fix heartbeats for standalone servers
make proper use of +pxo in multi.cfg for standalone so that games can show up in the lobby
client-side fix for getting pilot stats in lobby (Mantis #1652)
2008-10-05 13:31:35 +00:00
taylor 2f4f3e8e13 add separate standalone options for setting FS2NetD login/password (gets around FS2NetD server game listing issue) 2008-10-05 13:24:06 +00:00
taylor 1379b79ccd no magic numbers 2008-10-05 13:19:13 +00:00
taylor f4882400b1 start up mainhall music/ambient when in the lobby (Mantis #1761) 2008-10-05 13:16:42 +00:00
taylor 1a5633f546 fix standalone crash when server name/password is too long in multi.cfg 2008-10-05 13:15:10 +00:00
taylor 6167768616 better error handling for when TCP socket is already in use (Mantis #1626)
fix missing protocol XSTR that used the wrong tstring for display
2008-10-05 01:17:45 +00:00
taylor eec91d8092 you are never guaranteed a valid class_type (fixes Mantis #1742) 2008-10-04 20:48:07 +00:00
Swifty d0ef6486ac Fix the rest of the Visual Studio project files such that FRED can compile. 2008-10-03 00:04:52 +00:00
phreak 609fb62dba Update fred to include trackir libs 2008-10-02 17:32:54 +00:00
Swifty 1c7d9fca6f Added missing semi-colons. 2008-10-02 06:50:15 +00:00
Swifty 3b7aaaa300 Statically link TrackIR support; FS2_TrackIR.dll no longer required at run-time. 2008-10-02 05:58:01 +00:00
phreak 5b52752152 Disable the mouse when lost focus in windowed mode. 2008-10-02 00:57:10 +00:00
phreak 9dbe9a3d75 Get rid of some repeated code. 2008-10-01 22:50:13 +00:00
phreak b0e4a6bd20 Get rid of windows system ding sound when pressing ALT and another key while windowed mode is active. 2008-10-01 05:36:40 +00:00
phreak c74b776e4e It may be a hack, but this seems to fix that one pixel line seen on the bottom and right side of the screen when faded to a solid color. 2008-10-01 04:04:39 +00:00
Goober5000 79069c6621 fix linked primary behavior to be based on percentage, not absolute value, as expected (Mantis #1778) 2008-10-01 00:44:11 +00:00
Goober5000 0377e7682f re-bump alt names
fix hidden ship names for voice acting manager
2008-09-30 23:50:14 +00:00
karajorma 0ae0fffdc8 Fix Mantis 1774 (when-argument within when does nothing) 2008-09-30 17:36:12 +00:00
karajorma 629d004bce Fix compiling on OSX...apparently. 2008-09-30 15:52:53 +00:00
Goober5000 e13a493593 uninitialized pointer bugfix and cleanup to hud_stuff_ship_name / hud_stuff_ship_class
send messages with ship class rather than ship name if ship name is hidden
2008-09-29 04:47:23 +00:00
Goober5000 7b89f375c7 redo the callsign feature to be independent of the alt name
(fixes Mantis #1785)
2008-09-28 23:05:03 +00:00
Goober5000 deca7d7a7b add Keldor's fix for Mantis #1779 2008-09-28 20:58:28 +00:00
Goober5000 9e17717bde make CAR and CDR fail-safe 2008-09-28 19:28:22 +00:00
Goober5000 754551a374 don't hide information when displaying ship callsign
clean up hud_render_target_ship_info a bit
2008-09-28 01:53:54 +00:00
Goober5000 0de14aebfa fix for Mantis #1783 (voice acting manager message senders) 2008-09-28 01:16:07 +00:00
Goober5000 41f3a1d879 add KeldorKatarn's fix for AI afterburning too long 2008-09-28 00:26:56 +00:00
phreak ad3fd571e7 Allow .jpg files to be loaded out of VPs when in the "interface" subdirectory. 2008-09-26 04:59:12 +00:00
phreak 6329854685 Add KeldorKatarn's patch for mantis #1776 2008-09-25 03:55:24 +00:00
phreak 0f61b5c992 Fix for Mantis #1767: Fix invisible ships upon knossos warpin 2008-09-25 03:45:57 +00:00
phreak e6fdfe7e9b Fix for mantis #1773. Check null pointers 2008-09-25 01:58:40 +00:00
phreak 8ccb659191 Seperate 3d ship and weapons selection into their own command line options. 2008-09-25 01:15:30 +00:00
phreak 983c43a73c Render the lens flare even if the parent sun is off screen as some lens flares are much larger than their parent star and they magically disappear as soon as the center of the star leaves the FOV. 2008-09-18 00:33:59 +00:00
phreak 455f0e3ea2 Fix radar orb rendering (It was using the incorrect rotation matrix). Also enable alpha blending on the orb axes. 2008-09-18 00:30:54 +00:00
WMCoolmon 99682eba82 Fixed secondaries using the laser renderer 2008-09-17 00:10:05 +00:00
phreak 9a1778baf5 Ensure the larger keyframe is chosen when looping the weapon loadout animations. 2008-09-16 04:51:36 +00:00
phreak 8c5077fda8 Do the same thing for ships that the previous commit did 2008-09-15 23:21:41 +00:00
phreak fa0aab89e7 Honor the keyframe value in the weapon loadout animations. If less than 2 keyframes are defined (first frame and return frame), then the animation will treat "52" as the keyframe value (retail default).
All 1024x768 weapon loadout animations have 0 and 52 set as the keyframes so they render properly.
2008-09-15 23:05:05 +00:00
phreak f3f2b4ee74 Fix for Mantis #1562: Lens flares visible if sun behind asteroids. 2008-09-15 01:51:20 +00:00
phreak f2364aa986 Ensure target_engines pointer is initialized. 2008-09-14 21:55:34 +00:00
Goober5000 601f744a26 revert changes from 4801 (Phreak's fix for >4GB memory reporting)
c.f. http://www.hard-light.net/forums/index.php/topic,56409.0.html
2008-09-14 20:29:03 +00:00
Goober5000 ccc17eca80 re-fix WMC's bug to be compatible with expected behavior 2008-09-14 19:29:07 +00:00
phreak 15492f15e5 Fixed nebula render bug for Mantis #1765 2008-09-14 19:05:30 +00:00
phreak 0222c888ee cleanup find_homing_object() 2008-09-14 18:51:38 +00:00
phreak 08b8334615 Change output executables to 3_6_10 2008-09-14 17:05:59 +00:00
karajorma 83817a6475 KeldorKatarn's afterburner lock SEXPs 2008-09-13 22:21:38 +00:00
taylor b037fbbefe update with current official SDL framework (should fix Mantis #1727) 2008-09-13 14:41:57 +00:00
taylor 5f2591d617 if max shield strength is 0 then disable shields (rest of Mantis #1645) 2008-09-13 14:40:06 +00:00
karajorma 5a97de45f0 Fix Mantis 1088 (Extra call to ai_do_objects_docked_stuff() )
Remove the banks_fired Assert. WMC is correct. We don't need it anyway.
2008-09-10 11:24:00 +00:00
phreak fb6469928a Add updated freespace2 icons 2008-09-08 23:01:22 +00:00
Swifty 028d9f03e9 WMC's fix for RTT indexing and fix unnecessary slewing for 3D HUD elements. 2008-09-06 07:51:50 +00:00
Wanderer bd76cb0826 Fix for mantis 1736 2008-09-05 21:59:55 +00:00
Swifty 27d09405cb Fix for Mantis 1743: Targets don't shudder with the rest of the HUD. 2008-09-05 07:57:40 +00:00
phreak 9be018956e Fix memory detection for systems with > 4GB of RAM. 2008-09-04 20:40:57 +00:00
karajorma 092c0c32d6 Arguments within arguments (again). It should work this time round. 2008-09-04 20:38:14 +00:00
phreak 71469b436a Possible fix for Mantis #1669 2008-09-01 03:09:00 +00:00
karajorma 1071f03496 Fix Mantis 1545 & 1754 (Order SEXP doesn't work with wings or destroy subsystems properly)
Add the Query-Orders SEXP 
Deprecate the Order SEXP
2008-08-31 21:04:44 +00:00
WMCoolmon 402fd56bb8 Change set-fov back to a global override 2008-08-30 19:48:20 +00:00
WMCoolmon f1f4084de1 Final scripting, camera code updates. 2008-08-30 11:05:48 +00:00
WMCoolmon b6f607cd62 Fix for mantis 0001211 2008-08-30 11:04:12 +00:00
WMCoolmon 97c55db510 Core all-RTT code. 2008-08-30 11:03:03 +00:00
WMCoolmon 2d58c1687e Added object_get_model; moved object_h to object.h 2008-08-30 11:02:36 +00:00
WMCoolmon 21d01db812 Input updates for scripting 2008-08-30 11:00:11 +00:00
WMCoolmon 3170a1488e Attempted HUD shake fixes 2008-08-30 10:59:10 +00:00
WMCoolmon d988c162e6 Minor idiotproofs 2008-08-30 10:58:44 +00:00
WMCoolmon f23f526168 Better compatibility with avoiding the main hall 2008-08-30 10:57:27 +00:00
WMCoolmon b85b0e7cee all-texture replacement code 2008-08-30 10:56:28 +00:00
WMCoolmon 915ca7d5d8 Attempted HUD shake fixes 2008-08-30 10:56:04 +00:00
WMCoolmon 352dea1fda hud_get_draw, custom subsystem names in HUD subsystem damage list 2008-08-30 10:54:44 +00:00
WMCoolmon c747c1476d New camera code 2008-08-30 10:52:32 +00:00
WMCoolmon e4826d91b7 Replace Assert with smooth failure. 2008-08-30 10:52:08 +00:00
WMCoolmon 3c94467f4b New camera code, cutscene bar fixes 2008-08-30 10:51:21 +00:00
WMCoolmon 517eca5e64 Support for all-texture-type texture replacement. 2008-08-30 10:50:49 +00:00
WMCoolmon a51459fbee FRED support for new camera code and texture replacement of all texture types 2008-08-30 10:49:22 +00:00
WMCoolmon 8d168786c5 ship_wing_point_or_none SEXP type 2008-08-30 10:48:46 +00:00
WMCoolmon 8af81c334d Support for custom warp sounds 2008-08-30 10:47:50 +00:00
WMCoolmon 10f219d2b8 Fix unneeded use of doubles 2008-08-30 10:47:16 +00:00
WMCoolmon 79094955ef Updated objsnd API 2008-08-30 10:46:23 +00:00
WMCoolmon 79054c7a15 New camera code, warp code updates, debris attributes, fix large numbers of ships being created at the same time, delta bank. 2008-08-30 10:45:41 +00:00
WMCoolmon ace8251c8a Prevent "Alt-Alt" from textify_scancode 2008-08-30 10:43:37 +00:00
WMCoolmon 275d36445d New camera code core commit, delta bank code. 2008-08-30 10:42:27 +00:00
WMCoolmon 0c752aa245 Update to use new camera code. 2008-08-30 10:41:31 +00:00
WMCoolmon 1cdd0ea583 Updated to use new texture map class. 2008-08-30 10:41:01 +00:00
WMCoolmon cf994a011d - Fixed bug involving too many goals being assigned to a ship from wing orders 2008-08-30 10:37:51 +00:00
WMCoolmon 0fb415b913 Fix for mantis 0001737 2008-08-30 01:21:54 +00:00
WMCoolmon 8d863a8b9a Fix glowpoint option in lab not working (thanks blowfish) 2008-08-30 00:24:10 +00:00
Goober5000 0237463765 Mantis #1755: stars should not be drawn when there's a skybox 2008-08-26 01:28:30 +00:00
phreak df83440bc0 Add Fred to the list of executables automatically built in debug mode. 2008-08-22 15:05:12 +00:00
karajorma 7d19499055 Revert argument changes till I can figure out why they crashing VC6 builds but not 2005 ones. 2008-08-20 20:45:45 +00:00
phreak 52c8267d21 Fix alt-tab and FS2 trying to regain focus. 2008-08-20 04:22:39 +00:00
karajorma 8331c2c074 Fix the -argument SEXPs to allow them to cope with conditionals being used within them.
Clean up some code from in-sequence that never worked anyway.
2008-08-19 19:00:54 +00:00
phreak 0d73ca769c Applied blowfish's patch for Mantis #1714. 2008-08-18 23:33:34 +00:00
taylor cf7d96815b fix broken commit from partial Xt merge 2008-08-18 05:56:46 +00:00
phreak 3010b91b45 Don't flash the screen red when damaged while invulnerable (either through cheat or sexp). 2008-08-17 22:26:59 +00:00
phreak 71cd24e04e Fix beam damage when time compression is active. 2008-08-17 21:55:03 +00:00
karajorma e9bcdbc302 Hmmmmmm. Using a VC2005 keyword as a variable name is just asking for trouble. 2008-08-16 08:13:43 +00:00
Goober5000 0269f3dd92 fix a few bugs by rolling back the non-ship-template code from revision 4636
this also fixes the ship spinny thing (which both argv[-1] and Backslash had noticed and fixed previously)
2008-08-16 05:06:38 +00:00
phreak c0a012f5e0 Add a check to see if the complete escort list is full before adding an additional ship. 2008-08-15 01:37:38 +00:00
karajorma 878e632d03 Fix Mantis 1745 (TvT scoring for players kills scales with difficulty) 2008-08-12 20:29:36 +00:00
phreak c3214228e2 Remove check for no-collide-invisible ships when checking to see if a weapon passed it's target. Changed FOV check to allow for missiles with FOV half-angles greater than 90 degrees. 2008-08-11 04:11:46 +00:00
phreak 4d674fb25c Fix for mantis #1744 2008-08-10 21:17:00 +00:00
phreak 3f9211e62d Possible fix for mantis #1728 2008-08-10 21:16:22 +00:00
karajorma 7881ae8959 Add builtin messages for support ships back into TvT missions. 2008-08-10 10:37:20 +00:00
WMCoolmon 99c67bea2f ATTN: Swifty - Mantis #0001707. Update to fix what looks like basic math error on my part. 2008-08-07 01:35:17 +00:00
karajorma 972a6927cf Fix Mantis 1605 (Support ships are forever marked as abort on clients after initially called in).
Fix a bug where support messages were sent from the client and the server so they played twice.
2008-08-05 21:25:55 +00:00
WMCoolmon ee816cac30 Update MSVC2003 project files 2008-08-04 22:54:03 +00:00
karajorma 183cc5655d Fix the Run Freespace option in FRED. Still not 100% but it should get a valid name more often than not. 2008-08-04 09:56:40 +00:00
karajorma 7f23cf61e7 Fix Mantis 1731 (CTEXT reporting the variable value if a block variable of the same name existed) 2008-08-03 11:39:05 +00:00
karajorma 95ce110c7b Fix Mantis 1232 (Can't use Zeta in Coop or Beta/Gamma in TvT) 2008-08-02 19:20:58 +00:00
karajorma 4ef43af3d2 Fix Mantis 1734 (Block variables appearing in modify_variable menu and SEXP) 2008-08-02 16:53:09 +00:00
karajorma 4c98658e44 Fix a problem with the assertion logging fix I added earlier if the stack trace was too long. Will now log errors too. 2008-07-29 19:25:34 +00:00
WMCoolmon 4d04f612cc add isPXOEnabled scripting function to Testing library 2008-07-29 04:21:58 +00:00
phreak 05ba96dddd Disable UAC for the other project types (debug, and non-sse2 release builds). 2008-07-28 22:14:18 +00:00
phreak e03e2acde7 Remove UAC when building the executables. 2008-07-28 02:51:36 +00:00
karajorma 12a67b570a Print the stacktrace to the debug log on hitting an assertion. 2008-07-24 20:25:42 +00:00
karajorma caad8ad850 Allow the player to score from assists and kills in a variety of new ways. 2008-07-24 20:23:52 +00:00
karajorma 0a62bc7316 Let TvT games use all the skill levels 2008-07-24 20:10:29 +00:00
karajorma 5b9e4adbc9 Allow multi_find_player_by_ship_name() to deal with respawning players too 2008-07-24 20:09:21 +00:00
karajorma 971db01835 Fix Mantis 1732 (Ship-Guardianing ships destroyed before mission start)
Add change-player/team-score SEXPs
2008-07-24 20:01:30 +00:00
karajorma 18fff5ed47 Update 2005 solution with the shader stuff. 2008-07-24 19:56:27 +00:00
taylor caf605ab0c add ARB_shader_texture_lod to the stupid SM3.0 test (for OS X mainly) 2008-07-22 15:50:01 +00:00
taylor d2610484f7 2d poofs are supposed to be default (forgot that since I didn't commit the new neb2 code :)) 2008-07-22 12:59:58 +00:00
phreak 060d0f7d2c Updated to add new files to the VS2008 project. 2008-07-18 20:26:27 +00:00
taylor 19dcab46fd damn, forgot these 2008-07-16 07:50:58 +00:00
taylor b0731b7769 basic commit of a few Xt tree changes
- updated OpenGL code (basic shader support, etc.)
 - new ships lab code
 - scripting RTT fixes
 - don't let FRED hog CPU time
2008-07-16 02:49:19 +00:00
karajorma 20c9ea4fd5 A bandaid on the gaping wound that is the current score code for ships. Should stop the missions corrupting themselves with ;;FSO 3.6.10;; messages but missions won't open in 3.6.9 now. 2008-07-14 18:25:41 +00:00
taylor 29f4f9548d add part of the Xt texture replacement code which fixed texture page-in issues for late arrivals
(rest of the missing thruster fix)
2008-07-14 03:11:11 +00:00
phreak d85e7cb3ac Updated to a newer version of glext.h from SGI 2008-07-10 11:34:50 +00:00
taylor 4628959403 total_time fixage (it should never be allowed to be zero) 2008-07-10 06:15:56 +00:00
taylor e6d7a73936 various thruster fixage from the Xt tree (should fix Mantis #1450) 2008-07-10 05:58:51 +00:00
taylor 4c4f9c2f40 fix HB being sent after server disconnect (made games show up for up to 10 minutes after they had ended)
make the chat channel count update more than once, since that didn't appear to work very well
fix compile error with GCC 4.3
2008-07-10 05:10:31 +00:00
Goober5000 4a1b284a75 the second half of the Mantis #1271 fix 2008-07-10 03:44:45 +00:00
Swifty 1ebe92c298 Mantis 1707: fix for FTL warp effect going out of bounds. 2008-07-08 16:17:49 +00:00
Goober5000 19ae04a0ed d'oh -- fix Mantis #1271 2008-07-08 08:03:31 +00:00
karajorma bc476caf32 Couple of small changes to make the Standalone work again. 2008-07-07 08:46:17 +00:00
Goober5000 b1ee5abc98 fix incompatibility in sexps between retail and SCP 2008-06-26 21:18:46 +00:00
phreak e091be7029 Properly autocenter the missile models in the techroom. 2008-06-26 02:52:51 +00:00
Wanderer d7f1185001 added startMission lua function 2008-06-24 12:27:49 +00:00
phreak 55a690acc9 Fix mantis #1710 2008-06-23 22:09:04 +00:00
karajorma dd2e35987e Allow capship beams to take full credit for their kills if a flag is set. 2008-06-23 20:47:26 +00:00
karajorma e25b4b9ede Doh! 2008-06-23 19:01:08 +00:00
karajorma 735cd692d4 Fix a bug that meant players sometimes didn't get an assist is someone had already earned one.
Make it possible to decide what percentage of the damage a ship receives earns you a kill.
2008-06-23 16:27:14 +00:00
WMCoolmon 76ebe01fb5 The new scripting hooks for mouse/keyboard. 2008-06-23 07:50:47 +00:00
Swifty 1f3f6c9477 Even more accurate HUD reticle offset calculations. 2008-06-23 07:39:01 +00:00
phreak df32ef88fd Get rid of my mixed case old username. 2008-06-23 01:58:02 +00:00
phreak f384c35cdc Fixed filename cases in the code, fred2, and freespace2 project files. The files were originally mixed-case (from fs2-public) and the mixed-case names would be restored when saving the files. This didn't sit too well with SVN. 2008-06-23 01:54:33 +00:00
karajorma d609834b15 Change No Debrief to Toggle Debrief. It will now turn on debriefings for dogfight missions (Which otherwise get the kills matrix). 2008-06-22 16:57:35 +00:00
karajorma da20f59f1f Add the Hide-ship-name ship flag 2008-06-22 16:55:29 +00:00
Swifty 3a3d9109a2 Fixed inaccurate slewing HUD reticle as pointed out by Goober. 2008-06-22 08:24:57 +00:00
Goober5000 37ea36891a added missing TrackIR offsets in FS1 HUD code
disabled the entire HUD nose offset system until Swifty can fix the centering algorithm
2008-06-22 04:02:07 +00:00
taylor eb584295e9 fix compiling on F9 (per the standard, limits.h isn't implicitly included) 2008-06-19 04:36:26 +00:00
karajorma f3719c08b3 I'm fairly sure FRED shouldn't be calling that function. Certainly not for BtRL at least as it was causing a crash. 2008-06-18 22:24:56 +00:00
phreak 3a1335e388 Fix for mantis #1691: Ships disappear at stage 2 of knossos warpout. 2008-06-15 21:02:18 +00:00
Wanderer b8aa96c950 fix for the detail box parsing (issue reported by Water) 2008-06-13 13:18:43 +00:00
WMCoolmon bb78757a68 Move gr_reset_clip into draw_model_rotating, and don't assume that if a NULL closeup pos is passed that it's a missile. 2008-06-11 22:38:28 +00:00
phreak 5ee521d326 fix mantis #1682 - weapon ship collisions not applying to ships beyond the warpout clip plane. 2008-06-10 01:14:32 +00:00
phreak 0743335dcd Shoudln't forgetting a return statement be an error and not a warning? 2008-06-10 01:13:48 +00:00
phreak 5cb5795651 Mantis #1676 - Prevent particles from appearing during warpout and the particle emitter is beyond the clip plane. 2008-06-09 22:27:21 +00:00
Wanderer cfbf53c3e7 Fix for mantis #1687 (corkscrew missiles and turrets) 2008-06-09 08:11:27 +00:00
phreak 90a864aca9 Added SSE/SSE2 build configurations. These builds are are optional versions of the release builds with SSE/SSE2 instruction support. 2008-06-09 01:10:43 +00:00
phreak cd2ffd46a0 Added additional compiler optimizations for release builds. 2008-06-08 23:53:12 +00:00
phreak 4eb2cb8769 Add Visual Studio 2008 project files.
The release builds have been configured to use Multi-processor support (/MP) when compiling.
2008-06-07 23:59:05 +00:00
phreak 1de126062c Alpha blending and line widths for radar orb rings when in HTL mode. 2008-06-03 00:18:58 +00:00
Wanderer 08231420f3 fix for cutscene jerkyness (part of mantis #1697) 2008-06-02 20:51:50 +00:00
Wanderer 3f86aeea6a fix for the Mantis #1703 (debris and alt names) 2008-06-02 06:28:13 +00:00
phreak 5950239733 Render the radar orb using HTL. It still wasn't doing that after all these years. The original rendering method is still in place. 2008-06-01 17:54:02 +00:00
Wanderer 351798d60a Fixes beams have migrating firing points (Mantis #1688)
Prevents simultaneously fired weapons from sharing firing points.
2008-06-01 10:50:28 +00:00
phreak bb40204deb minor bugfix, readability. 2008-05-30 17:05:11 +00:00
Backslash 24f635f858 Minor typos. Also an fspeed -> speed change. 2008-05-30 03:33:27 +00:00
Wanderer 86028e259a removed a couple of unreferenced variables 2008-05-29 15:46:09 +00:00
phreak 48b32596ea -Fixed null pointer exception in beam_delete()
-Got Targeting Laser to sort of work, it paints, but does not render.
2008-05-29 03:54:33 +00:00
Swifty b1c8653559 Various 'pit bug fixes. Prevent TrackIR users from leaning back. Removed superfluous ApplyViewShake from game_render_frame_setup(). Fixed zbuffer clipping bug for separate cockpit POFs. 2008-05-29 03:31:46 +00:00
Swifty ccc4024779 Modified fireball handling; ship class or type specific explosions. 2008-05-29 03:26:23 +00:00
karajorma 2fad17854b Fix a couple of those pesky scoping in for loops problems. 2008-05-26 16:39:59 +00:00
karajorma 6560970097 Blowfish's port of Turey's ship template code. 2008-05-26 15:54:29 +00:00
karajorma 053ca35f9a Display the pilots score in the barracks. 2008-05-26 13:40:07 +00:00
karajorma 2972870484 Fix the primary weapons won't cycle bug (Mantis 1673) 2008-05-26 13:36:01 +00:00
karajorma b74a41c2d4 Allow priorities higher than 89 for orders in FRED. Clean up unused parameters from several AI methods. 2008-05-26 13:29:53 +00:00
Backslash 2e1761113d Fix to not play the flyby sound repeatedly for a stupid reason when viewing from another ship. (The player is NOT always the center of the universe.) 2008-05-26 06:59:00 +00:00
WMCoolmon b8b64e3352 Scripting:
- Add On Mission Start, On Mission End hooks; swap Warpin and Warpout to Warp In and Warp Out
- Safer handle helper structs
- Improved math, eg matrix interpolation and vector multiply/divide
- Filesystem read AND write support
- Initial scripting orders support
- Better waypoints support
- Assorted requested scripting functions
bmpman:
- Safer bm_get_filename
cfile:
- Support for RW, rather than just R or W, file modes.
model:
- Safer texture_info struct. Taylor, I know we talked about this, but I realized that it was just a lot better for what it does and it shouldn't be too much trouble to replace with the new system (operations tend to be much more concise and clear). Let me know if any unexpected difficulties arise.
2008-05-25 22:52:05 +00:00
WMCoolmon 1cbaecd4e0 Fix signed/unsigned mismatch 2008-05-25 20:13:52 +00:00
WMCoolmon d59634ca52 Don't quit the game when -output_sexps is used, and move the bulk of the code to a more appropriate location. 2008-05-25 20:13:35 +00:00
WMCoolmon 94902539b9 Fix a null vec_normalize bug from additive weapons 2008-05-25 06:29:59 +00:00
Backslash 5a8059237f More end_string_at_first_hash_symbol stuff -- targetbox orders, docked ships, message senders 2008-05-25 02:55:56 +00:00
Backslash d6fd347097 Whoops, wrong repository. Quick correction. 2008-05-24 06:55:19 +00:00
Backslash d921d227aa bump MAX_ALT_TYPE_NAMES 2008-05-24 06:44:29 +00:00
karajorma 9e949b7876 Fix bug where wings with only one ship would ignore orders 2008-05-23 20:24:47 +00:00
phreak f59778601f remove references to cloaking code. 2008-05-17 17:35:55 +00:00
phreak ef13cee351 Mantis #1462
non-local SSMs home in on objects instead of points to they can track moving targets.

ship_apply_tag and ssm_create take "team" arguments now to indicate which team fired the ssm strike.

ship-tag sexp also has an optional team argument added.  Team 0 is used if the team is not defined.

missiles that are fired without a parent and are locked will travel at their max velocity and not 1/4 of their max.

bugfixes where sometimes an animation may sometimes have a duration of zero and cause an infinite loop.
2008-05-16 01:29:19 +00:00
karajorma 43b7a32e84 Fix a crash when using <argument> with a numeric variable (Mantis 1656) 2008-05-15 22:42:38 +00:00
karajorma 80613cbecd Fix various crashes, assertions and Int3s caused by SEXPs unable to find subsystems after the player changes class during loadout. 2008-05-14 19:36:17 +00:00
taylor 91a4a37dff hopefully fix order issue from future wing waves (Mantis #1683) 2008-05-06 00:13:52 +00:00
taylor e87a7dab2a damn, that was pretty stupid of me (Mantis #1684) 2008-05-03 19:38:00 +00:00
taylor 5c586a856e remove old warning messages, that stuff should be added on an as-needed basis when debugging only 2008-05-03 04:47:51 +00:00
taylor f6ae457e8e make table crc spew use the proper table list 2008-05-03 04:46:42 +00:00
taylor c2d776e6da add missing break statement to get rid of unidentified packet message 2008-05-03 04:45:17 +00:00
taylor b24dad0929 some stats fixage 2008-05-03 04:44:22 +00:00
Backslash 1c1dd26842 Lock turrets on ships that have already split apart. This way firepoints don't go with the 'wrong ship half'. Nice work, Wanderer.
Good idea, blowfish -- this is a much better solution than locking during deathroll (which was proposed by _argv[-1] ages ago).
2008-04-30 07:36:29 +00:00
Backslash 4f8bec4bbc Add "orders hidden", "orders shown", and "wing name hidden" to iff_defs.tbl flags.
Use these flags instead of wcsaga command line for certain HUD displays.
2008-04-29 05:26:34 +00:00
Backslash 88fda15d68 One more little change involving #. Stupid pointers... 2008-04-24 02:16:10 +00:00
karajorma 17c2b2402e Nope. I don't know why I thought that would work either. 2008-04-22 10:13:43 +00:00
karajorma 3da62509d3 Fix ship-subsys-guardian-threshold so it can be used with ships in loadout.
Add the set-persona SEXP
2008-04-20 18:31:47 +00:00
Backslash 53610c612d Whoops, apparently we missed a bit of the turret fix. Working now. 2008-04-17 04:34:54 +00:00
Backslash c88b7eaba6 A few more tweaks for ship name end_string_at_first_hash_symbol support.
Make FPS and status displays hide when hud is toggled with shift-O.
2008-04-16 03:21:37 +00:00
phreak 0fac568eb9 Use the weapon object and not the weapon_info object when determining when a flak shell should detonate. Mantis #1662 2008-04-16 02:51:26 +00:00
taylor c900e2aed0 remove libreadline dependency since we don't need it and can't use it anyway 2008-04-12 22:18:01 +00:00
karajorma 5b034f2ec1 Fix the Stars slider so you can have none. Fix a problem with the SEXP argument numbering fix. 2008-04-12 20:18:44 +00:00
taylor 78411fff27 make SEXP argument numbering go by 5's, and change to bitmaps to try and be a bit more readable (Mantis #1517) 2008-04-07 22:07:06 +00:00
taylor d827cb097f try and handle FSO version comments better (should fix Mantis #1284 and #1639) 2008-04-07 22:01:30 +00:00
Backslash 9034f927ca Whoops. Don't actually change the name, just the displayed name.
Also, don't forget the alternate type name.
2008-04-07 00:18:19 +00:00
Goober5000 b57659088f remove obsolete ship flag 2008-04-06 23:37:21 +00:00
Goober5000 04d40fc90b merge the selectable Command feature (from 1/2007) into the stable branch
rearrange the Mission Specs dialog while we're at it
2008-04-06 23:26:33 +00:00
Backslash c3bd711fbc Apply end_string_at_first_hash_symbol to ship names now.
This way people can use # to name duplicates of ships for fake nanojumps and other stuff like that, instead of Unicode characters.
2008-04-06 23:00:20 +00:00
phreak 7f7f210222 Added support for multiple child weapons per parent weapon. 2008-04-06 21:56:08 +00:00
karajorma c12adc8894 Fix Mantis 1649 2008-04-06 18:53:01 +00:00
taylor c97c2a69ff keep track of primary weapons properly for multiplayer (Mantis #1094) 2008-04-05 13:39:21 +00:00
Backslash 5cc9a1f9b6 Guess this had only been committed to the former HEAD.
Make max_speed based on max_vel.xyz.z, so that we don't have a strange maxmimum throttle when the ship is capable of x/y movement.
2008-04-04 15:15:06 +00:00
taylor 1bda030371 make background import from FSO missions work if there is only one list (Mantis #1640) 2008-04-04 13:46:37 +00:00
taylor 8ee4c82cc3 be sure to properly update shields, afterburner energy, max speed, cm count and set initial
model_anim state through change_ship_type()   (Mantis #1512, #1594, #1645)
2008-04-04 03:17:01 +00:00
taylor 7e9d1f569c be sure to apply special explosion to all selected ships (Mantis #1634) 2008-04-04 03:10:45 +00:00
taylor 43080e354d disable PBO support for the time being (causes hangs under OS X for some reason) 2008-04-03 22:01:47 +00:00
taylor 4ae950a25a add back Bobboau's "check hull" turret subsystem flag support 2008-04-03 16:47:03 +00:00
Backslash 6425bfa877 Whoops, that beam chargeup particle fix only worked with certain table settings. This should work for everything. 2008-04-03 15:33:03 +00:00
taylor 770cb74b75 fix sorting of create list so that it properly sorts mission names
add CTRL+SHIFT+S hotkey to switch bewteen mission and file name sorting
2008-04-03 03:39:13 +00:00
taylor 1764452f2e remove all special_ship hack and just handle it all properly: keep wing order correct regardless of object order 2008-04-03 03:37:56 +00:00
taylor 52ff8f203f add a timeout for getting pilot info (part of Mantis #1652) 2008-04-03 03:35:26 +00:00
taylor 3082b39d84 make mission/campaign list dynamic (Mantis #1203) 2008-04-02 23:54:56 +00:00
taylor b2f4db28a1 /strchr/strrchr/, for mission filenames (Mantis #1629) 2008-04-02 23:54:25 +00:00
karajorma 2784594915 Add the is-player SEXP 2008-04-02 18:38:12 +00:00
Backslash 2c44f78b0a Tweak the lead indicator code to not just work with primaries -- now, dumbfire secondaries show the correct position.
Also, make it work when the target is stationary but "$use additive weapon velocity" is set.
Fix a couple typos and warnings.
2008-04-02 14:19:06 +00:00
taylor c2d16a3f7c remove multi_elements thingy since it caused problems for some ATI users, and it was kinda crazy anyway 2008-04-01 22:06:17 +00:00
taylor dfe44f8fcb make sure not to carry swarm/corkscrew missile fire to another bank when the first one is out of ammo (Mantis #464) 2008-04-01 20:04:04 +00:00
taylor 6388a789eb bah, that flag check was wrong since the initial commit to the unstable tree 2008-04-01 10:00:09 +00:00
taylor 5d8e057994 skip .svn directories when packing (for sanity sake when packing versioned data)
just skip files that have names too long rather than bailing
2008-04-01 06:31:55 +00:00
taylor 6938df2d3b be sure to skip filenames that are too long in cf_get_file_list() too, since we still need them to be of a certain size later 2008-04-01 06:30:05 +00:00
taylor 46e470cddc add missing check for "use multiple guns" so that it actually does something (Mantis #867) 2008-03-31 19:42:33 +00:00
taylor 339e75eba6 fix subtitle centering for non-1024x768 resolutions (Mantis #1630) 2008-03-31 13:51:39 +00:00
taylor f4b5f9d948 fix the "carry no damage" stuff to actually work right and distribute the proper amount of damage (Mantis #1638) 2008-03-31 13:08:45 +00:00
taylor 51e1579651 if no paths then don't try to allocate memory for them (avoids Int3() check in vm_malloc from requesting a size of 0) 2008-03-31 12:59:10 +00:00
taylor b1538b73f9 fix "generate icon" flag check for hud shield icons and add some compatibility handling for old data (Mantis #1646)
clean up ballistic primary fixage so that it doesn't run more than it needs to and doesn't end up "fixing" it's own mess
2008-03-31 12:57:34 +00:00
taylor bb84517520 bring OS X stuff up to date 2008-03-31 01:39:17 +00:00
taylor 020217e366 line sizes are figured at EOL breaks, so be sure that we account for those when splitting too (Mantis #1152) 2008-03-31 00:02:54 +00:00
Backslash bf4a37b49a Pretty sure it was agreed we could bump MAX_MISSION_MESSAGES until the dynamic code was finished. WCSaga and BtRL can't work on some missions without this. 2008-03-30 20:06:14 +00:00
Backslash d2aef93e07 Add $Max Turret Target Ownage and $Max Turret Player Ownage to ai_profiles.tbl
This is to customize the number of turrets on a ship allowed to fire at the same thing.
2008-03-30 19:49:42 +00:00
taylor 0374e48b7b crap, that did need to be a float to work properly (fixes wobbly hud from r4561)
also be sure to handle the overflow case in HUD_get_nose_coordinates()
2008-03-30 08:53:50 +00:00
taylor d9dc91702e don't mess with mainhall sounds directly in the movie code (should fix Mantis #1539)
be sure to stop the ambient mainhall sound when playing a movie through the cutscene viewer
2008-03-29 20:25:07 +00:00
taylor 6f702c9cdf fix various compiler warnings 2008-03-29 06:30:20 +00:00
taylor 87540ece9d some minor optimization and cleanup 2008-03-29 05:22:28 +00:00
taylor 979b1279b7 changes for Fred_texture_replacements to get that crap off of the stack and stop wasting memory (it was about 2.3meg wasted on non-Fred!!) 2008-03-29 02:11:19 +00:00
taylor 189c9f7b1c cheap build capability support for the launcher
(remains comapatible with older hack, but also allows detection of D3D or not)
2008-03-29 02:07:46 +00:00
taylor 0f42a2ee02 add optional string for +reverse_delay and default it to 0 for trigger type animations (Wanderer #27) 2008-03-28 20:29:31 +00:00
taylor 68293d8c96 some minor mprintf() cleanup 2008-03-28 03:32:38 +00:00
taylor 4210dcea3d use strrchr() to be sure that we get the last occurance of any "." (Mantis #1587) 2008-03-28 02:18:59 +00:00
taylor 92f8176608 make FRED use audiostr for audio previews instead of the Win32 mm API (Mantis #853) 2008-03-28 01:13:35 +00:00
Backslash 85b6cc79f3 Make generated muzzle particles' initial velocity match the parent ship -- this way they stay around the turret and don't go trailing behind. 2008-03-25 02:44:24 +00:00
WMCoolmon ad44682965 Maybe-fix TVWP bug 2008-03-24 05:27:00 +00:00
taylor 6ebf063bc8 fix broken ballistic weapons 2008-03-24 03:37:26 +00:00
WMCoolmon aae20c42ca Fix for mantis 0001527 2008-03-23 08:34:45 +00:00
WMCoolmon 894ff3772b Fix for mantis #0001580 2008-03-23 08:19:16 +00:00
WMCoolmon eb4d79bbb8 Fix for mantis 0001637 2008-03-23 07:33:11 +00:00
WMCoolmon 4d3de425ae $Application hook for mantis 0001574 2008-03-23 07:00:54 +00:00
WMCoolmon 3531414481 Lua 5.1.3 SDK (supposedly a bugfix update, so makefile updates should not be necessary) 2008-03-23 06:08:09 +00:00
WMCoolmon e17e99ae5d - Nearly all functions and variables have one return type, which defaults to 0, "", or an invalid handle if the function fails.
- All functions use seconds for time
- Syntax update for scripting.html
- Minor bugfixes
- gamestate and gameevent handles
- getState is now getCurrentGameState
- setEvent is now postGameEvent
- drawMonochromeImage arguments reduced in anticipation of agreeing with drawImage arguments
- Fixed numerical indexing of weapon classes
2008-03-23 06:07:23 +00:00
WMCoolmon 2f26f541be Add gameseq_get_event_idex. 2008-03-23 05:42:37 +00:00
WMCoolmon 0ce07ad573 MSVC 2003 Project File update 2008-03-22 19:55:46 +00:00
Goober5000 296aea3fea make the self-destruct sexp actually work for more than one ship 2008-03-22 03:59:29 +00:00
Goober5000 0a6d60928b fix the build naming convention 2008-03-22 01:52:17 +00:00
Goober5000 3b16659dcb apply WMC's patches for MSVC 6 2008-03-22 01:39:18 +00:00
phreak 91a447fa6c fix visual studio 2005 project files. 2008-03-21 22:31:11 +00:00
karajorma bcdce2440e Remove a couple of extra Int3()s in the transfer-cargo SEXP. 2008-03-21 21:49:50 +00:00
karajorma a303e19793 Add SEXPs and table entries to WMCs subsystem name changing system 2008-03-21 20:25:12 +00:00
taylor b227c37df0 bah, that wasn't supposed to hit just yet 2008-03-21 04:47:13 +00:00
taylor bb67f25e0a make sure that beam bitmaps are always loaded (like normal weapons are handled) 2008-03-21 01:57:19 +00:00
taylor 37aafcd18d side-turret patch from KeldorKatarn 2008-03-20 22:18:33 +00:00
taylor adf99d86a7 update to newest FS2NetD client code 2008-03-20 21:29:41 +00:00
taylor 94a9815dd7 add new files 2008-03-20 21:17:09 +00:00
taylor fdfcf3b368 change gr_set_cull() so that it works better (mainly part of the RTT fix) 2008-03-20 20:18:49 +00:00
taylor e83148bbb9 remove old files 2008-03-20 19:38:24 +00:00
taylor c8d4a09066 use specific intermediate directories to prevent clobbering of same-name files (particularly with lua) 2008-03-20 19:37:36 +00:00
taylor cac475bdd5 remove storybook, since the fiction viewer makes it obsolete 2008-03-20 18:55:16 +00:00
taylor 16fceaf5f5 fix Mantis #1636, thanks to VA for doing all of the leg work :) 2008-03-20 18:47:55 +00:00
taylor 6f35644a17 try to deal with processor affinity automatically (defaulting to CPU #2, and with registry setting override) 2008-03-20 18:41:23 +00:00
taylor 57f9d83978 add new files 2008-03-20 18:39:12 +00:00
taylor 639c57bfae fixage 2008-03-20 18:37:53 +00:00
taylor 0b7c61e120 little bit of cleanup 2008-03-20 18:37:16 +00:00
taylor ad0ce72be1 should be the last bit of the fix for Mantis #1520
various bits of little cleanup
2008-03-20 18:35:31 +00:00
taylor 7bb2949ce0 fix memory leak
address some compiler compaints and add a newline to debug message
2008-03-20 18:26:58 +00:00
taylor 3d6aa523f8 fix some variable types/init 2008-03-20 18:25:08 +00:00
taylor ee07a04e57 handle movie filenames and debug reporting better 2008-03-20 18:23:05 +00:00
taylor 72ad0b2547 this stuff really isn't working that well so disable it for the time being 2008-03-20 18:20:06 +00:00
taylor 810362afa4 handle lobby server diconnects in a more friendly way (Mantis #1600) 2008-03-20 18:17:51 +00:00
taylor 5481bfef20 keep track of whatever our previous state was (useful for better event handling) 2008-03-20 18:16:28 +00:00
taylor b373ebd8d9 we do actually pass invalid socket ids during init stuff so don't complain about such things in the log 2008-03-20 18:11:52 +00:00
taylor 3ab1f4ab32 add handler for bad channels (Mantis #1603) 2008-03-20 18:09:15 +00:00
taylor bbf94ec248 add better checks to catch connect() errors
bit of cleanup on win vs. non-win code
2008-03-20 18:08:12 +00:00
taylor 3f1467e918 fix NaN on pilot stats interface from float div-by-0 2008-03-20 18:06:07 +00:00
taylor af89adbdc1 change WSAEWOULDBLOCK to EINPROGRESS since that is what we were actually looking for on non-Windows 2008-03-20 18:03:58 +00:00
taylor 8f681c580c bump size of error text buffer
slightly better Lua error reporting
2008-03-20 18:02:51 +00:00
taylor 3726de1309 use VALID_FNAME checks to determine if a thruster filename is good and then re-init the entry to sane values if not 2008-03-20 17:57:01 +00:00
taylor b331d17cc1 little bit of cleanup (and we don't really have to Assert() there) 2008-03-20 17:55:51 +00:00
taylor 1c3f1a416b wing parse order and object parse order aren't always the same so be sure we tag the correct "special ship" (part of Mantis #1520) 2008-03-20 17:53:55 +00:00
taylor cdb611e159 changing soundtrack via sexp shouldn't require that a soundtrack is currently playing (Mantis #1631) 2008-03-20 17:50:48 +00:00
taylor ef046fc010 better checks for connect() errors, since the select() test can pass by mistake 2008-03-20 17:47:02 +00:00
taylor 0bb4c916e2 tweaks for slightly more efficient file matching
minor cleanup
2008-03-20 17:45:31 +00:00
taylor b5ef08a678 add proper lua flags for non-Windows builds
extra compiler warnings and lua checking for debug builds
2008-03-20 17:41:27 +00:00
taylor f15cd0821e remove Anjuta project (it's very out of date and I don't think anyone ever really used it anyway) 2008-03-20 17:39:15 +00:00
taylor 2156b36f81 remove luac.c since it is a seaparate binary and not actually part of the lua lib 2008-03-20 17:38:25 +00:00
taylor 38879ad798 copy of current stable to unstable (to be merged with unstable-old) 2008-03-16 16:28:57 +00:00
taylor 11ca1ef4a8 move stable branch to the primary under trunk 2008-03-16 16:25:19 +00:00
taylor eb8c44c2a0 move HEAD to it's own dir under trunk 2008-03-16 16:21:11 +00:00
WMCoolmon 84b33dd636 Quick patch to optimize camera code, and fix it when being used by any camera which does not use the internal movement code. 2008-03-15 21:06:39 +00:00
WMCoolmon c6da54a685 Update MSVC2003 project to compile with TrackIR and objectshield.cpp 2008-03-15 20:46:30 +00:00
WMCoolmon c1a163b0f3 Add objectshield.h and include it in files that require it. 2008-03-15 20:46:07 +00:00
WMCoolmon 7ac8ccf326 Camera code 2008-03-15 20:31:57 +00:00
WMCoolmon 76a3863323 Project file updates and minor code corrections. 2008-03-15 09:48:04 +00:00
Backslash f580335cff Freelook, Target padlock and TrackIR patch by Swifty. Very nice!
Don't forget to add code/io/trackir.* to your projects!
2008-02-29 04:28:13 +00:00
karajorma 57971b6cc1 Fix Mantis 1608
Fix a multiplayer issue with the force-jump SEXP
2008-02-25 11:14:33 +00:00
Goober5000 a70616d346 fix Mantis #1592 2008-02-20 07:47:16 +00:00
Goober5000 deb6c62d6e this is dumb; I didn't even use the formula correctly 2008-02-20 07:45:35 +00:00
WMCoolmon 9a5902fa48 Minor scripting optimization 2008-02-17 04:31:49 +00:00
Goober5000 4811257f31 revert the directory move 2008-02-09 21:33:46 +00:00
Goober5000 8909d048b3 remove extraneous fs2_open folder from all branches and tags 2008-02-09 19:21:05 +00:00
taylor 3ff967bbf6 set eol-style to LF for all code
set eol-style to CRLF for MSVC6 project files (since Windows needs it this way to load them)
2008-02-08 23:08:13 +00:00
Backslash 9058461a40 Mantis #0001488. The cases are depreciated, wouldn't compile using newest SDK. 2008-02-08 07:29:44 +00:00
taylor ea54b21210 remove old ignore files from CVS conversion 2008-02-06 13:31:14 +00:00
taylor a12559604d remove old CVS info 2008-02-06 13:29:03 +00:00
Backslash b962c76f77 Bump MAX_MISSION_EVENTS and MAX_WINGS limits.
Ideally someone can make this dynamic later... maybe me when I have time to learn how.
2008-02-01 08:03:29 +00:00
Goober5000 384a837106 allow FS1 hud to be displayed in FS2
(many thanks to the icculus project for blazing the way)
2008-01-24 03:53:36 +00:00
karajorma 9209b7cdf8 Fix for Mantis 1150 2008-01-20 17:18:06 +00:00
Goober5000 4a51724826 implement the targeting cutoff properly (Mantis #1468) 2008-01-19 01:23:41 +00:00
Goober5000 3e441af432 we all got led down the garden path there! revert all radar range modifications 2008-01-19 00:27:43 +00:00
karajorma 7523609229 Fix for Mantis 1516 2008-01-18 23:13:05 +00:00
Goober5000 1fb5ebdec6 back out the MOI fix 2008-01-18 17:59:53 +00:00
Goober5000 4807df77a7 warn users when they run a campaign under the wrong mod 2008-01-17 07:44:43 +00:00
Backslash d6dbaaad07 Fixed set-object-speed sexps. Thanks for the inspiration, Keldor! 2008-01-16 10:15:21 +00:00
karajorma c72bb295d8 Add SEXPs for determining the players score and how many respawns they've used. 2008-01-12 08:42:34 +00:00
wmcoolmon 36a3db1b4f hud_get_draw() 2008-01-05 02:39:42 +00:00
wmcoolmon 5ef89182ad Ze Viewer_pos...it does nothing! 2008-01-05 02:33:41 +00:00
karajorma a4affa4836 Catch-up update. This stuff is all in 3.6.9 but somehow missed being added to HEAD. 2007-12-30 18:30:29 +00:00
turey 53bf13728c Added Fiction Viewer files to project. 2007-12-25 04:05:26 +00:00
turey 4fb0af17fe Small fix for sim hull stuff. 2007-12-24 19:48:14 +00:00
Backslash f11e846da0 Glide When Pressed key works now!
Also, a fix to the engine sound so that it stops playing when the throttle is at 0.  (It used to just stop looping -- but in BtRL for example the sound is 20 seconds long.)
2007-12-22 09:36:17 +00:00
karajorma 7d6ea5aa16 Fix the Number Used in Wings display in FRED so that it does what V probably intended it to do all along. 2007-12-19 10:54:26 +00:00
wmcoolmon 29cd3d363f Move the camera functions into the 'mission' library 2007-12-15 09:52:28 +00:00
wmcoolmon 1d251606ee Maybe-catch an interesting crash upon attempting to revert a mission with no cargo. 2007-12-15 09:41:43 +00:00
wmcoolmon 649547106b Handle missing ship model files more gracefully 2007-12-15 09:12:57 +00:00
karajorma 0830a04d07 Unbreak FRED compiling 2007-12-15 07:41:13 +00:00
karajorma 217f33e5dd Fix the Run Freespace option in FRED 2007-12-08 20:02:16 +00:00
Goober5000 292d580264 patch hole in the state machine fix 2007-12-08 04:07:00 +00:00
Goober5000 c4d7756c7e catch invalid bounding boxes caused by buggy POF editors ;) 2007-12-03 04:47:02 +00:00
Goober5000 dd7cb206f2 watch out for bad MOI values 2007-12-02 08:21:50 +00:00
wmcoolmon 1b2b5d9f64 MOI access 2007-11-24 10:41:22 +00:00
wmcoolmon 8ca81a5d72 More script-eval functionality; additional matrix functions 2007-11-24 10:14:58 +00:00
wmcoolmon 88e0ed924a Fix script-eval and script-eval-num 2007-11-24 08:55:21 +00:00
wmcoolmon 708aa238d1 - Asteroid, debris, and ship collision damage type support
- Scripting system variable-setting optimizations
- Standardize override style
- Reinstate "Self" variable for HUD
- Automatic drawString moving-to-next-line
- Visible subsystem name can be changed through scripting; will not be changed in the log
- Fix many for-loop signed/unsigned warnings related to size()
- Asteroid, debris scripting collision handling
- Many, many additional Lua functions and variables
- Fix the dreaded random-Lua-parse-crash bug
- Fix struct array malf-ups due to flag_def_list change
2007-11-23 23:49:42 +00:00
wmcoolmon ad1dc44fe6 Improved nonwindows Lua errors 2007-11-23 23:48:21 +00:00
wmcoolmon cf2e36822d Update MSVC2003 project files & fix debugging 2007-11-23 23:46:28 +00:00
wmcoolmon 3306b3b88f weapon_armed update 2007-11-23 23:32:27 +00:00
wmcoolmon eada545787 Detect and warn when bad axis readings are loaded from a pilot file (Causes crashes on axes_values[Axis_map_to[i]] in control_get_axes_readings 2007-11-23 23:25:15 +00:00
wmcoolmon b246becf8b Misc. fixes 2007-11-23 23:22:34 +00:00
wmcoolmon 743db01d09 Fix array malfup due to flag_def_list change 2007-11-23 23:17:45 +00:00
wmcoolmon 1478ccabed Fix un/signed warnings related to size(), optimize Knossos-finding 2007-11-23 23:17:16 +00:00
wmcoolmon 7337df79bb Fix un/signed warning due to size() 2007-11-23 23:16:44 +00:00
wmcoolmon e4b5fc4495 Fixed array size, as it looks like it has to be the say as NUM_JOY_AXIS_ACTIONS 2007-11-23 23:08:32 +00:00
wmcoolmon 8a7be7bacd Updated event editor with minihelp box and numbered icons 2007-11-23 23:05:42 +00:00
wmcoolmon a5d7e9faf6 Fix compiling under HEAD branch. 2007-11-23 21:58:10 +00:00
taylor 9ce231dde1 oops! not ready to commit that part just yet :D 2007-11-22 05:49:36 +00:00
taylor 2d3e798704 bump node allocation increment (when you are regularly realloc'ing 20-30 times, the increment is too low :)) 2007-11-22 05:36:06 +00:00
taylor e1603519d6 better case for making sure that a missing ship anim doesn't lead us to a horrible death
minor cleanup
2007-11-22 05:31:18 +00:00
taylor 343a9ddf34 fix some missing cleanup 2007-11-22 05:25:22 +00:00
taylor 5dbd5674d0 fix campaign is missing then give player choice to switch campaigns, switch pilots, or exit 2007-11-22 05:23:44 +00:00
taylor d982a4e09d no reason to if-else the hud multiplier if it simply defaults to 1.0
add a little sanity checking for hud mutiplier tbl value
2007-11-22 05:19:09 +00:00
taylor ccf5133e77 try to deal better with gamma setting/resetting when minimizing/restoring the game (Mantis #1210) 2007-11-22 05:11:38 +00:00
taylor 11e996ead5 minor fixes and cleanup for the warp effect
change scale of 3D warp effect to better match up with size of 2D effect
2007-11-22 05:02:44 +00:00
taylor 2efd3118ca add/remove some old, forgotten, and new files 2007-11-22 04:52:30 +00:00
taylor ff24431168 initial support for cursors that are larger than 32x32
fix bug where animated cursors would be constantly loaded/unloaded
2007-11-22 04:49:58 +00:00
taylor dbb4da29fd cleanup/fixage for fade in/out function (Mantis #1186) 2007-11-22 04:43:47 +00:00
taylor 3ac4910531 be sure that we hide the game's mouse cursor (Mantis #1401) 2007-11-22 04:31:12 +00:00
Goober5000 923970c0df add Wing Commander Saga's fiction viewer 2007-11-21 07:28:50 +00:00
turey 3cbacb9ff0 minor bugfix. 2007-11-21 04:53:31 +00:00
Goober5000 4d74f5065e fix ship-type-destroyed 2007-11-20 04:58:25 +00:00
Goober5000 3ef004c041 recognize a Vasudan main hall even when it isn't the second one; play the appropriate music as soon as the main hall switches 2007-11-20 01:11:13 +00:00
Goober5000 f969feccc5 clean up the state machine logic for starting games 2007-11-19 20:24:40 +00:00
Goober5000 2062e0a6e1 some minor enhancements to the skip mission cheat 2007-11-19 19:50:15 +00:00
Goober5000 f98de0bf55 remove warning... properly this time 2007-11-19 18:11:03 +00:00
Goober5000 2f24ae80d3 clarify what this flag is actually for 2007-11-19 06:22:35 +00:00
Goober5000 a438be202d add the merge_stats debug function (use with caution) 2007-11-19 02:39:47 +00:00
Goober5000 6f2eceec32 fix for Mantis #1503 2007-11-18 07:43:15 +00:00
Goober5000 44420357ff gak -- stupid mistake 2007-11-18 06:57:40 +00:00
karajorma 22e47c6883 Fix peristent variables in missions played from the techroom 2007-11-14 14:14:25 +00:00
taylor cc67f11e37 fix out-of-bounds issue from retail (Mantis #1518) 2007-11-09 01:32:54 +00:00
karajorma bc1c16ec46 This is better than the other way. 2007-10-29 18:45:45 +00:00
karajorma ae171165e8 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. 2007-10-28 15:38:18 +00:00
taylor b1bd0095c6 reset Perspective_locked at the start of each mission so that view controls don't get locked until exit 2007-10-23 20:07:42 +00:00
phreak 2b8adb6a03 Get rid of 1-letter and non-descriptive variable names. 2007-10-23 02:07:27 +00:00
phreak 9b4fe128b1 'phreak' is now all lowercase (and has been for some time now) 2007-10-22 22:23:22 +00:00
Goober5000 cfdbebdced fix a minor bug in the dockpoint system (affects sm2-07a in the Port) 2007-10-21 22:11:17 +00:00
karajorma 477eecadbc Typo 2007-10-12 20:30:02 +00:00
karajorma 68dc149369 Doh! 2007-10-12 14:53:40 +00:00
taylor b4c125fc9f fix bugs in beam-*-all and turret-*-all that made them always trigger an Int3() 2007-10-04 16:26:43 +00:00
taylor cbbf58dce6 get rid of some old/obsolete items (Mantis #1489 and #1497) 2007-10-04 16:18:46 +00:00
Goober5000 df268fd75e another fix by razorjack... parent is -1 when created by sexp 2007-09-30 22:37:08 +00:00
Goober5000 1a0af541af another patch by razorjack -- remove something that never worked 2007-09-30 22:28:29 +00:00
Goober5000 bada723958 a bugfix by razorjack 2007-09-30 19:01:18 +00:00
karajorma 1b611b0985 Fix x-builtin-messages so that the Any Wingman option works 2007-09-29 21:51:31 +00:00
karajorma d044cfd69e Upgrade the beam-x-all and turret-x-all SEXPs to accept more than one ship.
Add the allow-treason SEXP
2007-09-29 15:27:53 +00:00
karajorma 24ee8b8299 Fix the double respawn bug (Mantis 788) and hopefully the corresponding server Int3 (Mantis 1213) 2007-09-29 14:31:17 +00:00
turey 508b840561 Mouse defaults to enabled as suggested in Mantis bug: http://scp.indiegames.us/mantis/view.php?id=1498 2007-09-29 00:24:51 +00:00
turey c7d17dbb96 Final fix for mantis bug: http://scp.indiegames.us/mantis/view.php?id=1482
There should be no more occurrences of campaign missions being skipped.
2007-09-28 23:46:31 +00:00
turey 3a498e8369 "no primary linking" ship flag and related SEXPs - prevent a ship from linking primaries. 2007-09-27 06:55:39 +00:00
Backslash 01fb792275 Whoops, missed a couple lines for Length Unit Multiplier 2007-09-16 21:01:48 +00:00
turey cdb6a1652e More fixes related to Lua's waypoint lists. 2007-09-10 07:54:09 +00:00
turey d51ae53733 Fixes related to Lua's asteroids, debris, and waypoints. 2007-09-05 23:47:19 +00:00
turey bec5d40e49 More work on Mantis bug: http://scp.indiegames.us/mantis/view.php?id=1482 2007-09-05 23:42:18 +00:00
Goober5000 7393c43b55 fix the factoring on the shudder parameters (Mantis #1419) 2007-09-04 00:08:51 +00:00
Goober5000 22295daf0e re-add the code to disable the Windows key... this time, without slowing the system to a crawl when FSO is in the background 2007-09-03 22:19:56 +00:00
Goober5000 78351c5d5e roll back the windows key hook for now 2007-09-03 21:00:24 +00:00
Goober5000 d95afb7249 fix for 1376 2007-09-03 01:02:50 +00:00
Goober5000 b402ef2f45 fix for 1471 2007-09-02 20:07:47 +00:00
Goober5000 ab8e6674fe Shade's fix for #1329 (approximately) 2007-09-02 19:06:02 +00:00
Goober5000 ff92e17d22 fix for #1455 plus a bit of cleanup 2007-09-02 18:53:24 +00:00
Backslash ab15aeef10 2005 Project file cleanup. Changed a lot of paths to compiler macros.
Also gave Freespace2 project the inherited property sheet CoreWin.vsprops -- this lets Express Edition compile!
2007-09-02 12:02:28 +00:00
Backslash 900a7ca4ea (code by KeldorKatarn)
Reactivated HUD_ship_sent_printf to enable more flexible handling of ship names in displayed messages.
Added functionality for WCSaga to use class name instead of ship name for enemy wings.
2007-09-02 03:07:55 +00:00
Goober5000 46b0d001fb added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable 2007-09-02 02:10:29 +00:00
turey ac942a3e8b Extensions to Lua system regarding asteroids, debris, and waypoints. They're not heavily tested, but I haven't seen any crashes from them. 2007-08-31 20:47:17 +00:00
turey 9afb4c3803 Fix for Mantis bug: http://scp.indiegames.us/mantis/view.php?id=1482
Also, fixed an implicit cast that MSVC2005 choked on.
2007-08-31 20:37:20 +00:00
Backslash bae1a7ddf9 The long-awaited HUD $Length Unit Multiplier setting! (With lots of help from KeldorKatarn)
Multiplies all speeds and distances displayed by the HUD by a given constant multiplier. The value is declared in hud_gauges.tbl (right after $Max Escort Ships) as
$Length Unit Multiplier: 5
2007-08-30 04:52:30 +00:00
phreak 39820d30c5 destroyed-or-departed-delay needs to check for ships that have self destructed 2007-08-26 16:01:59 +00:00
phreak f0edc21dc8 Add WINVER define to the VC2005 project file so it shouldn't affect users of other compilers. 2007-08-25 15:37:43 +00:00
Goober5000 f4c677f52e tweaky move 2007-08-20 02:55:12 +00:00
karajorma 56d10dc5fa Fix for Mantis 1234 2007-08-19 22:15:41 +00:00
Goober5000 d96089346d bring wxFRED project files up to date 2007-08-18 02:23:13 +00:00
Goober5000 b0fed45f6a bring sexp into conformance with other sexps 2007-08-18 01:59:14 +00:00
Goober5000 20047fbdb6 generalize the way radar ranges are handled (inspired by Shade's fix) 2007-08-17 03:29:51 +00:00
phreak f9c2d75343 Local SSMs shouldn't jump into subspace if they're not homing. 2007-08-16 00:45:54 +00:00
turey d934358570 Typo fixed. 2007-08-15 20:36:42 +00:00
turey 9e213c43d4 set-object-position and set-object-orient now work in multi. 2007-08-15 17:10:25 +00:00
Goober5000 573b760410 okay... let's not redefine the Windows version 2007-08-15 07:16:35 +00:00
Goober5000 afef6062c7 disable the Windows key while FreeSpace is running (thanks to jr2)
c.f. http://www.hard-light.net/forums/index.php/topic,48838.0.html
2007-08-13 23:07:35 +00:00
Goober5000 db1b344879 some improvements to the pirate ship 2007-08-13 04:54:41 +00:00
Goober5000 ca7fa9fd7f some tweaks for a field that's mostly unused anyway 2007-08-11 16:52:02 +00:00
Goober5000 d6c7eafbc4 fix case-sensitive #include (Linux) 2007-08-04 22:30:02 +00:00
karajorma b07a119039 Reinforcements Editor bug fixed Sucka! 2007-08-03 19:50:43 +00:00
Goober5000 4904926ffb fix compile error 2007-08-03 01:37:05 +00:00
Goober5000 d062b8ace4 fix warning 2007-08-03 01:35:48 +00:00
Goober5000 535d26eb6e fix compilation issue 2007-08-03 01:17:10 +00:00
turey fe17ace454 Scales GUI Mouse movements correctly for non-standard resolutions. Doesn't affect gameplay. 2007-08-01 12:25:51 +00:00
Goober5000 8cfbe8b4cd allow embedded dashes in command-line options 2007-07-29 03:11:01 +00:00
karajorma c6e31edd61 Apparently I forgot to commit this to HEAD. Fixes Mantis 1437 2007-07-28 22:10:46 +00:00
Goober5000 071d1dc077 tweaks 2007-07-28 22:04:47 +00:00
Goober5000 f6d39d0d0e this should really be capitalized 2007-07-28 21:31:11 +00:00
Goober5000 fdb76062cb make the parse object array dynamic; also made the docking bitstrings dynamic 2007-07-28 21:17:56 +00:00
Goober5000 51334ec91b a couple of tweaks 2007-07-28 04:43:43 +00:00
Goober5000 ca7631694d AAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!!! 2007-07-28 00:37:38 +00:00
Kazan 93df301575 I <3 making stupid bugs (return camera to normal when not using cutscene bars) 2007-07-25 20:45:16 +00:00
Kazan 297e2f4bd1 two-part autopilot warp, add +No_Cutscene_Bars optional flag to autopilot.tbl 2007-07-25 14:51:14 +00:00
Kazan 9c92523a2d small tweak 2007-07-25 00:33:31 +00:00
Kazan fd04e92bbe oops 2007-07-24 20:31:00 +00:00
Kazan ec02ebba46 Make asteroid/debris fields interrupt autopilot, add "hazards near" message to autopilot.tbl, add use-nav-cinematics sexp, fix mantis #1441 2007-07-24 20:17:36 +00:00
Kazan 92f9bab464 Resolve Mantis 1281 2007-07-24 13:04:11 +00:00
Goober5000 b55196f2ef allow mission messages in dogfights (Mantis #1436) 2007-07-24 05:08:13 +00:00
Kazan 7e82836fad Resolve Mantis #1440 2007-07-23 22:45:00 +00:00
Kazan 1e8f7a1a96 remove unused function... unused function that should probably never be used 2007-07-23 15:56:42 +00:00
Kazan 1946f1c3f9 copy+pasted typo, now with extra hotsauce 2007-07-23 15:49:07 +00:00
Kazan 0f1a767110 typo correction in autopilot.tbl 2007-07-23 15:35:40 +00:00
Kazan 0f85089eb5 Autopilot upgrades as described, MSVC2005 project fixes 2007-07-23 15:16:53 +00:00
turey 21ff9f0ec5 Small bugfix relating to restoring engines from disabled via the set-subsystem-strength SEXP. 2007-07-19 05:44:00 +00:00
turey 1d57e7235a Made Backslash's change to dampening tied to an ai_profiles flag, as it does affect
retail behavior, and significantly affects gameplay in the BtRL Demo.
Also, fixed a typo.
2007-07-19 03:19:32 +00:00
turey 488497154a Small change to how Simulated Hull works. If ship is gone, it now has 0 Simulated
Hull.
2007-07-15 23:08:16 +00:00
Goober5000 4837b644b7 Kazan's VC2k5 project file fix (HEAD only) 2007-07-15 18:01:41 +00:00
Goober5000 12e609b75a Kazan's autopilot fix 2007-07-15 18:00:55 +00:00
Goober5000 2edde0f16b fix and clean up the warpout conditions 2007-07-15 08:20:05 +00:00
Goober5000 fb59431376 restore WMC's ship flag 2007-07-15 06:29:56 +00:00
Goober5000 25fbdedfd0 fix extremely minor bug 2007-07-15 04:45:42 +00:00
Goober5000 5ea6290143 partial commit of aldo's eyepoint feature
it will need a keystroke to be complete
2007-07-15 04:19:34 +00:00
Goober5000 0c7abb28f7 fixed a small bug in the lab
moved WMC's no damage scaling flag to ai_profiles and made it work correctly
removed my old supercap damage scaling change
moved Turey's truefire flag to ai_profiles
2007-07-15 02:45:51 +00:00
Goober5000 f7574740ad fix a newline bug in the voice acting manager 2007-07-14 23:22:47 +00:00
turey 1a1e913a1b Initial commit of Training Weapons / Simulated Hull code. 2007-07-13 22:28:13 +00:00
turey 05e7f2a2a0 Truefire weapons code, adds firing ship's velocity to weapon velocity for a more realistic firing, especially during glide. Activated with the "truefire" flag on a weapon. 2007-07-11 20:19:00 +00:00
turey 5c779aac36 Ship Template fixes. It's fully working now, hopefully. 2007-07-11 20:11:33 +00:00
turey 74fb98ed15 Fixed MSVC2005 Project. Debug Config compiles fine, still working on Release config. One file needs to be renamed for these to work, see the README. 2007-07-10 03:56:39 +00:00
Goober5000 957b5a93a7 fix an off-by-one error 2007-06-30 23:32:25 +00:00
taylor 3ae7d74955 convert to LN EOL 2007-06-25 19:16:27 +00:00
Backslash 538496804f Cutscene subtitle positioning fix for resolutions other than 1024x768. Code by MikeStar. 2007-06-24 23:32:16 +00:00
turey 9c866c406f Fixed some silly little bugs that somehow slipped through the cracks. 2007-06-24 21:45:56 +00:00
karajorma 86b9f48819 Fix an issue with single character command line arguments 2007-06-24 18:04:23 +00:00
turey ef67295ee5 Added in Ship Templates code, with some syntax and warning cleanup. 2007-06-22 04:52:22 +00:00
Backslash 07b0a0d1d1 Backslash's HEAD-only controls commit:
-Lateral thruster axes
-Slide_when_pressed
-Placeholders for glide_when_pressed and more controls, to give us a little breathing room while we wait for the real pilot file code
2007-06-04 00:04:21 +00:00
taylor e2ddc8739c more resilient checking of stars.tbl and it's modular versions 2007-05-28 20:05:06 +00:00
taylor 95918056f3 various bits of clean up
make stats printing a bit more sane
printf out game version info to debug log (not very helpful, but might prove some use)
2007-05-28 20:00:17 +00:00
taylor 02fd38c813 oops! the exit() was supposed to come /after/ the last printf() :) 2007-05-28 19:46:30 +00:00
taylor f4fb5a03b9 make the chcksum spew in logs always have a full 8-set of values
skip over files found on system which are over the max filename length, prevents several crashes (partial for Mantis #1182)
2007-05-28 19:45:14 +00:00
taylor 3ad91ff785 various bits of cleanup
don't draw beam impact effect if we are hitting a shield
updated hit shield quadrant properly for player when a beam hits
set shield quadrant and exit_flag properly for collision info so that we don't count damage twice and handle no_pierce_shields properly
2007-05-28 19:41:47 +00:00
taylor 2d37406df8 fix armor index bug for shockwaves 2007-05-28 19:38:10 +00:00
taylor 73e65bc133 bump version to 3.6.10 2007-05-28 19:36:26 +00:00
Goober5000 ea7ba9fe1b add placeholder stuff for parsing ship-class texture replacements 2007-05-26 15:12:07 +00:00
Goober5000 572b1ae072 when importing FS1 missions, account for the shuffled Head-TP4 2007-05-26 12:08:26 +00:00
Goober5000 be100db1a6 the reinforcement comm menu will now correctly display according to whether or not reinforcements are available 2007-05-26 00:56:11 +00:00
taylor 1d7ab545a6 add the rest of the texture page-in code changes that I skipped before (should fix Mantis #1389) 2007-05-25 13:58:26 +00:00
taylor c41118eb0b make Linux just verbally ignore invalid cmdline options rather than it being fatal 2007-05-25 13:58:02 +00:00
taylor aafd9218c2 fix stupid bugs in CF_SORT_REVERSE (should be as originally intended now) 2007-05-20 02:51:26 +00:00
taylor 90d11da23f fix armor_parse_table() so that it will parse multiple entries properly
fix bug introduced from not closing down lcl_ext after parsing armor.tbl
2007-05-17 14:58:40 +00:00
Goober5000 4647998e76 --grouped the shake/shudder code together a bit better
--added a sexp to generate shudder
--fixed a minor bug in lock-perspective
2007-05-14 23:13:51 +00:00
taylor 155a9fe6da add session open/close times to debug log 2007-05-11 03:16:01 +00:00
taylor d43b67d891 properly handle invalid sound index case, fixes div-by-0 error 2007-05-11 03:14:02 +00:00
taylor 000b02dfea very minor optimization (mul is much faster than div) 2007-05-11 03:12:28 +00:00
taylor 038c7c3fea fix debug message (using wrong name, spit out a bunch of garbage on Windows boxes) 2007-05-11 03:10:48 +00:00
taylor d6d6e34b0f delete the .hdr file once we are done with it, since it's no longer useful 2007-05-11 03:09:21 +00:00
Backslash f83cb49b2f Add feature to $Max Glide Speed -- negative number means no speed cap
Only show gun muzzle flash effect if in not cockpit view, or if "show ship" flag is set
Fix a couple typos ;-)
2007-05-09 04:16:06 +00:00
Backslash 5d5c0abefc Fix tiny bug I introduced -- should use forward_decel_time_const, not slide_decel_time_const, for z
Add feature to $Max Glide Speed -- negative number means no speed cap
2007-05-09 04:13:14 +00:00
Backslash db5eefa938 Backslash's big Gliding commit! Gliding now obeys physics and collisions, and can be modified with thrusters. Also has a adjustable maximum speed cap.
Added a simple glide indicator.  Fixed a few things involving fspeed vs speed during gliding, including maneuvering thrusters and main engine noise.
2007-04-30 21:30:31 +00:00
karajorma db325bac84 Doh! Missed the return type. 2007-04-26 18:59:36 +00:00
karajorma c920a5e50f Add the knock feature from Tom's build.
Fix a number of places where the player of a dogfight game could end up in the standard debrief.
2007-04-24 13:13:49 +00:00
karajorma 572b49f07a Fix a number of places where the player of a dogfight game could end up in the standard debrief. 2007-04-24 13:13:05 +00:00
karajorma 2dc3f2849d Remove the -fredhtl command line. 2007-04-17 17:26:35 +00:00
taylor 2d8a833169 add Linux friendly icon 2007-04-15 12:46:43 +00:00
taylor cc03527c4e only add player-allowed flag on #Weak weapons when their non-weak versions also have the flag (Goober #73) 2007-04-14 23:44:08 +00:00
taylor f84404ce7b little cleanup
fix memory size fubar on trail vlist ptr
2007-04-14 23:42:20 +00:00
Goober5000 236d863401 fixed a silly speech bug (Mantis #1238) 2007-04-13 03:23:12 +00:00
taylor 9e12bbded8 cleanup and initialize persona_index properly for general safety reasons
slight change to karajorma's NO_BUILTIN_MESSAGES check, now it will be properly compiled away in release builds rather than an empty function
2007-04-13 00:36:43 +00:00
taylor c4be493ff6 use qsort() instead of insertion_sort() for light sorting, it should be better optimized and quicker in general for this use 2007-04-13 00:33:41 +00:00
taylor edcee7d57b some basic cleanup for the extension code
fix the old bug that didn't report a missing extension name properly
get rid of the message that says to use D3D, that's not normally going to be an option anyway
add ARB_point_sprite support, mostly for fun since no code will actually use it until after 3.6.10
2007-04-13 00:31:58 +00:00
taylor f009a1ef05 clean out some old code we no longer use/need
change warning messages to not print out current tbl name, since at the point those messages show the tbl has long since been parsed
add an extra quick-check to ship_get_subsystem_strength() to avoid div if we don't need it
make Ship_subsystems[] dynamic (sort of), it's allocated in sized sets now, so we can easily change size while still working with the existing linked-list code
2007-04-13 00:28:00 +00:00
taylor d03ffec411 cleanup of chksum stuff (works properly on 64-bit systems now)
add chksum support for VPs, both a startup in debug builds, and via cmdline option (-verify_vps)
little cleanup in cmdline.cpp (get rid of the remaining "fix bugs" crap)
2007-04-11 18:24:28 +00:00
taylor 9df15f3ee9 cleanup error message
allow launch_snd from tbl to be used for beam weapon shot sound (Mantis #1263)
2007-04-11 18:17:26 +00:00
taylor 1e161be24f add modular version of strings.tbl (*-lcl.tbm) (provides for Mantis #924) 2007-04-11 18:11:21 +00:00
taylor d9eb45f51c bm_unload_fast() should only unload the bitmap passed for animations, not the entire animation (fixes several issues) 2007-04-11 18:05:18 +00:00
taylor f6f432e419 get rid of stale NO_JOYSTICK define 2007-04-11 14:59:35 +00:00
taylor 6fe9bbce08 add extra safety check to make sure that we are going to do a wildcard search for modular tables 2007-04-11 14:58:07 +00:00
taylor 0f78f4c7f4 get rid of (now) unused variables 2007-04-11 14:50:01 +00:00
karajorma 49ab5ad564 Fix for Mantis 1312 2007-04-09 18:25:31 +00:00
karajorma ce00c0b145 Fix .wav playback in the briefing editors. 2007-04-08 08:37:37 +00:00
karajorma 36417d55a7 Friendly stealth ships shouldn't give away their position just cause they send a message. 2007-04-06 13:31:38 +00:00
karajorma 69ed1d5c59 Changed my mind This is an Int3() not an assertion 2007-04-06 13:28:49 +00:00
karajorma af75c27cc6 Prevent ships from jumping out in glide mode (They'd probably never get up to speed anyway) 2007-04-06 13:26:21 +00:00
karajorma 0c46052cd2 Fix a bug where gliding ships couldn't jump out. Remove a couple of magic numbers. 2007-04-06 13:24:32 +00:00
karajorma 58276830e9 A couple of minor fixes 2007-04-06 13:21:18 +00:00
karajorma 179f56ff24 I could have sworn I committed this! Anyway, make the wingman complain when you shoot them instead of command. Send traitor messages from wingmen if command is silenced. 2007-04-05 15:59:44 +00:00
Goober5000 32563b1dda meh, space 2007-04-03 02:19:26 +00:00
Goober5000 d1ae80c53f fixed up some error messages 2007-04-03 01:39:31 +00:00
Goober5000 5cd21fbebe tweak 2007-04-03 00:59:09 +00:00
karajorma 4bebdbeb8d Fix assertion on red-alert carry status in multi games 2007-03-23 06:31:31 +00:00
taylor b18719b531 fix breakage 2007-03-23 01:52:28 +00:00
taylor 06ba5be921 bit of cleanup and minor performance tweaks
sync up with new generic_anim/bitmap and weapon delayed loading changes
with generic_anim, use Goober's animation timing for beam section and glow animations
make trail render list dynamic (as well as it can be)
2007-03-23 01:51:57 +00:00
taylor b0dd737195 bit of cleanup and minor performance tweaks
render ship insignia with a bit of alpha to help with blending/lighting
dynamic thruster particle limits
update for generic_bitmap/anim changes
make use of flag_def_list for ship flags rather than a ton of if-else statements
use generic_bitmap and generic_anim where possible to faciliate delayed graphics loading (after all ship related tbls are parsed)
use VALID_FNAME()
2007-03-23 01:51:00 +00:00
taylor cfbbf623b8 get rid of non-standard itoa(), make use of the proper sprintf() instead 2007-03-22 22:34:59 +00:00
taylor 599353095f add back special "var" setting for flag_def_list and convert some of the lists to use it (more on the way) 2007-03-22 22:19:31 +00:00
taylor e99df39bf0 get rid of non-standard itoa(), make use of the proper sprintf() instead 2007-03-22 22:14:57 +00:00
taylor 18c8edf4d9 some generic_bitmap fixes to go with new changes (not in CVS just yet, don't freak out)
make use of VALID_FNAME() where possible
fix an animation time issue (sub-second animation playback caused div-by-0)
2007-03-22 21:55:01 +00:00
taylor 24328636e1 fix issue where the lab menu bar would disappear at times when you click on it (Mantis #1063) 2007-03-22 21:00:48 +00:00
taylor 14709000a0 forgot to remove -jpgtga from Launcher options previously
get rid of -fixbugs and -nocrash crap
2007-03-22 20:55:53 +00:00
taylor 470b9abf75 give a better msg when movies can't play because they are user-disabled with the cmdline option 2007-03-22 20:54:00 +00:00
taylor ceca92f325 bump version to 3.6.10, it will be needed for new texture replacement stuff (tbl version commenting) 2007-03-22 20:52:38 +00:00
taylor be30cf09ce some generic code cleanup 2007-03-22 20:50:28 +00:00
taylor 677d798936 make sure that we set/reset the red alert data properly (Mantis #1255) 2007-03-22 20:47:49 +00:00
taylor 0ea893424e cleanup and fix for weapon cycling (Mantis #1298) 2007-03-22 20:45:22 +00:00
taylor 908d24f797 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
2007-03-22 20:35:45 +00:00
taylor 9c27e52515 a little cleanup
handle issue where we don't deal with an error condition properly and hit a NULL ptr
2007-03-22 20:31:37 +00:00
taylor 3eb1080996 fix stupidness that screwed up RGB values (Mantis #1307) 2007-03-22 20:23:58 +00:00
taylor aadf64aa0b a little better error handling for cf_exists_full()
add a cf_exists_full_ext() which can find a series of extensions and returns true if any of them exist
use cf_exists_full_ext() for eventmusic file checks (to check for ogg and wav)
get rid of SPM hack, it's wrong (just commented out for now though)
fix a bunch of bugs in cf_find_file_location_ext():
 - try to handle files with multiple periods a bit better (for the wav files like: blah_1.5.wav)
 - load issue with finding incorrect files by mistake
 - prevent finding different file types in various paths/roots
2007-03-22 20:22:45 +00:00
taylor 16a18e049a various bits of bmpman cleanup
be sure to clean all three possible buffers with OGL init
fix a couple of bmpman loading bugs that messed up animations
fix bmpman bug that didn't properly account for free'd texture ram count with unload_fast
2007-03-22 20:14:17 +00:00
taylor 8a6036edd3 old ✌️ snafu 2007-03-22 20:09:05 +00:00
taylor d4757cb867 when parsing a modular tbl, allow a duplicate sun entry to overwrite an existing one 2007-03-22 20:07:16 +00:00
taylor 33a4cd018e little bit of cleanup
set "#Weak" weapons to always get the "player allowed" flag (Mantis #1301)
2007-03-22 20:04:04 +00:00
taylor fdf7874e2b make use of generic_anim and generic_bitmap where possible
bunch of cleanup and little optimizations
add "+remove" tbl option to completely get rid of particular beam sections
delayed loading of bitmaps, will only do it after all tbl/tbm have been parsed
if we are using a POF missile which isn't loaded yet, try and load it before going crazy
bug fix and optimization for laser color setting
2007-03-22 20:02:46 +00:00
karajorma 09d51722a3 Bump the number of debriefing stages.
Fix an annoying (and erroneous) warning in the campaign editor.
2007-03-21 21:06:54 +00:00
karajorma aae64e2722 Turn off afterburner controls when player isn't in control 2007-03-11 22:55:32 +00:00
karajorma fd5c1d6b4a Make .ogg voice files selectable in FRED. 2007-03-07 22:43:24 +00:00
karajorma 68af2a8847 It's perfectly legal to press the Target Target's Attacker key with no target. We should just play a failed sound instead. 2007-03-07 17:51:15 +00:00
Goober5000 6e4dfb8109 might as well do this too 2007-02-27 22:38:27 +00:00
Goober5000 88fa8a71f8 add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty 2007-02-27 01:44:48 +00:00
Goober5000 26cf04b870 small bugfix 2007-02-26 04:47:52 +00:00
Goober5000 dfbba19be3 add model compare capability (currently only via debug console) 2007-02-26 04:30:48 +00:00
Goober5000 bffc73c321 added vm_matrix_same() 2007-02-26 01:47:23 +00:00
Goober5000 13c7d96860 use dynamic memory instead of a static buffer for ship-specific replacement textures 2007-02-25 03:58:07 +00:00
Goober5000 9c2ebb339f remove duplicate model texture replacement 2007-02-21 01:44:02 +00:00
Goober5000 21cdeb8b81 oops, this is for a future commit 2007-02-20 17:22:34 +00:00
Goober5000 06a4b84567 revert to retail behavior 2007-02-20 04:27:23 +00:00
Goober5000 72ff31e614 the great big duplicate model removal commit 2007-02-20 04:20:38 +00:00
Goober5000 51195502d5 *** empty log message *** 2007-02-20 01:41:07 +00:00
wmcoolmon a7254905ec More minor tweaks/fixes 2007-02-19 20:39:10 +00:00
wmcoolmon 692aa7a951 More scripting tweaks/bugfixes. 2007-02-19 07:55:20 +00:00
wmcoolmon cc8c462143 WMCoolmon experiences a duh moment. Move scripting collision variable declarations in front of overrides, to give
them access to these (somewhat useful) variables
2007-02-19 07:24:51 +00:00
wmcoolmon 49ac99b8d8 Fixed minor precedence issue. 2007-02-19 07:08:04 +00:00
Goober5000 01ae17a92c magic word 2007-02-18 21:26:52 +00:00
Goober5000 a00e8549df revert Bobboau's commits for the past two months; these will be added in later in a less messy/buggy manner 2007-02-18 06:17:48 +00:00
Goober5000 b24ca036bd ugh... reverting this, because it was done wrong 2007-02-16 23:49:28 +00:00
Goober5000 09aa056a39 this should be based on a flag or something, not automatically tied into the power output 2007-02-16 23:18:15 +00:00
Goober5000 734d6cc767 fixed another of bobboau's stupid bugs 2007-02-16 22:25:21 +00:00
Goober5000 8b7bc8f162 remove obsolete and misleading comments which should have been edited when the code was upgraded 2007-02-16 22:09:05 +00:00
karajorma edd6ffe1a5 Thought I'd caught all of these months ago! Thanks to Wanderer for the heads up. 2007-02-16 18:54:09 +00:00
Goober5000 4ae1d5f03d uhh... wrong? 2007-02-16 07:06:46 +00:00
Backslash 0a6c000ccf small fix for reverse thrusters, and a speed tweak. also a change to damp physics, discussed on the forums and reported in Mantis #1051 months ago. 2007-02-15 06:19:19 +00:00
Goober5000 815e999a59 Linux project file change (thanks to ni1s) 2007-02-15 02:24:11 +00:00
phreak 9b56275823 Project file update for VC 2005. I included a new configuration called "ReleaseDebug" which has the NDEBUG macro found in release builds, but also has all the debugging information included. Regular release builds have no debugging information. 2007-02-15 02:09:30 +00:00
phreak aab303d98c Apparently Visual C++ 2005 follows standard syntax rules. 2007-02-15 02:03:56 +00:00
Goober5000 14ba002e68 fix a hideous bug with the knossos special warp stuff
(how did this ever actually work correctly?)
2007-02-13 01:46:03 +00:00
taylor 22cad74347 fix stupid bug (Mantis #1275) 2007-02-12 07:35:58 +00:00
Goober5000 83a8464f55 ack 2007-02-12 01:33:46 +00:00
Goober5000 a3a6cef35e scale shield strength according to generator damage 2007-02-12 01:24:18 +00:00
Goober5000 9353669e9f bah 2007-02-12 01:23:29 +00:00
Goober5000 1dc098600c fixage 2007-02-11 22:46:39 +00:00
Goober5000 2aba7f5860 change a number to a constant 2007-02-11 21:42:41 +00:00
Goober5000 04e498cbba massive shield infrastructure commit 2007-02-11 21:26:42 +00:00
Goober5000 37f8ce6592 fix some breakage ;) 2007-02-11 20:26:00 +00:00
taylor 15f6cfce37 fix a couple of breaks from my commits 2007-02-11 18:45:38 +00:00
taylor 8b31fc0365 cleanup and minor performance improvements
add support for new fireball specific lighting values from tbl
remove NO_SOUND
2007-02-11 18:35:45 +00:00
taylor 5f77a8a109 general cleanup
deal with -img2dds error issue
2007-02-11 18:34:56 +00:00
taylor 8b49480e9a remove cloakmap stuff, we'll need to redo this later on anyway
deal better with a strange Windows buffer swap issue
various bits of cleanup and performance improvements
fix for gr_opengl_flash() that I had screwed up earlier
2007-02-11 18:26:59 +00:00
taylor 9cf730d180 support for a couple of recent bmpman changes 2007-02-11 18:25:16 +00:00
taylor 9175dd8e92 support for new finding/loading of sound files
add support for automatically figuring out samples-per-measure based on Goober's explanation in the Wiki (not sure if it's actually right though)
remove NO_SOUND
2007-02-11 18:20:19 +00:00
taylor 551f919074 support for tbl specified fireball explosion color ("$Light color:") 2007-02-11 18:19:41 +00:00
taylor 6f43fe5284 remove some dead code
better texture memory handling (a work in-progress)
new image finding/loading
change the game_busy() reporting during bitmap page-in to only catch one frame of an animation
fix numerous little bugs in gropenglbmpman relating to -img2dds
2007-02-11 18:18:52 +00:00
taylor c561ddafac some minor performance improvements
remove NO_SOUND
2007-02-11 09:47:35 +00:00
taylor ef94a3ddb7 dd VALID_FNAME() macro and put it around a few places (more to come)
clean out some old variables
move CLAMP() macro from opengl header to global header
update COUNT_ESTIMATE to match new bmpman changes
2007-02-11 09:37:18 +00:00
taylor f11ca19ad3 some CFILE cleanup and slight directory order reorg
add cfopen_special() for quickly opening files that have already been found with cf_find_file_location_ext()
remove NO_SOUND
2007-02-11 09:31:12 +00:00
taylor 0f0852b143 remove NO_SOUND
fix debris recycling
2007-02-11 09:22:29 +00:00
taylor b71ab0e23b little bit of cleanup
more fixage for hidden jumpnodes (Mantis #1149)
2007-02-11 09:20:00 +00:00
taylor aa1a571798 fix simroom crash bug from Goober's rencent change
add NULL handling to make sure we don't crap out on sorting
2007-02-11 09:10:14 +00:00
taylor 484034b42e slight debug message fixage 2007-02-11 09:08:45 +00:00
taylor 35567fe5f7 if we are a dying ship then don't do collision detection against our own debris (slight performance boost to exploding ships) 2007-02-11 09:06:30 +00:00
Goober5000 982f8a00a7 we probably don't need to play a sound when we equalize already-equalized shields, since we don't play one when we augment already-augmented quadrants 2007-02-11 07:36:43 +00:00
Goober5000 7c282f4ddf when alphabetizing campaigns, ignore "the" at the beginning of a title 2007-02-11 06:38:56 +00:00
Goober5000 2a967b4235 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 7e46f44d84 fix spelling 2007-02-11 06:02:38 +00:00
taylor 2cce061c8b make sure that we don't set the 2d view matrix and then not reset it (Mantis #1269)
clean up some of the fullneb mess that was causing some initial setup issues (colors wrong, etc.)
2007-02-10 20:23:51 +00:00
Goober5000 8389b699a8 sort campaigns by title, not by file name 2007-02-10 06:55:58 +00:00
Goober5000 5f48bba8b8 new feature: shield generators that control whether the shield is up 2007-02-10 06:39:43 +00:00
Goober5000 dcd64bf6bd take all subsystems into account when displaying repair gauge 2007-02-10 05:01:11 +00:00
Goober5000 5aa6d9abf6 prevent the AI from falling into the black hole of disarming a turretless ship 2007-02-10 04:49:23 +00:00
Goober5000 395eff964a small tweak 2007-02-10 03:20:43 +00:00
Goober5000 617bd20fb5 made support ship shield control a bit less of a hack 2007-02-10 03:17:31 +00:00
taylor 328ee49dce remove NO_SOUND 2007-02-10 00:18:22 +00:00
taylor 84bde1a1c0 remove NO_SOUND
fix glow bank sexp bug (Mantis #1250)
2007-02-10 00:15:32 +00:00
taylor 1da9615722 fix a mouse button issue (just an issue with newer SDL versions?) 2007-02-10 00:12:35 +00:00
taylor 81bffcc81f a quick debug test to catch an error and FRED doesn't catch on it's own yet 2007-02-10 00:10:31 +00:00
taylor 852cd1ef2a performance optimizations:
- fvi_ray_boundingbox() is faster and should be less prone to compiler/optimization/platform specific issues
 - clean up or obj_check_all_collisions() which is a good bit faster now
2007-02-10 00:08:59 +00:00
taylor 0ed853c658 obsolete gluLookAt() in favor of doing it manually, should be slight faster and more precise 2007-02-10 00:05:48 +00:00
taylor 70547a6f09 performance/accuracy optimization for the (un)size functions 2007-02-10 00:04:03 +00:00
taylor ef10b7a367 make sure that our color is getting set properly (should properly fix the red/green tint problem, Mantis #1041)
slight optimization for Theora YUV->RGB converter
2007-02-10 00:02:18 +00:00
taylor 1c9f1a5f93 add the "show all" hotkey to the cutscene viewer 2007-02-09 23:58:52 +00:00
taylor c730a586ac add the number of files that CFILE is going to try and use in each root to the debug info
optimizations for cf_find_file_location_ext()
2007-02-09 23:57:24 +00:00
taylor df0731828a add better support for Ogg, Vorbis and Theora libs/includes 2007-02-09 23:54:00 +00:00
Goober5000 fb2bdb18e8 miniscule tweaks 2007-02-09 05:04:56 +00:00
Goober5000 a08b92b59d bah, change this so it's mostly diff-compatible with 3.6.9 2007-02-09 04:45:23 +00:00
Goober5000 68727591a9 add a few ship flags that weren't on the dialog 2007-02-08 18:34:05 +00:00
Goober5000 4229761ce5 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
2007-02-08 07:39:35 +00:00
Goober5000 ccdd67668c hm, didn't notice this new feature 2007-02-07 07:59:48 +00:00
Goober5000 93d4ca44f5 Cleaned 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:22 +00:00
Goober5000 46fb40747b remove obsolete and unused shield flag 2007-02-06 01:27:34 +00:00
wmcoolmon 2a0810d675 Couple of commented-out features. 2007-02-05 08:27:13 +00:00
wmcoolmon 7e091e7af8 Make an error message prettier 2007-02-05 08:26:49 +00:00
wmcoolmon 7b42152fda Fix a parse bug 2007-02-05 08:26:06 +00:00
Goober5000 a83443e82b fix an old subtle bug 2007-02-03 23:16:41 +00:00
phreak fc6d146b19 the particle batcher needs to work with static (non-animated) textures as well 2007-02-03 20:10:17 +00:00
Goober5000 8a95843bee d'oh... thanks phreak 2007-02-03 08:13:36 +00:00
phreak 859d434483 spawn weapons now have the option of passing a target lock onto their children.
http://www.hard-light.net/forums/index.php/topic,45166.0.html
2007-02-03 03:28:48 +00:00
phreak f771c91b41 Committing what i have of the MSVC 2005 project files. FRED2 still isn't there yet,
but I don't want to lose what I spent time on.
2007-02-03 03:17:10 +00:00
Goober5000 c5456a060e fixed two of Bobboau's bizarre bugs 2007-02-02 22:49:07 +00:00
karajorma c5ec204080 Well that's going to cause a few crashes (Thanks to ni1s for spotting it) 2007-02-01 22:15:58 +00:00
phreak ab3163731b We don't want to modify the clip plane variables in htl
mode once we've moved them to gr_start_clip()

do we even need htl mode checks anymore?  welcome to the 21st century
2007-01-31 05:08:35 +00:00
phreak f73136d61d Do clip plane testing on thruster glows and thruster particles 2007-01-31 05:04:24 +00:00
phreak 066dcddcc9 memset() does not go array, length, value
it goes the other way around
2007-01-31 02:00:21 +00:00
Goober5000 ba8cbd07f8 oops 2007-01-30 04:55:20 +00:00
Goober5000 8931ac707b --fix the empty ship name / U.R.A. Moron bug caused by WMC's commit
--properly update a ship score when its class changes (in FRED or via change-ship-class or via ship loadout)
2007-01-29 03:39:26 +00:00
Goober5000 bd5e9b5ad8 minor tweaks to the reset score feature 2007-01-29 02:56:34 +00:00
karajorma 4a5a0b9f21 Fix add-remove-escort to actually use a priority.
Add yet another missing bit of Network variable code
2007-01-27 19:09:06 +00:00
Goober5000 0449f94ecb removed code that isn't used (see Mantis 1219) 2007-01-22 21:45:10 +00:00
wmcoolmon 50e6658813 EXPERIMENTAL turret update, housekeeping for Lua 2007-01-22 04:43:28 +00:00
wmcoolmon 33153559d6 Fix mantis bug; add getOrientation to CVS 2007-01-22 04:42:25 +00:00
wmcoolmon 32d2e246c4 Fix non-opaque circles. 2007-01-22 04:02:23 +00:00
karajorma 40f190f10d Fix bug in the set ammo and weapon SEXPs
Add the reset-orders SEXP
Add support for network variables
2007-01-15 13:46:55 +00:00
karajorma cf4d8a2f8d Fix bug where orders you gave last mission are sill accessible to the Order SEXP. 2007-01-15 13:43:43 +00:00
karajorma ad608166a2 Hmmm. Forgot to commit changes to support network variables and setting ammo/weapons to HEAD as well as 3.6.9. 2007-01-15 13:42:59 +00:00
karajorma 97fa6218d3 Hmmm. Forgot to commit changes to support network variables and setting ammo/weapons to HEAD as well as 3.6.9.
Also add Juke's bug fix for streaming weapons.
2007-01-15 13:40:38 +00:00
wmcoolmon d614604355 Lua - fix one thing so you can break another. 2007-01-15 09:24:14 +00:00
wmcoolmon c8dc3bd950 Fix HookVariables-related stuff, and add errors in case it ever gets broken again. 2007-01-15 09:20:54 +00:00
wmcoolmon bc208ec01d Maintain "fileless fs2" capability; change ScriptingVariables library to HookVariables(hv) 2007-01-15 08:05:47 +00:00
bobboau 0e92be644e fixing some minnor errors with the batcher code 2007-01-15 02:56:36 +00:00
wmcoolmon 6ce20f19de Whoops, fix merge error 2007-01-15 02:46:07 +00:00
wmcoolmon 9aef50b0ff Finish off warning fixage 2007-01-15 02:19:03 +00:00
wmcoolmon a8b45bbc15 Finish off warning fixage; standardized defines in MSVC_2003 project file 2007-01-15 02:07:51 +00:00
bobboau f24f3f888c fixing a thruster bug, a geometry batcher bug, and trying to fix a shield bug 2007-01-15 01:52:47 +00:00
wmcoolmon 8d50a88715 Fix CVS & correct various warnings under MSVC 2003 2007-01-15 01:37:47 +00:00
wmcoolmon 695c72d2b3 Fix HEAD 2007-01-15 00:55:13 +00:00
Goober5000 0eabd65f0b operator precedence FTW! :D 2007-01-14 19:35:54 +00:00
bobboau 1b530c113c ok, something aparently went wrong, last time, so I'm commiting again
hopefully it should work this time
damnit WORK!!!
2007-01-14 14:03:40 +00:00
wmcoolmon aad898bd35 Fix +Override, attempted fix for code adjacent to [] causing crash in scripting.tbl (Unreproducable), and (Untested) fix for script-eval. 2007-01-14 12:06:56 +00:00
wmcoolmon ea164eb959 Attempt to remove various warnings under MSVC 2003, mostly related to casting, but also some instances of inaccessible code. 2007-01-14 10:26:39 +00:00
wmcoolmon aa5fdab68f Updated MSVC 2003 project files to work out of the box 2007-01-14 10:02:14 +00:00
wmcoolmon c7ba039c9b Removed MSVC_7 folder due to redundancy 2007-01-14 09:20:21 +00:00
bobboau 47e4d4e993 made a last second change of mind on something, made it a bit safer 2007-01-13 16:38:22 +00:00
bobboau 61968f9d40 left some test code on super sorry 2007-01-13 16:20:39 +00:00
Goober5000 0148b14a56 hmm... I guess when I fixed this back in 2004, I fixed it the wrong way :D 2007-01-12 04:33:50 +00:00
bobboau d202d1d67d made the new index buffers actualy work,
now that I had something to test it with fixed a small problem that kept it from working
2007-01-11 18:46:35 +00:00
bobboau 78c2e64ce5 forgot about this header in my last commit 2007-01-11 07:08:45 +00:00
bobboau cd87660246 makeing D3D compatable with 32 bit index buffers, and fixing a minor directx
technicality in the texture compression code.
2007-01-11 07:07:46 +00:00
taylor 4059d7faba remove non-dark support
per earlier discussions: remove -jpgtga and -pcx32
2007-01-10 01:49:16 +00:00
taylor b3fccca4c0 fixup texture addressing stuff so that it works better
bits of cleanup
remove non-dark support
support for releasing bitmap system memory when transfered to API memory
2007-01-10 01:48:32 +00:00
taylor fe403ea0cf don't bother trying to load message WAV when sound is disabled 2007-01-10 01:45:56 +00:00
taylor cd624d7626 compiler warning fixage 2007-01-10 01:45:06 +00:00
taylor 08cf275ee6 add support for new IBX format which can support up to UINT_MAX worth of verts (NOTE: D3D code still needs to be made compatible with this!!) 2007-01-10 01:44:39 +00:00
taylor 7edffa38fc remove -jpgtga, set 32-bit mode as default (the OGL code will automatically fallback to 16-bit is needed) 2007-01-10 01:41:27 +00:00
taylor bea3e4aca4 little bit of cleanup
per earlier discussions: remove -jpgtga and -pcx32
2007-01-10 01:40:43 +00:00
taylor 572319fd2e remove the non-dark stuff, it only works on PCX files and stuff to use it has already been ripped out
per earlier discussions: remove -jpgtga and -pcx32, set image load order to DDS->TGA->JPG->PCX
some debug log cleanup
remove bitmap data from system memory once it's in API memory
2007-01-10 01:40:07 +00:00
Goober5000 29103294f0 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
2007-01-08 00:50:59 +00:00
Goober5000 8f20a23de7 yet more tweaks to the WCS death scream stuff
added a ship flag to force screaming
2007-01-07 21:28:11 +00:00
taylor 1e487819b7 fix up Windows window/cursor handling so that it's up-to-date and more compatible
make sure that we handle background clearing ourselves, fixes several little issues
fix popup warnings to work a bit better and not screw up the game so much or make it difficult to interact with them
2007-01-07 13:15:42 +00:00
taylor e77d2e5c3f cleanup various bits of obsolete or unused code 2007-01-07 13:13:39 +00:00
taylor fdfe69c916 bunch of cleanup and minor little fixes
get rid of GL_activate and GL_deactivate hold-overs
various fixes for platform window/cursor handling
we don't need texture combine support most of the time, so don't bother with it (fixes fonts not displaying properly)
disable depth testing if we aren't using a zbuffer
get rid of secondary color crap that was just messing things up, there are better ways to do it if we need the basic functionality back later
dump old gamma ramp support, we don't really need it at this point
do edge clamping by default instead of repeat
2007-01-07 13:12:41 +00:00
taylor fa84771763 clean up extension list and comment out the things that we don't use 2007-01-07 13:08:12 +00:00
taylor 7d7f122810 slight change to emission light settings
change default ambient light settings back to proper values
add support for lighting falloff with directional lights
some minor performance improvements
2007-01-07 13:07:22 +00:00
taylor ba76499df8 various bits of cleanup
fix for anistotropic filtering messing up with lod bias
be sure that we always reset the properly active texture
get rid of old gamma stuff
loading fix for cubemaps
disable apple_client_storage for now
fix for ATI problem with framebuffers and corrupting starfield bitmaps
2007-01-07 13:05:21 +00:00
taylor 536e9f2206 some general cleanup
add emissive light falloff support for asteroids
properly setup env texture matrix
get rid of secondary color crap, there are better ways to do it anyway
2007-01-07 13:02:19 +00:00
taylor 05da1977ae remove some dead code 2007-01-07 13:00:24 +00:00
taylor 9b237b9105 fix thruster 2 length factor tbl entry so that it has the proper name 2007-01-07 12:59:54 +00:00
taylor 9ca3892323 cleanup shockwave code a bit
make Shockwave_info dynamic
lot of fixage to allow 2D and 3D shockwaves to work better
fix for Mantis bug #1148
properly handle both "none" and "<none>" for 2D and 3D shockwave names
better handling, preloading wise, of 3D shockwaves and their textures
2007-01-07 12:57:36 +00:00
taylor f9b780a000 safety check to make sure that we don't end up with non-player-usable weapons in the weaponselect pool (Mantis bug #1196) 2007-01-07 12:55:57 +00:00
taylor 88b8863c89 be sure that we can handle both "none" and "<none>" in ignored filenames 2007-01-07 12:54:35 +00:00
taylor 5f831b3da5 add position info for weapon energy text
make sure that we can't target a hidden jumpnode
rest of the weapon switch fix
2007-01-07 12:53:35 +00:00
taylor 83d237f9b0 fix NULL ptr reference when a weapon doesn't have a tech description 2007-01-07 12:51:30 +00:00
taylor 8442101e18 taking Bobboau's advice: make sure that anim angles are kept in sane values 2007-01-07 12:50:51 +00:00
taylor ade4bdedc0 fix tertiary glow sizes
fix model vertex normal data that was being read/written incorrectly under OS X (still don't know why this was a problem, but this fixes it)
2007-01-07 12:49:51 +00:00
taylor 53b2b48763 crazy-freaky-cool OS X sound crash fixage
fix sound resource exhaustion from using too many buffers
allow loading of ogg or wav based on which is found first rather than tbl filename (fixes crash when Theora movies end up in wav code by mistake)
2007-01-07 12:48:18 +00:00
taylor a34585bf0d fix problem with model unloading that happened because skyboxes aren't reset properly
be sure that skybox textures are paged in properly
there needs to be a case insensitive string check when looking for existing bitmap filenames
2007-01-07 12:46:19 +00:00
taylor 9338a24449 make expl info dyanmic
fix possible out-of-bounds on expl lod checking
fix memory leak from modular tables
2007-01-07 12:41:37 +00:00
taylor 15de26fca2 build for for newer GCC versions 2007-01-07 12:39:59 +00:00
taylor c7404da99d add missing Lua files from recent update 2007-01-07 12:39:30 +00:00
taylor 7e47264ed1 add in Theora build support
add a /y to the copy line (got tired of doing this myself since it won't overwrite by default)
remove DirectShow files
2007-01-07 12:38:53 +00:00
taylor 17395a28f8 make fire-on-normal return value a little more obvious
fix the "infinite genius" move I made by breaking turret movements  ;)
2007-01-07 12:36:51 +00:00
taylor 1e795769a4 remove DirectShow files, they are no longer supported 2007-01-07 12:35:45 +00:00
taylor 77c8e54a2b proper envmap generation for OpenGL 2007-01-07 12:34:36 +00:00
taylor 0f536016ea fix for Mantis bug #1195 2007-01-07 12:33:59 +00:00
taylor 655fc73213 clean up defines a bit 2007-01-07 12:33:27 +00:00
taylor 78ecf0e0c5 remove avi and mpg from supported extensions 2007-01-07 12:32:38 +00:00
taylor cea54b4240 fix bm_page_in_texture() so that it will load all frames of an animation (caused slowdowns in-game with it) 2007-01-07 12:32:06 +00:00
taylor 271c356260 add Theora player build support
add in the waypoint files
2007-01-07 12:31:16 +00:00
taylor 260e420f5d add Theora player
remove DirectShow support from movie player
fix triple-buffer page flipping problem (Mantis bug #1190)
2007-01-07 12:29:43 +00:00
taylor 1bca5a55c6 add Theora lib header 2007-01-07 12:27:47 +00:00
Goober5000 ae5a3f5799 don't display any error messages when there are no background bitmaps to load 2007-01-07 03:44:50 +00:00
Goober5000 0cac7ae078 fix bug where built-in lament messages were never played 2007-01-07 03:10:05 +00:00
Goober5000 fca4524c68 convert a mission variable to a mission flag 2007-01-07 01:00:18 +00:00
Goober5000 c8280cac73 move this to the Message location of the mission 2007-01-07 00:24:18 +00:00
Goober5000 f252ac6edf add a feature for specifying the source of Command messages 2007-01-07 00:01:28 +00:00
Goober5000 d9550278c0 taylor's bugfix 2007-01-06 23:56:43 +00:00
Goober5000 8d030ef5ab breathalyzer for WMC 2007-01-06 23:13:40 +00:00
Goober5000 96e34630b5 gah, not this again 2007-01-04 04:51:57 +00:00
Goober5000 834044ac09 update to Lua 5.1.1 2007-01-04 04:46:14 +00:00
Goober5000 5456140e25 add feature to reset ship scores to what they are in ships.tbl 2007-01-04 02:50:33 +00:00
Goober5000 deaf5f709c fix #include path 2007-01-04 02:50:14 +00:00
wmcoolmon 61f8a4044b Add missing waypoint files 2006-12-30 23:34:18 +00:00
Goober5000 81dd514e0a fix spelling... *twitch* 2006-12-28 22:47:16 +00:00
Goober5000 11a4fdd81c assume ships-with-bays which haven't yet entered the mission are valid for syntax checking 2006-12-28 02:07:49 +00:00
Goober5000 74df0fc1dc removed obsolete limits 2006-12-28 01:22:04 +00:00
wmcoolmon 7366176e79 WMC codebase commit. See pre-commit build thread for details on changes. 2006-12-28 00:59:54 +00:00
Goober5000 897db2b4af added to the main branch as binary 2006-12-27 02:29:28 +00:00
Goober5000 d1af277332 allow parsing of similar ship copy names properly (Mantis #1178) 2006-12-26 18:14:42 +00:00
Goober5000 fc45fea3ed make chase view and external view toggles independent (Mantis #1087) 2006-12-25 18:54:15 +00:00
karajorma 0c59d8d4ee Move the voice recognition init to stop Windows complaining and failing to init it. 2006-12-20 11:27:06 +00:00
Goober5000 0292a00483 fix Mantis #1163 2006-12-08 19:18:54 +00:00
Goober5000 fab13d297d reverted the buggy commit that caused Mantis bug #1101 2006-12-01 04:50:59 +00:00
Goober5000 ff4255aa4e make an error message more descriptive 2006-11-28 05:51:05 +00:00
Goober5000 8b3dc00c0b the grammar nazi strikes again! 2006-11-28 05:47:28 +00:00
Goober5000 ad93ec5c87 prevent false positive while error checking 2006-11-26 03:22:45 +00:00
Goober5000 a21c5fe95e if a wing of ships is docked to something, that entire wing must have an arrival cue of false 2006-11-25 07:07:52 +00:00
Goober5000 885fae6f63 holy crap, this had the potential to mark the locked-true sexp as known-false, which would seriously screw a lot of stuff up 2006-11-25 06:37:06 +00:00
Goober5000 ba325f7b06 this may have been an oversight 2006-11-25 06:33:22 +00:00
Goober5000 6de60e0f75 FRED again updates backgrounds while the user is editing them 2006-11-24 22:46:25 +00:00
taylor 9925ea5d74 handle knossos warp effect flip in a slightly better, slighter safer way (Mantis bug #1048, plus a couple that weren't filed) 2006-11-16 01:11:28 +00:00
taylor 78f979634d do no culling on the warp effect model_render call properly (doesn't appear to break anything now that it actually set to not cull) 2006-11-16 01:10:47 +00:00
taylor bff832f826 updated outwnd code for both Windows and non-Windows:
- make print filters dynamic
 - fix various little bugs and issues
 - cleanup some non-used variables (non-Windows)
 - put everything under NDEBUG like it was, or should be
 - change to using data/fs2_open.log for log file (Windows)
 - change to using data/debug_filter.cfg (Windows)
 - make the extra debug window optional, and disabled by default (Windows)
 - fix some possible NULL references
 - clean up the SAFEPOINT() crap
2006-11-16 00:56:16 +00:00
taylor 57bb4320c1 handle the video registry entry better
support for new Windows window creation code
various bits of minor cleanup
2006-11-16 00:55:08 +00:00
taylor eae49ce651 properly support the updated window create code (all told: should take of of Mantis bugs #542, #624, #1140, and possibly #962 and #1124) 2006-11-16 00:54:41 +00:00
taylor ccaaf2ea50 new window creation code for Windows (gets rid of some stupid :V: voodoo for the software/glide stuff)
use detect_home() on Windows too (needed for now outwnd code)
some bits of minor cleanup
2006-11-16 00:54:15 +00:00
taylor 5e9e081871 various bits of little cleanup
add the debug cmdline printer to FRED, so that we can make use of that info in the FRED-debug case too
2006-11-16 00:53:31 +00:00
taylor ee2e0a83ee various bits of little cleanup
get rid of some more compiler warnings
2006-11-16 00:53:12 +00:00
taylor 71dc2b2241 add some needed wing leader checks to prevent Assert()'s and out-of-bounds problems when the leader is dead/dying (Mantis bug #1134) 2006-11-16 00:52:28 +00:00
taylor 84cfa9f06a clean up skybox model selection and usage to work better with FRED
make sure to go ahead and set the skybox model when it's set/changed in FRED
go ahead and load/set the envmap  when it's set/changed in FRED
get rid of extra envmap image types, only DDS is actually supported (not sure what the hell I was thinking there)
2006-11-16 00:51:43 +00:00
taylor 28b50da98b fix the stupid safe_string thing ("LogFile" was already closed by the time it tried to write) 2006-11-16 00:51:04 +00:00
taylor ac4468a045 clean up AVI movie stuff a bit:
- use the default black brush for clearing the screen, it's a little less stupid this way
 - have the AVI player send messages back to the game rather than trying to poll for that extra crap
 - remove the only DivX6 fix, there is better addressed by newer window handling code
2006-11-16 00:50:38 +00:00
taylor ac24f74dd0 clean up some cmdline options which were/weren't FSO only
add back the "-32bit" option, for retail compatibility (doesn't do anything, it's just there to avoid the unknown option message)
add "-debug_window" to turn on the Windows-only extra debug output window (it's off by default now, only logging to file instead)
2006-11-16 00:50:00 +00:00
taylor 399da8ba4d fix stupid bay depart object animation bug (Mantis bug #1133, part 2) 2006-11-16 00:49:35 +00:00
Goober5000 319e9b8e9d a much better fix for built-in arrival messages... it needs a new feature to fully work for custom wings though 2006-11-15 04:02:31 +00:00
Goober5000 66487a8d4c fix spelling, and synch with voicerec.cpp 2006-11-15 00:00:37 +00:00
Goober5000 39f97fa896 remove directory-specific information 2006-11-14 01:37:55 +00:00
phreak 5238726ffe oops, forgot a break statement
*scrapes off the rust*
2006-11-13 23:11:08 +00:00
Goober5000 0389d2104a added MadProf's voice recognition enhancements 2006-11-13 02:54:04 +00:00
phreak d4c14f4487 two fixes:
1) Fix for mantis #1099, part 2.

2) when changing the player's ship using debug_cycle_player_ship(), initialize the
 primary bank starting capacity so the support ship will rearm it.
2006-11-12 20:01:55 +00:00
phreak 3ca6506bf3 Don't copy parentheses to parse buffers if outside of quotation marks. Otherwise
the parsing syntax will be copied to said buffer and some warnings/errors would occur.
2006-11-12 19:58:13 +00:00
bobboau a2955058b4 fixed D3D environment mapping 2006-11-07 05:30:14 +00:00
taylor 1db41ff217 fix return values (something that was different between 3_6_9 and HEAD) 2006-11-06 07:00:05 +00:00
taylor 3fecfa76aa updated/fixed modelanim code 2006-11-06 06:50:59 +00:00
taylor 98ca98c02f fix some of the envmap issues
- use proper hand-ness for OGL
 - fix distortion
 - get rid of extra index buffer requirement
change starfield bitmaps to use an instance matrix rather than going through all the trouble of resetting the view matrix
basic cleanup and get rid of a couple of struct/variable naming issues (compiler sanity)
make double sure that we aren't using culling of z-buffering when rendering starfield bitmaps
2006-11-06 06:46:08 +00:00
taylor d3b31875e3 enable/disable alpha test based on blend mode (found this hidden in an old tree, may help with blending the newer alphablend mode) 2006-11-06 06:44:43 +00:00
taylor e341c3a67a if a submodel anim fails to start then move directly to ready position flag (set it up to do this, just forgot to do it ;)) (fix for Mantis bug #1133) 2006-11-06 06:43:58 +00:00
taylor 7615437c1d make glow_point array for thrusters and glow_point_banks dynamic (a proper fix for old Mantis bug #43) 2006-11-06 06:42:22 +00:00
taylor f2880d8b31 forgot to reset default value for Interp_warp_alpha when it was changed earlier
be sure that we are using the proper zbuffer setting when rendering thruster glows
2006-11-06 06:39:11 +00:00
taylor 4d86d1bdb6 forgot this part of the render box fix (obviously no one ever really tried to use this feature, since it has never worked) 2006-11-06 06:38:34 +00:00
taylor 6bc0a6c8e7 ok, so apparently that did actually do something ;) 2006-11-06 06:37:59 +00:00
taylor 542147c48c updated/fixed modelanim code 2006-11-06 06:36:44 +00:00
taylor 30a5bf5d31 more cleanup of warp_global crap
scale render/detail box limits with detail level setting
make sure that we reset culling and zbuffer after each model buffer that gets rendered
2006-11-06 06:33:48 +00:00
taylor 1bb9eb5fc5 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)
2006-11-06 06:32:30 +00:00
taylor a72b8925b5 updated/fixed modelanim code 2006-11-06 06:24:57 +00:00
taylor 17b228e494 grrr ... fix dos EOL chars 2006-11-06 06:23:27 +00:00
taylor 795103ab49 rename set_warp_globals() to model_set_warp_globals()
remove two old/unused MR flags (MR_ALWAYS_REDRAW, used for caching that doesn't work; MR_SHOW_DAMAGE, didn't do anything)
add MR_FULL_DETAIL to render an object regardless of render/detail box setting
change "model_current_LOD" to a global "Interp_detail_level" and the static "Interp_detail_level" to "Interp_detail_level_locked", a bit more descriptive
minor bits of cleanup
change a couple of vm_vec_scale_add2() calls to just vm_vec_add2() calls in ship.cpp, since that was the final result anyway
2006-11-06 06:19:17 +00:00
taylor d9b756654d a LOT of cleanup:
* remove a bunch of old/dead code
 * some reformatting to help with readability
 * rearrange/rename some code so that it is a little clearer
 * move thruster glow code to it's own function (model_render_thrusters())
make HTL model buffers dynamic
fix detail boxes so that they actually work for the first time
2006-11-06 06:15:01 +00:00
taylor 8d471e08bb add "Render full detail" support to the lab as well 2006-11-06 05:59:36 +00:00
taylor 6e7dbc0136 fix compiler problem due to change in parse_init() function
fix dos EOL chars
2006-11-06 05:58:57 +00:00
taylor 87528a0862 add a "Render full detail" view option to render models at their full detail for the LOD (for render/detail boxes, Mantis bug #1121) 2006-11-06 05:58:05 +00:00
taylor 6f6f691e14 give the standalone chat box a horizontal scroll capability, not terribly accurate but it's good enough for the purpose (Mantis bug #1095) 2006-11-06 05:55:43 +00:00
taylor 10b85bdb8b add envmap selection to background editor
change skybox selection to be a text entry or browse instead of only text entry
allow envmap selected in background editor to be used by FRED
make texture replacement work in FRED for ships (Mantis bug #1068)
2006-11-06 05:54:13 +00:00
taylor 7541bdf84f fix the cmdbrief editor deleting the wrong stage (Mantis bug #1115) 2006-11-06 05:49:02 +00:00
taylor 89bb5f5801 fix loading callback issue in standalone 2006-11-06 05:48:15 +00:00
taylor 45b9b82efc don't require hardware GL if running FRED (this is mainly for my benefit since I always forget to add that locally) 2006-11-06 05:47:37 +00:00
taylor 70e9d6bd96 fix the envmap-getting-rotated-by-turrets bug (though it did make me chuckle a bit when I first saw it ;))
try to reuse old view setup info, if we are using the same settings again (for speed up purposes, will be a bigger deal when bumpmapping gets here)
2006-11-06 05:46:54 +00:00
taylor a7e9d368eb fix Personas memory leak (not really an issue, I just got tired of seeing it in the Valgrind reports) 2006-11-06 05:45:13 +00:00
taylor c025ce2af5 remove a basically useless debug message
fix parse_init() so that it doesn't absolutely have to init sexps (doesn't need them when getting basic info, and causes memory fragmentation otherwise)
fix multiplayer mission info getting to just get basic info (fixes a couple of minor multi issues that were already fixed in single)
2006-11-06 05:44:33 +00:00
taylor 76e3c69779 fix a memory leak that Valgrind was complaining about (happens mainly when you have a mission without a briefing) 2006-11-06 05:43:36 +00:00
taylor a72289efe0 various bits of cleanup (slight reformatting to help readability, remove old/dead code bits, etc.)
deal with a index_buffer memory leak that Valgrind has always complained about
make HTL model buffers dynamic (get rid of MAX_BUFFERS_PER_SUBMODEL)
get rid of MAX_BUFFERS
make D3D vertex buffers dynamic, like OGL has already done
2006-11-06 05:42:45 +00:00
taylor 36712fcd25 fix for Mantis bug #1104 (can't use a ":" in chat) 2006-11-06 05:40:57 +00:00
taylor d898153c5e 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
2006-11-06 05:40:06 +00:00
Goober5000 9e059618c9 --prevent the ai from "forgetting" that it's attacking a wing (fix for Mantis #1131)
--move AI_CHASE_WING goal check so that it will properly short-circuit when appropriate (discussed in the same bug)
2006-11-06 03:38:32 +00:00
Goober5000 5adc21ca15 minor bugfixes 2006-11-06 02:20:00 +00:00
Goober5000 e022750899 fix is-event-x-delay optional argument type 2006-11-05 18:42:25 +00:00
Goober5000 a2ab9e5be0 improve error message 2006-11-05 18:41:40 +00:00
Goober5000 9152530ad3 improve error message 2006-11-04 17:22:54 +00:00
karajorma ae64f135e9 Fix for Mantis 1017. - Hope we've seen the end of that damn persona bug 2006-11-03 21:36:56 +00:00
Kazan d765c4ebad Absolute speed, not forward speed, for hud speed reticle - fixes the guage for gliding 2006-11-03 18:47:43 +00:00
Kazan af1ba53142 prevent autopilot initialization while player is gliding 2006-11-03 18:45:11 +00:00
taylor ee39fab1c7 make "TBL Info" button in ships editor handle modular tables (Mantis bug #1130)
fix bugs where ship names with leading '@' or trailing whitespace didn't get compared properly in "TBL Info"
2006-11-01 15:55:25 +00:00
taylor 306fa2020b remove Assert() on Viewer_obj for supernova sun processing, it's not really needed and a NULL obj is easily dealt with by the code 2006-11-01 06:15:25 +00:00
taylor d23110b1ce add the part of the fix which actually did something ;) 2006-10-27 16:31:09 +00:00
Goober5000 e5716902e6 fix error line reporting (Mantis #1120) 2006-10-27 16:01:49 +00:00
Goober5000 18f80a109d moved some stuff around in the sexp menus 2006-10-25 01:01:55 +00:00
Goober5000 7813e5157d clarified this; it was confusing before 2006-10-24 23:56:56 +00:00
Goober5000 3a31757359 make sure to only add the sexp callback once 2006-10-24 23:28:56 +00:00
wmcoolmon e16cc4df9d Fixx0r FRED 2006-10-20 20:37:42 +00:00
wmcoolmon e66983c13a Fix extra jumpnode settings not saving. They still don't show up in FRED, unfortunately. 2006-10-15 22:03:16 +00:00
Goober5000 06d7b442c7 better safety check 2006-10-15 00:41:01 +00:00
Goober5000 841311484a betterized some things with mission arrivals and departures 2006-10-09 20:50:13 +00:00
Goober5000 4229364792 make sexp nodes dynamic 2006-10-09 06:02:46 +00:00
Goober5000 9060f65781 make sexp nodes dynamic 2006-10-09 05:25:18 +00:00
Goober5000 f0d839e9db preliminary commit of sexp node bump... fred only, just changing some names for clarity 2006-10-09 04:44:58 +00:00
Goober5000 87af51fc7d bah 2006-10-08 08:04:52 +00:00
Goober5000 327e559a32 nitpick 2006-10-08 05:21:44 +00:00
Goober5000 4c4081e078 fix forum links 2006-10-08 02:05:38 +00:00
Goober5000 f194df812e bypass annoying warnings for nonexistent bitmaps 2006-10-07 02:43:46 +00:00
karajorma 8aad408674 Fix for Mantis 1092 - (Support ships damage hull) 2006-10-06 15:23:42 +00:00
Goober5000 e0e193af78 <nelson> Ha, ha! </nelson> 2006-10-06 13:41:41 +00:00
karajorma 4f2049011b Remove the extra ship_class variable. I'd already added on as part of the team loadout changes 2006-10-06 13:32:23 +00:00
taylor 35ee92bc69 handle another null vec warning which can happen during a multiplayer respawn or certain death sequences (Mantis bug #1090) 2006-10-06 10:04:03 +00:00
taylor 52213e88fa clean up some old software rendering stuff that we don't use any longer
remove grzbuffer.*, since all it did was give us 3 variables, which were moved to 2d.*
2006-10-06 09:56:42 +00:00
taylor e062901952 For redalert stored data be sure that dead ships don't come back, and departed ships come back just as they left (Mantis bug #810) 2006-10-06 09:55:36 +00:00
taylor 015185aa86 make sure that the armor stuff gets initted (should fix Mantis bug #1080) 2006-10-06 09:54:57 +00:00
taylor 1eb29f91a0 meant to do this before but forgot about it (just replaced "(4.0/9.0) * PI" with it's result) 2006-10-06 09:34:19 +00:00
taylor c294c80b4a if shockwaves weren't loaded then don't try to unload them (fixes standalone crash) 2006-10-06 09:33:56 +00:00
taylor c4980805a6 make sure Multi_create_bitmap is initialized properly since it might not be otherwise in standalone 2006-10-06 09:33:33 +00:00
taylor 89588d45de fix for the "branch" bug (still a minor usability issue however, see Mantis bug for details)
add a popup to the loopbrief screen when you press ESC, so that we can either accept or decline the loop offer
2006-10-06 09:33:10 +00:00
taylor 36d54a10c3 bit of cleanup (technically the vertex buffer stuff is part of a much larger change slated for post-3.6.9, but this should be a little faster) 2006-10-06 09:32:16 +00:00
taylor e0657f41de re-fix this crap that I managed to break last time (was Mantis bug 1066 I think) 2006-10-06 09:31:27 +00:00
wmcoolmon 9a8ba5fce2 Fix OGG bug where sound files were always allocated 16 seconds of wavedata 2006-10-06 04:58:25 +00:00
Goober5000 711f4e6a5f check that targetview model files exist as well 2006-10-01 18:53:59 +00:00
Goober5000 15087ca0a5 more accurate message number 2006-10-01 06:18:36 +00:00
Goober5000 2cc29e4e07 fix spacing 2006-10-01 05:00:31 +00:00
Goober5000 8680154eb8 find message sender too 2006-10-01 03:22:58 +00:00
Goober5000 273f42535e newline tweaks 2006-10-01 01:28:58 +00:00
Goober5000 5393c29bdf small bugfixes 2006-10-01 01:18:42 +00:00
Goober5000 a19f89cd2c enhanced voice acting manager, now with script generator :) 2006-10-01 01:12:32 +00:00
Goober5000 00aa5b7d51 fix crlf 2006-10-01 00:54:29 +00:00
Goober5000 076e0c6fa6 more flexible checking of generic messages 2006-09-30 21:58:09 +00:00
Goober5000 9ccccac581 merge voice file manager into voice acting manager, plus make a few tweaks to it 2006-09-29 06:38:28 +00:00
Goober5000 c8ec015ff8 fix for Mantis #1070 2006-09-28 23:47:25 +00:00
taylor fe803ffa25 more standalone server fixes:
- add some basic bmpman functionality to grstub, since it needs to do something at least
 - add missing gr_* function ptrs to grstrub
 - (re-)enable radar and hud setup functions that used to crash (problems are fixed now)
 - deal with default pilot file properly (also caused a bmpman headache)
 - don't bother with Multi_common_icons[] in standalone mode (they don't load, so don't let them unload either)
2006-09-24 22:55:17 +00:00
taylor 5ee4833100 clean up the function ptrs so that it's a bit easier to read 2006-09-24 22:54:24 +00:00
taylor 520f5e1a5f move FS2NetD connection checks to *after* it tries to connect ;) (Mantis bug #1065) 2006-09-24 13:32:47 +00:00
taylor 018bfafa64 fix for deletion of multiplayer pilots (Mantis bug #1066) 2006-09-24 13:32:11 +00:00
taylor 36201f918d minor clean and code optimizations
clean up view/proj matrix fubar that made us need far more matrix levels that actually needed (partial fix for Mantis #563)
add debug safety check to make sure that we don't use more than 2 proj matrices (all that GL is required to support)
set up a texture matrix for the env map to that it doesn't move/look funky
2006-09-24 13:31:52 +00:00
taylor abe12361cc fix SAFE_STRCAT() so that it can work in an if() statement that doesn't have braces 2006-09-24 13:31:08 +00:00
taylor 72934de1c4 small optimizations and code cleanup
use the real frametime for FPS counter stuff, no reason to deal with time compression there (Mantis bug #1058)
2006-09-24 13:30:33 +00:00
Backslash d4bf059c27 Ok, maybe this one will be better. Sorry about that. 2006-09-22 09:22:08 +00:00
taylor fc1a0b5b34 revert Backslash's commit, *way* too many changes there for a single friggin line 2006-09-21 13:33:27 +00:00
Backslash 340db1e470 max_speed changed to get ship's max forward speed instead of max_vel magnitude, thus fixing trichord speed problems. (Mantis 1050, and early work by argv.) 2006-09-20 09:29:36 +00:00
Goober5000 40086501a4 more descriptive warning message for docking paths 2006-09-20 05:19:02 +00:00
taylor c24a2c8606 default to 44100 sound sample rate (OpenAL tends to works much better with this) 2006-09-20 05:06:54 +00:00
taylor fed34ef542 add some extra FS2NetD safety checks around to prevent the code from doing stupid crash-happy things 2006-09-20 05:05:28 +00:00
taylor f5daeb638a have the joystick thread prevent the display and network from going to sleep or activating the screensaver if you use only a joystick to play 2006-09-20 05:05:07 +00:00
taylor b8431d7803 the resolution checks needed to be based on the unscaled res since you would have to include correct sizes for every single resolution otherwise (fixes a bug noticed in WCS) 2006-09-20 05:04:42 +00:00
taylor e7fa994287 some gamma ramp fixage, still hasn't gotten a steller review from DaBrain but it does work much better than before, so I'll tweak it later if need be 2006-09-20 05:04:22 +00:00
taylor 1438125c1b neither of these two structs appear to be used anywhere, so lets just comment them out 2006-09-20 05:04:01 +00:00
taylor 28d2071297 some basic error message/handling fixage 2006-09-20 05:03:41 +00:00
taylor 935192c732 properly support 4gig of RAM, and don't totally freak out if user has more than that 2006-09-20 05:03:12 +00:00
taylor b0fcbc77f5 properly fix the new_recommendation_text FRED problem, plus some real cleanup for that code in general, and some memory leak fixes 2006-09-20 05:02:41 +00:00
taylor 677b191765 add default recommendation text for debriefing, it's either this or making sure that it's nul 2006-09-14 23:29:47 +00:00
taylor 65ca654c79 prevent FRED from hitting an Assert() that it shouldn't have had to hit in the first place 2006-09-14 18:48:17 +00:00
taylor 0d4849712b fix for Mantis bug #1006 2006-09-13 17:30:25 +00:00
taylor 84c5044f8e fix some stuff_string()'s that got missed previously 2006-09-13 03:57:00 +00:00
taylor a376fdd753 forgot to check that error message to match the new struct format 2006-09-13 03:56:29 +00:00
taylor 6dc30d6061 bah! stupid. 2006-09-13 03:55:50 +00:00
taylor cbc53627db might as well add this, just to be on the safe side (I haven't hit it anywhere, but it could be made into a warning if it starts getting hit) 2006-09-13 03:18:15 +00:00
taylor 496bee9a6e be sure to setup/reset ship team data too when moving to a red-alert mission (Mantis bug 1042)
(this will hopefully fix Mantis bug 860 as well, which is a separate but related issue)
2006-09-13 03:17:59 +00:00
taylor f1e1424f6f be sure that we still try to play a movie if we get to the cmd/brief screen right from another mission without debrief (Mantis bug 1043) 2006-09-13 03:17:34 +00:00
taylor a5f560da57 restore MAX_AIFTT_TURRETS to retail level, and add comment as to what it means for the next person that tries to change it 2006-09-13 03:17:06 +00:00
taylor a6d1f2c11b revert to retail behavior for turret_should_pick_new_target()
fix out-of-bounds issue
2006-09-11 09:43:35 +00:00
taylor 8c5276c067 fixes for stuff_string() bounds checking 2006-09-11 06:51:17 +00:00
taylor 113685032f fixes for stuff_string() bounds checking
stict compiler build fixes
2006-09-11 06:48:40 +00:00
taylor bc19b3429c compiler warning fixes 2006-09-11 06:47:59 +00:00
taylor a2ab2e4904 fix bug where set-object-speed-* could set speed subjectively if left to default 2006-09-11 06:47:33 +00:00
taylor 2b0c39fecf fixes for stuff_string() bounds checking
compiler warning and stict compiling fixes
2006-09-11 06:47:07 +00:00
taylor bc329454f7 fixes for stuff_string() bounds checking
compiler warning fixes
2006-09-11 06:46:36 +00:00
taylor 0da453852a fixes for stuff_string() bounds checking
make sure that default entries always get used in techroom if they don't otherwise have the techroom visibility flag
fix crash bug where the first entry in the various lists wasn't ever initialized if there is no ship/weapon/intel info to show
2006-09-11 06:46:04 +00:00
taylor 1669d78b5e various small compiler warning and strict compiling fixes 2006-09-11 06:45:40 +00:00
taylor 6b90422215 crap. ... again 2006-09-11 06:38:32 +00:00
taylor 85e1c35109 clean up the grstub mess (for work on standalone server, and just for sanity sake)
move color and shader functions to 2d.cpp since they are exactly the same everywhere
don't bother with the function pointer for gr_set_font(), it's the same everywhere anyway
2006-09-11 06:36:38 +00:00
taylor 7957f8964d crap, there was supposed to be a multi check there 2006-09-11 06:10:28 +00:00
taylor 4fafdf4c52 allow W32 init fallback if desktop depth is less than requested game depth (it may look like crap, but at least it will work) 2006-09-11 06:09:30 +00:00
taylor 3f9bfa9708 bah! got the post-it sitting in front of me, but still forgot to remove this 2006-09-11 06:08:46 +00:00
taylor 35837e3ef9 make Species_info[] and Asteroid_info[] dynamic 2006-09-11 06:08:09 +00:00
taylor 7c18fc6c7e quite a few fixes to handle missing campaigns better
change load order for campaign loading to a full check: Player-specified -> BUILTIN_CAMPAIGN -> First Avaiable.
clean up the getting of a list of available campaigns
fix simroom issue where single missions, with the [V] icon, would display wrong (this was a retail bug, but it doesn't show normally)
fix bug where, if a campaign failed to load, it would still appear available for savefile useage
fix bug where, when resetting the campaign info, the num_missions var wasn't 0'd and it could cause a sexp Assert() during reset
2006-09-11 06:02:14 +00:00
taylor f62dcfc2f4 fix a compiler warning/error on Squadmsg_history[] init 2006-09-11 05:56:23 +00:00
taylor e116f93c66 forgot an extension check (was this the background corruption bug???) 2006-09-11 05:55:18 +00:00
taylor 74a32d2bb4 switch to using cf_find_file_location_ext() when looking for movies 2006-09-11 05:54:37 +00:00
taylor 35d24f1475 various small cleanup and speedup changes
add a cf_find_file_location_ext() function, which you can pass a filename and a list of extensions and it will search for all of them at once
2006-09-11 05:49:05 +00:00
taylor c79df6bf25 make muzzle flash info dynamic
add support for modular mflash tables (*-mfl.tbm)
2006-09-11 05:44:23 +00:00
taylor 1330cb65c8 add font.h since the gr_set_font() function is only available from there now 2006-09-11 05:39:48 +00:00
taylor 7fbddd55a5 don't try to draw beam sections if there is no valid texture for it, or if there is no width 2006-09-11 05:38:16 +00:00
taylor a891b0505f make sure that we properly page in textures for 3d shockwave models 2006-09-11 05:37:33 +00:00
taylor 181d391365 compiler warning fixes 2006-09-11 05:36:43 +00:00
taylor 2366c0a5e3 some fixes for the standalone server
- get init order correct for lcl and std init
 - turn off some cmdlines that are just graphics related when Is_standalone
 - skip radar_mission_init() (may need to rethink that though, it's bound to cause problems)
2006-09-11 05:35:51 +00:00
taylor 57c2783177 minor spelling/grammer fixes 2006-09-11 05:31:11 +00:00
taylor 907d6cce6a be sure to reset color and clear color before MVE playback (fix for Mantis bug #1041) 2006-09-09 21:28:19 +00:00
wmcoolmon 31da311257 New model & ship scripting stuff 2006-09-09 09:53:36 +00:00
taylor a72c5c6194 fix for vanishing FRED2 cursor (Mantis bug #997), plus a little cleanup 2006-09-09 04:07:57 +00:00
taylor b648d1a708 crap, knew I should have fixed that in the patch so that it would be right in both branches... 2006-09-08 07:25:05 +00:00
taylor 34dd365821 fix things that strict compiling balked at (from compiling with -ansi and -pedantic) 2006-09-08 06:20:15 +00:00
taylor 4cb780ee2b fix for Mantis bug #1038 (glow point bank storage being wrong after changing ships in shipselect)
fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
2006-09-08 06:19:02 +00:00
taylor 6033260f37 small optimization 2006-09-08 06:18:29 +00:00
taylor 4148824ff3 fix for Mantis bug #617 (with a very big assist from Shade who did most of the initial work on this) 2006-09-08 06:18:05 +00:00
taylor 7b1543d3f8 lower client/server version back to retail level, there was no reason to bump it in the first place 2006-09-08 06:17:32 +00:00
taylor 3e66cff282 add support for a server name in fs2open_pxo.cfg, rather than just an IP address for the server 2006-09-08 06:17:07 +00:00
taylor 34d848fc3a 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
2006-09-08 06:16:18 +00:00
wmcoolmon 69098866b7 Better static mouse cursor support 2006-09-04 20:56:12 +00:00
wmcoolmon 1f5970d3e0 Update MSVC 7 Project files 2006-09-04 19:58:06 +00:00
Goober5000 94fae5d487 revert VOICER breakage 2006-09-04 19:14:32 +00:00
Goober5000 705635a220 fix macros 2006-09-04 18:06:37 +00:00
Backslash d653b1fdee Make hud toggle apply to hud framerate, statistics, and camera position 2006-09-04 09:26:36 +00:00
Backslash 0ae60785fe Turn off gliding upon activating autopilot 2006-09-04 09:21:55 +00:00
wmcoolmon 9e8aba7a74 Commit of 'new' BTRL FTL effect work 2006-09-04 06:17:26 +00:00
wmcoolmon c7476e9403 Update to allow flak range to be manually overridden, and safeguard against NULL predicted_pos 2006-09-04 06:13:31 +00:00
wmcoolmon b0b62c1414 Conditional hook 2006-09-04 06:12:35 +00:00
wmcoolmon 1cd84d8e82 enumerations; drawImage update; subsystem orientation and fireWeapon() member objects; many new weapons.tbl data variables; conditional hooks; modular scripting table support (*-sct) 2006-09-04 06:11:50 +00:00
wmcoolmon b6d1e894bd Fix scripting HUD hook execution method 2006-09-04 06:11:22 +00:00
wmcoolmon c9a1fd21d2 Don't force fs2_open to load motion debris. 2006-09-04 06:08:20 +00:00
wmcoolmon 944561356d Cover-up a bloody annoying warning 2006-09-04 06:06:38 +00:00
wmcoolmon 73377b5200 Allow use of the techroom, even if no current campaign exists. 2006-09-04 06:03:10 +00:00
wmcoolmon 166f2f8cf3 Changes to allow for a species with no shield anim 2006-09-04 06:00:11 +00:00
wmcoolmon d8a8b65ea2 Fix bug (under Win32) where FRED would warn about unacceptable accepted orders, but not do anything about them. 2006-09-04 05:54:14 +00:00
wmcoolmon d6413adb26 Added flag-to-string function for error messages 2006-09-04 05:50:58 +00:00
Goober5000 cf9a8ff010 fix waypoint time to goal 2006-09-02 23:41:53 +00:00
Goober5000 c249edf4d4 remove unnecessary warning 2006-09-02 20:07:39 +00:00
karajorma 0d1bd2ac91 Fix TvT problem with scores appearing incorrectly. 2006-08-25 21:21:17 +00:00
karajorma 230f108db1 Fix lack of Wingman Status indicator for Zeta wing in TvT games. 2006-08-25 21:19:02 +00:00
Goober5000 e25feb5e4e a tweak and a fix 2006-08-21 04:02:41 +00:00
taylor bb7e2ad35a maybe optimize the (PI/2), (PI*2) and (RAND_MAX/2) stuff a little bit 2006-08-20 00:51:07 +00:00
taylor fe62e071e0 slight math optimizations
reduce COUNT_ESTIMATE since I added more game_busy() calls for models and it threw off the loading bar
2006-08-20 00:50:08 +00:00
taylor f43a52e767 slight optimizations
fix AI shields to not get overly charged or overly drained when AI does equalize (it's closer to player now, but still within retail intent of function, I think)
2006-08-20 00:49:39 +00:00
taylor 1932e7ed53 slight optimizations
compiler warning fixes
2006-08-20 00:49:09 +00:00
taylor a9c8df9b94 clean out some crap that we don't really need 2006-08-20 00:48:47 +00:00
taylor 9876de8f61 cleanup
bugfixes
error-handling
(lots of crap got fixed to work better, and lets leave it at that, the commit log would be too long otherwise :))
2006-08-20 00:48:28 +00:00
taylor 3dff3f2560 very slight speed optimization to avoid math that we really don't need to do anyway 2006-08-20 00:47:57 +00:00
taylor c04620ce4d add custom IP option to maybe help get around NAT issues (I haven't heard whether this actually works or not yet though, but it's been out for testing all week) 2006-08-20 00:47:35 +00:00
taylor a0fc8f1932 add render option for no glowmaps
remove render option for fog (why was this even there??)
add tech model view for missiles with special tech models (will hopefully help spur some work towards fixing the currently broken models)
handle Z-buf issue that made the lab interface disappear when the transparent render option was ticked
2006-08-20 00:47:10 +00:00
taylor 677b753a04 OMG! MEMLEAK!!!! (maybe no one will notice that it was my fault ;)) 2006-08-20 00:46:42 +00:00
taylor ce1fd5101c an int wrap-around issue could (and was) make debris not have electrical arcs (or lighting or sounds) since it would always fail this check 2006-08-20 00:46:02 +00:00
taylor f551c87880 ever so slight speed up for bm_set_components_* (this crap is slow, and it's called a LOT) 2006-08-20 00:45:37 +00:00
taylor d88d964ff1 "byte" was the same as "ubyte", but since "byte" has to be an extra #define on everything but Windows, lets just get rid of it 2006-08-20 00:45:10 +00:00
taylor cba1fd3205 add decoder for 8-bit MVEs
a basic fix for finding AVIs over MVEs, for mod dir stuff (this needs some CFILE support added to be a true fix, it's on the TODO list)
little bits of cleanup for old/unused code
make sure MVE filenames are correct in mvelib
2006-08-20 00:44:37 +00:00
Goober5000 9599af7418 disable duplicate model texture replace 2006-08-19 21:46:05 +00:00
Goober5000 bb2c9b1a9c if a modular table ship pof cannot be found, use the original one 2006-08-19 21:45:20 +00:00
karajorma 79fc10b429 More cut & paste errors fixed and removal of the hardcoded warp out animation. Will now actually use the one specified in the table. 2006-08-18 18:07:03 +00:00
Goober5000 3eaab708b8 better handling of ballistic rearm sounds
--Goober5000
2006-08-18 04:34:59 +00:00
karajorma b5d7caf3e9 Doh! Minor fix 2006-08-16 16:47:55 +00:00
karajorma c55c3415f1 Another typo 2006-08-15 20:00:51 +00:00
karajorma 51b09a9c46 Fixed a typo which breaks team-score 2006-08-15 19:25:57 +00:00
Backslash 89d335f225 add .ogg to the list of recognized movie file extensions 2006-08-15 00:26:07 +00:00
Backslash 08c686a5d3 Quick fix to deal with the slide accel / decel inconsistency, Mantis 951. 2006-08-15 00:12:40 +00:00
Goober5000 b750f128fa nitpick 2006-08-14 22:02:43 +00:00
Goober5000 76f1e529ae extremely minor optimizations 2006-08-14 21:59:14 +00:00
karajorma a930ad0d1e Fix a Multiplayer bug where anything that included the name of a player wing was automatically considered to be a part of that wing. 2006-08-14 19:58:42 +00:00
karajorma 01b005c15e Fix Mantis 1009 - A problem with using the Change-ship-model SEXP 2006-08-09 17:50:15 +00:00
taylor 2768d08bed fix for setting of texture lod bias 2006-08-09 14:42:24 +00:00
taylor a7a0c6c361 very small math optimization 2006-08-09 14:41:44 +00:00
karajorma a0800c052d Fix a small problem with ballistic primary ammo. Forgot to upload this one earlier 2006-08-07 15:24:32 +00:00
Goober5000 0b9e9143b0 deprecate change-ship-model 2006-08-06 19:27:13 +00:00
Goober5000 af6fac57eb make these consistent (pitch-bank-heading is the established order)
--Goober5000
2006-08-06 19:06:42 +00:00
Goober5000 901e20273d add the multiple background feature
--Goober5000
2006-08-06 18:47:29 +00:00
karajorma 9f77c108e7 Fix bug where end-mission SEXP only resulting in the mission ending for the server 2006-08-04 11:45:21 +00:00
karajorma 8f4276203a Stop multiplayer campaigns crashing if the campaign lacks a description 2006-08-04 11:24:27 +00:00
Goober5000 20a5da322f add a second method for specifying ship copies, plus allow the parser to recognize ship class copy names that aren't consistent with the table
--Goober5000
2006-08-03 01:33:56 +00:00
Goober5000 d01ec0ce35 fix display of ship copy class names in ship loadout screen
--Goober5000
2006-08-02 22:47:40 +00:00
Goober5000 29f662da5d fix display of ship copy class names in ship loadout screen
--Goober5000
2006-08-02 22:31:15 +00:00
Kazan 9df2da81b7 commented out glide_while_pressed changes until taylor deems them safe 2006-08-01 04:26:02 +00:00
Goober5000 a58aa28307 proper phrase case 2006-08-01 01:56:44 +00:00
Kazan 6f9a48fec4 glide while pressed 2006-07-31 23:57:48 +00:00
Goober5000 7ed1e89ff3 fix for Mantis #1020
--Goober5000
2006-07-31 21:13:03 +00:00
Kazan e3b53ce80e resolve 1018 and an interface problem in fred2's ship editor 2006-07-30 20:01:56 +00:00
Goober5000 1a4e5991dc bah, revert 2006-07-30 02:20:17 +00:00
Goober5000 63bd3a5711 stage 1 in multiple-background feature
--Goober5000
2006-07-30 00:23:30 +00:00
taylor 4446bb66fb check first stage warp arrival against all docked objects so we can not render them all if even one is 1st stage 2006-07-28 02:46:10 +00:00
taylor 3eec72b159 when in external (non-control) view be sure to not include time compression speed in camera movement 2006-07-28 02:40:07 +00:00
taylor 78908bd6a5 don't render extra lighting passes when fog is enabled, prevents fog fragment from getting added for each pass
wobble wobble no more!!
2006-07-28 02:38:35 +00:00
taylor 9c8109a80f switch from Assert() to basic error fixage for end-of-string white space check 2006-07-28 02:37:08 +00:00
taylor 7d4b222a0e include CF_TYPE_PLAYERS in special pilot path consideration, prevents moddirs from always getting and empty data/players/ 2006-07-28 02:36:07 +00:00
taylor 9fa0710b07 don't lowercase the dir for chdir on non-Win32 since it could be, and probably is, case sensitive 2006-07-28 02:34:52 +00:00
Kazan 321feca334 Lock player primaries during autopilot 2006-07-27 19:17:59 +00:00
karajorma 00df4c9dc6 Fixed an error in ballistic weapons where only the server got the correct number of bullets in multiplayer.
Fixed a rounding up error in get_max_ammo_count_for_primary_bank()
2006-07-27 10:43:16 +00:00
Kazan e126dd0f44 Resolve Mantis #1011 2006-07-26 03:46:04 +00:00
Kazan 2d800d702c Optimize 2006-07-26 03:45:02 +00:00
Kazan d5747be6b0 Resolve Mantis #1010 2006-07-26 03:44:17 +00:00
taylor 998cccaf2f support for cmdline option stacking (a per option setting) so that things like "-mod derelict -mod mediavp" will end up as "-mod derelict,mediavp" to the game
fix bug where white space chars didn't get dropped from the end of a option string like they were supposed to
allow for something like "-ambient_factor 100 -ambient_factor 70" to use the proper value, the last one specified, rather than just accept the first instance
2006-07-25 16:26:24 +00:00
taylor e0f5aa388c minor cleanup/optimization to beam warmup glow rendering function
various lighting code cleanups
 - try to always make sure beam origin lights occur outside of model
 - make Static_lights[] dynamic
 - be sure to reset to first 8 lights when moving on to render spec related texture passes
 - add ambient color to point lights (helps warp effects)
 - sort lights to try and get more important and/or visible lights to always happen in initial render pass
2006-07-24 07:38:00 +00:00
Goober5000 08ff0d5894 fix a subtle and nasty bug
--Goober5000
2006-07-24 02:09:29 +00:00
Goober5000 46d62fd07c fix for Mantis #1003
--Goober5000
2006-07-23 16:58:28 +00:00
taylor b92196a0dc minor changes to game_busy() debug text
- don't alloc it for bmpman, and make sure to only call on textures that we are loading
 - add text for model loading, gets rid of the long-wait issue when it appears to not be doing anything early on
2006-07-21 16:08:32 +00:00
taylor c178c4b2d9 little cleanup 2006-07-21 16:08:03 +00:00
Goober5000 81c07a5f1a add another method for calculating dimensions of docked objects, plus improve an existing one
--Goober5000
2006-07-21 05:41:10 +00:00
Goober5000 957ec76724 fix help text
--Goober5000
2006-07-21 05:38:41 +00:00
karajorma 1e5152e2c2 Fix for Mantis 996 2006-07-20 21:43:05 +00:00
karajorma 122a6f3b76 Fix for Mantis 888. 2006-07-20 20:41:31 +00:00
Goober5000 9a877dcfa4 tweak control text
--Goober5000
2006-07-20 01:51:20 +00:00
taylor 16d6840523 make glow point banks dynamic 2006-07-17 01:12:52 +00:00
taylor 0bf0bc0cc3 fix some missile autocentering issues
- use MR_AUTOCENTER and MR_IS_MISSILE flags to generate an autocenter for a missile if one doesn't already exist
 - don't try to autocenter loadout icons when rendered 3d
2006-07-17 01:12:19 +00:00
taylor 344858d68b maybe this will finally shut-up some of the people who have complained about certain mipmap issues 2006-07-17 01:11:32 +00:00
taylor a13815b41c only do i2fl() on the font bitmap once per string rather than doing it per-letter (basically unnoticable performance boost)
before doing alpha channel check, make sure the bitmap is valid, since it doesn't actually catch that until later in the texture code
2006-07-17 01:10:45 +00:00
Goober5000 face66c8c4 move WMC's preload stuff into main preloader routine 2006-07-17 00:50:00 +00:00
Goober5000 e6036722d2 stage 2 of animation fix (add base frame time to each ship)
--Goober5000
2006-07-17 00:10:05 +00:00
taylor 90009fd558 missed the extern apparently 2006-07-15 18:16:00 +00:00
taylor 6953bb0d1b we probably need to be processing the number of weapons here rather than the number of ships ;) (Mantis bug #988) 2006-07-15 15:51:19 +00:00
taylor 43d4470b19 change clamp mode for font/interface graphics, don't want the border factored in for scaling/filtering 2006-07-15 06:11:27 +00:00
taylor 3a6d86da82 add missing stub for game_get_overall_frametime() 2006-07-14 03:50:31 +00:00
taylor 3ff76e3892 fix for animated texture map issues (*part one*), this should be faster than before too, and fix inf-loop/div-by-0 issues 2006-07-13 22:16:38 +00:00
taylor 3b174ae9a1 change compiler optimizations a little for release builds, use "Maximize Speed" setting, since it's basically using debug optimizations otherwise 2006-07-13 22:16:09 +00:00
taylor 13e87b9e03 fix for network afterburner support, this one should be compatible with all previous versions 2006-07-13 22:15:37 +00:00
taylor 14206edcde handle non-MVE movies a bit better in OpenGL (don't get freaky with the window, don't lose input, etc.)
some cleanup to OpenGL window handling, to fix min/max/full issues, and try to make shutdown a little nicer
2006-07-13 22:15:02 +00:00
Goober5000 d914ff97e9 * better formatting for substitute music options
* better handling of all special FSO comment tags
--Goober5000
2006-07-13 06:11:52 +00:00
Goober5000 bbc93d116a prevent labels from overlapping widgets 2006-07-13 06:10:22 +00:00
taylor af7b853d83 fix the endless-loop fix ;) (this is what broke shield recharging btw) 2006-07-12 04:59:03 +00:00
karajorma a52a8aab39 Fix afterburner trails in multiplayer (Mantis 895) 2006-07-11 23:17:03 +00:00
taylor e41b10e2e2 fix undo system
restore the two autosave points that got removed for some reason (yes, these are needed for things to work properly)
2006-07-10 21:48:33 +00:00
Goober5000 5959ab6567 bah, make sure we're in the correct mode 2006-07-09 06:12:37 +00:00
Goober5000 2b6f11be9e tweak max speed function
--Goober5000
2006-07-09 06:07:20 +00:00
Goober5000 dffba1e50a fix INF builds 2006-07-09 04:05:43 +00:00
Goober5000 4a11d9465e ugh... FS2_VOICER isn't actually defined at this point, for some reason... but it looks like phrases.cfg will always be generated, so it should be okay to take these #ifdefs out
--Goober5000
2006-07-09 03:18:15 +00:00
Goober5000 9afae7db7c this shouldn't actually be in CVS; it's produced during the build process
--Goober5000
2006-07-09 02:36:05 +00:00
Goober5000 fb22ef4804 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
2006-07-09 01:55:42 +00:00
Goober5000 f6394cdef8 iff defs should allow specification of both flag fields
--Goober5000
2006-07-08 19:36:04 +00:00
taylor be408bb34d remove -allslev
make CTRL-SHIFT-S hotkey work in mission simulator (it's a toggle, so you can turn it on or off while on the screen)
fix a bug where blank lines would show up in the campaign list for branch/alternate type missions that are otherwise marked as not completed
2006-07-08 18:11:33 +00:00
taylor e3dd86923b require OpenAL 1.1 under Windows, I think it's causing problems for us to mix users with 1.0 and builds for 1.1
(having 1.0 is fatal to sound, but the game should still work, a corresponding Launcher change goes with this too)
clean up some of the error messages to not say "DirectSound" is doing this or that, just say "Audio" instead
2006-07-08 18:10:59 +00:00
taylor 0d2a51569d debug-build-only issue, make sure that thrusters are properly enabled if needed for POF based weapons when using cheat keys 2006-07-08 11:30:40 +00:00
taylor 550aea61bc hopefully this should get missile viewing working decently again 2006-07-08 11:30:13 +00:00
Goober5000 f76462b697 fix for Mantis #967
--Goober5000
2006-07-08 04:53:29 +00:00
taylor 124341b1e0 make sure to reset the optional maps after each buffer render (little scary that this wasn't noticed a long time ago) 2006-07-07 16:26:44 +00:00
Goober5000 ed0854a255 fixed something that slipped by taylor ;)
(caused by having extra flags in the main branch)
--Goober5000
2006-07-07 01:45:57 +00:00
karajorma 3fe9fdc6fd Fix for Mantix #959. Campaign editor shouldn't crash on finding an empty mission list any more. 2006-07-06 23:48:43 +00:00
taylor ce498fc223 some better handling of OpenAL errors during init 2006-07-06 22:02:11 +00:00
taylor 719333d8c0 add some minor error catches for invalid values 2006-07-06 22:01:50 +00:00
taylor cce1c5ba61 more big-endian fixage (seriously hope this is the last of it) 2006-07-06 22:01:26 +00:00
taylor 9d81ff39e3 rest of the map/glow changes
- put glowmap activity back on a per-ship basis (via a SF2_* flag) rather than per-model
 - same for glowpoints, back on a per-ship basis
 - put specmaps and bumpmap back on a LOD0 and LOD1 affect (got changed to LOD0 only recently)
 - fix glowmaps for shockwaves again
 - add support for animated specmaps (mainly for TBP and Starfox mods)
some minor code cleanup and compiler warning fixes
2006-07-06 22:00:39 +00:00
taylor f6c652e458 add a render option to make the model not spin around, easier to work with in some cases, and better screenshots 2006-07-06 21:59:34 +00:00
taylor 35923e6bb9 newline fixage 2006-07-06 21:59:12 +00:00
Goober5000 26a7cd3c0a fix ship type bug that Taylor mentioned
--Goober5000
2006-07-06 21:24:36 +00:00
Goober5000 94e22cc069 add CVS headers
--Goober5000
2006-07-06 21:23:28 +00:00
Goober5000 ab471fd284 remove obsolete (and hackish) flag
--Goober5000
2006-07-06 21:00:13 +00:00
Goober5000 b25a6abd3a WCS screaming stuff
--Goober5000
2006-07-06 20:46:39 +00:00
Goober5000 1f01d7c558 fix dumb endless loop bug
--Goober5000
2006-07-06 18:19:59 +00:00
Goober5000 49d2670cf2 fix subtle change from retail... dunno if it's a bug, but best to stay on the safe side
--Goober5000
2006-07-06 06:04:51 +00:00
Goober5000 1b62d5ab41 fix for Mantis #856
--Goober5000
2006-07-06 05:35:13 +00:00
Goober5000 100c68141d commented annoying redundant warnings
--Goober5000
2006-07-06 05:29:57 +00:00
Goober5000 64122b414e fix a couple of typos
--Goober5000
2006-07-06 04:26:00 +00:00
Goober5000 97a4f39f1f 1) complete (almost) changeover to reorganized texture mapping system
2) finally fix texture animation; textures now animate at the correct speed
--Goober5000
2006-07-06 04:06:04 +00:00
Goober5000 9811d5a5dc fix for Mantis #571
--Goober5000/Backslash
2006-07-05 23:48:20 +00:00
Goober5000 06d046f44b spelling 2006-07-05 23:41:43 +00:00
Goober5000 472624f72a cvs comment tweaks 2006-07-05 23:37:13 +00:00
Goober5000 5594feb983 forgot this yesterday 2006-07-04 22:22:52 +00:00
Goober5000 48281a91e1 unremove the storybook for now, but it will probably be replaced with a more complete version in a week
--Goober5000
2006-07-04 16:10:48 +00:00
Goober5000 04cdbb31fe --in preparation for fixing an annoying animated texture bug, reorganize the various texture structs and glow point structs and clarify several parts of the texture code :P
--this breaks animated glow maps, and animated regular maps still aren't fixed, but these will be remedied shortly
--Goober5000
2006-07-04 07:42:50 +00:00
Goober5000 82c3862537 remove the storybook for now 2006-07-04 07:36:25 +00:00
karajorma 59a8a55be4 Restore the Hostile Warning triangles and the "On your Six" warning messages. 2006-07-02 22:53:53 +00:00
Goober5000 754bc347ba remove associated AI flags
--Goober5000
2006-07-02 03:39:55 +00:00
Goober5000 3920a826fe okay, I have no idea what I was doing there
--Goober5000
2006-07-02 03:34:16 +00:00
Goober5000 100b0bec06 fix the "Game of TAG" bug; hopefully this won't unfix something else
--Goober5000
2006-07-01 00:30:51 +00:00
Goober5000 ef911ed5b8 restore compatibility with retail ship types
--Goober5000
2006-06-28 00:46:00 +00:00
taylor 8357912841 add in Goober's new files 2006-06-27 16:53:36 +00:00
taylor 3b70983230 account for some minor floating point error in the undock speed check 2006-06-27 05:10:02 +00:00
taylor 2f132c4662 fix various compiler warnings and things that Valgrind complained about 2006-06-27 05:07:49 +00:00
taylor 37c54073ae make sure we don't process cmeasure homing more than once (this should also fix the incompatible network packet)
fix flag check to be sure that we properly detonate missiles tracking cmeasures
2006-06-27 05:06:39 +00:00
taylor fd3cebce55 we don't use alc functions here so no real need for the header 2006-06-27 05:06:05 +00:00
taylor 728b407347 make sure we only do ship related setup on actual ships 2006-06-27 05:05:18 +00:00
taylor 258504e2ee 32-bit PCX conversion doesn't do a bit swizzle so be sure we get the transparent pixel right in the first place to avoid the green 2006-06-27 05:04:43 +00:00
taylor 99006aec58 try to allow RAS VPN connects since they probably aren't dial-up and shouldn't be seen as such 2006-06-27 05:04:16 +00:00
taylor 399c4f3a21 fix so that multiple FBOs can be used with different sizes (plus a few other minor adjustments)
fix various things that Valgrind complained about
2006-06-27 05:03:42 +00:00
taylor 994f5a2ed5 add -disable_fbo option to help troubleshoot crappy ATI drivers
address a strange resize error that triggers an Assert() in the texture code with mipmaps
2006-06-27 05:02:22 +00:00
taylor 8bbaf6210f be sure to properly reset fullscreen/minimized state vars as we switch between them
remove the temporary -alpha_alpha_blend option
fix screenshots on big endian
fix various things that Valgrind complained about
2006-06-27 05:00:57 +00:00
taylor 9583a28bce sync up current OpenAL changes
- "SoundDeviceOAL" reg option for user specified sound device (used instead of "Soundcard" for OpenAL)
 - reset current context when we are leaving, may be leaving drivers in a bad state, and it hasn't hung up in quite a while
 - if sound card (which DS or OAL) is set to "no sound" then be sure to disable both sound and music
fix various things that Valgrind complained about
make sure we can report both AL and ALC errors
fix for ds_get_free_channel(), it shouldn't return -1 on an AL error
2006-06-27 04:58:58 +00:00
taylor 3fd0c6c3a9 add -disable_fbo to troubleshoot crappy ATI drivers
remove the temporary -alpha_alpha_blend option
tack on an extra byte to the flags.lch file so that the launcher can easily detect if it's an OpenAL build or not
2006-06-27 04:55:53 +00:00
taylor 39f136901d fix various things that Valgrind complained about
comp_type for DDS images will always be set to something, an 'uncompressed' type at the least
2006-06-27 04:52:50 +00:00
taylor 313f686894 add/remove files so that 'make dist' works again 2006-06-27 04:50:59 +00:00
taylor 0e74334010 bump package version 2006-06-27 04:50:33 +00:00
Goober5000 450c48e2fb add new files to project 2006-06-27 04:12:27 +00:00
Goober5000 736920cb5a handle docked objects during death roll
--Goober5000
2006-06-27 04:10:48 +00:00
Goober5000 30aa2a615c fix comment in preparation for code commit
--Goober5000
2006-06-27 03:55:22 +00:00
Goober5000 d19f74a0d6 change back to ubyte
--Goober5000
2006-06-27 02:52:36 +00:00
Goober5000 5fe39724c6 slight optimization
--Goober5000
2006-06-27 02:48:41 +00:00
wmcoolmon d71712a4b9 Fix loadTexture; fix subsystem indexing; fix getNum() for weaponbanktype; improve missing function error reporting when using LUA_INDEXER 2006-06-24 20:38:36 +00:00
wmcoolmon 5d01507169 New function for scripting 2006-06-24 20:32:00 +00:00
Goober5000 a3efb817a1 doh! sorry for blaming this on you, WMC
--Goober5000
2006-06-24 18:02:02 +00:00
Goober5000 4e58002a88 cosmetics, plus revert an unnecessary if 2006-06-24 04:48:08 +00:00
Goober5000 2b58b7c5d0 make ai-chase-any-except default to ai-chase-any
(since it never really worked properly in the first place)
--Goober5000
2006-06-24 01:54:08 +00:00
karajorma f6686a6f2c Should be here too 2006-06-23 16:16:59 +00:00
karajorma 6cea95b73e Make the ambient light sliders actually save their settings. 2006-06-23 09:17:02 +00:00
wmcoolmon 9f60e29bf1 Remove Assert, should be caught by aforementioned warning 2006-06-23 04:57:09 +00:00
wmcoolmon 8036a4383f Change an Assert to a more verbose Warning, in the case of issues restoring a red alert ship. Also, try and get some backup allocation of weapons in. 2006-06-23 04:56:31 +00:00
Goober5000 400b87939c make warpout work properly even if the player is docked to something
--Goober5000
2006-06-15 06:18:43 +00:00
wmcoolmon 20138ab38f Mantis Bug 0000947: Ahh, so that's what this was for :P 2006-06-15 04:20:13 +00:00
Goober5000 917237d3bf this is kinda superfluous 2006-06-15 01:36:01 +00:00
Goober5000 80a5fb1d9c version bumpage 2006-06-15 01:35:11 +00:00
Goober5000 b8f2e7fb3c tweaked the version string
--Goober5000
2006-06-15 01:29:25 +00:00
Goober5000 f84b9431b3 better handling for 'G' key press
--Goober5000
2006-06-15 00:47:21 +00:00
taylor c08bcff44b remove previous attempts at the Y bug fix, it's now back to the retail code for that 2006-06-15 00:37:11 +00:00
taylor e1a83a1535 fix Assert() on value of face variable, it should be able to be -1 for non-cubemap images 2006-06-15 00:36:33 +00:00
Goober5000 bcc1a646b0 remove /Og switch 2006-06-14 22:33:41 +00:00
wmcoolmon d3696ce322 Tweak events support; fix a few of Wanderer's bugs; begin model support 2006-06-12 02:33:34 +00:00
wmcoolmon 86d7fccebe Oh wait, I can just do this 2006-06-10 21:31:14 +00:00
wmcoolmon 072c1e58c3 Fix attempt #2 for mantis bug 0000900 2006-06-10 21:22:57 +00:00
Goober5000 5bdbc3769c fix parsing/handling of debriefing persona indexes
--Goober5000
2006-06-10 18:35:05 +00:00
wmcoolmon 08faeaab78 Scripting support for events/directives 2006-06-08 09:13:45 +00:00
Goober5000 3c543e56aa update credits 2006-06-08 06:48:13 +00:00
karajorma 240ccbd4dc Fix 130 ships limit for Inferno builds 2006-06-07 18:47:51 +00:00
wmcoolmon 6d1ba2d096 Fix the getScreenCoords function. 2006-06-07 07:41:16 +00:00
wmcoolmon e376768031 Not sure why I didn't catch this when compiling earlier... 2006-06-07 05:20:52 +00:00
wmcoolmon e382bbe838 Move fog disappearance factor to objecttypes.tbl 2006-06-07 05:19:49 +00:00
wmcoolmon e72678b281 Link in some scripting limbo support 2006-06-07 05:01:57 +00:00
wmcoolmon c14462aa64 Pass to get any files that I missed 2006-06-07 04:49:20 +00:00
wmcoolmon 029b2b0385 Limbo flag support; removed unneeded muzzle flash flag 2006-06-07 04:48:38 +00:00
wmcoolmon 09bef53f95 Begin multi-turret-guns toggle work 2006-06-07 04:45:55 +00:00
wmcoolmon 84dffe7569 Limbo flag support 2006-06-07 04:44:57 +00:00
wmcoolmon afd2026c8e Limbo flag support; fix scripting debug bug 2006-06-07 04:43:38 +00:00
wmcoolmon d500911b66 Limbo flag support; further scripting 3.6.9 update 2006-06-07 04:42:22 +00:00
wmcoolmon 8240763746 Limbo flag support 2006-06-07 04:39:56 +00:00
wmcoolmon 00604adf72 Limbo flag support, even for as-yet-unused code :P 2006-06-07 04:38:29 +00:00
wmcoolmon be55b7c792 "Limbo" flag support 2006-06-07 04:37:36 +00:00
wmcoolmon 73de68e1a6 Fix muzzleflashes for non-flak weapons. Begin commit of limbo code. 2006-06-07 04:36:52 +00:00
wmcoolmon e8f3ee00ee Scripting system prep for 3.6.9 2006-06-07 03:54:29 +00:00
wmcoolmon 87bbe986f5 Revert changes 2006-06-07 03:49:36 +00:00
wmcoolmon 3b7e5fc840 Scripting system prep for 3.6.9 2006-06-07 03:36:19 +00:00
wmcoolmon 18b471111b Scripting system prep for 3.6.9 2006-06-07 03:23:15 +00:00
wmcoolmon 69a4f18d07 Various sscripting fixes/updates; a couple new functions; esp. for mantis bug 0000893 2006-06-07 02:24:58 +00:00
taylor a7dc6f4632 properly initialize a few entries that were left zero'd by mistake 2006-06-06 00:00:00 +00:00
taylor 789389efe3 don't Int3() here, it's actually going to happen in some cases when using -img2dds 2006-06-05 23:59:33 +00:00
taylor 718e73d136 this should hopefully fix cursor drift on multi-display configs 2006-06-05 23:59:11 +00:00
Goober5000 3624244103 change to ASCII 2006-06-04 01:16:41 +00:00
Goober5000 694735555b add fighterbay restriction code
--Goober5000
2006-06-04 01:03:13 +00:00
Goober5000 62ed0c7f53 add capability for preloading special arguments
NB: it's disabled for now, and it needs to be moved after sexps are parsed to work
--Goober5000
2006-06-04 00:01:48 +00:00
taylor 4ea099c4a1 remove init_decals declaration, it's in the header now since we build without decal support 2006-06-03 11:57:13 +00:00
Goober5000 0d5b605882 project changes for karajorma's fred stuff 2006-06-03 06:56:17 +00:00
taylor eb6131abc3 change filename case to our standard (lower) 2006-06-02 11:57:15 +00:00
karajorma b944c5f11e Alt Ship Classes inital commit 2006-06-02 09:54:22 +00:00
karajorma d4cc6f27cc Complete overhaul of how ship loadout is handled to support the use of variables for setting the class and quantity of ships present in loadout. 2006-06-02 09:52:42 +00:00
karajorma 1a5e4e95e8 Added the alt ship class button 2006-06-02 09:48:38 +00:00
karajorma bcaf84e2e4 Added the set-class-dynamically and team-loadout-store-status ship flags 2006-06-02 09:47:30 +00:00
karajorma 83f7e6eef9 Prevented the modify variable dialog deleting or changing the type of variables which are used in Team Loadout 2006-06-02 09:46:04 +00:00
karajorma ab3718309a Team Loadout from variable changes. Added alt ship classes 2006-06-02 09:40:33 +00:00
taylor 926bf27cb5 be sure that we properly apply light to submodels (mainly for debris), looks *really* bad otherwise 2006-06-02 09:40:32 +00:00
karajorma d748a0f286 Added Team Loadout from variables and alt ship classes changes 2006-06-02 09:39:11 +00:00
karajorma 808c582f4c *** empty log message *** 2006-06-02 09:36:40 +00:00
karajorma 44c9ade1a8 no message 2006-06-02 09:35:29 +00:00
karajorma ae1a76c25f Added the Team Loadout Change subcategory
Added the deal-with-ship-loadout SEXP. It's only temporary but it give people an option other than having to roll their own events to fix up loadout at the end of a mission.
Added the num_assists SEXP to complement the num_kills one.
Updated the is-ship-class SEXP so that it can also act as was-ship-class for departed and destroyed ships.
Updated change-ship-class to work with ships that aren't in the mission yet.
Updated sexp_modify_variable to actually do the multiplayer callback that V had noticed was needed but never actually added.
2006-06-02 09:29:13 +00:00
karajorma 0a3ff37e7e Added the Team Loadout subcategory (Only one SEXP in there at the moment but more will come).
Added the num_assists SEXP to complement the num_kills one
2006-06-02 09:20:06 +00:00
taylor 461c3cbbe9 hmm, wonder why I did that? ;) 2006-06-02 09:17:09 +00:00
karajorma 4bed1abc2e Added the VARIABLE_UPDATE packet to send sexp variable value changes to client machines. 2006-06-02 09:10:02 +00:00
karajorma 49260271fb Team Loadout changes to accept variables names as legitimate values for ship class and quantity in loadout.
Added the new alt class system
2006-06-02 09:06:12 +00:00
karajorma a752d6d0d7 Swaped from stuff_int_list to stuff_ship_list when parsing in a list of ships allowed in the campaign. 2006-06-02 08:59:58 +00:00
karajorma 8bafa994d0 Added stuff_ship_list to act as a typesafe replacement for stuff_int_list and handle variables as legitimate values for both ship type and availability when parsing Team Loadout lists 2006-06-02 08:55:47 +00:00
karajorma 5c9361e8de Support for alt ship classes, team loadout flag and changes to Ships_exited. Fixed assertion upon multiple uses of the change-ship-class SEXP. 2006-06-02 08:49:35 +00:00
karajorma c2a0d8dd03 Support for alt ship classes, team loadout flag and changes to Ships_exited 2006-06-02 08:46:47 +00:00
taylor 99db7b2b18 some more buffer size strangeness (which I still don't understand) that makes certain sound formats not work properly 2006-06-02 08:05:33 +00:00
taylor c99fdf2c96 flip color/depth values, appears some are initting software GL again and this was the problem previously 2006-06-01 07:33:59 +00:00
taylor 17fd0ef9aa make sure to use software device rather than hardware since we don't currently handle source rotation/reuse properly between ds and audiostr code 2006-06-01 07:33:00 +00:00
taylor a23de790f4 make sure FORM_ON_WING goal is valid since it works for ships other than player now 2006-06-01 04:47:23 +00:00
taylor 46f7e597cb put back listener setup for each sound, doesn't make a difference under Linux but it may be hurting Windows for some reason 2006-06-01 04:46:18 +00:00
taylor 0a377e7f56 a little change to the order here, this should be safer in the long run and avoid some memory issues too 2006-06-01 04:45:19 +00:00
taylor f8d912a4c0 fix the scope issues that someone complained about in the forums 2006-06-01 04:44:19 +00:00
taylor 6c32756521 use vm_vec_normalize_safe(), a bit cheap as a fix, but it's really difficult to trace the VECMAT errors back from here 2006-06-01 04:43:49 +00:00
taylor d8835bdc16 put decals back under an #ifdef, until this is fixed it's just in the way 2006-06-01 04:41:43 +00:00
taylor 50005735a9 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 a18ca79093 render strings a string at a time rather than a letter at the time (should be at least 3 times faster from state changes alone) 2006-05-31 04:02:05 +00:00
taylor 8d66781134 bah! this thing is crashing. disable for now until I can figure out what's going on 2006-05-31 04:01:13 +00:00
Goober5000 3fa1ee0451 whoops, didn't mean to commit that 2006-05-31 03:27:19 +00:00
Goober5000 7cdb7814d8 some cosmetic changes in preparation for bay arrival/departure code
--Goober5000
2006-05-31 03:05:43 +00:00
Goober5000 7f24e0f07f fix compiler warning
--Goober5000
2006-05-31 02:08:22 +00:00
karajorma c039805ba0 Got sick of seeing that compiler warning all the time! 2006-05-30 11:20:38 +00:00
Goober5000 20209bc1f6 fix up CVS headers
--Goober5000
2006-05-30 06:01:05 +00:00
Goober5000 19b6d0b52f I should probably add these files too
--Goober5000
2006-05-30 05:58:59 +00:00
Goober5000 4565e6f240 add capability to restrict arrival/departure paths
(FRED only; FS2 implementation to follow)
--Goober5000
2006-05-30 05:37:29 +00:00
taylor c2ea62e833 make sure we are locking those vars down in timer_get() to avoid thread issues (may fix hang on "timer rolled" message) 2006-05-30 03:55:09 +00:00
taylor 52c27a513b z-range for 2D ortho is -1.0 to 1.0, may help avoid some strangeness if we actually get that right. :)
minor cleanup of old code and default settings
try not to bother with depth test unless we are actually going to need it (small performance boost in some cases)
don't clear depth bit in flip(), while technically correct it's also a bit redundant (and comes with a slight performance hit)
2006-05-30 03:53:52 +00:00
Goober5000 fe2a3e03b6 add substitute music boxes to FRED, and reset music properly when mission is cleared
--Goober5000
2006-05-30 02:13:22 +00:00
Goober5000 6ae6742b1e add AI Profile box to FRED
--Goober5000
2006-05-30 01:36:24 +00:00
Goober5000 0e6208e044 add debriefing persona index to fred
--Goober5000
2006-05-30 01:08:10 +00:00
Goober5000 41e061bb92 removed small redundancy
--Goober5000
2006-05-29 19:14:30 +00:00
Goober5000 62df777a19 add Taylor's compile fix
--Goober5000
2006-05-29 02:02:17 +00:00
taylor 12410efb93 fix D3D white screen issue 2006-05-28 18:40:37 +00:00
taylor 969febfbd9 remove DX9 SDK since it's useless to us at this time 2006-05-28 17:57:29 +00:00
taylor 7c28b639b3 minor safety check 2006-05-27 17:22:04 +00:00
taylor 767b33f610 update proj/view matrix calls to use new values 2006-05-27 17:21:37 +00:00
taylor c376148d23 clean up BM_TYPE_* stuff so it's a little easier to tell what is what
bm_load_sub_fast() doesn't need to lowercase filenames, so don't
byte-swap 16-bit DDS on big endian (they still don't look right though)
update bm_has_alpha_channel() to be less dumb
2006-05-27 17:20:48 +00:00
taylor a2cdb99bb6 d'oh! that was supposed to be off by default! 2006-05-27 17:18:56 +00:00
taylor 3c9d4d9c3d few things:
- comment out that -fixbugs and -nocrash crap, that's just stupid
  - move -env off of the experimental list (since it's working pretty well in OGL)
  - remove -nobeampierce
  - remove -max_subdivide (didn't do anything)
  - remove -rt (didn't do anything, and per-coder cmdline options should never be in CVS)
  - move -cache_bitmaps to game speed rather than graphics
  - add options for env and spec map scaling for envmaps (temporary, to be removed before official 3.6.8)
  - add option for new alpha blend mode so that artists can still test with it but not mess up normal users with the bad MediaVPs
  - remove -d3d_particle (it's obsolete now)
2006-05-27 17:17:57 +00:00
taylor 7f1da984b7 add NO_DIRECT3D support 2006-05-27 17:13:22 +00:00
taylor fe22826ef5 NO_DIRECT3D support
clean up video init stuff to use D3D if specified but always OGL otherwise (using NO_DIRECT3D will force always force OGL)
if video card reg entry can't be found just use OGL rather than getting all freaky on people
change for geometry batcher update
2006-05-27 17:12:44 +00:00
taylor 08394a9e8c don't setup all of the sound stuff for a mission if sound is disabled 2006-05-27 17:09:43 +00:00
taylor 2a44b90d16 oops! 2006-05-27 17:08:50 +00:00
taylor f1638de72e remove grd3dparticle.* and grd3dbatch.*, they are obsolete
allow us to build without D3D support under Windows (just define NO_DIRECT3D)
clean up TMAP flags
fix a couple of minor OpenGL state change issues with spec and env map rendering
make sure we build again for OS X (OGL extension functions work a little different there)
render targets always need to be power-of-2 to avoid incomplete buffer issues in the code
when we disable culling in opengl_3dunlit be sure that we re-enable it on exit of function
re-fix screenshots
add true alpha blending support (with cmdline for now since the artwork has the catch up)
draw lines with float positioning, to be more accurate with resizing on non-standard resolutions
don't load cubemaps from file for D3D, not sure how to do it anyway
update geometry batcher code, memory fixes, dynamic stuff, basic fixage, etc.
2006-05-27 17:07:48 +00:00
taylor 312b19926f only display that "no wavefile for voice" message if sound is enabled 2006-05-27 17:00:02 +00:00
taylor 55f1ab1b3b comment out some code which used only if neither D3D nor OGL 2006-05-27 16:59:05 +00:00
taylor 5ee7f1b1ae comment out the model cache stuff, it's old and not actually used anyway
minor cleanup of some modelinterp.cpp code, to make it more readable
fix tertiary thruster batcher which had the radius value swapped
comment out a couple places where we were doing a D3D or OGL check (it's always true so why bother)
add more support for NO_DIRECT3D so that it can be used on Windows to build without D3D
2006-05-27 16:57:13 +00:00
taylor 785593361e lots of little cleanup and minor fixage
make Particles[] dynamic (appears to improve processing speed of two particle functions by about 30%)
move to completely using Bobboau's geometry batcher instead of the stale one that RandomTiger did
little change to PARTICLE_SMOKE to flip UV orient differently, may add some realism, or just look kinda neat
get rid of particle_emit() stuff what was hardcoded for MAX_DETAIL_LEVEL value
2006-05-27 16:52:50 +00:00
taylor e705951cdd comment out some pointless checks which look for not using either D3D or OGL
don't run through ships on level load setting up the sound environment if sound is disabled
minor cleanup
2006-05-27 16:49:05 +00:00
taylor 5131db0c80 remove some of the old batcher functions, nothing is using them now anyway
minor cleanup
add orient UV flipping to HTL drawing functions, like retail/non-HTL has support for
2006-05-27 16:47:12 +00:00
taylor b9c2f1858c some minor cleanup
remove -nobeampierce
update for geometry batcher changes
2006-05-27 16:45:11 +00:00
taylor cd935f2b66 fix slight freakiness with debris vclips (un)loading
comment out some code which was only used if neither D3D or OGL
fix dumb particle_emit() calls
2006-05-27 16:42:16 +00:00
taylor ac449637ff remove non-Windows timeSetEvent() functions
make PDWORD and LPDWORD int instead of long (64-bit issue) (thanks Spike)
fix 64-bit ptr issue with OpenAL audio streaming code (thanks Spike)
add start of device enumberation for OpenAL 1.1 (it just lists available devices now)
make sure we open the default OpenAL 1.1 device under Windows
comment out blank listener stuff, this may have been crashing under OS X
add support for AL_BYTE_OFFSET in OpenAL 1.1 for buffer positioning under Windows
2006-05-27 16:39:40 +00:00
taylor 4967c0fdd4 remove grd3dparticle.* and grd3dbatch.* since they are obsolete
update to current Xcode project file
update frameworks (header problems) used by OS X version
2006-05-27 16:34:57 +00:00
wmcoolmon 66bdc93df2 Fix for Mantis bug #0000922 2006-05-24 05:09:25 +00:00
Goober5000 ea224ed952 fix for Mantis #750
--Goober5000
2006-05-21 22:57:30 +00:00
Goober5000 ecd04a316e fix Mantis #834
--Goober5000
2006-05-21 03:58:58 +00:00
Goober5000 02d8e6fd1c fix for Mantis #827
--Goober5000
2006-05-21 02:12:21 +00:00
Goober5000 43539dfd98 and actually commit the uncorrupted file - grr...
--Goober5000
2006-05-20 03:00:06 +00:00
Goober5000 367dbec7b6 try changing the format again
--Goober5000
2006-05-20 02:56:11 +00:00
Goober5000 eac4702e2c fix for Mantis #755, plus make the missionlog #defines uniform
--Goober5000
2006-05-20 02:03:01 +00:00
Goober5000 b08377cd2c formatting and clarification, plus fix for Mantis #911
--Goober5000
2006-05-19 04:47:40 +00:00
taylor 0836646e80 fix bool compiler warning for MSVC 2006-05-18 14:56:02 +00:00
Goober5000 c7ffc5a00c fix for Mantis #875
--Goober5000
2006-05-16 15:54:39 +00:00
karajorma bb46d019a2 Fix the lack of a background in FRED 2006-05-16 12:45:20 +00:00
Goober5000 912c927c5e fix directory goof
--Goober5000
2006-05-15 17:42:35 +00:00
karajorma f0e16e290c no message 2006-05-14 16:02:02 +00:00
karajorma 141bab42d3 Checkboxes for locking primary and secondary weapons and for disabling builtin messages from command and individual pilots 2006-05-14 15:57:43 +00:00
karajorma d90c9283a7 Fixes for the Targetable-as-bomb error from Mantis 0000910 (amongst others) 2006-05-14 15:54:16 +00:00
karajorma 6ee483f9ac Fixes for the Invulnerability problems from Mantis - 0000910 2006-05-14 15:52:42 +00:00
taylor 15bb5dceed forgot to remove STRICT define before commit, gets rid of a Windows compiler warning 2006-05-14 05:22:43 +00:00
taylor e137882c77 OpenGL envmap support
newer OpenGL extension support
add GL_ARB_texture_rectangle support for non-power-of-2 textures as interface graphics
add cubemap reading and writing support to DDS loader
fix bug in DDS loader that made compressed images with mipmaps use more memory than they really required
add support for a default envmap named "cubemap.dds"
new mission flag "$Environment Map:" to use a pre-existing envmap
minor cleanup of compiler warning messages
get rid of wasteful math from gr_set_proj_matrix()
remove extra gr_set_*_matrix() calls from starfield.cpp as there was no longer a reason for them to be there
clean up bmpman flags in reguards to cubemaps and render targets
disable D3D envmap code until it can be upgraded to current level of code
remove bumpmap code from OpenGL stuff (sorry but it was getting in the way, if it was more than copy-paste it would be worth keeping)
replace gluPerspective() call with glFrustum() call, it's a lot less math this way and saves the extra function call
2006-05-13 07:29:52 +00:00
taylor 7706111156 get rid of some wasteful math for gr_set_proj_matrix() calls
fix check that broke praise of kills for player
fix knossos warpin effect that always seems to get rendered backwards (I couldn't find anything that broke with this but I suppose it's a mod could have an issue)
2006-05-13 07:15:51 +00:00
taylor 7032281eb3 make sure sound buffers are valid before trying to delete them (was causing crash issues on Windows and OS X) 2006-05-13 07:11:46 +00:00
taylor 345b8fef8b some Windows specific OpenAL changes
add MVE files to MSVC6 project
2006-05-13 07:10:37 +00:00
taylor dc422b24a6 minor cleanup and a couple extra error checks
get rid of some wasteful math from the gr_set_proj_matrix() calls
2006-05-13 07:09:25 +00:00
taylor 61bf47af51 Vodka, it's a killer ;) 2006-05-13 07:03:41 +00:00
taylor 2180996dd8 add lazy (ie, faster) checking of asteroid collisions for time-to-impact 2006-05-13 07:02:27 +00:00
taylor 9d11783b3b fix bug where anything that wasn't a ship was considered a non-goal 2006-05-13 07:01:17 +00:00
taylor 02c737e71b MVE player (audio only works with OpenAL builds!) 2006-05-13 06:59:48 +00:00
taylor 2303a827de add newest OpenAL SDK, this makes things easier as OpenAL is now the build default 2006-05-13 06:58:07 +00:00
taylor b87fbfe680 add some missing headers, got tired of doing this myself when I did a build under Windows 2006-05-13 06:55:54 +00:00
Goober5000 36f397948a fixed build bug under WinXP
--Goober5000
2006-05-10 23:49:46 +00:00
taylor f73633677f if in freecamera mode, or the hud is disabled, the don't draw scripted hud elements
(this is almost hackish, but the bug never got a comment from WMC, so he can fix it later if this is wrong)
2006-05-09 09:23:05 +00:00
taylor 3ae297733f fix incorrect button locations, it matches the correct layout of the other techroom screens now
(thought Backslash was going to fix this, but I got tired of waiting. :))
2006-05-09 09:21:15 +00:00
taylor bfd717361b remove SCP Lite build option, the rest of the code for it was long since removed
remove the glBindBufferARB lib check, the soon-to-be-committed extension code upgrade will handle the issue much better
2006-05-09 09:19:38 +00:00
phreak c5e593b5fc the -decal command line doesn't enable decals anymore, just pops up a messagebox in windows saying that decals are disabled from now on. 2006-05-04 21:25:12 +00:00
phreak bfb0763c7d You can now preview sounds again in the event editor. 2006-04-30 16:39:43 +00:00
Goober5000 e13a46012f tweak for yesterday's file name change 2006-04-20 17:38:25 +00:00
taylor 700d2580b8 makefile fixage 2006-04-20 16:24:48 +00:00
Goober5000 67e8f94a93 proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
Goober5000 c0760fe0eb change animation.cpp to modelanim.cpp, add CVS info, and add the file to the VC6 project
--Goober5000
2006-04-20 05:42:05 +00:00
bobboau 1ebf49e128 bugfix for the animation system 2006-04-18 02:33:59 +00:00
bobboau 4148f915f3 bugfix for the animation system 2006-04-18 00:56:28 +00:00
phreak ce6bc0a4a2 fix FRED crashing if the user adds multiple waypoint paths then inserts more ships. 2006-04-18 00:08:23 +00:00
karajorma a45abe3803 Some how managed to fail to commit the primary-locked and secondary-locked ship flags.
No idea how. Oh well here they are.
2006-04-16 11:58:11 +00:00
taylor 6d62bbc1c0 extra safety check when creating a default path string, filename is optional be we need to available if root0 is missing (CFILE not initted yet)
fix that crazy compiler<->constructor<->linker<->server.txt deal caused by some bad code and a freaky link thing in freespace.cpp
2006-04-16 05:28:10 +00:00
taylor 68ef4fba9f compiler warning fix, missed this one previously 2006-04-16 05:24:58 +00:00
taylor f680a2cac7 probably doesn't need to be world readable, but certainly doesn't need to be world writeable
add Assert() to can when we are stupidly trying to allocate 0 or less size bytes in vm_malloc()
2006-04-16 05:24:16 +00:00
taylor 065d73228c some optimizations for *nix 2006-04-16 05:22:21 +00:00
taylor 732ab180fc forgot to add forward declaration for allocate_mission_text() (thanks karajorma ;)) 2006-04-15 19:00:52 +00:00
phreak 2da7ae9abe use gr_flash_alpha() for fade-in/fade-out effect.
just using gr_shade() will not work with the hud off or using an external camera.
2006-04-15 04:17:58 +00:00
phreak 71b7ae9015 gr_flash_alpha(), much like gr_flash(), but allows an alpha value to be passed 2006-04-15 00:13:22 +00:00
taylor e3d03fd212 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 52f8465347 that was rather stupid of me, fogetting this would not have been a good thing :) 2006-04-14 18:50:52 +00:00
taylor aeb1c904a1 remove all of the *_ex() parsing functions added for use by EFFs
add a pause/unpause for parsing so that we can safely start parsing something new then continue parsing something old
make Mission_text and Mission_text_raw only use the memory needed, and free it when it doesn't need to parse anymore
  (should work ok with FRED2, but I wasn't able to test it)
2006-04-14 18:44:16 +00:00
taylor 9987ec1d61 make sure that modular star tables actually work without going into an endless loop, or constantly complaining on you 2006-04-14 18:40:44 +00:00
taylor 4fba39d9cf something that Valgrind complained about 2006-04-14 18:39:38 +00:00
taylor cb267605ed giving a tbl name in this warning message is basically useless since there we can't tell which tbl this particular ship is in 2006-04-14 18:39:06 +00:00
taylor 4ff77f28a3 more checking to make sure that the malloc calls are actually needed 2006-04-14 18:37:06 +00:00
taylor d601a98198 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 a6eb24fa82 make sure we don't allocate any memory for turrets unless there are some, was causing a few various memory issues, mainly for debug builds
(there is more of this same checking on the way for the other malloc() calls during model loading, and vm_malloc() will be set to
   Assert() on a 0 or less size as well)
2006-04-13 12:19:33 +00:00
taylor 96ef2672ea deal with font rendering issue from float precision on non-standard resolutions. this is only about a 97% fix/hack
but I don't want people complaining about the bad issue until I can figure out a more appropriate solution with
  gr_set_clip(), which is the real source of the problem
2006-04-13 12:15:58 +00:00
taylor 5d7c6fb3df bah! forgot to add a blasted = on that check 2006-04-13 12:12:27 +00:00
taylor 7ec2cd5f5c compiler warning fixes to make GCC 4.1 shut the hell up 2006-04-12 22:23:41 +00:00
phreak 3624b1a7ab get jump nodes rendering again..... again. 2006-04-12 05:30:50 +00:00
phreak 7e4e0982a9 obj_delete() needs to be called for jump nodes since the slot the jump node
that used to reside in hasn't been marked as empty.  This leads to the node still appearing in fred
if the user tries to delete the "ghosted" jump node, fred crashes.
2006-04-12 05:07:00 +00:00
taylor d71387ba9b some cleanup and slight reorg
- remove special uv offsets for non-standard res, they were stupid anyway and don't actually fix the problem (which should actually be fixed now)
 - avoid some costly math where possible in the drawing functions
 - add opengl_error_string(), this is part of a later update but there wasn't a reason to not go ahead and commit this peice now
 - minor cleanup to Win32 extension defines
 - make opengl_lights[] allocate only when using OGL
 - cleanup some costly per-frame lighting stuff
 - clamp textures for interface and aabitmap (font) graphics since they shouldn't normally repeat anyway (the default)
   (doing this for D3D, if it doesn't already, may fix the blue-lines problem since a similar issue was seen with OGL)
2006-04-12 01:10:35 +00:00
taylor 8c121c59d8 more s/colour/color/ changes
throw in a couple of safety checks for some neb2 functions
2006-04-12 01:03:00 +00:00
taylor 3750db172a some small optimizations and cleanup
use floats for gr_bitmap() size and positions, mainly for non-standard resolutions since this allows proper resizing and positioning
  (the cast to float was happening later anyway so there should be not additional slowdown from that with standard resolutions)
change g3_draw_2d_poly_bitmap() to use floats instead of ints, gets rid of the extra cast and allows better resize values
2006-04-12 01:00:58 +00:00
taylor 5309150c35 that's a rather expensive function to call twice per frame, we should only need to call it once per mission and not ever have to reset it to some middle value 2006-04-12 00:55:16 +00:00
taylor d89ef03a18 DDS now works well on the interface, but I forgot to every commit the CFILE change so that they are actually usable :) 2006-04-12 00:53:26 +00:00
taylor 935b9bf981 keep forgetting to add this 2006-04-12 00:52:32 +00:00
phreak 743e183c39 undo mission list changes for now while taylor is out of town and unable to commit the rest of the codebase. 2006-04-09 19:50:19 +00:00
karajorma f4cb11fb88 Added SEXPs to lock and unlock the primary and secondary weapons 2006-04-07 20:17:33 +00:00
taylor 92c0c62c8d perhaps this will fix the white splash screen issue on Windows (been sitting on this, might as well commit it) 2006-04-06 23:25:17 +00:00
taylor 2d61680691 bits of cleanup
minor fixes for -img2dds
2006-04-06 23:23:56 +00:00
karajorma 93fdc17fa1 Damn spelling mistakes. And in the only place where it would be visible too! 2006-04-06 20:44:14 +00:00
Goober5000 f7b2ba59e3 small fix 2006-04-06 18:53:28 +00:00
wmcoolmon 7769e8f393 Better scripting team support. (Just a tad) 2006-04-06 05:28:30 +00:00
karajorma 9a17211b9c Bah! Silly error. 2006-04-05 19:59:11 +00:00
karajorma c0d4616aad Support added for the Enable/Disable-BuiltinMessages SEXP 2006-04-05 17:54:25 +00:00
karajorma 66cbc52e27 Changes to support the new Enable/Disable-Builtin-Messages SEXP 2006-04-05 16:56:57 +00:00
karajorma 1af353ba41 Changes to support the new Enable/Disable-Builtin-Messages SEXP 2006-04-05 16:46:40 +00:00
karajorma 9b945036cc Changes to support the new Enable/Disable-Builtin-Messages SEXP 2006-04-05 16:29:53 +00:00
karajorma a22a83f181 Changes to support the new Enable/Disable-Builtin-Messages SEXP 2006-04-05 16:14:04 +00:00
taylor 527f2729ac remove -tga16, it's obsolete now
add a temporary -no_emissive_light option to not use emission type light in OGL
2006-04-05 13:47:01 +00:00
taylor 103149396d correct some coding mistakes 2006-04-05 13:45:08 +00:00
taylor c49e421e76 fix linking, again. 2006-04-05 13:44:30 +00:00
wmcoolmon 7e6bab7efc Maneuvering hruster scaling, gun convergence 2006-04-04 11:38:07 +00:00
wmcoolmon 6b2844c13e Bump this, too 2006-04-03 09:07:34 +00:00
wmcoolmon 601f884ecd show-subtitle's got its groove back 2006-04-03 09:05:37 +00:00
wmcoolmon 1c39fb3916 Maneuvering thruster fixes 2006-04-03 08:09:32 +00:00
wmcoolmon cd6d006019 Miscellaneous minor changes, mostly related to addition of Current_camera variable 2006-04-03 07:48:03 +00:00
wmcoolmon 613e92d84a Scripting support for cameras, as well as for moving model subobjects 2006-04-03 07:47:07 +00:00
wmcoolmon f93d5e2cf9 gamesnd_get_by_name now ignores extensions, mostly for parse_sound reasons. 2006-04-03 07:45:43 +00:00
wmcoolmon 5bef6f400a camera code updates (Translation should be possible now) 2006-04-03 07:45:15 +00:00
wmcoolmon 76890e3683 $Warp time and $Warp speed vars 2006-04-01 01:21:58 +00:00
wmcoolmon c966f042c3 Prelim. BSG warpin effect stuff 2006-03-31 10:20:01 +00:00
Goober5000 acf908dc58 those were some bugs just waiting to happen 2006-03-30 04:18:40 +00:00
Goober5000 e77da0c908 hehe, grammar
--Goober5000
2006-03-30 04:15:20 +00:00
karajorma ec0f94d2f6 Added the set-primary-weapon and the set-secondary-weapon SEXPs. Updated the corresponding
set-x-ammo SEXPs to also accept a rearm limit.
2006-03-28 11:41:57 +00:00
taylor d6257e32df forgot to ever change this stuff
- version bump to 3.6.8 for configure file
 - the Frameworks package for OS X is now a tarball rather than a zip file
2006-03-26 10:31:02 +00:00
taylor 596a94c3ab make sure to only allow on screen save at the time (I don't like having it restricted but since it's not used for anything else there is little point) 2006-03-26 08:26:45 +00:00
taylor 15e691540a the bmpman release issues for the chatbox should be fixed now so we can go back to using bm_release() on the bitmaps
Chatbox_p_coords (the multi-pause background) should be at 0,0 (even though this isn't used I thought it was a good idea to go ahead and fix it)
2006-03-26 08:25:05 +00:00
taylor dffe83c331 split pause_*() and multi_pause_*() functions into individual single and multi versions (why it was hacked up like that I'll never know)
fix screen save in multi pause mode
address some bmpman issues from interface graphics getting released and then still used by something else
2006-03-26 08:23:06 +00:00
Goober5000 e38accf100 this should fix random-of
--Goober5000
2006-03-26 06:42:01 +00:00
taylor 80e294a5b2 fix model_allocate_interp_data() extern for OSX 2006-03-25 22:44:52 +00:00
taylor 21cbe12363 add OGL headers to CFLAGS for OSX 2006-03-25 22:44:04 +00:00
taylor b257727de4 the previous changes should prevent these things from happening, but drop in some more Assert()'s anyway 2006-03-25 22:38:15 +00:00
taylor 10c58da28c modelinterp.cpp: that little bit really isn't needed
popup.cpp:  GCC 4.1 warning fixes
2006-03-25 10:41:44 +00:00
taylor cb3acee35f don't run through game_shade_frame() every frame unless we are in a game-play state 2006-03-25 10:40:38 +00:00
taylor edefe13877 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
Goober5000 e5da8c3ec6 hopefully fix this :( 2006-03-24 18:40:13 +00:00
wmcoolmon a8a62b6a53 New subobject animation stuff and Lua functions. 2006-03-24 07:38:36 +00:00
Goober5000 2c443660d1 add nav flag to def_files
--Goober5000
2006-03-24 05:08:23 +00:00
Goober5000 897b7c5dff tweak karajorma's fixes... these should work exactly the same but are closer to my original intent 2006-03-24 05:08:19 +00:00
taylor 84637262ec address out-of-bounds issues for Sounds[] when unloading 2006-03-22 21:42:55 +00:00
taylor 252de388d3 minor warning fixage 2006-03-22 18:20:06 +00:00
taylor d288d1a25e if -mipmap is used with -img2dds to then have compressed image also contain mipmaps
use nicest hints for texture compression, should improve quality a little
when reporting compressed sizes to debug log make ani size be total, not per frame
2006-03-22 18:14:52 +00:00
taylor 0c40355fe0 minor cleanup 2006-03-22 18:12:50 +00:00
taylor f63964da82 don't really see the point of the Assert() here, just bail if it's an issue 2006-03-22 18:12:16 +00:00
taylor a950517602 GCC 4.1 barfed on this 2006-03-22 18:11:28 +00:00
karajorma c8a11c7606 Fixed Random-Of so that it finally works properly. and doesn't ignore the last items on the list.
Fixed Rand-Multiple so that when seeded it works the way I originally designed it to. Previously it was
working exactly the same as rand when seeded.
2006-03-22 16:24:20 +00:00
taylor dcc0bbee6f fix text subtitles that I so kindly broke not too long ago 2006-03-22 08:34:17 +00:00
karajorma 1eac27d093 Bah. More errors fixed. This time in in-sequence 2006-03-22 01:36:21 +00:00
karajorma bb8e8276a2 Added the In-Sequence conditional. 2006-03-21 17:19:01 +00:00
taylor 623b944400 add commands to view from and change target in viewer mode pause
also add reset ability to both view mode and hud state to return to pre-pause settings
2006-03-21 14:19:18 +00:00
Goober5000 a420a09f3b fix taylor's fix :p
--Goober5000
2006-03-21 02:50:59 +00:00
taylor f34a4c6035 some minor cleanup 2006-03-21 00:27:27 +00:00
taylor cfb9531877 fix target eval check for weapons so that friendly ships will stop shooting at friendly bombs 2006-03-21 00:08:18 +00:00
taylor f0633adb5b change wording to ease Goober's ulcer. ;) 2006-03-20 06:25:19 +00:00
taylor 4a7d3296c3 add ai_profiles flag to get rid of limit on minimum speed a docked ship can move
(not going to Int3() here from < 0.1 speed by default, a support ship actually hit it)
2006-03-20 06:19:04 +00:00
taylor 3a745df024 fix D3D/OGL test for asteroid rotations (I was far too excited about the result of this :() 2006-03-20 06:16:45 +00:00
taylor 5f29c82949 might as well do star antialiasing for OGL too 2006-03-20 06:13:35 +00:00
taylor 5c5ed650dd make sure the mission log doesn't modify stuff in Cargo_names[], since it shouldn't
have split_str_once() be sure to not split a word in half, it should end up on the second line instead
2006-03-19 05:05:59 +00:00
Goober5000 e010375e02 added set-death-message sexp
--Goober5000
2006-03-18 22:43:16 +00:00
Goober5000 46c934495b blast 2006-03-18 22:18:24 +00:00
Goober5000 14570cb8ff fix comm order initialization bug
--Goober5000
2006-03-18 22:00:43 +00:00
taylor fe21f898b1 add framerate var since it's contained in freespace.cpp and that's not used in a FRED2 compile 2006-03-18 21:23:38 +00:00
wmcoolmon 0f4afd3f04 Nitpicketiness 2006-03-18 20:24:54 +00:00
taylor 213ce40ba4 meh. 2006-03-18 10:28:58 +00:00
taylor d5b2634313 fix out-of-bounds problem in awacs checking (full neb missions may have been a bit freaky from this) 2006-03-18 10:28:25 +00:00
taylor 8d44bdaf4d make sure errors in rand_sexp() and rand_internal() are properly handled 2006-03-18 10:26:42 +00:00
taylor 439cfa5e45 some cleanup to the nebula debug console help messages 2006-03-18 10:25:45 +00:00
taylor 3347889a16 never try and load glow or shine maps if we don't have a base map for it
but WMC's bumpmap block in a BUMPMAPPING define since it useless most of the time
2006-03-18 10:25:05 +00:00
taylor b106442d33 make the main vital TMAP_MAX_VERTS stuff dynamic, should handle the major non-HTL related crashes 2006-03-18 10:23:46 +00:00
taylor ff2518fa25 we already have a variable to show the framerate so lets just use the one 2006-03-18 10:17:59 +00:00
wmcoolmon 9ac38958b0 Allow "none" in $Shockwave Model to disable shockwave 2006-03-18 09:25:55 +00:00
Goober5000 2bc810eaa7 add ship-subsys-targetable and ship-subsys-untargetable
--Goober5000
2006-03-18 07:12:08 +00:00
taylor c196e8c971 this should fix the secondary thruster effect flow direction problem 2006-03-17 18:26:40 +00:00
taylor 14c774ef95 beyond some possible out-of-bounds issues, I think this stuff was messing up non-HTL lighting too 2006-03-16 14:23:35 +00:00
taylor bad5c7caf6 make sure our event state doesn't get filled with things we should poll for (was waiting for the new input code, but really needed to get at least this in) 2006-03-15 17:35:24 +00:00
taylor a6d2bc92d9 couple of nitpicks 2006-03-15 17:33:05 +00:00
taylor 16d05bf4fd bump error msg buffer size a little (I'll probably just go dynamic with this since you hopefully won't get this too much anyway) 2006-03-15 17:32:13 +00:00
taylor d0cd9b7b2a remove alut headers, since we don't use any alut functions anyway (didn't I already do this a couple of months ago??) 2006-03-15 17:30:47 +00:00
taylor 429e6525ab bump sexp nodes to 4000 for TBP, really needs to go dynamic soon 2006-03-12 07:35:33 +00:00
taylor 8d278275c2 when I forget that I'm an idiot little things like this slip through (me == moron) 2006-03-12 07:34:39 +00:00
taylor abded996e4 gah, how stupid could I have been! gotta make sure that the symlinks are preserved (keeps file size down too). 2006-03-12 07:31:20 +00:00
taylor 939d60468f update Makefile.am for all of the project files changes, include Xcode stuff too
update code/Makefile.am with FRED2 stuff, might as well in case someone wants to do a winelib port or something
2006-03-08 05:24:11 +00:00
taylor 40006729ff remove asm from MulDiv() since Intel Mac doesn't like it very much, and it doesn't do exactly what it should anyway 2006-03-08 05:22:14 +00:00
taylor c04664849a add model_allocate_interp_data() extern for PPC machines 2006-03-08 05:15:20 +00:00
taylor 51b6d8b1b9 update project file with a bunch of cleanup and universal binary building support
add a Frameworks.zip which contains pre-made universal binary frameworks for Ogg, Vorbis and SDL
2006-03-08 05:13:10 +00:00
taylor 03fa91edb8 add Frameworks directory to the ignore list 2006-03-08 05:09:53 +00:00
taylor fdef4c6b80 don't need these with new project file and frameworks 2006-03-07 09:21:21 +00:00
taylor 0b161c6ae4 make filename length checks non-fatal 2006-03-06 16:30:06 +00:00
taylor 38da59fa62 various small cleanups, fixes, error checks 2006-03-05 21:45:12 +00:00
taylor dfa3724143 remove WMC's "speed increase" ;) (the math isn't right yet so the collision checks won't be correct, and fixing it to work right wouldn't be any faster) 2006-03-05 18:00:55 +00:00
karajorma 672aba310c Bah. Error in secondary and primary ammo SEXPs fixed 2006-03-04 11:05:47 +00:00
Goober5000 7db3ed83ec fix the random-of sexps to only choose valid arguments 2006-03-03 06:14:41 +00:00
Goober5000 0cddf00e4f took care of (hopefully) the rest of Karajorma's SEXP node handle conflicts, plus merged the random sexps with their multiple variants 2006-03-02 04:05:27 +00:00
karajorma daa8de6441 Fixed a bunch of bugs with Set-x-ammo and Rand SEXPs. 2006-03-01 23:22:25 +00:00
karajorma bf70b733fe Added the random-multiple-of SEXP and fixed random-of to work as designed 2006-03-01 20:54:35 +00:00
karajorma c2ea734c56 Changed text FRED displays for Fade-In and Fade-Out SEXPs 2006-03-01 14:53:15 +00:00
Goober5000 502fba611f fix comm message localization 2006-03-01 04:01:37 +00:00
Goober5000 1f3db839e8 not needed... and just an annoyance with > 2 main halls 2006-03-01 04:01:15 +00:00
Goober5000 8b8c6a2e86 oswpt wing fix 2006-03-01 03:14:22 +00:00
Goober5000 a8a1bfbfdb more FS1 import tweaks 2006-03-01 00:46:11 +00:00
wmcoolmon d87360e6ac Silly mistake 2006-02-28 07:52:04 +00:00
Goober5000 9241fc8043 fix another import bug 2006-02-28 07:37:12 +00:00
Goober5000 73af2a1fec cool stuff with main hall music tracks 2006-02-28 06:59:28 +00:00
Goober5000 22f2be0d3d fix the animation type triggers 2006-02-28 05:16:55 +00:00
Goober5000 0014e5f42b add log entry for jettison-cargo 2006-02-27 04:17:11 +00:00
wmcoolmon c47dbebae2 x != y, surprisingly enough 2006-02-27 01:21:03 +00:00
wmcoolmon 19b59199c3 Bump MAX_TFP to 10 2006-02-27 00:51:03 +00:00
wmcoolmon a6eebda3f9 Consistency in Lua 2D funcs; fix FRED2 loading screen images dialog boxes. 2006-02-27 00:40:34 +00:00
wmcoolmon 756a61f6db Afterburner & meta updates 2006-02-27 00:15:08 +00:00
wmcoolmon 57ef52f6ec Targetable as bomb SEXPs and dialog stuff; made invulnerable an object flag in both FRED and FS2. 2006-02-26 23:23:31 +00:00
Goober5000 3245346c91 wow, over a year later and I'm still finding docking bugs :p 2006-02-26 22:47:11 +00:00
wmcoolmon 91cd167d33 SF2_TARGETABLE_AS_BOMBER flag, Lua gr_bitmap_ex fix 2006-02-26 22:23:01 +00:00
Goober5000 9922355122 some more WCSaga stuff 2006-02-26 18:49:07 +00:00
taylor 71299f6f64 one friggin line, should have been able to notice that sooner 2006-02-26 11:09:31 +00:00
taylor c5d99f8837 another non-linear campaign fix, this one affected PVs 2006-02-26 08:06:57 +00:00
Goober5000 e3f020349e fix stupid bug 2006-02-26 05:32:55 +00:00
Goober5000 71f3acb329 guess this is still needed 2006-02-26 05:32:38 +00:00
Goober5000 32b340d20b bah 2006-02-26 01:32:23 +00:00
Goober5000 627b90b89b fix subsystems for get-object-* 2006-02-26 00:43:10 +00:00
Goober5000 cc7c096d32 some paring down of sexps 2006-02-26 00:22:15 +00:00
Goober5000 b2ad92daa5 import tweak 2006-02-25 22:06:57 +00:00
Goober5000 8747465d38 spelling 2006-02-25 21:47:19 +00:00
Goober5000 f504ecb5da fixes from last commit 2006-02-25 21:42:31 +00:00
Goober5000 584fb2a5b6 added function for retrieving a ship, wing, waypoint, or team from a sexp argument
--Goober5000
2006-02-25 20:18:14 +00:00
Goober5000 7cbc657454 some tweaks to the ignore code 2006-02-25 19:03:39 +00:00
karajorma 9774ddecc1 Added Seeding functions to Rand and Rand-Multiple SEXPs 2006-02-25 17:34:23 +00:00
wmcoolmon 1dc1aed65c Fix no text for splash screen scripting problem 2006-02-25 06:57:58 +00:00
taylor 71085ffcb4 try and make some sense out of that cmdline option mess, maybe it will stay sane for a few days at least :) 2006-02-24 07:36:49 +00:00
taylor 39e45eacb2 add v-sync support for OGL (I skimmped on this a bit but will go back to do something better, "special" extension wise, at a later date) 2006-02-24 07:35:48 +00:00
taylor 326f68ee82 fix custom loading screens that I manage to break yet again
add a "MaxFPS" registry/ini option to specify a FPS cap, useful if you can't make use of v-sync for some reason
2006-02-24 07:34:07 +00:00
taylor 7af3194685 vm_extract_angles_vector() doesn't do the same thing that this code used to so don't use it 2006-02-24 07:32:11 +00:00
taylor 6d121c1c3d clean up some of that FS2OpenPXO crap (can't wait to rip all this out for official PXO :)) 2006-02-24 07:31:18 +00:00
taylor eab464576f compiler warning fixage 2006-02-24 07:30:23 +00:00
wmcoolmon 74468eb153 Maybe fix ships-limit bug 2006-02-24 05:13:26 +00:00
Goober5000 9ab540efa8 remove my old anti-frustration thing since it's not what retail does
--Goober5000
2006-02-24 05:02:34 +00:00
wmcoolmon 6185fe9336 I love it when bugs are this easy to fix. ;) 2006-02-24 04:45:00 +00:00
taylor 69b80ad5b4 attempt to fix bad out-of-bounds (and related) issues when weaponchoice icon is missing
be sure to always initialize frame count and FPS with bm_load_animation() calls in case caller got lazy
2006-02-23 06:21:56 +00:00
karajorma 24a4b142bf Added the String-to-int SEXP. 2006-02-23 01:37:51 +00:00
taylor 4ae489e5d0 fix subsystem distance check from single ship to subsystem (this has been broken since day 1, over 3 years ago, so there could be other Mantis bugs relating to this) 2006-02-22 18:32:18 +00:00
karajorma 25904b40c6 Changed the set-secondary-ammo and set-primary-ammo SEXPs to use the banks
capacity rather than starting ammo.
2006-02-22 00:04:04 +00:00
karajorma 9aae6f74e3 Fixed the problems with set-primary-ammo and set-secondary-ammo SEXPs 2006-02-21 22:20:04 +00:00
karajorma c0bcbd8cd4 Added the get and set-primary-ammo SEXPs. The set-primary-ammo
and set-secondary-ammo SEXPs appear to be broken at the moment though
2006-02-21 21:40:25 +00:00
Goober5000 e6fd50c4a7 more true/false tweaks and redid the get-object-* and set-object-speed-* sexps to be more flexible and extensible
this will break compatibility with certain uses of these sexps in existing missions; I don't think there are any released campaigns
with the old versions so hopefully mission designers can simply update unreleased missions... however if it gets to be a problem
I will code in some reverse compatibility

--Goober5000
2006-02-21 09:08:10 +00:00
Goober5000 49059aaea0 add a bunch of tweaks to hopefully lessen the possibility of misinterpreting special return values (such as nan) as true or false
--Goober5000
2006-02-21 07:58:01 +00:00
taylor c547fd7352 make changed object type debug message a bit more useful 2006-02-21 07:12:59 +00:00
karajorma f56a087069 Added the num-ships-in-wing, get-secondary-ammo and set-secondary-ammo SEXPs 2006-02-20 20:53:11 +00:00
Goober5000 ed0ad344a9 fixed several more things in the new ignore code
--Goober5000
2006-02-20 07:59:26 +00:00
taylor e473e600b9 updated to newest dynamic starfield code
- this mainly is to just better support SEXP based starfield bitmap changes (preloading, better in-mission stuff loading)
 - also fixes index_buffer related double-free()
 - done waste memory for env index buffer if env is not enabled
 - address a couple of bm load/release issues and comment a little to tell why
2006-02-20 07:30:15 +00:00
taylor f9fe94ef49 div-by-0 bug fixage 2006-02-20 07:26:07 +00:00
taylor d3bf2d5b0f handle badly encoded (has short reads due to strange block/data size ratio) ADPCM files a little better in debug builds 2006-02-20 07:25:14 +00:00
taylor 2783f86320 start of some of the newer GL stuff
- initial support for dropping from fullscreen to windowed mode (will get more changes in another day or so, mainly because of FRED2)
 - a little cleanup
 - init change for WGL to be a little safer and to help report what it tried to use and what it got in the way of pixelformat
 - don't use global OGL_enabled to decide if GL is initialized or not (also getting more changes shortly)
 - make sure opengl_close() will always execute properly through atexit() (also getting changed later to not run through atexit())
2006-02-20 07:23:29 +00:00
Goober5000 1425f4774f hmm, remove one form of commenting 2006-02-20 05:54:44 +00:00
Goober5000 93d23f857a added ai-ignore-new which hopefully should fix the ignore bug
--Goober5000
2006-02-20 02:13:08 +00:00
Goober5000 acbd81cebe reduce confusion in naming
--Goober5000
2006-02-19 23:14:22 +00:00
Goober5000 c5b832dea2 restore original ignore behavior and remove soon-to-be-obsolete ai-chase-any-except
--Goober5000
2006-02-19 22:00:10 +00:00
Goober5000 197960047d rearrange some turret code to be more like retail
--Goober5000
2006-02-19 07:20:43 +00:00
Goober5000 0c25c442e2 fix stealth
--Goober5000
2006-02-19 03:17:01 +00:00
wmcoolmon 74306d9663 Oops 2006-02-19 02:04:40 +00:00
wmcoolmon 74ed40d63a Documentation consistency; remove unneeded check. 2006-02-19 02:01:24 +00:00
Goober5000 17773591a3 breathalyzer for WMC, stat!
--Goober5000
2006-02-19 00:59:49 +00:00
Goober5000 8278e0f44e fixed saving of special tags
--Goober5000
2006-02-19 00:49:41 +00:00
Goober5000 c3b3a75d19 additional error checking
--Goober5000
2006-02-19 00:32:47 +00:00
Goober5000 062aa69b38 center cbanis
--Goober5000
2006-02-19 00:29:39 +00:00
wmcoolmon 312cc178b6 Introducing draw_model_rotating; many improvements to weapon selection missile rendering 2006-02-18 00:42:51 +00:00
wmcoolmon 496395d498 Fix a silly bug 2006-02-17 21:47:47 +00:00
Goober5000 ba967dee96 bother those variables 2006-02-17 08:36:16 +00:00
Goober5000 6df44ceaa6 fix subtle bug
--Goober5000
2006-02-17 08:13:53 +00:00
wmcoolmon d4a7ff97bb Various updates for consistency in documentation 2006-02-16 06:00:49 +00:00
taylor 6be29e0fdf keep weapon model refcount correct (this is admittedly strange, but safer than before) 2006-02-16 05:48:48 +00:00
taylor 75727a19df I never did really like the old audiostr OpenAL change here, this just seems safer
initialize si->data and si->size before loading sound buffer (fixes OGG issue for plats that don't zero-initialize <vector>, this will be handled differently in the new code)
2006-02-16 05:47:32 +00:00
taylor 1b2721b088 remove reset of modelnums on level start (more properly moved to model_unload())
minor change ship class fixage to clear out old model
take better care to make sure that a ship model has the proper refcount (this needs further work, I don't like :V:'s crap here)
add <string> to includes in ship.h, fixes a compile issue that I forgot to fix properly before (thanks Jens)
2006-02-16 05:44:53 +00:00
taylor bf0eeb27b5 please stop modifying the passed node value in sexp functions, it makes it very difficult to debug problems 2006-02-16 05:40:58 +00:00
taylor d04ee2f2e0 some FS2NetD fixes
- timer/timeout issues
 - keep server heartbeats to a minimum in order to save some bandwidth
 - clean up some debug message a little
2006-02-16 05:39:13 +00:00
taylor c1f9b7efcf NULL vec warning fix (basically just setup as if it were NULL and skip the extra work if needed)
more bmpman related fixes, mainly addresses the condition where it would try to render textures that have been released
have model_unload() run through Ship_info[] and clear out modelnum's when they are free'd (makes more sense here than doing it on level load to keep counts right)
fix missing subsystem warning messages
2006-02-16 05:31:00 +00:00
taylor 4bd1a26311 should fix some of the model/bmpman errors off of the weaponchoice screen 2006-02-16 05:24:35 +00:00
taylor 146e2c192d I would say this is another selling point for the boozer-svn plugin, but I would have needed it too as I've missed this stuff several times 2006-02-16 05:19:46 +00:00
taylor 7e133609d3 all just getting basic info in parse_mission_info(), this fixes several parsing/warning issues that can show up
from going in the techroom and some similar FRED2 issues as this stuff doesn't get reset between get_mission_info() calls.
  this also should make the mission simulator screen load a bit faster
2006-02-16 05:18:48 +00:00
taylor 79050b101f fix strangeness with persona index thingy (ubyte can't be -1, this needs to be left like this or make an int)
address some pilot file corruption using non-linear campaigns, rather simple fix for something that took quite a while to track down
2006-02-16 05:15:48 +00:00
taylor d9752473af NULL vec warning fix (I don't really like this one that much so it may get replaced later) 2006-02-16 05:09:26 +00:00
taylor f1b2d2af86 minor 64-bit related fixage 2006-02-16 05:07:50 +00:00
taylor 6e8aab4827 various camera fixes (did this ever work properly?)
- handle basic init properly for those platforms that do/don't zero-initialize STL vector
 - allow text images without witten text
 - don't try to process text if it's NULL or of 0 length
 - don't get freaky with image handling
 - add clone/assignment operator so that push_back() will not screw up bmpman stuff
2006-02-16 05:07:08 +00:00
taylor 11830f47b7 various bmpman related fixes
- some new error checking (and fixes related to that) and cleanup
 - fix EFFs not getting released/unloaded properly (was in a local tree but apparently missed CVS)
 - minor fixes for bm_release() to produce a more properly cleaned slot
 - use fast unloading for page_in stuff since we don't actually want really want the load count changing for texture maps
   and to make sure that we free the memory usage regardless of load count
2006-02-16 05:00:01 +00:00
taylor 1e0c0f2235 couple more lighting value tweaks 2006-02-16 04:55:53 +00:00
taylor 1cd7e8f606 newline fixage 2006-02-16 04:55:14 +00:00
wmcoolmon 2981450fa2 Dodge an Assert 2006-02-15 07:30:54 +00:00
wmcoolmon 4d02e1217e Blah, pulled a Goober. 2006-02-15 07:26:52 +00:00
wmcoolmon f606fe7a5c Various weapon and team related scripting functions; $Collide Ship and $Collide Weapon hooks 2006-02-15 07:19:50 +00:00
Goober5000 01ecd46ee6 enabled modular tables for ai_profiles and added the default table to def_files
--Goober5000
2006-02-13 04:56:58 +00:00
Goober5000 fa4a39a8c7 nitpick 2006-02-13 03:11:19 +00:00
Goober5000 31bb6acc9d more tweaks, plus clarification of checks for the existence of files
--Goober5000
2006-02-13 00:20:46 +00:00
wmcoolmon 3d4295ca95 Remove initial corkscrew values from parse_weapon 2006-02-12 17:54:35 +00:00
Goober5000 7b31df805b allow specification of debriefing personas
--Goober5000
2006-02-12 10:42:25 +00:00
Goober5000 c5b61babeb whoops, forgot this 2006-02-12 08:39:32 +00:00
Goober5000 f5ba1e19b0 additional fixes and enhancements for substitute music
--Goober5000
2006-02-12 05:23:16 +00:00
Goober5000 2a061c3fdc more cool work on importing, music handling, etc.
--Goober5000
2006-02-12 01:27:47 +00:00
Goober5000 ca4e256101 bumped to 3.6.8 because of version-specific commenting
--Goober5000
2006-02-11 22:10:11 +00:00
Goober5000 cd26bde8e9 removed the FS1-specific music hack
--Goober5000
2006-02-11 22:08:56 +00:00
Goober5000 a986c1e2a2 this isn't needed now
--Goober5000
2006-02-11 21:24:05 +00:00
Goober5000 3405ad64de reworked how comments are parsed and added version-specific commenting
--Goober5000
2006-02-11 21:23:42 +00:00
wmcoolmon 606708f0e0 getWeaponClass->getWeaponClassByName, Linked/DualFire variables 2006-02-11 19:24:17 +00:00
Goober5000 6651e9f32d RT's bugfix 2006-02-11 07:34:25 +00:00
Goober5000 41f95a7f5e two things I missed before
--Goober5000
2006-02-11 07:31:55 +00:00
Goober5000 b99f6819c4 yet more various and sundry fixes
--Goober5000
2006-02-11 02:58:23 +00:00
Goober5000 c833458e9a more fixage
--Goober5000
2006-02-11 01:02:28 +00:00
Goober5000 4ee85f2ea7 more FS1 import goodness
--Goober5000
2006-02-11 00:13:55 +00:00
Goober5000 5d4852df2e fixed an old Volition bug unmasked by my parse changes
--Goober5000
2006-02-10 23:33:39 +00:00
wmcoolmon fc54469c0a Removed resize fields; fixed silly bug with RunBytecode 2006-02-09 05:07:02 +00:00
wmcoolmon ce8ec37de8 Maybe fix gliding insta-turn problem 2006-02-08 02:10:39 +00:00
wmcoolmon a956ebf70f WMC-Since we're abusing species_defs.tbl anyways, remove $NumSpecies 2006-02-06 02:29:17 +00:00
wmcoolmon 02eb2a16a1 Various fixes; very beginnings of Directives scripting support 2006-02-06 02:06:02 +00:00
Goober5000 ca1e2ae810 fixed several IFF bugs in FRED (plus one or two other bugs)
--Goober5000
2006-02-04 07:05:03 +00:00
taylor 41448cf7b0 fix sun flares that I had broken previously 2006-02-03 22:29:01 +00:00
taylor 3f2b3cb49f a couple of mvalid.cfg and tvalid.cfg file format changes to give them at least some readability
some cleanup, extra logging, and very slight speedup with mission and table validation checking
fix memory leak from mission and table validation checking
2006-02-03 22:28:10 +00:00
taylor 31a1c0b81f I don't like this being considered a fix without retail compatibility testing, but it should at the very least compile... 2006-02-03 22:25:18 +00:00
Goober5000 68f0190dc0 ugh, more ship/wing fixage
--Goober5000
2006-02-02 08:12:47 +00:00
Goober5000 d5de7aefec bah and double bah 2006-02-02 07:13:42 +00:00
Goober5000 8d5f3eb959 fixed what I broke for ship types :p
--Goober5000
2006-02-02 07:01:16 +00:00
Goober5000 e3ae13d7dd consolidated comm order stuff
--Goober5000
2006-02-02 07:00:29 +00:00
Goober5000 69e2beb10a replaced Fred_comm_orders with proper Comm_orders, just for WMC ;)
--Goober5000
2006-02-02 06:22:58 +00:00
Goober5000 a53e6c7b74 restore retail compatibility with comm orders: one logic bugfix, one cosmetic bugfix
--Goober5000
2006-02-02 06:04:02 +00:00
Goober5000 6338c13bae fixed a FRED problem brought on by the parse reordering
--Goober5000
2006-02-02 05:48:17 +00:00
phreak b976ebc8b9 Allow weapons to home in on countermeasures as well. The multiplayer code was only allowing bombs to be homed in on. 2006-02-01 23:43:34 +00:00
phreak fbaeb10cd2 -ingame should be -ingame_join 2006-02-01 23:35:31 +00:00
taylor c2c2b69a9d add local lua dir to includes 2006-02-01 13:30:12 +00:00
Goober5000 19dd7af5a4 now all the project files are working :)
--Goober5000
2006-02-01 08:05:47 +00:00
Goober5000 0e734baf44 try fixing this again 2006-02-01 05:40:44 +00:00
Goober5000 c5f879d372 bettered the ballistic primary check
--Goober5000
2006-02-01 05:11:25 +00:00
Goober5000 5e7b8e14d0 fixed project folder settings 2006-02-01 04:29:30 +00:00
taylor 47b8515aee oh the shame (/me imagines the big grin on Goober's face right now :p) 2006-01-31 17:19:20 +00:00
taylor 4e7473d94e remove USE_LUA 2006-01-31 15:44:55 +00:00
taylor 5a2cecb05e we need to skip to the start of the string, not the end 2006-01-31 15:44:29 +00:00
wmcoolmon fb23f6d361 Removed USE_LUA; Simulation hook; better debug messages for Lua; swapped out mounted weapon functions for variables 2006-01-31 06:46:14 +00:00
wmcoolmon 45760b32bf Compiler warning fix 2006-01-31 06:44:48 +00:00
wmcoolmon 65694ccf6e Debug warning; compiler warning fix. 2006-01-31 06:43:21 +00:00
wmcoolmon 1106a7af9a Removed USE_LUA 2006-01-31 06:42:28 +00:00
wmcoolmon 26c9b9c22d Scripting simulation hook; removed USE_LUA 2006-01-31 06:42:00 +00:00
wmcoolmon 90cf8fc7ef Fix hack for checking for ballistic primary ammo 2006-01-31 06:32:42 +00:00
Goober5000 a6ba03c9f4 stuff 2006-01-31 04:24:25 +00:00
Goober5000 dd0b86e564 oh noes! :( 2006-01-31 04:13:00 +00:00
Goober5000 f437c999a9 fix a potential problem with replacement range
--Goober5000
2006-01-31 02:02:33 +00:00
Goober5000 b00090cd29 update FSM import for FSPort v3.0
--Goober5000
2006-01-31 01:53:37 +00:00
taylor 985d861732 fix problem that made briefing voice repeat first second or two in OpenAL 2006-01-30 22:09:52 +00:00
taylor 4f28325994 some minor fixage 2006-01-30 22:08:59 +00:00
taylor de01dc405d and after all of my recent work fixing div-by-0 zero bugs, ya had to know this was coming :) 2006-01-30 19:37:33 +00:00
taylor 87a8b123a9 fix parsing of reinforcements 2006-01-30 19:35:41 +00:00
taylor d02d542fac make sure to init dest and dest_size for any calling functions that don't 2006-01-30 07:14:32 +00:00
taylor 3f599bcf26 fix endless loop when we've got too many weapons 2006-01-30 07:00:14 +00:00
taylor 2ecc191857 try and handle things like $$ and ## a bit better (this worked for what I threw at it but please double-check me here Goober) 2006-01-30 06:58:10 +00:00
taylor 96c6bdacec better lighting for OpenGL
remove some extra stuff that was from sectional bitmaps since we don't need it anymore
2006-01-30 06:52:15 +00:00
taylor 42c4cdd754 make MAX_LIGHTS global 2006-01-30 06:41:34 +00:00
taylor 25569bebcf better lighting for OpenGL
remove some extra stuff that was from sectional bitmaps since we don't need it anymore
some basic lighting code cleanup
2006-01-30 06:40:49 +00:00
taylor 5da0a66ddd clean up lighting stuff a little 2006-01-30 06:38:34 +00:00
taylor 4d63cf4769 account for a freaky wing issue (saw this in Derelict, or somewhere) 2006-01-30 06:37:49 +00:00
taylor cfd3d70987 handle Interp data allocation a little better 2006-01-30 06:36:35 +00:00
taylor b9c7b01ff6 minor warning fixage 2006-01-30 06:36:01 +00:00
taylor 60dd6b6ab3 minor fixage 2006-01-30 06:35:29 +00:00
taylor cade5bfea9 (possibly) better fix for some static/stuttering in certain wav files 2006-01-30 06:35:02 +00:00
taylor 4a34a158b0 try and detect some bad path info 2006-01-30 06:34:06 +00:00
taylor db36f73445 add transparent, cycling alpha, and no-light options for weapons 2006-01-30 06:33:19 +00:00
taylor 2e82436028 dynamic starfield bitmaps (if the thought it was freaky before, just take a look at the new and "improved" version ;)) 2006-01-30 06:31:30 +00:00
taylor 6965a6a84a dynamic starfield bitmaps 2006-01-30 06:30:03 +00:00
wmcoolmon bcad5469b8 Apologies, don't know how I missed this... 2006-01-29 18:01:04 +00:00
wmcoolmon 82b02677dc Make sure stuff is set up properly for ship kills 2006-01-29 07:42:49 +00:00
wmcoolmon fef970a13d Minor warning update 2006-01-29 07:41:57 +00:00
Goober5000 a6a7372c97 fix all teams at war IFF behavior
--Goober5000
2006-01-28 04:33:06 +00:00
Goober5000 fdbbc56725 fixed the bug where wings couldn't be initially docked to stuff
--Goober5000
2006-01-28 02:59:55 +00:00
Goober5000 532809a656 fixed a small incompatibility
--Goober5000
2006-01-28 00:23:36 +00:00
Goober5000 c0cd19b0a2 some tweaks for insertion sort
--Goober5000
2006-01-27 20:29:30 +00:00
Goober5000 ab1a0eeedf replace quick sort with insertion sort in many places
--Goober5000
2006-01-27 06:21:10 +00:00
Goober5000 411be31efc add an insertion sort function for small or almost-sorted arrays; it has the same prototype as stdlib's quick sort
--Goober5000
2006-01-27 06:03:41 +00:00
Goober5000 b388c2a9da a few project file fixes
--Goober5000
2006-01-27 04:06:31 +00:00
phreak 9d38626cb4 Grid zbuffering issue fix moved to the new fred project folder 2006-01-26 23:04:45 +00:00
Goober5000 fe552db39e spelling 2006-01-26 04:01:58 +00:00
taylor 01b5c513e8 first version of this sucked, this should be a bit better while working with both new and retail data
- get an average color from the palette rather than picking first (unoptimized palettes could have unused pixels in first entry)
  - slight cleanup, and s/colour/color/ (yeah, stupid American, deal with it! :))
2006-01-26 03:59:59 +00:00
Goober5000 1e2f2296e8 added variable replacement to command briefings, briefings, and debriefings
--Goober5000
2006-01-26 03:58:14 +00:00
Goober5000 2f9af7b19c pare down the pragmas some more
--Goober5000
2006-01-26 03:23:30 +00:00
Goober5000 48b4f603ac ugh; these scripting #defines really need to be kept up-to-date 2006-01-26 02:26:17 +00:00
taylor 3c9494535c quick and ugly hack to get aigoal sorting working on Windows again (temporary, should be replaced by better and permanent sorting function) 2006-01-25 22:51:07 +00:00
wmcoolmon 196e612ea1 Maybe fix G3_count error 2006-01-25 07:46:13 +00:00
phreak a762accd17 htl_lines should follow zbuffering rules 2006-01-25 03:11:52 +00:00
taylor 71a15f1b21 break out of error check loop after the first check in FRED since it doesn't like this for some reason 2006-01-24 13:38:30 +00:00
taylor b408734f17 another NaN/div-by-0 bug 2006-01-23 13:51:11 +00:00
taylor 75471226d5 fix d3d_bitmap_ex coloring (thanks Alpha0!) 2006-01-23 09:39:30 +00:00
taylor 867ab841c0 add fixes for capships that hit waypoints and just spin around
try and fix a big ship guard NaN error that is the result of an incredibly small forward speed value
2006-01-22 22:41:16 +00:00
wmcoolmon 3922659ee8 0...1...2...4? 2006-01-22 19:57:35 +00:00
taylor d71cd89d5f more class type name fixage (maybe an AltName: line for objettypes.tbl in the future?)
if a ship has no class_type in ai_chase() then assume it's ok to chase, but log it in debug
  (uncomment Int3() here after this has been tested a little more)
2006-01-22 14:09:01 +00:00
taylor 9d16c71b18 oops, didn't notice that was out of the wrong diff 2006-01-22 01:35:23 +00:00
taylor c691641dcf warning fixage
don't Int3() when trying to set ship speed via sexp if ship is not in mission yet, this shouldn't be fatal
2006-01-22 01:33:39 +00:00
taylor 073a792c67 newline fixage 2006-01-22 01:32:07 +00:00
taylor 5944464e20 no real need to cast these so just get it right in the first place 2006-01-22 01:31:44 +00:00
taylor 72c15efe38 clear depth buffer on each page flip (may give a slight speed increase)
change error check handling again, FRED may like this better but if it starts hanging again I have another fix
little safety checks for opengl_close()
fix atexit() call for OGL closeout
2006-01-22 01:30:33 +00:00
taylor 195b8688e1 handle NULL ptr ref in debug message (needs to be reconsidered as to whether the function should actually return here or not) 2006-01-22 01:28:06 +00:00
taylor 0d810f08d2 fix temp ptr warning, untested but could possibly be less error prone in some situations 2006-01-22 01:26:15 +00:00
wmcoolmon 8d0031dcd6 Texture replacement stuff 2006-01-21 09:36:58 +00:00
taylor bc89f95379 long way to go for a simple div-by-0 fix 2006-01-21 02:43:23 +00:00
wmcoolmon 7a40fe7cdc Scripting updates; Special scripting image list; Better operator meta; Orientation type; Wing type; Texture type. Fix for MSVC7 compiling. 2006-01-21 02:22:05 +00:00
taylor 53f2b228d0 that wasn't too smart of me, move extra anim filename size check to *after* we have found an anim 2006-01-21 01:56:58 +00:00
taylor 07807a9417 don't forcefully disable multisample still (part of an old ATI fix that didn't actually fix anything) 2006-01-21 00:14:25 +00:00
taylor d0ec8435f1 fix for LuaError change, *again* ;) 2006-01-21 00:11:51 +00:00
taylor 9b299e520b fix anim filename length check, they need at least 5 extra characters for the frame number on the filenames 2006-01-20 23:47:51 +00:00
wmcoolmon 3d8e063072 Lua unloadMission() 2006-01-20 17:37:38 +00:00
taylor 7ac46baa04 gr_*_bitmap_ex() stuff, D3D side is 100% untested to even compile
several other very minor changes as well
2006-01-20 17:15:16 +00:00
Goober5000 e59ea2686b remove unreferenced variable 2006-01-20 07:50:25 +00:00
Goober5000 672d33567c fix warning message
--Goober5000
2006-01-20 07:21:33 +00:00
Goober5000 5f61c6698c reordered #include files to quash Microsoft warnings
--Goober5000
2006-01-20 07:10:34 +00:00
Goober5000 392140a3d7 sorted the #include listing again
--Goober5000
2006-01-20 06:26:41 +00:00
Goober5000 05051081d1 added a missing file
--Goober5000
2006-01-20 06:24:28 +00:00
Goober5000 b8fb4ebf0b hopefully fix the Microsoft warnings
--Goober5000
2006-01-20 06:24:01 +00:00
wmcoolmon 6a50a28799 Updated FREDStubs.cpp to most current version 2006-01-20 05:35:59 +00:00
wmcoolmon 53f33c6529 Added FRED2 project file to CVS for MSVC7 2006-01-20 05:34:42 +00:00
Goober5000 2f7f66b429 fixed a sexp help message
--Goober5000
2006-01-20 04:33:21 +00:00
wmcoolmon 6032276576 GCC compile fixes 2006-01-20 03:48:35 +00:00
wmcoolmon 6f99c4e3f1 Faster object handles 2006-01-19 22:25:01 +00:00
wmcoolmon f4f8d28209 More Lua checks; added Lua vector object; better operator support. 2006-01-19 20:18:12 +00:00
wmcoolmon d5425998f9 Lua debugging stuff; gr_bitmap_ex stuff for taylor 2006-01-19 16:00:04 +00:00
taylor c954cf4088 don't attempt to draw glowpoints or engine glows when in wireframe mode (this may need to be a flag or something, but I'm not sure) 2006-01-19 14:06:33 +00:00
taylor 34bf938f98 better error handling for OGG Voris files 2006-01-19 11:49:12 +00:00
wmcoolmon 4c5e6bae52 Possible overflow check 2006-01-19 05:40:19 +00:00
phreak fc5414c2fc gr_render_buffer shouldn't be returning values if it's supposed to return void 2006-01-19 03:20:49 +00:00
phreak ddd208201e give repair-subsystem and set-subsystem-strength a fourth optional parameter used to possibly regenerate the submodel of a given subsystem
sabotage-subsystem should make the subsystems explode
2006-01-19 03:17:12 +00:00
phreak a09468be15 obj_script_set_global() should have an #ifdef/#endif USE_LUA pair in the function body. 2006-01-19 03:15:31 +00:00
Goober5000 4bbf5da5ba whoops, messed up the paths
--Goober5000
2006-01-19 02:51:00 +00:00
Goober5000 8645d371dc import FRED2 back into fs2_open module
--Goober5000
2006-01-19 02:27:38 +00:00
Goober5000 ffd76acd92 add lowercase .ico file 2006-01-19 02:00:39 +00:00
Goober5000 d6b7619ad1 remove uppercase .ico file 2006-01-19 02:00:00 +00:00
taylor 261ec77c66 this is probably going to end up doing something bad again when switching mods, hopefully it's not still necessary though 2006-01-18 17:45:01 +00:00
taylor 945d2e0f99 oops! :) 2006-01-18 16:36:32 +00:00
taylor 3228a365bb use HTL wireframe view if in HTL mode 2006-01-18 16:17:33 +00:00
taylor bf6ecae647 allow gr_render_buffer() to take TMAP flags
let gr_render_buffer() render untextured polys (OGL only until some D3D people fix it on their side)
add MR_SHOW_OUTLINE_HTL flag so we easily render using HTL mode for wireframe views
make Interp_verts/Interp_norms/etc. dynamic and get rid of the extra htl_* versions
2006-01-18 16:14:04 +00:00
taylor bc115d988e if a weapon model isn't loaded then be sure to load it in weapon_create() (catches a few weird weapon setups) 2006-01-18 16:02:26 +00:00
taylor b7832b7730 support only PCX for the nebula background graphics (given how it works that's the fastest and easiest way to get it done) 2006-01-18 16:01:14 +00:00
taylor 3ade8b5d0e show poly flag setting was reversed 2006-01-18 15:59:33 +00:00
wmcoolmon 5c51bb7c9e Various scripting updates 2006-01-18 06:13:18 +00:00
wmcoolmon c8c7be9b3f Switch ballistic weapon hudgauge to show "Energy" field in place of pure-energy weapons 2006-01-17 17:41:05 +00:00
wmcoolmon c451e89322 Better state handling; added GameInit hook 2006-01-17 07:28:39 +00:00
wmcoolmon 540cfa86c1 Various minor improvements 2006-01-17 07:10:01 +00:00
wmcoolmon c91c1d14e5 Removed #ifdef around Object_type_names extern 2006-01-17 04:11:26 +00:00
phreak 3d12a5038f Make sure the rearm eta isn't recalcuated until the player docks again with a support ship 2006-01-17 03:48:25 +00:00
phreak 70c843a92d Modified the formatting for the rearm countdown timer once docked. 2006-01-17 03:46:56 +00:00
phreak ffef71b0e0 Rearranged the rearming code so it doesn't potentially take 2 minutes to reload a single bomb. 2006-01-17 03:45:32 +00:00
wmcoolmon 1fba6643ff data/scripts directory 2006-01-17 02:33:20 +00:00
taylor 61513eda31 well that was super smart of me 2006-01-17 01:31:43 +00:00
wmcoolmon 1fd2e6183a Fix scripting; Tidy up scripting.html; Replace various functions with virtual variables 2006-01-17 01:31:20 +00:00
wmcoolmon 7152f462ac drawText => drawString 2006-01-16 23:29:06 +00:00
wmcoolmon 84509ecb1b Added support for setting handle variables with LUA_VAR; added support for array indexing with LUA_INDEXER; use LUA_SETTING_VAR to check whether in setting mode for both. Cleaned out older code 2006-01-16 21:26:19 +00:00
taylor d12146c399 some minor changes to model_should_render_engine_glow(), better safety checks, support for disrupted engines
check to see if a particular engine is disabled/destroyed/disrupted before making engine wash for it
2006-01-16 20:57:03 +00:00
taylor 788346132d compile fix 2006-01-16 20:54:58 +00:00
wmcoolmon 61b0961b1b Use obj_script_set_global for "plr" and "slf"; remove Lua variable if variable goes to NULL 2006-01-16 11:16:07 +00:00
wmcoolmon 76b72c21a1 Changed object's "getType" to "getBreed" to avoid confusion 2006-01-16 11:12:46 +00:00
wmcoolmon 566683d944 Can't forget #End! 2006-01-16 11:07:37 +00:00
wmcoolmon a532dfe749 Various warning fixes, scripting globals fix; added "plr" and "slf" global variables for in-game hooks; various lua functions; GCC fixes for scripting. 2006-01-16 11:02:23 +00:00
phreak 725f48d83f Only display the capped normal message in debug builds 2006-01-16 07:46:03 +00:00
Goober5000 22a6ee7e4b use IFF colors in escort list 2006-01-16 05:54:21 +00:00
taylor cb56528cd5 correct get/set sample math, it expects 8-bit sizes so we have to convert to/from actual 2006-01-15 21:22:22 +00:00
taylor f199e105d6 another NULL VEC3D warning fix 2006-01-15 18:56:45 +00:00
taylor 6822ac268e fix compile issues from bad constructor
make sure ai_actively_pursues gets filled for modular tables too
fix NULL ptr reference when parsing ship type which doesn't exist and is set to not create
2006-01-15 18:55:27 +00:00
taylor 2c49f2319e fix stuff_boolean() debug spew 2006-01-15 18:53:19 +00:00
Goober5000 6e32da638d fix some tweaky thing that isn't even used :p
--Goober5000
2006-01-15 01:02:01 +00:00
wmcoolmon 26cc1a7742 Special shockwave and moving capship bugfix, (even more) scripting stuff, slight rearrangement of level management functions to facilitate scripting access. 2006-01-14 19:54:55 +00:00
taylor 9d85cfe870 minor OGL lighting fix 2006-01-14 19:25:55 +00:00
wmcoolmon a05865d418 Allow RunByteCode to return an argument 2006-01-14 10:35:41 +00:00
wmcoolmon a113b16c2b New Lua feature - globals control. 2006-01-14 09:21:27 +00:00
taylor a8528fac46 make sure rship gets initialized before use 2006-01-14 06:25:11 +00:00
taylor 83f75aae47 get object vars correct 2006-01-14 06:24:27 +00:00
taylor b18cf46162 be sure to account for skipped mipmap levels in calculation of textures in VRAM 2006-01-14 06:23:39 +00:00
Goober5000 aa3218101d tweaky tweak
--Goober5000
2006-01-14 05:36:06 +00:00
phreak 01cacc1109 Tried to make the sphere size more uniform on opposite ends of the orb
Modified the radar disruption angle scale a bit.  Went from 200 degree to 20 degree disruption.  Otherwise, it was very confusing to find hidden objects.
2006-01-14 04:44:29 +00:00
phreak 0b6c4a0811 Make orb radar mode drawing again.
Clarify "fudge" variable used for viewing transformations
2006-01-14 03:28:29 +00:00
wmcoolmon a432a38e83 Grr...fix out-of-sync game states 2006-01-14 01:51:49 +00:00
wmcoolmon 22fa83c886 Added a few more functions 2006-01-14 01:20:16 +00:00
wmcoolmon bb2b1919f3 Oops 2006-01-14 01:15:11 +00:00
wmcoolmon 3523f2a381 Campaign scripting functions 2006-01-14 01:12:35 +00:00
taylor e2ce25bd66 move SDL autoconf checks up so we get the defines earlier
fix some Lua build problems on Linux (enabled by default now, but with configure option)
newline fixage
comment fixage
2006-01-13 14:19:34 +00:00
taylor 9a1462c758 hmm, didn't put much thought in that the first time, this should work closer to the original but still be cleaner 2006-01-13 13:06:15 +00:00
taylor 2f0bc312ea fix hud comm message screwups (missing support ship, no coverme, etc) that was part :V: bug and (bigger) part Ship_types related bug 2006-01-13 11:09:45 +00:00
taylor e8e2af7762 swap order of pilot read and reset-to-defaults so that the various entries in the pilot file don't get clobbered needlessly 2006-01-13 08:27:43 +00:00
wmcoolmon 8a8811b346 More scripting stuff 2006-01-13 04:46:17 +00:00
Goober5000 daedc76eba add a necessary #ifdef
--Goober5000
2006-01-13 04:36:21 +00:00
Goober5000 6070ee973e oops
--Goober5000
2006-01-13 04:12:23 +00:00
Goober5000 ce7cb583d8 remove FS2_VOICER define by default; this should really be kept in local copies
--Goober5000
2006-01-13 04:11:49 +00:00
Goober5000 af29186ae5 übercommit of custom IFF stuff :) 2006-01-13 03:31:20 +00:00
Goober5000 ad4da02782 formatting, meh
--Goober5000
2006-01-13 02:56:01 +00:00
wmcoolmon d6a9bc8b97 Even more scripting stuff. 2006-01-12 17:42:56 +00:00
wmcoolmon e348177e06 Finished committing codebase 2006-01-12 04:18:10 +00:00
wmcoolmon 0d61ee4b41 Oops, missed a file 2006-01-12 04:16:27 +00:00
wmcoolmon a579001520 Fix bug with float return; update scripting.html format 2006-01-11 22:09:41 +00:00
wmcoolmon a7f066cad7 More scripting functions, various scripting enhancements 2006-01-11 21:24:37 +00:00
wmcoolmon 92e7163230 Made turret handling code more descriptive 2006-01-11 21:23:43 +00:00
wmcoolmon 71b6357623 Somewhat better turret comments 2006-01-11 21:15:15 +00:00
taylor cc47681a4b allow for an equals value in qsort() comparison function, will hopefully fix Enif station bug and not cause any new problems 2006-01-11 05:42:17 +00:00
taylor c7b527fd64 use cf_find_file_location() check instead of cfopen() for is_spary_hi check 2006-01-11 05:40:59 +00:00
taylor 60ad956c3e newline fixage 2006-01-11 05:40:09 +00:00
taylor 2a0ff30b8e skip ourselves in hostile check, this isn't really needed since it's handled by the next check but for clarity sake it's here now 2006-01-11 05:39:49 +00:00
wmcoolmon 58df873315 Complete the HUD scripting hook. (Eight lines of code, and I still miss three of them. :P 2006-01-11 01:35:53 +00:00
randomtiger 0146194f66 Took demo compile flag off. 2006-01-10 18:39:40 +00:00
randomtiger 94503d5da6 Improvements to voice recognition system.
Also function put on -voicer launcher option.
2006-01-10 18:37:46 +00:00
phreak c7ed7640e1 Fixed a logic error when dealing with non-targetable subsystems 2006-01-10 01:23:09 +00:00
phreak dfd3306f4f Add the argument for alpha color when using set-jumpnode-color. This was defaulting to some junk value and making the jumpnode disappear. 2006-01-10 00:12:08 +00:00
phreak 9ef6ca64d1 Argument checking when setting jumpnode color. 2006-01-10 00:11:03 +00:00
phreak 9782a6b52e Remove tertiary weapons in their current form, I want something more flexable instead of what I had there. 2006-01-09 04:54:51 +00:00
phreak 69b36d1824 fix compile warnings. 2006-01-09 04:52:34 +00:00
taylor 89e4543401 newline fixage 2006-01-08 13:05:41 +00:00
taylor f8af83a132 make sure that thrusters will still render with a missing primary bitmap if they have a primary glow 2006-01-07 12:48:04 +00:00
taylor 38514b3511 I refuse to comment on my own stupidity! (fixes music interruption) 2006-01-06 11:25:29 +00:00
wmcoolmon 51f843c9ca turret-target-order SEXPs, ship thrusters 2006-01-06 04:18:55 +00:00
taylor 3ff670c687 make Split_ships[] dynamic (wouldn't have been a big deal to just bump the limit, but what the hell) 2006-01-05 11:34:44 +00:00
taylor 0be24fea31 add a .cvsignore file for lua so there isn't a worry of commiting something bad 2006-01-05 08:06:03 +00:00
wmcoolmon 01236d638f Fix supercap 2006-01-05 05:54:16 +00:00
taylor ea4659474f allow both +Pri style and original style (+Normal, etc) for species_defs TBMs
allow for "<none>" as a bitmap/anim name, to have no effect
fix ship/weapon thruster rendering to handle missing primary animation and/or glow graphics
2006-01-05 05:12:11 +00:00
wmcoolmon f3c13f173a Flak weapons only use detonation range if targets are further away than $Det range 2006-01-04 21:48:36 +00:00
taylor de4dadf744 fixes for regular texture replacement 2006-01-04 08:19:22 +00:00
taylor 3a90aac9aa fix files corrupted by RTs commit 2006-01-03 23:24:54 +00:00
taylor 6a6101a250 oops, should have been checking my logs on that one, fixes minor GL error 2006-01-03 22:46:52 +00:00
randomtiger b04f429d2b Fixed bad phrases path 2006-01-03 20:13:23 +00:00
randomtiger a150b020e2 Removed bad phrases.cfg reference 2006-01-03 18:09:31 +00:00
randomtiger 2ed66e92a0 Added voice recognition functionality for Visual C6 project only.
Currently still a work in progress.
2006-01-03 17:07:11 +00:00
taylor be24147515 weapon precedence wasn't getting read in on normal weapon.tbl parse, should fix the missing primary weapons in early retail missions 2006-01-03 06:02:59 +00:00
taylor 1081bfb4b1 fix freaky nan error on line drawing where model would get loaded on second entry into WS screen when it should be animation 2006-01-03 06:02:00 +00:00
taylor 5b2fc86332 fix a couple of minor mipmap problems
add resizing with mipmaps rather than a physical change in memory when detail levels dictate scaling (maybe this won't blow up)
2006-01-03 02:59:14 +00:00
taylor 277994cc42 can't overwrite node var here, it's original value is needed later and was throwing out NULL chars in the Warning()s 2006-01-02 21:28:52 +00:00
taylor e6fc6e112d remove ALUT headers, we don't it anyway and it's not included with OpenAL anymore 2006-01-02 07:26:43 +00:00
taylor f4eb204370 don't specify a read buffer, something with this is screwing up ATI cards, a debug string should satisfy a hunch
ifdef out the bumpmap stuff, it's very wrong anyway :)
2006-01-02 07:25:11 +00:00
taylor 6546209fca use cf_find_file_location() for objecttypes.tbl rather than a cfopen()
fix a few compiler warning messages
2006-01-02 07:16:43 +00:00
taylor cc0539bd2f make sure we clear out the vertex used to render a sun (just to be on the safe side)
use parse_modular_table() for -str.tbm
2006-01-02 07:13:38 +00:00
taylor 8937061e7c those blasted Windows programmers! ;) 2006-01-02 07:12:24 +00:00
taylor 24a51079f3 start of DDS volume/cube map support (rest of this needs code not ready for CVS but this will be needed later) 2006-01-02 07:11:41 +00:00
phreak bf8e759daf add def_files.h and def_files.cpp to code project. 2006-01-02 03:55:28 +00:00
phreak f763434e89 this should have an ifdef/define/endif block 2006-01-02 03:54:27 +00:00
wmcoolmon 29cea0d232 Changed num-within-box wing function 2005-12-31 01:49:53 +00:00
wmcoolmon bfd966dc45 num-within-box 2005-12-31 01:47:35 +00:00
taylor 4bfa879248 forgot to include autoconf/automake versions 2005-12-30 10:12:53 +00:00
taylor edd4729029 update Linux build steps 2005-12-30 10:11:02 +00:00
taylor 00531000b1 add def_files 2005-12-30 09:57:53 +00:00
wmcoolmon f9410e1ea3 Assert -> parse warning 2005-12-30 05:40:19 +00:00
wmcoolmon b6bf0aaba0 Updated MSVC projects 2005-12-30 00:53:00 +00:00
taylor d3e8f3a35e we are using gouraud lighting here so be sure to set the proper tmap flag (fixes D3D, corrects OGL) 2005-12-29 20:12:51 +00:00
wmcoolmon 2e77457f49 Fix(?) shiptypes.tbl crash on startup 2005-12-29 12:44:45 +00:00
wmcoolmon 0b858ba513 Codebase commit, most notably including objecttypes.tbl 2005-12-29 08:08:42 +00:00
taylor 1c1c50e39f add <gamedir>/screenshots support and save screenshot images in TGA rather than BMP format 2005-12-29 07:58:02 +00:00
taylor dbb52132e4 put texture filter debug message back (was commented out for some reason in phreak's commit) 2005-12-29 04:33:15 +00:00
phreak aa8c7e0331 loading code for flipped briefing icons. 2005-12-29 00:56:45 +00:00
phreak 460524986d mirror parameter in hud_anim_render(). only used when briefing icons are fading in. 2005-12-29 00:54:08 +00:00
phreak 40e4c92b1d changed around aabitmap calls to accept a "mirror" parameter. defaults to false, and is only true for mirrored briefing icons.
If the mirror param is true, then the picture is mirrored about the y-axis so left becomes right and vice versa.
2005-12-29 00:52:57 +00:00
phreak bd3320579e Briefing icons can now be mirrored so one can point them in the opposite direction. 2005-12-29 00:49:43 +00:00
taylor d04fe382b0 add support for a species_defs modular table with XMT support (*-sdf.tbm) 2005-12-29 00:01:29 +00:00
taylor 6e6ed4cd76 handle case where we make an atexit (on failure) flush call before the texture system is initted 2005-12-29 00:00:18 +00:00
taylor 17be7fd87e getting tired of having to ifdef the snprintf/_snprintf thing that Microsoft can't do right 2005-12-28 22:34:01 +00:00
taylor 97a4b4d4e8 properly deal with post-89 TGA images which have extra extension and developer info in the file 2005-12-28 22:32:37 +00:00
taylor 00452e781b unused variable (to make GCC shut up) 2005-12-28 22:31:03 +00:00
taylor 7b67285676 add fl_tan() for getting the tangent of a float since it's terribly inaccurate to just use tan() on a float 2005-12-28 22:30:24 +00:00
taylor f5bb9d1092 add support for glCompressedTexSubImage2D(), we don't use it yet but there is nothing wrong with adding it already
better support for mipmaps and mipmap filtering
add reg option "TextureFilter" to set bilinear or trilinear filter
clean up bitmap_id/bitmap_handle/texture_handle madness that made things difficult to understand
small fix for using 24-bit images on 16-bit bpp visual (untested)
2005-12-28 22:28:44 +00:00
taylor a44ddee6ad save screenshots into <gamedir>/screenshots/
another attempt at fixing popups with single colors (saves memory too, hope it doesn't blow up)
add a debug msg about mipmap filter in use
2005-12-28 22:24:48 +00:00
taylor 7e8f6f8643 clean up the EVENT and STATE names so we don't have to manually backtrack the number during debugging 2005-12-28 22:22:34 +00:00
taylor b93e2dfc4e Oops, bit of debug stuff I didn't mean to commit (but something similar is needed so you'll it again) 2005-12-28 22:21:04 +00:00
taylor d7b35bcd30 deal with cf_find_file_location() changes
add a central parse_modular_table() function which anything can use
fix up weapon_expl so that it can properly handle modular tables and LOD count changes
add support for for a fireball TBM (handled a little different than a normal TBM is since it only changes rather than adds)
2005-12-28 22:17:02 +00:00
taylor 07fd2703b8 properly deal with non-compressed images with mipmaps (image size didn't include mipmaps before 2005-12-28 22:07:46 +00:00
taylor bfdce36d7a fix up cf_find_file_location() and related elements so that it's safer (based on WMC's work, but actually safe this time ;)) 2005-12-28 22:06:48 +00:00
taylor 9cc0ca14f8 allow for 24-bit user created bitmap images
make sure we have proper memory size requirements for non-DDS EFFs
2005-12-28 22:04:00 +00:00
taylor ce66dd2a79 fix a couple of beam section issues when using modular tables 2005-12-24 04:18:57 +00:00
taylor 3dab81ffd6 one more attempt to fix screenshots on Radeons. 2005-12-22 19:15:20 +00:00
taylor 38c055f375 changes to add Lua
don't use compatibility SDKs
2005-12-22 04:36:03 +00:00
taylor 06cc47cb8e more big-endian fixes
fix the totally retarded check I made for multi fighter beams (they really don't work right yet anyway) since it broke normal beams for clients
2005-12-22 04:35:04 +00:00
taylor c36a750528 MSVC6 was being a pain about this 2005-12-22 04:33:12 +00:00
taylor 9f5120bce0 GCC knows that fix == int so it hates the utility functions here, for sanity sake just rename them to type specific to avoid rampant casting 2005-12-22 04:32:44 +00:00
taylor 510e73bc4d add the name of the modular table about to be parsed to the debug log
a missing weapon_expl table should just be a note in the debug log rather than a popup warning
2005-12-21 08:27:37 +00:00
taylor 0fa789719a allow the show-all hotkey to work on all techroom tabs
address a couple of possible memory leak issues that could have come up in the future
2005-12-21 08:24:51 +00:00
wmcoolmon 6f7789c15f Swap beam fixed/animation image loading order 2005-12-18 20:13:26 +00:00
wmcoolmon 5708960152 Added +nocreate and more verbose index handling for beam sections 2005-12-17 00:59:48 +00:00
wmcoolmon 2df70ccbcc Better handling of beam overrides (bm_unload textures as they are replaced) 2005-12-17 00:50:55 +00:00
taylor a5ea507b3c ehh, didn't ever fix that to my satisfaction, bastardize it until more work can be done (so people don't start filing bug reports) 2005-12-16 16:34:35 +00:00
taylor 184f09346e apply at least some lighting to ship insignias rather than them being full bright 2005-12-16 06:54:10 +00:00
taylor 62f3fc0791 fix a NULL pointer crash from shipselect screen
make sure to reset "display_type" for weapon select since it would only render one ship correctly
  (still something wrong here WMC, try using models without -ship_choice_3d, everything is positioned too high on screen)
2005-12-16 06:51:31 +00:00
taylor ed324d0c54 "House Keeping!!"
- minor cleanup of things that have bothered me at one time or another
  - slight speedup from state switching
  - slightly better specmap handling, fixes a couple of (not frequent) strange and sorta random issues
  - make sure to only disable HTL arb stuff when in HTL mode
  - handle any extra lighting pass before spec pass so the light can be applied properly
2005-12-16 06:48:28 +00:00
wmcoolmon b4de1efa92 Keep a crash from happening if POF file isn't initially specified 2005-12-16 03:36:21 +00:00
taylor 2880736beb fix limits checking messages to actually be useful and hit sooner (wireframe view of some hi-poly models was going out-of-bounds from normals) 2005-12-15 16:31:03 +00:00
taylor 1d81f99bb8 make sure we always disable all VBO related elements to avoid crashing (new that was a problem, did it anyway, me == stupid) 2005-12-15 16:27:45 +00:00
taylor 79a49487a3 didn't mean for that to hit CVS, it makes neb missions work a little strange 2005-12-15 16:26:35 +00:00
phreak aba39cfc32 Countermeasres parameters. Lets users specify how easily missiles are spoofed by countermeasures
A missile is given a seeker strength.  Aspect default of 2.  Heat default of 3.  This is a missile's resistance to spoofage
A countermesaure is given an effectiveness for each type.  The defaults for countermeasure heat and aspect effectiveness are both 1.
Also gave the countermeasure an effective range.  Default is 300 meters.

A missiles chance of being spoofed is calculated by <cm type effectiveness>/<seeker strength>
So by default, 1/2 of aspect seekers will be fooled by a countermeasures, while 1/3 of heat seekers would be spoofed by default.

Also i gave the option of aspect missiles having a view cone different from 180 degrees.  This parameter is optional and doesn't effect anything already there.
2005-12-15 06:03:50 +00:00
phreak b39b8288e9 [V] can't spell 'turret' 2005-12-15 04:31:05 +00:00
wmcoolmon 5511b65084 Added script_lua_callback 2005-12-14 20:31:18 +00:00
taylor 105460ddf0 should have tested that better, it was still finding or ignoring options that it shouldn't if they were in the wrong order on
the same source (source being the two possible cmdline_fso.cfg files and the actual args passed on the cmdline)
2005-12-14 17:58:26 +00:00
phreak e29ef7266b Handling of exit explosions for beams when a ship is about to get destroyed, or according to the code: "tooled".
Bumped beam frame collisions to 10 to compensate.
2005-12-14 08:07:33 +00:00
wmcoolmon 3fbb2aa032 Ability to disable damage particle spew on ships 2005-12-13 22:32:30 +00:00
wmcoolmon 87131bd78a Grr, how did I miss this? 2005-12-13 21:50:20 +00:00
wmcoolmon 4d0f5fbc34 Music TBL to proper XMT file (-mus) 2005-12-13 21:48:39 +00:00
wmcoolmon 1ce86ebf14 Minor XMT-engine wash fix 2005-12-13 20:20:20 +00:00
taylor b6cf54c25c Hmm, .triggers isn't ever malloc'd for the Ships[] copy so don't try to free it since it's actully trying to free the Ship_info[] memory instead, which is bad :)
(newer glibc just starting going monkey over this, not sure why it didn't screw up before)
2005-12-13 18:15:26 +00:00
phreak bd8ee6108d various countermeasures related fixes. Special cases needed to be handled. 2005-12-13 05:27:36 +00:00
taylor b64ed1d334 make sure that the value of model_current_LOD stays with the detail_level value so that it's properly capped when used latter
undo the locked detail level change, all of the LOD textures are cached (or should be) so that really only hurt speed rather than helping
2005-12-12 22:04:19 +00:00
taylor 7a5f8a4169 allow use of a specific LOD for ship and weapon rendering in the hud targetbox 2005-12-12 21:32:14 +00:00
taylor ab2c7112fe double free and invalid ptr reference fixage 2005-12-12 05:29:59 +00:00
taylor 66e1060a5e switch the shockwave pof and normal names back to the correct spots, this was probably causing some
3-D shockwave usage issues since they wouldn't have rendered
2005-12-08 15:33:39 +00:00
taylor d3087989cd fix several bad crash related problems from WMC's commits on the 4th 2005-12-08 15:17:35 +00:00
taylor 4fbf8b61da a few game_busy() changes 2005-12-08 15:11:29 +00:00
taylor 3a1132516a add APPLE_client_storage support to improve texture performance and reduce memory usage a tiny bit on OS X 2005-12-08 15:10:07 +00:00
taylor 1f1d561250 signed->unsigned compiler warning fix 2005-12-08 15:08:39 +00:00
taylor 20f7523e73 remove GL_NO_HTL define since it's basically useless at this point and can produced non-functioning builds
minor cleanup and readability changes
get Apple GL version change in CVS finally, the capabilities of an Apple GL version don't neccessarily correspond to it's features
2005-12-08 15:07:57 +00:00
taylor 55659b0063 fix last bit of recent spec issue 2005-12-07 12:40:51 +00:00
taylor 9562408f1a partial spec fix, can't mass kill the pointers when they are still needed for the second pass (still something else wrong though)
forgot that the extra rangeelement optimization check isn't needed anymore, just look at indices since that's all we're using
2005-12-07 05:42:50 +00:00
taylor ba06d03663 bah, X sucks. I need to beef up error handling there in order to make all of the platforms happy. 2005-12-07 05:39:50 +00:00
taylor 30c4fc86f8 make sure with cmdline option check that it's the actual option (-spec was getting picked out of the -spec_* options by mistake) 2005-12-07 05:38:32 +00:00
taylor 63c52d70f9 15 individual commits, ya had know I was going to miss something :) 2005-12-06 17:53:25 +00:00
taylor efeb7bddf5 cleanup some debug log messages:
note that a nprintf() with "Warning" or "General" is basically the same thing as mprintf()
  make sure that OpenAL init failures always get to the debug log
2005-12-06 03:17:48 +00:00
taylor a2ff4d7ff5 add a couple of Assert()'s that it doesn't otherwise check for 2005-12-06 03:15:47 +00:00
taylor fb8cd02a10 fix for string overwrites with get_version_string() 2005-12-06 03:14:45 +00:00
taylor 0fd5616000 fix quite a few CFILE issues:
use #define's for path lengths when possible so it's easier to move between functions
  fix huge Cfile_stack[] issue (how the hell did that get through ✌️ QA?)
  add Int3() check on cfopen() so it's easier to know if it get's called before cfile is ready to use
  move path separators to pstypes.h
  fix possible string overruns when setting up CFILE roots
  make sure we don't try to init current directory again thinking it's a CD-ROM
  add the list of VP roots to debug log, this will undoubtedly be useful
when -nosound is use go ahead and set -nomusic too to both checks are correct
add list of cmdline options to debug log
fix possible overwrite issues with get_version_string() and remove '(fs2_open)' from string plus change OGL->OpenGL, D3D->Direct3D
2005-12-06 03:13:49 +00:00
taylor 6824ba9f02 add base support for 8-bit DDS images
clean up some DDS error messages and other minor bug/comment fixes
move bitmap stuff from pstypes.h, it makes more sense here anyway
start of 8-bit palette conversion, needs work but is here for WMCoolmon to look at and play with
2005-12-06 03:05:53 +00:00
taylor 8d84e56b7b move the pragma warnings here from pstypes.h for Windows
add indexed palette support for DDS images
2005-12-06 03:02:28 +00:00
taylor 2052e60d4f add a nomusic check to not get an error when eval on the change soundtrack sexp 2005-12-06 03:01:25 +00:00
taylor e68bc63754 get away from using CFILE here, needed this to change cfile init order 2005-12-06 03:00:09 +00:00
taylor 25a5ddc5bd sorry but the extra messages are somewhat annoying and already exist in another log anyway, disable by default 2005-12-06 02:59:10 +00:00
taylor d40b1fafed just to be on the safe side 2005-12-06 02:57:57 +00:00
taylor dcf437010a if for some reason we don't end up using a joystick then shut down the subsystem, saves a few cycles 2005-12-06 02:56:15 +00:00
taylor 06af0f80f8 little consolidation:
move path separator stuff here from cfile.h
  move the pragma warnings to config.h, since they produce warnings on anything that's not MSVC
  move the bmpman related stuff to bmpman.h, if you need this stuff you have to include bmpman.h anyway
2005-12-06 02:55:22 +00:00
taylor b912223f92 clean up some D3D debug messages to better match new OGL messages (for easier debugging)
remove D3D_32bit variable since it's basically useless and the same thing can be done another way
2005-12-06 02:53:02 +00:00
taylor 269675a79f clean up some init stuff and fix a minor SDL annoyance
make debug messages a bit more readable
clean up the debug console commands for minimize and anisotropic filter setting
make anisotropic filter actually work correctly and have it settable with a reg option
give opengl_set_arb() the ability to disable all features on all arbs at once so I don't have to everywhere
2005-12-06 02:50:41 +00:00
wmcoolmon e7ca24e86a Oops, arand should only be generated if it isn't passed to the function as well. 2005-12-05 09:09:53 +00:00
wmcoolmon b741ac411a "laser" and "missile" to "primary" and "secondary" 2005-12-05 01:54:16 +00:00
Goober5000 a31aff0d0a fix compiler error
--Goober5000
2005-12-04 22:44:00 +00:00
wmcoolmon 6e639560f3 Post-final commit 2005-12-04 19:12:53 +00:00
wmcoolmon 99cbbd5eee Final commit of codebase 2005-12-04 19:07:49 +00:00
wmcoolmon 0432da0970 Slightly better main hall error handling 2005-12-04 19:06:01 +00:00
wmcoolmon 34cb8f1554 Better weapon handling for techroom (more dynamic-limits friendly) 2005-12-04 19:05:06 +00:00
wmcoolmon fa4172c966 Better XMT beam section handling ("+Index:"); weapon shockwave armor support; countermeasures as weapons 2005-12-04 19:02:36 +00:00
wmcoolmon aae6ac2ff8 Attempt to fix OpenGL crash-on-debug-exit 2005-12-04 18:59:18 +00:00
wmcoolmon e945847322 subsystem + shockwave armor support; countermeasures as weapons 2005-12-04 18:58:07 +00:00
wmcoolmon 5328927b9b Better overhead-view handling 2005-12-04 18:55:42 +00:00
Goober5000 cbf6545219 bypass annoying warnings when loading optional models
--Goober5000
2005-12-01 07:45:21 +00:00
phreak fccd4a4a64 texturing shouldn't be on when drawing lines. 2005-11-30 03:07:54 +00:00
wmcoolmon 2a9c1bfd0f no message 2005-11-27 23:54:13 +00:00
Goober5000 9cfa585ba6 bah, forgot a colon
--Goober5000
2005-11-24 09:08:44 +00:00
Goober5000 46e1d51c6b * cleaned up mission_do_departure
* fixed a hidden crash (array index being -1; would only
be triggered for ships w/o subspace drives under certain conditions)
  * removed finding a new fighterbay target because it might screw up missions
  * improved clarity, code flow, and readability :)
* added custom AI flag for disabling warpouts if navigation subsystem fails
--Goober5000
2005-11-24 08:46:11 +00:00
taylor a2e607327a fix fred2 startup crash (we probably need to Assert() this case so it doesn't easily happen again) 2005-11-24 07:27:14 +00:00
phreak 887e1155b0 Added wiki help for -rearm_timer and -missile_lighting 2005-11-24 06:46:39 +00:00
phreak 17db6de95e Added -missile_lighting command line 2005-11-24 06:37:47 +00:00
phreak 3f9f76ca47 Apply lighting to missiles if -missile_lighting command line is set. 2005-11-24 06:37:17 +00:00
phreak cd38a1528a Forgot to add in the part where the rearm timer actually counts down. Minor oversight 2005-11-24 03:07:35 +00:00
taylor c7c3287184 yeah I know, I should have noticed that little jewel *before* the commit 2005-11-23 06:59:09 +00:00
taylor 2b6464dd6e make sure all weapons that will get used later in a mission get preloaded 2005-11-23 06:55:47 +00:00
taylor 67578d39df crash fix for using flak without having something targetted 2005-11-23 06:54:28 +00:00
taylor 35cb43c38a when using cheats be sure to properly load up all weapons that aren't already paged in 2005-11-23 06:53:22 +00:00
phreak a7013311e7 whoops i should test my code sometimes 2005-11-23 04:05:23 +00:00
phreak 91eccb9262 Added the function to estimate rearm and repair time. 2005-11-23 01:06:58 +00:00
phreak cff54cf6c9 Player repair rearm completion timer display added. 2005-11-23 00:49:51 +00:00
phreak 3073135022 Calculate player repair timer when the support ship docks to him. 2005-11-23 00:46:26 +00:00
phreak 9ddcfc01ea Command lines for rearm countdown timer. 2005-11-23 00:43:20 +00:00
taylor 2c8bd98cf8 yuck, ugly mistake on my part (thanks Goober!) 2005-11-22 04:50:52 +00:00
taylor ff90e21eca combine weapon_info_close() and weapon_close()
changes to allow use of weapon_expl.tbl and the modular table versions once more
 - the tables aren't required (but a warning will be produced if weapon_expl.tbl doesn't exist)
 - don't back load LODs, if it's not there then don't use it
 - handle a couple of error conditions a bit better
2005-11-22 00:01:11 +00:00
taylor 846ec383d7 some minor thruster cleanup, if you could actually use the term "clean" 2005-11-21 23:57:26 +00:00
taylor 10123cf66c move generic_* functions to their own file 2005-11-21 23:55:57 +00:00
taylor ec65c19f10 add generic.cpp and generic.h 2005-11-21 23:55:00 +00:00
taylor ac90d7c2ee little cleaner, lot more friendly to 64-bit archs (long type is usually 64-bit there) 2005-11-21 15:01:18 +00:00
taylor 06de274c17 add ai_profiles.cpp/.h 2005-11-21 14:57:08 +00:00
taylor 41c0baed84 i minus u ;) (should fix overzealous directives list) 2005-11-21 13:04:08 +00:00
Goober5000 85b947e158 remove old files
--Goober5000
2005-11-21 03:51:03 +00:00
Goober5000 163d3b715b bah and double bah
--Goober5000
2005-11-21 03:47:51 +00:00
Goober5000 4798d73423 and the project file
--Goober5000
2005-11-21 02:46:36 +00:00
Goober5000 c6acc068ff change from "setting" to "profile"; this way makes more sense
--Goober5000
2005-11-21 02:43:37 +00:00
Goober5000 367141fa5a add a flag to re-enable shockwaves damaging subsystems (from FS1)
--Goober5000
2005-11-21 01:53:57 +00:00
Goober5000 7ad17cb439 whoops
--Goober5000
2005-11-21 00:52:19 +00:00
Goober5000 8a66799d66 add ai_settings.tbl
--Goober5000
2005-11-21 00:50:02 +00:00
taylor 4105f02814 get rid of the while() loop, OGL doesn't stack errors (this killed FRED2 for some reason even though no error was present) 2005-11-18 13:13:47 +00:00
Goober5000 a16c0a96ec Wiki links updated; many thanks to StratComm :)
--Goober5000
2005-11-18 08:03:23 +00:00
Goober5000 5504a6a99e made arrival invalidation more efficient
(probably only a small speedup, but meh)
--Goober5000
2005-11-18 07:53:27 +00:00
taylor dbeca4632d fix for thruster glows (affecting TBP mainly but OC as well):
- thruster glows should always come from ship entry rather than species (it will be initted by the species entry at first)
 - this obviously needs some work done on it but that gets dangerously close to a rewrite and that isn't something I have time for
2005-11-17 20:52:02 +00:00
wmcoolmon df8100e85a Small fix for XMTs 2005-11-17 05:12:42 +00:00
taylor 5a949b253b fix crash on kamikaze deaths 2005-11-17 02:31:36 +00:00
taylor 9ed6849224 correct a little EFF fubar from my -img2dds commit
vocalize EFF loading errors so that they get noticed and fixed sooner
2005-11-17 02:30:49 +00:00
taylor 1220b2fa4c pretty sure my brain wasn't working that day 2005-11-17 02:29:21 +00:00
taylor 989e19c06a don't try to apply a shockwave force if there is no actual force to apply, avoids needless math and fixes a NULL vec3d warning 2005-11-16 21:27:31 +00:00
taylor 5ecaf658f4 switch from strchr() to strrchr() for extension checks in order to allow for multiple periods in a filename 2005-11-16 21:25:34 +00:00
taylor 8817a12cab allow for badly encoded ADPCM files if it was otherwise decoded properly 2005-11-16 09:16:24 +00:00
taylor 0a7c13004c umm, no one saw that, right? :) 2005-11-16 07:45:35 +00:00
taylor 232901ac61 bunch of error checking and code cleanup for the team stuff in ship/weapon select 2005-11-16 05:46:27 +00:00
taylor 41fec4840e didn't mean for that to hit CVS, stops FRED2 from crashing on exit 2005-11-14 08:39:00 +00:00
taylor 25bb1cf68c now able to build with OpenAL 1.0 and 1.1 thanks to newer OpenAL CVS changes (patch from icculus.org FS2 mailing list) 2005-11-14 05:12:01 +00:00
Goober5000 1fb4f808bc fix the icons.tbl bug
--Goober5000
2005-11-13 23:02:04 +00:00
Goober5000 4aab3c2c04 this should fix the no-warp-effect bug
--Goober5000
2005-11-13 22:27:17 +00:00
taylor 416eec60a0 cmdline option cleanup:
remove from launcher -pcx32, -cell, -UseNewAI
remove from game -loadonlyused, -dxt, -pcx2dds
rename -d3dmipmap, -d3d_no_vsync, -dnoshowvid to non API specific sounding names
add -nograb into help output under Linux/OSX
add -loadallweps and -img2dds
2005-11-13 06:55:38 +00:00
taylor da42be1b24 minor cleanup and comment cleanup about bpp usage 2005-11-13 06:52:06 +00:00
taylor ff5b2e3453 don't fail if not a starfield pof to load, regular starfield bitmaps don't hard fail so this shouldn't either 2005-11-13 06:50:57 +00:00
taylor 11c2f28b23 small big-endian fix 2005-11-13 06:49:32 +00:00
taylor 034170c1fa -loadonlyused in on by default now, can be turned off with -loadallweps 2005-11-13 06:49:05 +00:00
taylor 8d44e11441 make sure that we don't get "-transport" in with the transparent filename check (TBP bug) 2005-11-13 06:47:26 +00:00
taylor 4c720500fd some minor movie cleanup, not what I would like but enough for now 2005-11-13 06:46:10 +00:00
taylor 16c4614476 minor cleanup of old code and consolidate the texture compression checks into this one place 2005-11-13 06:45:24 +00:00
taylor 940b77cfc2 small bit of EFF cleanup
add -img2dds support
cleanup some D3D stuff (missing a lot since the old code is so unstable I couldn't get it working like I wanted)
some minor OGL cleanup and small performance changes
converge the various pcx_read_bitmap* functions into one
cleanup/rename/remove some cmdline options
2005-11-13 06:44:18 +00:00
taylor dfb2ca06fe add support for 8/16/24/32 bit output from ani frame decoder 2005-11-13 06:40:19 +00:00
taylor 7537edc256 remove Cmdline_cache_ani support, it only worked if not in a VP and only on streaming ani so it was pretty much useless 2005-11-13 06:39:38 +00:00
taylor 0b91ca7664 never did port this stupid thing to PPC 2005-11-13 06:38:04 +00:00
taylor 3c1271a338 always produce BGR ordered images rather than RGB 2005-11-13 06:37:24 +00:00
taylor f2d6ad844c add LUA building for MSVC6 2005-11-13 06:36:52 +00:00
phreak ec909ec855 LuaError() body should not be compiled into the code unless USE_LUA was defined in the project file. 2005-11-13 05:25:59 +00:00
wmcoolmon c8b032291d 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 e5eef67d24 Fixed capitalization 2005-11-05 11:00:50 +00:00
wmcoolmon a34135e05c Int3() --> Warning 2005-11-05 10:26:09 +00:00
unknownplayer 81a45606a3 Committed the DX9 December 2004 SDK. None of the DX9 changes have been committed however. This might break the MSVC 2003 build since DX9 and DX8 share the DX8 include files. Just eliminate one from the library paths if you have any problems. 2005-11-05 09:31:45 +00:00
wmcoolmon 982c662da0 Forgot the breathalyzer 2005-11-05 08:39:10 +00:00
wmcoolmon 74d081fd2f Fix for this old and silly bug. 2005-11-05 08:38:36 +00:00
phreak 32bd17ae17 add/remove-sun-bitmap. Also changed "Ship_arrival_list" to "ship_arrival_list" since the former technically doesn't exist due to the capital 'S'. 2005-11-05 07:42:09 +00:00
wmcoolmon 4a81216e3b Support for using Lua files for hooks 2005-11-05 05:13:05 +00:00
wmcoolmon 95dddca667 Fix(?) for checking whether a weapon is armed or not 2005-11-05 05:12:21 +00:00
wmcoolmon d961eb935a Slight optimization 2005-11-05 05:11:29 +00:00
wmcoolmon 24e9cd45ed Removed unneccessary casts 2005-11-05 05:08:58 +00:00
wmcoolmon 698a80d45a turret-change-weapon 2005-11-05 05:06:13 +00:00
Goober5000 f5b9a8636c remove unused commented stuff
--Goober5000
2005-10-31 09:12:16 +00:00
Goober5000 21fbc6eb9a bit of tweakage
--Goober5000
2005-10-31 09:09:41 +00:00
wmcoolmon 82b8c1cb49 Support for passing C pointers w/ LUA 2005-10-31 08:57:40 +00:00
wmcoolmon d098b84a0c Support for custom operators in Lua 2005-10-31 06:37:17 +00:00
Goober5000 791d40be45 stuff for comparing ship classes
--Goober5000
2005-10-30 23:45:45 +00:00
Goober5000 5628d1aabb added scripting stuff to MSVC project
--Goober5000
2005-10-30 21:05:24 +00:00
Goober5000 be3f085c96 fix the support ship spawning bug
--Goober5000
2005-10-30 20:42:45 +00:00
Goober5000 c5fa1e6a0b comment fixage 2005-10-30 20:20:44 +00:00
taylor d5de67114e add a bunch of Assert()'s and NULL checks to either help debug or avoid errors
fix Mantis bug #381
fix a small issue with the starfield bitmap removal sexp since it would read one past the array size
2005-10-30 20:03:40 +00:00
taylor 5c36f7b421 same basic cleanup and self-sanity changes
split up WinMain() and main() so it doesn't resemble ifdef hell
rename WinMainSub() to game_main() and move anything that should have been in WinMain() to WinMain()
2005-10-30 20:00:22 +00:00
wmcoolmon ab67577322 Display a special dialog if the player tries to continue a campaign with no missions 2005-10-30 19:22:31 +00:00
wmcoolmon 9bffa8b8dc Return an error if mission_campaign_next_mission() is called when the campaign has no missions 2005-10-30 19:21:45 +00:00
wmcoolmon ec299d0437 Fix scripting.html 2005-10-30 18:19:58 +00:00
taylor 1d53405076 add Lua support for automake/autoconf 2005-10-30 10:46:23 +00:00
taylor ef4203311c fix a couple of campaign savefile bugs for WMC 2005-10-30 10:45:19 +00:00
wmcoolmon 7dece4af61 Codebase commit - nebula.tbl, scripting, new dinky explosion/shockwave stuff, moving muzzle flashes 2005-10-30 07:10:20 +00:00
wmcoolmon c9b872df9f Codebase commit - nebula.tbl, scripting, new dinky explosion/shockwave stuff, moving muzzle flashes 2005-10-30 06:45:00 +00:00
Goober5000 643a4b15c4 multiple ship docking implemented for initially docked ships
--Goober5000
2005-10-29 22:09:31 +00:00
taylor 8151f7d80e Add some error checking and handling to better deal with possible problems, and to let us know what/where they are 2005-10-29 12:26:58 +00:00
taylor 07678a8f6e bullet-proof the loadout read a little bit (did this before and had it locally, must have missed CVS) 2005-10-29 12:25:49 +00:00
wmcoolmon 461332483d Safeguard against saved loadout and loadout changes. 2005-10-29 09:06:52 +00:00
wmcoolmon afb235d9cc Better alloc_block function 2005-10-29 09:02:13 +00:00
wmcoolmon 2a61be8fe8 Minor change to an assert 2005-10-29 09:00:41 +00:00
taylor f6c3b17374 hmm, didn't even notice that earlier 2005-10-28 14:52:26 +00:00
taylor 7f7cf7728a some minor cleanup and compiler warning fixes 2005-10-28 14:49:35 +00:00
taylor 2475a73098 don't do any decal processing if decals are not enabled 2005-10-28 14:48:26 +00:00
taylor e6988155c3 fix issue where GR_640 based non-standard resolutions (ie. 800x600) would use GR_1024 screen coordinates/sizes 2005-10-28 14:47:16 +00:00
taylor 8679d340f1 more TMAP_MAX_VERTS overflow protection for non-HTL usage (these are the things that need to be addressed to fix non-HTL)
fix some compiler warning messages
don't do any decal processing if decals are disabled, the math was a waste of CPU cycles in that case
2005-10-28 14:45:55 +00:00
Goober5000 78dd2bcaca nitpicked a rather dumb non-bug
--Goober5000
2005-10-28 06:10:07 +00:00
phreak e86478e0bf Added extra documentation for add-background-bitmap and add-sun-bitmap 2005-10-28 05:48:55 +00:00
phreak 976694a83b added implementation for add-background-bitmap and remove-background-bitmap 2005-10-28 05:25:27 +00:00
taylor 881eec7288 some minor fixes to message_translate_tokens(), fixes a bug and adds some out-of-bounds checks 2005-10-27 16:24:24 +00:00
taylor 1ae7853fdc go back to using abort() over exit() for Assert's and Int3's but close out SDL first this time, makes debugging much easier 2005-10-27 16:23:03 +00:00
taylor a4d405357f fix some automake errors with OSX 10.4's crappy AutoMake and a couple of other OS X related terminal compile fixage 2005-10-27 16:21:19 +00:00
taylor d60afee14d D3D missed the non-standard resolution updates for aabitmaps, should fix briefing icon positioning 2005-10-26 20:54:18 +00:00
taylor fb6be02afc convert Jpegs from RGB to BGR after read, OpenGL had a problem with this, D3D still works fine 2005-10-26 20:53:02 +00:00
taylor e541fc13ad update Xcode project with IFF stuff 2005-10-26 20:51:55 +00:00
taylor 94e211e84e make sure that XMTs don't try to still create an invalid entry when +nocreate is used 2005-10-26 00:43:06 +00:00
wmcoolmon ea0d07ea2f Bumped MAX_HOTKEY_TARGET_ITEMS 2005-10-25 01:21:52 +00:00
phreak 2cbfa525d4 implementation for nebula-change-storm and nebula-toggle-poof. looks like they're working 2005-10-24 23:28:37 +00:00
taylor 1000fd5527 init thruster stuff properly so that bmpman doesn't have a fit 2005-10-24 12:42:14 +00:00
Goober5000 c7d967b52d merge Bobboau's thruster code back in; hopefully this covers everything
--Goober5000
2005-10-24 07:13:05 +00:00
taylor 8190f89912 not sure what I was smoking there, max shininess value is 128, not 180 2005-10-24 04:48:14 +00:00
phreak 11254c3ecc Get the new nebula argument types working in fred. 2005-10-24 02:53:48 +00:00
wmcoolmon 1564e913c4 Removed max_overclock restriction related to warpout 2005-10-24 02:15:41 +00:00
taylor ee0a8f762b some cleanup, fix some general memory leaks, safety stuff and whatever else Valgrind complained about 2005-10-23 20:34:30 +00:00
taylor f0f41a4f4f fix crashes and minor slowdowns when sound is disabled (-nosound) 2005-10-23 19:08:01 +00:00
taylor 5f1e2e9f83 make AABITMAP use GL_ALPHA rather than GL_LUMINANCE_ALPHA (now 8-bit instead of 16-bit, fixes several minor rendering issues) 2005-10-23 19:07:18 +00:00
taylor d08479de39 minor cleanup to screenshot code
force front buffer reads for relevant glReadPixels() calls
2005-10-23 14:12:35 +00:00
taylor ec757ab001 add -ogl_shine to adjust the OGL shininess value so that people can play around and find the best value to use 2005-10-23 11:45:06 +00:00
taylor 636bc06e5b fix memory errors from new[]/delete[] mismatch 2005-10-23 11:44:07 +00:00
wmcoolmon a0f0735de9 Ack, missed testing compile under an Inferno build 2005-10-23 05:37:59 +00:00
wmcoolmon 55e36de866 *Fix* 2005-10-23 05:01:49 +00:00
phreak 5a329c572a add-background-bitmap and add-sun-bitmap needed scale values added
also their sexp functions should not return integers.
2005-10-23 04:48:26 +00:00
phreak 3ba27cb1e7 various background and nebula sexps
add-background-bitmap
add-sun-bitmap
remove-background-bitmap
remove-sun-bitmap
nebula-change-storm
nebula-toggle-poofs

All of these sexps are just stubs for now.
Just want to get in the commit before someone
else commits and i'll make a mess trying to merge.
Everything is compiling fine, so it shouldn't mess up anything.  But you know that murphy guy....

I've put these sexps in a new fred subcategory called "Backgrounds and Nebula"
along with the sexps "change-skybox-model" and "mission-set-nebula"
2005-10-23 04:18:23 +00:00
Goober5000 fee22cf735 made Cmdline_UseNewAI toggle the mission flag, plus fixed a few other flag-related potential bugs
--Goober5000
2005-10-22 22:25:23 +00:00
Goober5000 afde24171d rolled back UnknownPlayer's commit
--Goober5000
2005-10-22 22:22:41 +00:00
wmcoolmon 51cc626041 mission-set-nebula fixage; remainder of python code 2005-10-22 20:17:19 +00:00
taylor 172bf5db01 couple of changes to NULL vec fixes which better match what Volition would have done (makes both Goober and myself happier :))
keep track of what was an error (even if erroneous) and why with "VECMAT-ERROR" comment
2005-10-22 06:26:30 +00:00
unknownplayer b8822ebe66 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
taylor a8e1459022 fix main NULL vec errors, still at least one left but these were those that happened most often:
modelinterp.cpp:parse_tmap() -> first IS_VEC_NULL() check would fail, wasn't a second on reassign
  aicode.cpp:ai_path() -> when (Pl_objp->pos == gcvp), fixed globally in vecmat.cpp:vm_vec_dot_to_point()
2005-10-21 11:32:15 +00:00
taylor b8beecfd70 fix player warpout
basic code cleanup (that previous braces change did nothing for readability)
spell "plyr" correctly
tweak warp shrink time to better match WMC's other changes and avoid the skipping during shrink
2005-10-20 17:50:03 +00:00
taylor bff09ca775 minor readability fix
plug a memmory leak and possible Polygon_models[] madness if a POF can't be found or is otherwise invalid
2005-10-20 15:33:44 +00:00
wmcoolmon 9bbe0ef033 More player warpout speed stuff 2005-10-20 06:38:18 +00:00
wmcoolmon 56b2035866 Oops, guess I didn't commit this stuff 2005-10-20 06:37:34 +00:00
taylor 57bc110209 fix some bugs with spawn type weapon assignments, particularly with TBMs 2005-10-19 20:54:06 +00:00
wmcoolmon ada07e972d Don't need this anymore 2005-10-19 04:23:05 +00:00
taylor 4e44ad6cbc make sure gamesnd_parse_soundstbl() doesn't inf-loop because of species problems
if we have missing species then report that before the end of table section check so we're sure to know what's missing
2005-10-18 14:57:32 +00:00
taylor 2cb97774ae lowercase filenames in model_load_textures()
turn texture loading debug messages back on but under "Maps" so they are easy to turn off if not wanted
2005-10-17 14:23:21 +00:00
unknownplayer 795b779779 Final update to the project files - all compile correctly on MSVC_2003
from the sources on the CVS.
2005-10-17 08:43:03 +00:00
unknownplayer 220d98fe1d Updated the files from the MSVC 6 projects - they seem to work better. 2005-10-17 08:38:17 +00:00
taylor d80d29981d dynamically allocate object collision pairs 2005-10-17 05:48:18 +00:00
unknownplayer 70eb3414b1 Added project files for MSVC_2003 - these are made from the MSVC_7 files. 2005-10-17 02:17:26 +00:00
wmcoolmon 6c1e1c13e5 Fix redmenace's compile problem 2005-10-17 02:09:29 +00:00
wmcoolmon 95bf16615a Make weapons clip less 2005-10-17 01:54:15 +00:00
wmcoolmon a9e8dc0665 Weapon models now shown in lab 2005-10-17 01:51:01 +00:00
wmcoolmon 5fb1ece53e Some cfile changes that slipped by 2005-10-17 00:13:28 +00:00
wmcoolmon 7037744bfd USE_OPENAL 2005-10-17 00:03:13 +00:00
wmcoolmon e4e606ae5c Change this back for MSVC.NET? 2005-10-17 00:02:46 +00:00
wmcoolmon 83ae7c42e9 CFile stuff 2005-10-17 00:02:09 +00:00
wmcoolmon 2b88dda60c Updated & fixed project files 2005-10-16 23:31:58 +00:00
wmcoolmon 4d6db9104b Hardened cfile against array overflows 2005-10-16 23:15:47 +00:00
wmcoolmon 67f9f87f6c Small fix for amor code 2005-10-16 23:15:13 +00:00
Goober5000 3904706464 I need to bone up on my bulletproofing
--Goober5000
2005-10-16 18:54:12 +00:00
taylor 0d948a3aae use unsigned index buffers 2005-10-16 11:20:43 +00:00
taylor 966335ce31 (NULL != (int)0); the size and type of NULL is platform and implementation dependant and should only be used for pointers!
fix naughty bug that would set the flyby sound filenames to NULL
2005-10-16 11:19:57 +00:00
taylor cc48b49fcf clean up a couple of things 2005-10-16 10:12:14 +00:00
Goober5000 6a479838f8 ship-create now generates a default name if you specify "<none>" for the ship name
--Goober5000
2005-10-16 00:32:30 +00:00
taylor e44735a96d properly handle cases where bm_make_render_target() might have failed 2005-10-15 20:53:29 +00:00
taylor 435514e90f make sure that bm_make_render_target will handle failure 2005-10-15 20:42:40 +00:00
taylor 9cfc9fc643 add error message in case the number of verts on a submodel is in excess of SHRT_MAX 2005-10-15 20:28:26 +00:00
taylor e04261ceb4 make some code a bit more readable
speed up index buffer generation just a tad (maybe 1/3rd)
2005-10-15 20:27:32 +00:00
Goober5000 d55bff80cc add weapon-create sexp
--Goober5000
2005-10-14 09:29:56 +00:00
Goober5000 730fd8491a removed an unneeded parameter and renamed some stuff
--Goober5000
2005-10-14 07:22:24 +00:00
Goober5000 f0d7b9de4c stuff for WMC: fix sexp description and three warnings; plus add some
bulletproofing to name-specified ship_create
--Goober5000
2005-10-14 07:06:59 +00:00
wmcoolmon b05a37bef0 armor.tbl work 2005-10-14 02:13:52 +00:00
wmcoolmon 86777d3528 Make ship_create not return a value 2005-10-13 23:23:32 +00:00
wmcoolmon 46804f90b7 Fixage for ship_create 2005-10-13 18:47:45 +00:00
taylor 7318a3750a new timer code that shouldn't suffer from multi-cpu (or dual core) systems
clean out all old Windows timer code since that was just a mess at this point
2005-10-12 05:45:35 +00:00
taylor 68fde5dcd5 temporary cmdline option, -y_bug_fix, to switch between original code (default) and previous attempt at the Y-bug fix 2005-10-12 05:43:40 +00:00
taylor 5c71e497e7 little cleaner since the two sets weren't needed 2005-10-11 12:24:04 +00:00
taylor 8bdf7224e6 fix memory freakage from dynamic spawn weapon types 2005-10-11 08:30:38 +00:00
wmcoolmon 3101fb61a7 Topdown updates 2005-10-11 07:43:10 +00:00
wmcoolmon 9c2e5dd3f4 Gliding 2005-10-11 05:24:34 +00:00
taylor 89621393c4 actual cmeasure fix, don't know why the hell it didn't end up other commit 2005-10-10 17:32:59 +00:00
taylor 95e056f6fd remove NO_NETWORK 2005-10-10 17:21:11 +00:00
taylor 229e448fed remove NO_NETWORK
little sanity on model_load() calls
fix cmeasure bug where a blank entry was getting added
2005-10-10 17:19:07 +00:00
taylor 24e8fa9416 remove NO_NETWORK
clean out some old debug messages that were littered about
2005-10-10 17:17:45 +00:00
taylor b256ad2aef remove NO_NETWORK
whether multi is disabled or not is now determined at runtime
clean out some crap and old debug messages that were littered about
2005-10-10 17:16:22 +00:00
taylor f56551d51b remove NO_NETWORK
fix controlconfig so that axes can be set to joystick/mouse using the mouse (required when no joystick attached)
2005-10-10 17:14:31 +00:00
wmcoolmon cb2912867e Tidied up code a bit 2005-10-10 01:14:11 +00:00
Kazan b29b104272 some weird character was on the head of weapons.cpp 2005-10-09 23:56:22 +00:00
wmcoolmon bc4c92b78f Added names to the 'limits reached' dialogs in ship/weapons.tbl 2005-10-09 17:38:49 +00:00
wmcoolmon a6e283db70 Added warpin/warpout speed values to the lab 2005-10-09 09:18:10 +00:00
wmcoolmon 0e16ea57cc Added warpin/warpout speed override values to ships.tbl 2005-10-09 09:13:29 +00:00
wmcoolmon 61a109dcb1 Minor update to ship-create description 2005-10-09 08:10:03 +00:00
wmcoolmon 3d57aefef6 New SEXP stuff 2005-10-09 08:03:21 +00:00
wmcoolmon 1e2783906d Added sexps set-object-speed-x, set-object-speed-y, set-object-speed-z,
and ship-create
2005-10-09 06:10:59 +00:00
wmcoolmon b0912a1082 Much better laser weapon/pof handling, removed a couple unneccessary
warnings (used to try and track down a bug)
2005-10-09 03:13:13 +00:00
wmcoolmon b686df2e87 Bumped MAX_PAIRS to prevent objects flying through other objects 2005-10-09 01:50:04 +00:00
wmcoolmon 0beedfa677 Extendable modular tables (XMTs); added weapon dialogs to the Lab 2005-10-09 00:43:09 +00:00
wmcoolmon d40bc8a817 Attempt to fix crash bug on 'Mystery of the Trinity' 2005-10-08 19:29:08 +00:00
wmcoolmon 4438ce571e Error checking for dock error 2005-10-08 18:46:38 +00:00
wmcoolmon 28041d497a Better readability for parse errors 2005-10-08 18:26:40 +00:00
wmcoolmon e473be185e These are no longer needed... 2005-10-08 18:25:41 +00:00
taylor f4d95bc9bb fix several asteroid problems, little code duplication but this actually works and is less error prone than the previous method 2005-10-08 15:37:26 +00:00
wmcoolmon e384b8ee28 Fix Int3() from ship-vanish 2005-10-08 05:41:09 +00:00
taylor 0c38c21ac1 make sure player death message works when using a NO_NETWORK build 2005-10-06 07:53:01 +00:00
Goober5000 a1e18b212d fixed the CTD when support is called for a ship lacking a rearming dockpoint
--Goober5000
2005-10-02 23:12:44 +00:00
Goober5000 f3f52618b7 removed a redundant action
--Goober5000
2005-10-02 23:01:17 +00:00
Goober5000 663994c0f7 juxtaposition for clarity
--Goober5000
2005-10-02 23:00:39 +00:00
taylor a71bf31824 remove -rlm, it's always on now since there was never a complaint and pretty much everyone uses it
add -cache_bitmaps and have bitmap caching between levels off by default
when -cache_bitmaps is used then use C-BMP for top-right memory listing, and just BMP otherwise
2005-09-30 09:47:06 +00:00
taylor f11038667a add iff stuff to makefile 2005-09-30 09:44:19 +00:00
Goober5000 2956626467 hooray for more work on the iff code
--Goober5000
2005-09-30 03:40:40 +00:00
Goober5000 89ba5a2e33 parsing stuff
--Goober5000
2005-09-30 03:19:57 +00:00
Goober5000 2b4a16ee61 parse fixage
--Goober5000
2005-09-29 04:26:09 +00:00
Goober5000 ed7ea880f9 fix debug warning
--Goober5000
2005-09-27 08:09:13 +00:00
Goober5000 8a3a2169e9 small fix, bah
--Goober5000
2005-09-27 06:39:23 +00:00
Goober5000 4f2b0db7ac added iff_defs to project
--Goober5000
2005-09-27 06:39:04 +00:00
Goober5000 7bb3e2fc44 initial commit of basic IFF code
--Goober5000
2005-09-27 05:25:19 +00:00
Goober5000 3423d8b641 betterizing
--Goober5000
2005-09-27 05:01:52 +00:00
Goober5000 0ed86295bb clarification
--Goober5000
2005-09-27 02:36:58 +00:00
Goober5000 ad411a41df this should fix the rest of the briefing icon bugs
--Goober5000
2005-09-26 06:00:59 +00:00
Goober5000 c90b03a218 small fix
--Goober5000
2005-09-26 05:24:25 +00:00
Goober5000 ab99d4877f moved these per taylor's recommendation
--Goober5000
2005-09-26 04:53:19 +00:00
Goober5000 887d687e09 some more cleanup
--Goober5000
2005-09-26 04:51:00 +00:00
Goober5000 633954fdf1 some more cleanup
--Goober5000
2005-09-26 04:08:54 +00:00
Goober5000 9a25153e9a okay, this should all be working :)
--Goober5000
2005-09-26 02:15:03 +00:00
Goober5000 fa303129e6 and again, gah
--Goober5000
2005-09-25 23:02:29 +00:00
Kazan 8c918ef816 my bad 2005-09-25 22:29:35 +00:00
Goober5000 dd63695d6a more fiddly stuff
--Goober5000
2005-09-25 22:24:22 +00:00
Kazan f560aff0c5 correct an error 2005-09-25 22:23:39 +00:00
taylor 08e1f23065 gah. 2005-09-25 21:00:40 +00:00
Goober5000 e52a9ae599 oh noes!
--Goober5000
2005-09-25 20:55:28 +00:00
Goober5000 c31f5ab505 taylor forgot something ;)
--Goober5000
2005-09-25 20:42:57 +00:00
Goober5000 a2e6884321 okay; everything should be good to go
--Goober5000
2005-09-25 20:31:42 +00:00
taylor 077b97f304 GCC fixage, my Whiffle Bat that was saved for Bobboau's constant breaking is currently getting "Goober5000" etched into it :) 2005-09-25 18:48:25 +00:00
taylor 37a7e70d39 fix Subsys_status leak, wasn't a problem in game but can be touchy on exit 2005-09-25 18:44:51 +00:00
Goober5000 29dda0a324 Okay, everything should now work again. :p Still have to do a little more with the asteroids.
--Goober5000
2005-09-25 08:25:16 +00:00
Goober5000 7adba91866 remove unneeded #include
--Goober5000
2005-09-25 08:23:38 +00:00
Goober5000 4ffb56ecb1 remove duplicate #include
--Goober5000
2005-09-25 08:21:54 +00:00
Goober5000 f7b61e5666 and again
--Goober5000
2005-09-25 07:27:33 +00:00
Goober5000 b56688e720 try to fix the headers
--Goober5000
2005-09-25 07:26:05 +00:00
Goober5000 0749cebaa1 partial commit; hang on
--Goober5000
2005-09-25 07:07:34 +00:00
Goober5000 d16a2f95e2 bah
--Goober5000
2005-09-25 05:26:13 +00:00
Goober5000 b23de6a2e2 hopefully complete species upgrade
--Goober5000
2005-09-25 05:13:07 +00:00
Goober5000 ff652edbd5 meh for consistency
--Goober5000
2005-09-25 02:15:02 +00:00
Goober5000 35188a2b9e cleaned up some more thruster stuff; honestly, the thruster code is such a
mess that it should probably be reverted to the retail version
--Goober5000
2005-09-24 07:45:31 +00:00
Goober5000 6e7756b455 fixage
--Goober5000
2005-09-24 07:18:15 +00:00
Goober5000 a2a5b2e952 another species overhaul
--Goober5000
2005-09-24 07:07:17 +00:00
Goober5000 30495588fa a fix
--Goober5000
2005-09-24 02:57:12 +00:00
Goober5000 47953947cf whoops
--Goober5000
2005-09-24 02:43:33 +00:00
Goober5000 058aa3b940 get rid of a whole bunch of Microsoft warnings
--Goober5000
2005-09-24 02:40:10 +00:00
Goober5000 6dfe488f6f bah
--Goober5000
2005-09-24 02:24:29 +00:00
Goober5000 a906f582f3 a bunch of support ship bulletproofing
--Goober5000
2005-09-24 01:50:10 +00:00
Goober5000 831dbe1e6a this isn't needed because of is_support_allowed
--Goober5000
2005-09-24 01:41:21 +00:00
Goober5000 19487cb111 bettered the web cursor bitmap error message
--Goober5000
2005-09-23 23:07:11 +00:00
Goober5000 b9090328d0 something for WCS
--Goober5000
2005-09-23 22:48:56 +00:00
taylor 714e71f51a fix screen update of pilot list when you delete one of them 2005-09-22 19:16:48 +00:00
taylor c10b06d937 entries for icon file
some general cleanup of the project file
use "Release" and "Debug" for the builds since that's the terminology we use
2005-09-22 11:22:52 +00:00
taylor 2543fdd5f7 delay for fox OS X, SDL messes up for some reason and though I don't like this, even Apple does it 2005-09-22 11:21:22 +00:00
taylor 5f16edd112 byte-swap for 32-bit uncompressed DDS images on big endian 2005-09-22 11:20:11 +00:00
taylor 113d67d6c0 ignore .DS_Store from OS X
add .cvsignore for Xcode project stuff
temporary placeholder for real FS2_Open icon file
2005-09-22 11:18:30 +00:00
Goober5000 e801840cac add option for warp flash; mess with the cmdlines a bit
--Goober5000
2005-09-21 03:55:32 +00:00
wmcoolmon 2f0ad1c35c New parsing functions that I'll be using for XMTs once I get them
working
2005-09-20 04:51:45 +00:00
wmcoolmon 791c7c39ea Oops. Breathalyzer standing by... 2005-09-20 04:51:01 +00:00
wmcoolmon 86539f252f Some work I did on the camera code 2005-09-20 04:48:52 +00:00
wmcoolmon c2c44c86b7 Fixed techroom crash if there are no entries to display; removed
unneeded MULTIPLAYER_BETA_BUILD define that disallowed supercaps
2005-09-20 04:37:01 +00:00
taylor b2937b2e08 fix a couple of things that Valgrind complained about 2005-09-20 02:48:37 +00:00
taylor b3f2c96435 make sure that any extra ship textures get loaded on a class change (that Ares bug which wasn't actually Ares specific) 2005-09-20 02:48:06 +00:00
taylor 4da393e6ce slight speedup for font rendering
fix a couple of things that Valgrind complained about
2005-09-20 02:46:53 +00:00
taylor ebfa7423fc bump version to 0.6
add a specified directory to output files to
2005-09-20 02:45:47 +00:00
taylor fe88ab1396 gah, revert that since it was never going to work (not sure what I was drinking that day) 2005-09-18 23:06:17 +00:00
wmcoolmon 4179e85caf Fixed silly i variable placement mistake 2005-09-18 20:41:10 +00:00
Goober5000 b73dcd739b a small fix
--Goober5000
2005-09-18 02:28:18 +00:00
phreak c1a82b09d6 radar bitmap should render the correct color using -orbradar 2005-09-17 19:12:37 +00:00
Goober5000 75e8b56828 better tweak 2005-09-17 01:41:49 +00:00
Goober5000 205fc23b91 tweak 2005-09-17 01:37:02 +00:00
Goober5000 49a65b4ea8 It is a strange fate that we should suffer so much fear and doubt over so small a thing.
Such a little thing...
2005-09-17 01:36:29 +00:00
Goober5000 d8351b5cb9 roll back taylor's loadout fix and do it this way: it saves memory
(but thanks to taylor for drawing attention to the difference between wing slots and wss slots!)
--Goober5000
2005-09-16 17:02:50 +00:00
taylor 50306334bc fix afterburner bug 2005-09-16 08:11:39 +00:00
taylor 7e3012fec1 when a wing is departing to a bay have ships break formation when playing follow-the-leader 2005-09-16 02:59:55 +00:00
taylor 28b190122d when changing a campaign in the campaign room make sure that the mainhall is properly set without having to play a mission first 2005-09-16 02:51:54 +00:00
taylor caa37d9b86 didn't mean to leave that in there 2005-09-16 00:03:51 +00:00
Kazan 8a36ebd73e comment out superfluous debug message 2005-09-15 23:54:58 +00:00
taylor 8890cec34b gah, I still messed that up. Add a NULL check and have register_malloc() actually handle the correct pointer 2005-09-15 05:19:25 +00:00
taylor d2bcd90e9e some vm_* fixage for Windows 2005-09-14 20:38:12 +00:00
taylor 017d7b1cb8 fix ace badges not getting displayed in debriefing 2005-09-14 20:03:40 +00:00
phreak fccb7eaf69 fix to a minor annoyance where the hud weapons gauge wouldnt render properly if there were no secondary weapons. 2005-09-14 02:55:04 +00:00
taylor 6b94ed3308 fix out-of-bounds crash when apply_to_all button is hit 2005-09-13 04:32:11 +00:00
phreak cee0940c17 sort_weapons_by_type() now also subsorts primaries by whether its supposed to only
be used on big ships or not.
2005-09-11 03:50:42 +00:00
taylor 5663c4933a make sure smart shields can't send the strength of a quadrant over the max 2005-09-10 21:10:19 +00:00
Goober5000 1292005d71 "no briefing" flag now works for red-alert missions too
--Goober5000
2005-09-09 05:12:44 +00:00
Goober5000 598598d26c braces for clarity 2005-09-09 05:11:20 +00:00
phreak 4d6d45dd76 sort_weapons_by_type() now subsorts missiles and places fighter-sized weapons ahead of capital weapons and child weapons
its also alot less memory intensive too.
2005-09-08 23:20:54 +00:00
taylor efe030c058 make it actually compile under WIN32
bump version to 0.5 since little else is going to be done to this thing
2005-09-08 05:04:15 +00:00
taylor 8b4b35be0a fix building/linking of command line tools under Linux/OSX
add tools as targets to OSX project file
2005-09-08 00:09:32 +00:00
taylor f51a10c546 fix mouse position setting in non-standard resolutions 2005-09-06 17:26:39 +00:00
taylor c1acb96dc6 use exit(EXIT_FAILURE) rather than abort() so that all atexit() calls will actually get executed 2005-09-06 05:32:12 +00:00
taylor 0952771b72 fix for -pcx32 on big-endian 2005-09-06 02:40:24 +00:00
Kazan f116ff4f58 fixed a bug related to multiplayer table validation and modular tables 2005-09-06 00:32:20 +00:00
taylor f6c794bd85 merge of OSX tree
a lot of byte swaps were still missing, will hopefully be fully network compatible now
2005-09-05 09:38:19 +00:00
taylor cc72eb1d2a merge of OSX tree
fix OGL fullscreen switch for SDL since the old way only worked under Linux and not OSX or Windows
fix OGL version check, it would allow a required major version to be higher if the required minor version was lower than current
2005-09-05 09:36:41 +00:00
taylor 68265ecfc9 a little more cross-platform friendly this way 2005-09-05 09:34:06 +00:00
taylor adb71b42b6 merge of OSX tree
update cmdline stuff for Linux to be less stupid and provide better feedback to the user
2005-09-05 09:33:08 +00:00
taylor bd372c46ec merging of project files for OSX 2005-09-05 09:23:26 +00:00
taylor a62183fd64 merging of new files from OSX tree 2005-09-05 09:21:15 +00:00
wmcoolmon 74f451ab2e Fix the ship vanishing in TOPDOWN mode error 2005-09-05 09:02:08 +00:00
phreak f98a3ba721 don't wrap the U_offset variable since it causes the beam to jump once it gets reset. 2005-09-03 17:48:21 +00:00
taylor 33e28ed71e various weapon_range cap fixes for primary, secondary weapons and hud targetting info 2005-09-01 04:14:04 +00:00
Goober5000 2518d7d7a9 hm, typo
--Goober5000
2005-08-31 08:11:58 +00:00
Goober5000 391ae75979 All wings will now form on their respective leaders, not just certain starting wings.
If this breaks anything, the old code is commented out.  You know who to yell at. ;)
--Goober5000
2005-08-31 08:09:51 +00:00
Goober5000 fa1270f62d Wings will now form on their leader, not necessarily the player. This is to
account for cases where the player is not the leader of his wing.  It has the
side effect of causing wings that arrive later in the mission to form on *their*
leader rather than the player, but this is probably the preferred behavior (at
least judging from Mike Kulas's comment of 5/9/98).  This does create a
difference from retail AI, but it should be only cosmetic, since ships only form
on a wing until they are ordered (via comm or sexp) to do something else.
--Goober5000
2005-08-31 07:54:33 +00:00
Goober5000 7e583ad5d6 removed two unused functions
--Goober5000
2005-08-31 07:17:43 +00:00
Goober5000 46386e5ee0 remove a redundant function
--Goober5000
2005-08-31 07:01:40 +00:00
Goober5000 40442a6cc4 fix a function prototype to match its counterpart in vecmat.h
--Goober5000
2005-08-31 06:25:27 +00:00
Goober5000 b783360750 roll back and recommit the minimally invasive version of phreak's fix...
this removes a bit of redundant code
--Goober5000
2005-08-31 06:12:41 +00:00
phreak 5507bf9c95 real spawn angle fix. The problem stemmed from the matrix argument in vm_vec_random_cone()
being objp->orient and should have been the matrix formed by vm_vector_2_matrix(&m, &objp->orient.vec.fvec, NULL, NULL);
2005-08-31 05:47:02 +00:00
Goober5000 dcb66b4ce6 fixed yet another docking bug, based on taylor's original fix :p
--Goober5000
2005-08-31 00:59:35 +00:00
Goober5000 d13386b02b made spawning missiles work like retail when appropriate
--Goober5000
2005-08-31 00:48:22 +00:00
phreak 9f64817f7d Get rid of alpha blending when using the htl drawing fuctions for lines and spheres.
Right now, gr_opengl_draw_htl_line and gr_opengl_draw_htl_sphere are only used in fred, so
it shouldn't change anything critical
2005-08-29 02:23:04 +00:00
phreak 80a248e214 Record state changes in gr_opengl_set_state() 2005-08-29 02:20:56 +00:00
Kazan 6e816fc2d3 potential fix for mantis bug 237 2005-08-27 00:21:27 +00:00
taylor 0357abd27d fix strange static issue experienced with TBP briefing voices 2005-08-26 17:05:13 +00:00
taylor 98ab82451e send out multi pings during level load to prevent timeouts on slower computers (does not break network compatibility with older, or retail, clients/servers) 2005-08-26 00:56:17 +00:00
taylor ae0211df31 basic cleaning, removing old/useless code, sanity stuff, etc:
- very minor performance boost from not doing stupid things :)
 - minor change to 3d shockwave sizing to better approximate 2d effect movements
 - for shields, Gobal_tris was only holding half as many as the game can/will use, buffer is now set to full size to avoid possible rendering issues
 - removed extra tcache_set on OGL spec map code, not sure how that slipped in
2005-08-25 22:40:04 +00:00
taylor a71dd6e5c5 fix crash from oversized buffer data requests with OGGs 2005-08-25 22:33:48 +00:00
taylor f3d6636fb9 since the geomtry_batcher can send more verts than non-HTL code can handle, avoid drawing in that case to avoid crashing 2005-08-25 22:32:55 +00:00
taylor 499bfccdf3 fix Int3() when we are an OGG and need silence data 2005-08-25 06:32:42 +00:00
taylor 10b4d8ef73 don't let ai keep firing primary and secondary weapons for fighters and bombers if they are dying (fixes player deathroll too) 2005-08-25 00:48:19 +00:00
Goober5000 f7db8ee7d1 tweaky optimization based on the current version of stristr and
the current version of the expanded music.tbl
--Goober5000
2005-08-24 07:20:36 +00:00
Goober5000 20de684fcd faster version of stristr
--Goober5000
2005-08-24 07:14:52 +00:00
matt 0b285d1ce5 Changed rect_size_y - 1 to rect_size_y. Not really that important, but much more correct. I'll stop barraging cvs now :) 2005-08-23 17:06:28 +00:00
matt 85e806405c Fixed another screen save bug relating to having your window positioned offscreen. Still isn't great for when the window is offscreen top left 2005-08-23 16:57:28 +00:00
matt 94d2d6da1d Fixed screen save crash when a popup is called 2005-08-23 15:59:51 +00:00
Goober5000 6d83162a72 ensure init/reset of goals works cleanly
--Goober5000
2005-08-23 09:18:08 +00:00
Goober5000 995961bd93 fix for bug 519
--Goober5000
2005-08-23 09:03:56 +00:00
Goober5000 f9e97e03dc removed a thing I apparently forgot to remove on 2005/07/12
--Goober5000
2005-08-23 07:49:24 +00:00
taylor 87363eba75 fix navpoint hud brackets and text display in non-standard resolutions 2005-08-23 07:37:14 +00:00
Goober5000 9f2bf811be some tweaks to parselo, plus ensure that Unicode files don't crash
--Goober5000
2005-08-22 22:24:22 +00:00
Goober5000 49735a9631 one more change
--Goober5000
2005-08-22 04:59:13 +00:00
Goober5000 7d7d365d9c final changes to projects and workspace; everything should work now
(in MSVC 6 anyway)
--Goober5000
2005-08-22 04:58:38 +00:00
Goober5000 eff4e44151 these ogg libs are needed also
--Goober5000
2005-08-22 04:55:38 +00:00
Goober5000 ce5aa8edfb add dx8 libs and headers missing in the dx9 sdk
--Goober5000
2005-08-22 04:53:41 +00:00
Goober5000 e28c203461 add ogg libs and headers
--Goober5000
2005-08-22 03:11:32 +00:00
taylor 87d2843cfc fix stats display in debriefing with non-standard resolutions 2005-08-21 21:05:53 +00:00
Goober5000 09e9dbec4d clarified the comment on my original move of the wing departure information assignment
--Goober5000
2005-08-21 06:19:31 +00:00
taylor 35309cc15a more unix->SCP_UNIX define fixing 2005-08-20 20:38:08 +00:00
taylor f851a3190b some bmpman and render_target function name changes so that they make sense
always use bm_set_render_target() rather than the gr_ version so that the graphics state is set properly
save the original gamma ramp on OGL init so that it can be restored on exit
2005-08-20 20:34:51 +00:00
taylor a646e617ff Make sure to always use world pos for shockwaves in HTL mode, avoids the distance check Error()
(if someone can find a better explanation of why this one thing was different please make a better fix)
2005-08-20 20:32:28 +00:00
taylor 9872bd0bc3 Fix an old unix define, should be SCP_UNIX 2005-08-20 20:29:47 +00:00
Goober5000 e01b990494 made AwacsMultiplier more user-friendly
--Goober5000
2005-08-20 18:23:02 +00:00
matt 1000c46fe9 Fix for D3D white squares issue 2005-08-20 16:00:03 +00:00
taylor 73c9b0e749 Address a couple of pilot code issues
- make the same MAX_PILOTS in the barracks that the playerselect screen has since it's a problem here too
 - add a -1 check for ship/weapon name lookups to avoid bounds issues.  NOTE: this can empty the techroom of entries if ithits this check, but it won't crash :)
2005-08-18 01:15:41 +00:00
Kazan 421fc46b42 # FEATURE BREAK # This breaks a feature in pilot files temporarily to correct a [reproducable] crash - it is merely commenting out the trouble lines - bug report in mantis and assigned to taylor 2005-08-18 00:19:53 +00:00
Kazan 66fd939231 [hopefully] Fix the bug i introduced in the show memory usage code, and the convergence bug during autopilot [also saves cpu cycles - MANY of them] 2005-08-16 20:06:24 +00:00
Kazan 725bfc17df i introduced a bug in _vm_realloc.. fixed it 2005-08-14 23:05:27 +00:00
Kazan 2cde2c8e46 I'm stupid, sorry - fixed release-build-crash 2005-08-14 21:01:59 +00:00
Kazan 9e9b151960 diabled NEW_MALLOC on windows - it was causing crashing - must have been corrupting it's own heap 2005-08-14 17:20:56 +00:00
taylor 5c563c5cb8 don't do any ambient sound or music stuff in game_pause()/unpause() on options screens when in mission so we can
avoid having mainhall ambient sounds and music start playing and then not stop until you exit the mission
2005-08-11 12:22:26 +00:00
taylor b8818d6cfc handle rare cases where anims would get freaky if one happened to still be playing or otherwise queued 2005-08-11 12:18:53 +00:00
taylor a081773563 little safety check, a couple of strange cases allow this to happen so we should look for it 2005-08-11 12:16:23 +00:00
taylor cb3401e03a well that was rather stupid of me, this would crash if old + new pilots went over MAX_PILOTS 2005-08-09 10:06:47 +00:00
taylor 222b984cc3 be sure to remove ships from a wing when that ship gets vanished 2005-08-08 03:13:53 +00:00
taylor 0fda3d1fbd hopefully fix the problem that was causing geometry issues in just OGL when using VBOs 2005-08-08 01:19:50 +00:00
taylor 4e3fb69600 some minor cleanup
don't load the default 2d shockwave graphics if we have a default 3d shockwave, they won't get used and only take up memory
2005-08-07 09:25:55 +00:00
taylor 0ee8aac766 forgot to commit this before, did this gui code actually compile for anyone? 2005-08-07 09:24:22 +00:00
taylor ca91178cbe fix 3-D shockwave frame detection so that it will use the proper number of frames for the animation (not less, not more) 2005-08-05 15:33:45 +00:00
Goober5000 c619247b02 made "stealth" tag more user-friendly, and fixed a bit of punctuation
--Goober5000
2005-08-03 22:02:38 +00:00
taylor 3708fb1de7 allow for both gamedir and userdir cmdline config files 2005-08-01 10:00:39 +00:00
taylor 4602e63dc1 never could get Ai_class_names to realloc properly but this does the job just as well 2005-08-01 09:57:52 +00:00
wmcoolmon d9cf3916f4 MR_NO_FOGGING for shockwaves 2005-07-31 20:31:41 +00:00
taylor 2c6bc53193 we only care about fmt and data tags so once we have them bail out, fixes some really bad seek errors in crappy wav files 2005-07-31 01:35:43 +00:00
taylor 61ccec1abd fix a NULL pointer reference if there are no secondary banks on a ship 2005-07-31 01:34:03 +00:00
taylor c8bc719c4c few data type fixes, was only a problem for big-endian systems as little-endian doesn't really care about this 2005-07-31 01:32:21 +00:00
taylor 3817a704ff print file and line info for Int3() calls to the logfile so that they are easier to debug with basic error reports 2005-07-31 01:30:48 +00:00
taylor 1a62ef0b68 Temporarily add an empty AIM_GET_BEHIND case to ai_execute_behavior() to avoid hitting Int3() in TBP 2005-07-31 01:29:21 +00:00
wmcoolmon d37906f041 Removed turret thing, added some more armor type calculations 2005-07-30 22:34:42 +00:00
taylor d77c090eaf safety check for TYPE_D beam weapons, the +Shots: count needs to be at least 1 to avoid various errors 2005-07-29 10:18:26 +00:00
Goober5000 8a5dc41e2e verified that submode_start_time is updated whenever submode is changed
--Goober5000
2005-07-27 18:27:49 +00:00
Goober5000 2dd43251ec more tweaks to the dock code
--Goober5000
2005-07-27 17:22:22 +00:00
taylor 9719b83766 Add ability to use specific refresh rate, needs a soon to be updated Launcher to have set via GUI
but this can go in already.  Defaults to, and falls back on, previous behavior and adds some
  error checking that wasn't there previously.
2005-07-26 08:46:48 +00:00
Goober5000 9fb769900b more bugs and tweaks
--Goober5000
2005-07-25 08:22:00 +00:00
Goober5000 9b12500fe1 forgot this
--Goober5000
2005-07-25 05:55:40 +00:00
Goober5000 2d0bde22e4 cleaned up some command line and mission flag stuff
--Goober5000
2005-07-25 05:24:17 +00:00
Goober5000 f0b3d37762 whoops
--Goober5000
2005-07-25 05:23:33 +00:00
Goober5000 2f1745b9c8 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
Goober5000 db06ce05c1 cleaned up some rotating submodel code
--Goober5000
2005-07-24 20:12:55 +00:00
Goober5000 9e830fd82d fixed a minor docking bug
--Goober5000
2005-07-24 19:59:24 +00:00
taylor e4dfa534f6 proper multi support for fighter beams, already has code to break protocol commented out if we need it,
decided to skip and beam type checks and let beam_fire() reassign it (should work ok)
2005-07-24 18:35:44 +00:00
taylor 9ad5b3686f hehehe, fix the check to allow fighter beams to count for kills 2005-07-24 18:33:47 +00:00
taylor 2bb5300132 various incarnations of freaky and stupid, need to do this everywhere eventually 2005-07-24 18:32:58 +00:00
taylor ed4f880369 address possible div-by-0 problem 2005-07-24 18:31:59 +00:00
taylor 01f6ac2148 little 64-bit strangeness (longs are 64-bit here rather than 32) 2005-07-24 18:31:17 +00:00
wmcoolmon 253e12878c Multiple shockwaves support. 2005-07-24 06:01:37 +00:00
wmcoolmon 7b18d839ca Synced 3D shockwaves' glowmaps with the model, tossed in some medals.tbl
support for the demo/FS1
2005-07-24 00:32:45 +00:00
wmcoolmon b1f5390f90 Fixed formatting FTW 2005-07-23 22:52:44 +00:00
wmcoolmon c85ed21a50 Fixx0red description for show-subtitle 2005-07-23 22:48:28 +00:00
Goober5000 a8daa191bf bah - fixed subsystem comparison
--Goober5000
2005-07-23 21:47:46 +00:00
Goober5000 95f0ce016e fixed ai issue where some ships would never call for rearm
--Goober5000
2005-07-23 21:06:24 +00:00
Goober5000 6328625e63 fixed a rare but ugly (though amusing) bug
--Goober5000
2005-07-23 18:38:47 +00:00
wmcoolmon 2f84efb076 Fixed bug where camera reset when rotation complete 2005-07-23 18:25:42 +00:00
Goober5000 1c19a2bfa5 remove Bobboau's extra warp thing
--Goober5000
2005-07-23 17:27:50 +00:00
Goober5000 9a494bb545 remove an extraneous extern
--Goober5000
2005-07-23 16:25:32 +00:00
Goober5000 f7cc6399c4 fix the support ship bug; taylor should be happy now ;)
--Goober5000
2005-07-23 11:42:54 +00:00
wmcoolmon f996cbb2c0 Another try at fixing gun turrets sticking straight up 2005-07-23 08:17:04 +00:00
Goober5000 d4e507ad41 CVS header tweaks
--Goober5000
2005-07-22 10:18:41 +00:00
Goober5000 25d1addbed unhide null vector bug
--Goober5000
2005-07-22 09:59:30 +00:00
wmcoolmon 295a57cc65 Dynamic AI Class number commit. KNOWN BUG: When AI_CLASS_INCREMENT is hit and vm_realloc is called, memory corruption seems to
result. Not at all sure what causes this; if this can't be resolved soon, we can always treat _INCREMENT like _MAX
2005-07-22 09:19:40 +00:00
Goober5000 c54410f177 fixed another bug when changing ship classes
--Goober5000
2005-07-22 04:31:12 +00:00
taylor 1ffb472245 better error checking/handling for when you fire primary/beam weapons without a target selected 2005-07-22 03:54:46 +00:00
taylor db538a19d7 fix crash on commit in the multi ship selection screen
mask_data in the UI code is always cast to ubyte so why it was a ushort type I'll never know
fix unsized text in input boxes (fixed the real problem earlier but forgot to remove this old fix)
2005-07-22 03:53:32 +00:00
taylor ba26e4690f forgot to remove PreProcDefines.h from here too 2005-07-22 03:51:13 +00:00
wmcoolmon 478543cd73 Changed $Hull Repair Rate and $Subsystem Repair Rate to be percentages,
as well as making them accept all values between -1 and 1
2005-07-21 07:53:14 +00:00
taylor e21deb998a fix problem loading compressed DDS created by DX9 utils 2005-07-20 14:55:12 +00:00
taylor 7cc52df168 move the "none.wav" init to event_music_init() so it only runs through once (fixes no mission music when modular tbls are used) 2005-07-20 02:37:32 +00:00
taylor 32304b128a better UV offsets when using non-standard resolutions (for text mostly), copied from D3D code 2005-07-20 02:35:51 +00:00
taylor fe0b2855ee fix resize fixes 2005-07-19 04:52:56 +00:00
taylor 5398dc8206 better "is_640x480" detection, 800x600 res was using GR_1024 where it should have used GR_640 2005-07-18 14:09:03 +00:00
taylor f0b509911a errant unsize was still messing up h-sliders in non-standard resolutions 2005-07-18 12:42:10 +00:00
taylor a13064936a more non-standard res fixing
- I think everything should default to resize now (much easier than having to figure that crap out)
 - new mouse_get_pos_unscaled() function to return 1024x768/640x480 relative values so we don't have to do it later
 - lots of little cleanups which fix several strange offset/size problems
 - fix gr_resize/unsize_screen_pos() so that it won't wrap on int (took too long to track this down)
2005-07-18 03:45:10 +00:00
taylor a14b57d6f5 cleanup hudtargetbox rendering from that total hack job that had been done on it (fixes wireframe view as well)
more non-standard res fixing
 - I think everything should default to resize now (much easier than having to figure that crap out)
 - new mouse_get_pos_unscaled() function to return 1024x768/640x480 relative values so we don't have to do it later
 - lots of little cleanups which fix several strange offset/size problems
 - fix gr_resize/unsize_screen_pos() so that it won't wrap on int (took too long to track this down)
2005-07-18 03:44:01 +00:00
taylor 23d5e01508 PreProcDefines.h has to be removed from here as well so that "make dist" will work 2005-07-18 03:37:35 +00:00
wmcoolmon b48172ce1b Unlike my previous commit, this one does not cause a segmentation
fault. :)
2005-07-16 07:03:49 +00:00
wmcoolmon 64721e4407 Commented out lines 554 and 555 so the code would compile 2005-07-16 06:33:16 +00:00
Goober5000 6a2a61287d cleanup and clarification of phreak's fix of a bug propagated by me and penguin
--Goober5000
2005-07-16 04:41:04 +00:00
wmcoolmon 08db59549f I can't compile the source to test this, but this should switch the
hi-res check to "2_ChoosePilot-m" rather than sparky_hi_fs2.
2005-07-15 23:19:10 +00:00
Goober5000 6a02b099da fixed a typo of Kazan's dating all the way back to October 15, 2003 (!!) that
created a nasty stealth bug
--Goober5000
2005-07-15 03:48:40 +00:00
Goober5000 e49cd4edb8 remove PreProcDefines.h from project file; tweak #define's
--Goober5000
2005-07-14 23:46:57 +00:00
mrduckman 919bd0d434 Restored messages to on-focus channel. If it doesn't work, we'll work around with a pseudo-cmd. 2005-07-14 13:25:03 +00:00
phreak d9c643bb41 If the web cursor bitmap isn't found, tell the user to move the executable to the main FS2 directory. 2005-07-13 15:15:54 +00:00
Goober5000 1004ffcb54 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:35:36 +00:00
Goober5000 d62d659bf4 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:26:00 +00:00
Goober5000 81833122b8 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:15:53 +00:00
Goober5000 a3ee32e28d remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 02:50:53 +00:00
Goober5000 851732e3e1 remove preprocdefines, yay!
--Goober5000
2005-07-13 02:39:17 +00:00
Goober5000 485e7fcf7e this seems like it should be handled by the code already...
let's remove it and see what happens :p
--Goober5000
2005-07-13 02:32:22 +00:00
Goober5000 c14a21e332 removed autopilot #define
--Goober5000
2005-07-13 02:30:54 +00:00
Goober5000 55e04969c9 move inferno vs. network check here for the time being
--Goober5000
2005-07-13 02:08:26 +00:00
Goober5000 b8db2eb59f fixed a bunch of "issues" caused by me with the species stuff
--Goober5000
2005-07-13 02:01:30 +00:00
Goober5000 47edc76b69 rolled this back because it causes a syntax error in MSVC
--Goober5000
2005-07-13 02:00:44 +00:00
Goober5000 84b8fe77d7 improved species support and removed need for #define
--Goober5000
2005-07-13 00:44:24 +00:00
Goober5000 28fdeb4a28 removed DECALS_ENABLED
--Goober5000
2005-07-12 22:14:40 +00:00
Goober5000 197a041da5 removed NO_LINKED_PRIMARY_PENALTY as it's better suited for difficulty.tbl or something similar
--Goober5000
2005-07-12 21:58:45 +00:00
Goober5000 9b657a529b fixed "warpout sequence aborted" bug
--Goober5000
2005-07-12 21:10:57 +00:00
Goober5000 3008602982 properly fixed beam_apply_whack()
--Goober5000
2005-07-12 21:01:40 +00:00
mrduckman 1259c46d3c Better SDL Headers checking for MacOSX 2005-07-12 18:14:53 +00:00
Goober5000 67a5183ad6 remove all restrictions on which ship types can dock with each other
--Goober5000
2005-07-12 07:03:18 +00:00
mrduckman 61162cfd67 Fixed SDL linking for MacOSX 2005-07-11 14:26:30 +00:00
wmcoolmon 6a2b0110b9 Bumped Fs2_open version to 3.6.7 2005-07-11 10:13:09 +00:00
wmcoolmon 43d061d4f3 Bumped version for Linux makefile to 3.6.7 2005-07-11 10:12:06 +00:00
wmcoolmon 344c50572a Fixed the bug where sending an ignore command to "All fighters" would
apply to all ships
2005-07-11 10:01:06 +00:00
taylor 2175a959db make sure to tack on a / on the dot dir so that recursive directory making will work properly (code thought it was a file rather than a dir) 2005-07-09 04:34:43 +00:00
wmcoolmon ccd760994b Added fixes for custom gauges discussed in the recent thread 2005-07-09 03:02:07 +00:00
taylor 775c86a894 various compiler warning fixes (some of these from dizzy) 2005-07-07 16:36:58 +00:00
taylor 449f1e2fe5 make double sure that we actually need to render thruster glows instead of doing it regardless 2005-07-07 16:35:11 +00:00
taylor dc7a2d08db add value of GL_vertex_data_in to OGL card memory usage 2005-07-07 16:33:39 +00:00
taylor 88d08df966 compiler warning fixes
add -noibx troubleshooting cmdline option to disable use of IBX files
don't try to set thuster object number is only one thruster bank is specified (default method should go into affect)
2005-07-07 16:32:33 +00:00
phreak 5e8c31dadd fixed an afterburner bug where AI ships would have infinite AB fuel if NO_NETWORK
was defined.
2005-07-05 17:04:08 +00:00
taylor ea7c3255fc bah, forgot to ever check debriefings 2005-07-02 20:57:48 +00:00
taylor e2bc4ff920 ton of non-standard resolution fixes 2005-07-02 19:45:02 +00:00
taylor 7500378696 ton of non-standard resolution fixes
make gr_cross_fade() work properly in OGL
2005-07-02 19:40:48 +00:00
taylor 3921b2b079 fix compiler warnings introduced by recent stub changes (defining an empty stub as something is wrong, it should be nothing)
assuming that GetStatus thing wasn't tested since it would never have worked
2005-07-02 19:39:23 +00:00
taylor 15c5c06c7f some supernova fixing 2005-07-02 19:36:04 +00:00
taylor 0270ac2c0b compiler warning fixes 2005-07-02 19:33:18 +00:00
phreak 8842fb64db remove the BEAM_NO_WHACK flag in beam_apply_whack() 2005-07-01 17:19:43 +00:00
Goober5000 578d70b7cd the message queue now waits for simulated speech to finish
--Goober5000
2005-06-30 02:36:16 +00:00
Goober5000 ea73c417ff added functions to check if speech is playing
--Goober5000
2005-06-30 02:35:17 +00:00
Goober5000 cbf7b33393 * NOX'd none.wav
* changed comparisons on none.wav to only look at the first four letters in case
  we don't have an extension or in case some weirdo decides to put none.ogg
* simulated speech pre-empts "beeps" in in-game messages
--Goober5000
2005-06-30 01:48:52 +00:00
Goober5000 84e6492488 tweaked the stubs and added a function
--Goober5000
2005-06-30 01:35:52 +00:00
Goober5000 d24b80f395 if game_busy() is in gamesnd_preload_common_sounds() then it should
also be in gamesnd_load_gameplay_sounds() I would expect
--Goober5000
2005-06-30 00:48:02 +00:00
Goober5000 ef175e9271 Removed "beam no whack" as setting the beam's mass to 0 achieves the same effect.
--Goober5000
2005-06-30 00:36:10 +00:00
taylor 304a1f77a1 set-skybox-model only takes one argument so don't advertise more
add set-skybox-model help text for FRED2
2005-06-29 18:54:59 +00:00
taylor 83012fe0e9 should fix perpetually damaged subsystems on ships for multi clients 2005-06-29 18:54:02 +00:00
taylor 4df1fd48c4 FRED2 does special stuff for jumpnode handling so don't try and delete the obj ourselves when FRED is running 2005-06-29 18:53:07 +00:00
taylor 81480ebcbc extra checks to make sure we don't end up targetting a sensor-invisible ship 2005-06-29 18:52:02 +00:00
taylor 15628c5f8b revert OGL init changes since ATI drivers suck and don't like it 2005-06-29 18:51:05 +00:00
taylor 5427e73ffa little cleanup and error checking 2005-06-29 18:50:13 +00:00
taylor 97982c52d7 various FS2NetD fixes:
- replace timer stuff with something that more accurately works cross-platform and without being affected by load
 - better sanity checking for the server list
 - working Linux compatibility that's not dog slow
 - when calling DataReady() make sure that the data is properly valid
 - fix messed up cvs merge cleanup from the Linux merge which did nasty things
2005-06-29 18:49:37 +00:00
taylor 892fb2ea93 add option to not scale up movies to fit window/screen, default is to scale
(arguably not a bug but I said I would get it in before 3.6.5 and forgot)
2005-06-29 18:46:13 +00:00
taylor 4de6d09b64 we only want to have m_data_offset be 0 for oggs since the seeking callback will account for the true offset
only extern the one int we need for the -nosound speech fix rather than including the entire header
2005-06-24 19:36:49 +00:00
taylor 52d9eccb72 compiler warning fix (dizzy) and make sure that it's safe to continue after that switch statement 2005-06-22 15:25:41 +00:00
taylor abed73b3c6 make sure that _mkdir() will return an error if the path is invalid 2005-06-22 15:18:58 +00:00
taylor 5f9b7064c9 objnum check when targetinfo is used, fixes message brackets having random text as info 2005-06-22 15:17:53 +00:00
taylor 148ba14b56 make sure we only have one extension on mission names 2005-06-22 15:16:40 +00:00
taylor 3abc9fc0f8 probably be a good idea to make the valid objnum check here too 2005-06-21 00:25:34 +00:00
taylor 0de8af2602 in the model _render functions change "light_ignore_id" to "objnum" since that's what it really is
and this makes it so much easier to realize that
properly deal with the fact that objnum can be -1 in  model_really_render()
add NULL check to neb2_get_fog_values() so that it can just send back defaults if objp is NULL
small compiler warning fix for neb code
2005-06-21 00:20:24 +00:00
taylor 7f48891579 unbreak network compatibility with 3.6.5 and earlier builds
fix crashing with turret weapons
2005-06-21 00:15:06 +00:00
taylor 375bad91e6 add some better error checking/handling for when GetServerList messes up 2005-06-21 00:13:47 +00:00
taylor 887aa98e05 add virtual destructor so that GCC4 can shut up 2005-06-21 00:12:11 +00:00
phreak 8862debae8 added cmdline.h include so the compiler would see the no sound command line option
also added CVS header information.
2005-06-20 15:54:58 +00:00
taylor d1b28d6c7e little cleaner ship_get_random_targetable_ship(), for Goober's sake ;) 2005-06-20 04:10:35 +00:00
taylor b4cf700de6 arch and GCC4 compatibility 2005-06-20 04:09:46 +00:00
taylor cb9c2520bd make sure to reset size to 0 on texture free 2005-06-19 09:04:40 +00:00
taylor e2c5b17775 check_values() shouldn't be inline anymore
remove useless neb2_get_fog_intensity() call
s/alocate/allocate/g
2005-06-19 09:03:05 +00:00
taylor 4a1fa4ce38 minor sanity checking for geometry_batcher
make particle batchers allocate dynamically
handle cases where a particle graphic couldn't be loaded
2005-06-19 09:00:09 +00:00
taylor ad6698346f disable speech when -nosound is used 2005-06-19 08:56:23 +00:00
taylor 5db635395d woorps! 2005-06-19 04:59:04 +00:00
taylor 960d41a0d5 remove xmouse.cpp since it's pretty much useless 2005-06-19 02:48:14 +00:00
taylor 457f351954 never "promote" to a lower rank than current 2005-06-19 02:47:00 +00:00
taylor ed3eeb59e4 OGG streaming fixes to get data reading right and avoid skipping
properly handle seeking in OGG streams
compiler warning fix in OpenAL builds
2005-06-19 02:45:56 +00:00
taylor 7bb2d44d29 WMC's build fix, part deux 2005-06-19 02:43:49 +00:00
taylor c774be5da9 jumpnodes can get deleted outside of FRED now so allow for that 2005-06-19 02:43:14 +00:00
taylor b213b72e04 really needed to mention those two things as well given the types of changes those are 2005-06-19 02:42:21 +00:00
taylor 1f3ed28920 fix possible crash from popups, especially in multi 2005-06-19 02:38:33 +00:00
taylor 7df06d9b99 model_free_all() will unload textures so don't bother doing it twice 2005-06-19 02:37:43 +00:00
taylor 2b4dd24535 general cleanup, remove some old code
speed up gr_opengl_flip() just a tad
inverted gamma slider fix that Sticks made to D3D
possible fix for ATI green screens
move opengl_check_for_errors() out of gropentnl so we can use it everywhere
fix logged OGL info from debug builds to be a little more readable
if an extension is found but required function is not then fail
try to optimize glDrawRangeElements so we are not rendering more than the card is optimized for
some 2d matrix usage checks
2005-06-19 02:37:02 +00:00
taylor 2807196e1e allow screenshots and backsaves in windowed mode
account for D3D_textures_in size so that it doesn't hit negative values
2005-06-19 02:31:51 +00:00
taylor 1665521590 MIN Num_iface_sounds fix 2005-06-19 02:29:54 +00:00
taylor 0051f2b19f add a _fast version of bm_unload() to be used in modelinterp and future graphics API code
clean up some modelinterp code to not use memcpy() everywhere so it's more platform compatible and matches old code (Jens Granseuer)
NaN check to catch shards-of-death and prevent hitting an Assert() (Jens Granseuer)
fix jumpnode code to catch model errors and close a memory leak
make the call to bm_unload_all() after model_free_all() since we will get bmpman screwups otherwise
don't show hardware sound RAM when using OpenAL build, it will always be 0
print top-right memory figures in debug builds slighly further over when 1024+ res
2005-06-19 02:28:56 +00:00
Goober5000 8f0d5d7024 fixed a CVS log spelling error, plus fixed a tricky sexp allocation bug
--Goober5000
2005-06-16 05:17:32 +00:00
mrduckman e3883f2426 Added LIST command and added comment about PRIVMSG for Channels 2005-06-09 14:57:38 +00:00
wmcoolmon f006692c72 Hopefully this fixes something :) 2005-06-07 06:34:30 +00:00
wmcoolmon 98870cab35 This may stop targeting not-targetable ships in EMP 2005-06-07 06:10:51 +00:00
taylor 7ffbec56f3 add wxwidgets macro so that the dev package doesn't have to be installed to compile regular builds 2005-06-04 20:03:37 +00:00
wmcoolmon 28979a738d I *think* this should fix bool lists 2005-06-03 22:36:57 +00:00
taylor 5977a382dd some IBX debugging info to help determine if an IBX is corrupt post-mortem 2005-06-03 18:18:02 +00:00
matt 125f341f10 D3D gamma now no longer works backwards --Sticks 2005-06-03 16:42:30 +00:00
taylor 597668dd88 the problem this tried to fix should be properly fixed now but I keep forgetting to remove this block 2005-06-03 06:51:50 +00:00
taylor 7b1cf8dd59 cleanup of gr_bitmap since it's the same for D3D and OGL, skip if GR_STUB though
fix resize/rendering issue when detail culling is used with optimized opengl_create_texture_sub()
2005-06-03 06:44:17 +00:00
taylor c71c1ab1f9 eek... fix wrong description of changes 2005-06-03 06:41:37 +00:00
taylor 85a0250f11 better audio pause/unpause support when game window loses focus or is minimized 2005-06-03 06:39:27 +00:00
wmcoolmon dc0d63e1c0 Small extern fix 2005-06-03 02:28:54 +00:00
Goober5000 1c229c15d0 ugh... reverting taylor's change for now; I'll have to take another look at this
--Goober5000
2005-06-02 03:20:20 +00:00
wmcoolmon 32dd6aafd5 Protected ships are safe from spawning weapons. :) 2005-06-02 02:41:52 +00:00
wmcoolmon 1500870bfa Removed OF_DESTROYED, replacing it with a deletion cache 2005-06-02 02:09:43 +00:00
wmcoolmon 063342c36b Cast to quiet error 2005-06-02 01:56:32 +00:00
wmcoolmon f034cb48a1 Better missing model handling Pt. 2 2005-06-01 22:54:23 +00:00
wmcoolmon 12fc5a9a32 Better missing model handling 2005-06-01 22:52:56 +00:00
phreak 2db4db928e clarified error messages to say that the files listed on asserts/warnings/errors
are located on the computers that built the exe.
2005-06-01 15:10:26 +00:00
taylor e03d62eeb7 bit of cleanup for audiostr-openal and fix a Windows-only enum error
bunch of OGG related fixes for Linux and Windows (DirectSound and OpenAL), fixes audio related TBP 3.2 crashes
gracefully handle OGG logical bitstream changes, shouldn't even load if there is more than 1
2005-06-01 09:41:14 +00:00
taylor 59c1d7a01e little cleanup
optimize opengl_create_texture_sub() by not doing any extra image processing if we don't have to
  if an image is already power-of-2 or we don't need power-of-2 then avoid the extra time and memory usage
2005-06-01 09:37:44 +00:00
taylor e24d75cf94 make sure that newly created entries are properly initialized 2005-06-01 09:35:42 +00:00
taylor 8d1c0cd5b2 newline fix 2005-06-01 09:34:59 +00:00
taylor bb89ede9a2 well that previous docking fix wasn't quite enough, this makes sure that code will actually get exec'd
(Goober: might want to double check that this isn't stupid, does appear abort properly though)
2005-06-01 09:34:36 +00:00
wmcoolmon 8ffc7d031f This should fix redmenace's Assert...I'm not sure why it hasn't been triggering every time a shield is at full strength. 2005-05-30 23:41:36 +00:00
taylor 49318711ab if a briefing does have any stages (no text) then don't carry over text from a previous mission
some generic cleanup to V code that isn't a real problem now but could easily have been a memleak
2005-05-30 05:33:11 +00:00
taylor 5e415f7bd4 make sure we don't show various offscreen indicators and info when hud-disabled-except-messages is used 2005-05-30 05:31:19 +00:00
taylor abb7c260b4 make sure we stop mission in the redalert case too 2005-05-30 05:30:02 +00:00
taylor 622f835598 as soon as the first frame gets released the rest are unreachable in the loop
this was basically became a memory leak as additional frames never got released
2005-05-30 05:29:17 +00:00
taylor 039f3a26af me is a moron, this broke audio streaming 2005-05-30 05:27:30 +00:00
Goober5000 7cfdb91770 Taylor's the real SCP leader; I just play one on the Internet
--Goober5000
2005-05-30 04:38:33 +00:00
taylor f0b9910163 haven't got a clue what I was thinking with that crap 2005-05-28 19:44:17 +00:00
taylor 1f730b9284 debug message fixing
a little bit of code clarity
2005-05-28 19:43:28 +00:00
taylor 90005e98fe add a NULL check to model_get() for better error detection over an outright CTD 2005-05-28 19:41:56 +00:00
taylor 28fbeef528 fix ani corruption detection so that certain streaming anis don't hit it (check was wrong anyway) 2005-05-28 19:40:59 +00:00
Goober5000 ba24fb1aee moved some prototypes that WMC put in the header file back to the implementation file
--Goober5000
2005-05-27 03:37:53 +00:00
Goober5000 a4f4184fe0 hmm, rolled back to 2.3
--Goober5000
2005-05-27 03:36:20 +00:00
Goober5000 17b8798fbe removed some old unnecessary prototypes WMC had added
--Goober5000
2005-05-27 02:37:29 +00:00
tbird 133e98a434 no message 2005-05-26 20:59:59 +00:00
tbird 583024a8fa no message 2005-05-26 20:59:58 +00:00
tbird 9bea5c63e6 Removed due to problems with getting the correct file in place 2005-05-26 20:57:33 +00:00
tbird 437733a98e Updated based on VC6 projects 2005-05-26 20:56:10 +00:00
taylor 366980ab4a forgot to take into account F1_0 on timer_get_fixed_seconds(), remove those stupid CRs too 2005-05-26 09:21:28 +00:00
Goober5000 8fa5d63cb0 some bracket happiness, plus fixed the traning message version of the crazy semicolon bug
(thanks to taylor for fixing the regular message version)
--Goober500
2005-05-26 05:07:19 +00:00
taylor 82d7c503d8 the Loki extensions are Linux only so don't even bother checking under Windows, the
new spec has a cross-platform way of getting the same thing so this isn't a big deal
2005-05-26 04:32:31 +00:00
taylor 7aec8d2a42 don't page out textures in ship_delete() since it causes some slowdown which can make
the explosion effects skip/stutter
2005-05-26 04:30:48 +00:00
taylor edc7a3da00 those crazy semi-colons 2005-05-26 04:29:23 +00:00
taylor e722d89389 if we switch to a pilot who has a campaign that isn't available then abort the read and
deselect all pilots, should prevent data loss or crashes due to the missing safety check
2005-05-26 04:28:45 +00:00
taylor 6f481a3472 timer changes to fix game_busy() on the loading screen and 100% incorrect values on some machines,
don't know if this is going to work that great but it's more like the Linux SDL code now which
  has worked for years without major problems
2005-05-26 04:27:11 +00:00
taylor 7c5d87a506 make sure batch rendering of lasers happens after fog is disabled in nebula missions 2005-05-24 20:55:21 +00:00
taylor ae398ffe8b couple of extra checks to make sure that we can't enter the barracks or the techroom
if the currently selected campaign isn't available, fixes several pilot crash bugs
2005-05-24 20:54:06 +00:00
taylor 644f1120ed make sure that we recursively create directories for Linux/OSX
replace older recursive mkdir method in cfileextractor with new method
2005-05-24 20:52:10 +00:00
wmcoolmon edc4c33208 Commented out -fixbugs and -nocrash in preparation for 3.6.7 2005-05-24 07:05:49 +00:00
taylor 1c55a120b8 extra check to make sure that RLE reading never goes over frame size in new ANI formats 2005-05-24 03:13:36 +00:00
taylor 49f283f030 get command sanity check right, fixes lowercase on extract too 2005-05-24 03:12:27 +00:00
taylor c96527a320 an extra bounds check in sound.cpp
fix audiostr error when filename is !NULL but 0 in len might hit on SDL debug code
2005-05-24 03:11:38 +00:00
taylor d363f55686 quick catch for some corrupted anis, only a partial fix but it will do until something
a bit more heavy duty comes along in the near future
2005-05-23 05:58:31 +00:00
taylor 0610b5e051 Jens, again:
- compiler warning fixes
 - sanity and readability fixes for bmpman
2005-05-23 05:56:26 +00:00
taylor e02157b394 more from Jens...
- make sure that a frame number doesn't get carried over to non-animated weapon glows
 - move the line splitting code in missiontraining.cpp so that we don't have to worry about EOS chars
2005-05-23 05:55:13 +00:00
phreak 1aafce7240 fix out of bounds error 2005-05-23 04:58:43 +00:00
phreak a73e6686d0 compile warning fixage. 2005-05-22 22:47:19 +00:00
taylor 75ecd13e2c a medals crash fix that isn't influenced by the evil Java empire (Jens Granseuer) 2005-05-18 14:03:27 +00:00
taylor b3235d9998 some basic Polish language support from the icculus.org version (Janusz Dziemidowicz) 2005-05-18 14:01:31 +00:00
taylor 71cb920cab a few help text adjustments and fix some compiler warnings 2005-05-18 01:57:54 +00:00
taylor f0f3990738 Initial import of cfileextractor, still needs some work but does what it needs to 2005-05-17 21:00:57 +00:00
taylor a432fd8699 add building for cfileextractor 2005-05-17 20:59:23 +00:00
taylor f66759eac1 more autogen goodness from Jens
- remove old/unneeded checks (ie. we don't use libtool so don't check for it)
 - use --foreign rather than --gnu on automake so we can get rid of things like NEWS, etc.
2005-05-17 20:58:46 +00:00
taylor 4c8003fb8c more missed stuff from the vm_* macro change (thanks Alpha0) 2005-05-17 20:57:05 +00:00
phreak 4a8d5d19d3 reverted a tagged only commit, it wasn't needed 2005-05-16 15:40:43 +00:00
phreak 97778bd8ce custom loading screen fixage. 2005-05-15 21:40:31 +00:00
taylor 560ee745ea don't let the ogg callbacks close the file handle on us, let us do it ourselves to keep things straight 2005-05-15 06:47:57 +00:00
phreak c44cb63459 another tagged only turret fix 2005-05-14 21:48:22 +00:00
phreak f9cad9acb4 stop turrets from targeting non-bombs. also some tagged-only fixes. 2005-05-14 21:35:04 +00:00
phreak c225d664a2 fixed an out-of-bounds array bug 2005-05-14 21:34:17 +00:00
phreak 78d4b21830 medal_stuff needed a copy constructor and an overloaded assignment operator. 2005-05-14 16:16:48 +00:00
taylor 349a0cda5f unbreak joining (when forming, not in-game) (Jens Granseuer) 2005-05-13 23:10:17 +00:00
taylor ff36b6aa7b Ooops! Added the wrong version of the streaming patch from Jens 2005-05-13 23:09:28 +00:00
taylor fdb372e5a3 properly support multiple versions of automake (Jens Granseuer) 2005-05-13 23:08:39 +00:00
phreak 7089596664 possible fix for seeing suns through ships. shouldn't break anything. 2005-05-13 20:55:19 +00:00
taylor 9ff37eb37e more malloc->vm_malloc, free->vm_free, strdup->vm_strdup fixage 2005-05-13 02:56:34 +00:00
phreak dca9ba1202 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
taylor 359485654f missed a strdup to vm_strdup conversion 2005-05-13 02:47:58 +00:00
phreak 0a858b7b05 forgot a vm_strdup in place of a strdup 2005-05-13 02:41:24 +00:00
taylor e4131e25e4 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
2005-05-12 17:49:18 +00:00
taylor b4cc142d08 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
fix a few streaming errors in OpenAL code (Jens Granseuer)
temporary change to help deal with missing music in OpenAL Windows builds
don't assert when si->data is NULL unless we really need to check (OpenAL only)
2005-05-12 17:47:57 +00:00
taylor 7dbcf77914 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
reallocate sp->triggers with the real vm_realloc() rather than that manual method
2005-05-12 17:45:53 +00:00
taylor 23176b03dd use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
fix crash with Warning() message getting the wrong string
2005-05-12 17:44:02 +00:00
taylor ff31561484 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
try and keep up with how much VBO data is in memory too since that takes away from texture memory
2005-05-12 17:43:20 +00:00
taylor 6f55648495 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
set byte_mult to 2 for TCACHE_TYPE_AABITMAP to get the memory size right for Debug builds
2005-05-12 17:42:13 +00:00
taylor 122ddc2134 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
use correct GL VRAM texture number in OGL mode rather than the D3D number
2005-05-12 17:40:48 +00:00
taylor a110e19177 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
change system->decals allocation to use real vm_realloc() rather than that manual method
2005-05-12 17:39:13 +00:00
taylor c2700b4b9e add an extra gr_flip() after gr_clear() to make sure the change is made active 2005-05-12 17:37:48 +00:00
taylor 6a9f82eac5 use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
for the game_busy() text during page in add a "BmpMan" so we know better what's going on
2005-05-12 17:36:59 +00:00
Goober5000 ee91e844ef added dialogs to the project file
--Goober5000
2005-05-12 14:02:57 +00:00
Goober5000 5fbc8f7e23 added a bunch of dialogs to wxFRED... thanks, taylor, for the GUI development :)
--Goober5000
2005-05-12 14:00:15 +00:00
Goober5000 62cfe8b61b whoops
--Goober5000
2005-05-12 03:51:17 +00:00
Goober5000 ef6b1a12f4 repeating messages with variables should work properly now
--Goober5000
2005-05-12 03:50:10 +00:00
Goober5000 f2d38d2f13 removed variables in messages for now
--Goober5000
2005-05-12 01:34:50 +00:00
phreak 76d763cd8e added mission flag that will not show enemy wing names, just the ship class. 2005-05-11 22:15:49 +00:00
Goober5000 35c25efdc7 fixed a docking bug
--Goober5000
2005-05-11 11:38:03 +00:00
Goober5000 8eea5e3446 grr
--Goober5000
2005-05-11 09:32:03 +00:00
Goober5000 1563378777 fixed a few of karajorma's bugs
--Goober5000
2005-05-11 09:28:32 +00:00
Goober5000 03137abad6 changed an Assert() to an Error()
--Goober5000
2005-05-11 09:27:35 +00:00
Goober5000 48af4d28a9 variables should now work properly in messages that are sent multiple times
--Goober5000
2005-05-11 08:10:20 +00:00
phreak bc45b7c1d8 clean out some old code 2005-05-11 02:16:17 +00:00
phreak 8f8afd10ff fix the problem where the fade in/out doesn't work if looking at a sun. 2005-05-11 02:15:07 +00:00
phreak 428dde26e4 reverted a change that WMC made. It made Goober mad and delayed the release of
3.6.6 by two months.
2005-05-11 00:25:42 +00:00
phreak 2b8b24f78a 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 33b64ccd98 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 7fa4c0f215 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 ee3624ccdb Code betterness 2005-05-08 20:39:10 +00:00
wmcoolmon 4631e6f31a Dynamically allocated medals 2005-05-08 20:38:32 +00:00
wmcoolmon 3232327c9d Various turret code changes in a vain attempt to make things more readable/work properly 2005-05-08 20:35:26 +00:00
wmcoolmon f3bc4e0425 Turret debugging code; Medals stuff; GUI_system change 2005-05-08 20:33:42 +00:00
wmcoolmon 790810ada9 Dynamically allocated medals 2005-05-08 20:28:57 +00:00
wmcoolmon 994f25cdf0 Change to GUI_system; this will probably break the lab, but is necessary for things to compile properly. 2005-05-08 20:27:51 +00:00
wmcoolmon c70c6005b3 Change to GUI_system (to prevent memory leaks and allow for auto-deconstruction) 2005-05-08 20:26:46 +00:00
wmcoolmon 63d1922367 "backspace" function 2005-05-08 20:23:28 +00:00
wmcoolmon 0c7adec15c armor.tbl revamp 2005-05-08 20:21:48 +00:00
tbird 3230a9eca9 Added project files for VC.NET 7.0 (the 2005 project files do not work in 7.0) 2005-05-04 00:30:56 +00:00
wmcoolmon 313d75276e Added variables to permanent location 2005-05-03 07:55:44 +00:00
wmcoolmon 045e29ae29 Removed variables files 2005-05-03 07:54:49 +00:00
wmcoolmon d0bace2c57 Added Bobb's variable system (with some minor compiler-warning fixes) 2005-05-03 06:33:07 +00:00
wmcoolmon aa61590ad3 Bah, stupid externs. :P 2005-05-02 22:36:54 +00:00
mrduckman a1569ff1c2 Added /NAMES command (Very needed to know who's in a channel :P) 2005-05-02 15:33:17 +00:00
phreak 39ea734595 bumped MAX_SPAWN_WEAPONS to 30 for inferno builds 2005-05-01 23:40:44 +00:00
phreak 471ed14f14 added CVS info to top of file. 2005-05-01 23:23:18 +00:00
phreak 2ce65069fb when creating the window take into account the top border 2005-05-01 23:17:46 +00:00
phreak 1270b04c97 fix the window from shrinking if a cutscene is played in windowed mode 2005-05-01 23:16:12 +00:00
phreak 0b959888c7 don't confine the cursor in d3d 2005-05-01 23:13:19 +00:00
wmcoolmon bd620e76dd -output_sexps command line 2005-05-01 07:13:59 +00:00
wmcoolmon 6f2fc71a7c Added (up-to-date) SEXP description info. 2005-05-01 06:18:58 +00:00
phreak 24774cf9cc buckets in sort_weapons_by_type() allocated on the heap instead of the stack. 2005-04-30 18:20:57 +00:00
phreak 79d41f9a59 ABbitmap should default to -1 2005-04-30 18:18:46 +00:00
phreak 6e69f08e65 bm_page_in_textures() should return if bitmap_num is any negative value, instead of just -1 2005-04-30 18:17:17 +00:00
wmcoolmon 529e3c47bd Removed FS2_DEMO defines that looked like they wouldn't cause the universe to collapse 2005-04-28 05:29:30 +00:00
wmcoolmon e01a6293d5 Cleared up some ambiguity that made MSVC 2003 go on strike 2005-04-28 05:12:26 +00:00
wmcoolmon e63b108e61 stuff_byte to stuff_ubyte 2005-04-28 01:39:14 +00:00
wmcoolmon 744a53ddf0 parse_ship uses stuff_bool_list; stuff_byte to stuff_ubyte 2005-04-28 01:38:32 +00:00
wmcoolmon ff0d52b1a4 More parsing flexibility 2005-04-28 01:36:46 +00:00
wmcoolmon fbc24176cd stuff_byte to stuff_ubyte; does the same thing, but with a better name. 2005-04-28 01:36:09 +00:00
wmcoolmon a7987b89be Switch stuff_string_white to stuff_string (I don't see why _white was used in the first place) 2005-04-28 01:32:57 +00:00
wmcoolmon 448027d119 Added stuff_bool_list; Internationalized stuff_boolean. 2005-04-28 01:12:19 +00:00
Goober5000 ec269425fd -made the XRC file parsed on load instead of embedded
-migrated wxFRED to wxWidgets 2.6.0
--Goober5000
2005-04-25 12:14:21 +00:00
taylor 7543e00581 newline fix 2005-04-25 06:36:25 +00:00
taylor 593ff86eeb use full size of Campaign_missions[] for simroom filtering, fixes the problem of campaign
missions still showing up in the single list even after filtering
2005-04-25 06:36:01 +00:00
taylor 46acd73b0b little cleanup so that debug and release build files don't have to be listed twice
add newer wxFRED2 files
2005-04-25 06:33:56 +00:00
wmcoolmon 7ed4e8985d Use parse_sound instead of code chunks 2005-04-25 00:34:00 +00:00
wmcoolmon 151c188018 Dynamically allocated engine washes; subsystem sounds; armor fixes. Line 4268 of ship.cpp, apparently, works properly; bears further looking into. 2005-04-25 00:31:14 +00:00
wmcoolmon 97cb2f5933 subsystem sounds 2005-04-25 00:28:58 +00:00
wmcoolmon a4d6350db0 MAX_SHIP_TYPES > Num_ship_types 2005-04-25 00:28:17 +00:00
wmcoolmon d0d7f35c76 Commented out unneeded array (Glide) 2005-04-25 00:27:32 +00:00
wmcoolmon 44f837acf8 Dynamically allocated engine washes; subsystem sounds 2005-04-25 00:26:53 +00:00
wmcoolmon 68ded37681 Windows have minimum size according to caption; made lab use another tree level so all ships can be seen 2005-04-25 00:24:34 +00:00
wmcoolmon f959265a74 Added parse_sound; replaced Assert() with an if() (The latter may not be a good idea, but it keeps missions from being un-debuggable) 2005-04-25 00:22:34 +00:00
wmcoolmon 01791870bc Center title screen, removal of unnecessary #ifdefs 2005-04-25 00:21:30 +00:00
wmcoolmon 365c12e99f Bumped console printing buffer size so people can play with the neb2 command 2005-04-25 00:07:22 +00:00
wmcoolmon d2eaea9a85 MAX_SHIP_TYPES -> Num_ship_types 2005-04-25 00:04:30 +00:00
Goober5000 18606cfb46 updated the project file
--Goober5000
2005-04-24 14:45:17 +00:00
Goober5000 658730bb4b wxFRED now uses XRC-based resources
--Goober5000
2005-04-24 14:42:27 +00:00
taylor 732d7f5561 really are too many changes here:
- remove all bitmap section support and fix problems with previous attempt
 ( code/bmpman/bmpman.cpp, code/bmpman/bmpman.h, code/globalincs/pstypes.h,
   code/graphics/2d.cpp, code/graphics/2d.h code/graphics/grd3dbmpman.cpp,
   code/graphics/grd3dinternal.h, code/graphics/grd3drender.cpp, code/graphics/grd3dtexture.cpp,
   code/graphics/grinternal.h, code/graphics/gropengl.cpp, code/graphics/gropengl.h,
   code/graphics/gropengllight.cpp, code/graphics/gropengltexture.cpp, code/graphics/gropengltexture.h,
   code/graphics/tmapper.h, code/network/multi_pinfo.cpp, code/radar/radarorb.cpp
   code/render/3ddraw.cpp )
 - use CLAMP() define in gropengl.h for gropengllight instead of single clamp() function
 - remove some old/outdated code from gropengl.cpp and gropengltexture.cpp
2005-04-24 12:56:43 +00:00
taylor 592899a5f5 little cleanup of laser rendering
- fix animated glows
 - proper alpha modification (still messed up somewhere though, shows in neb missions)
 - remove excess batch_render()
2005-04-24 12:47:36 +00:00
taylor a99518e88d possible dev/0 bug fix (Jens Granseuer) 2005-04-24 12:45:14 +00:00
taylor e3c8004429 make sure we don't build with speech support under Linux unless we specify it as a configure option 2005-04-24 12:44:25 +00:00
Goober5000 343e2537de fix0red the CVS log
--Goober5000
2005-04-24 08:27:17 +00:00
Goober5000 995ce3e17f made swarm/corkscrew/flak conflict more friendly
--Goober5000
2005-04-24 07:31:34 +00:00
wmcoolmon f630e1799e Enabled movies in windowed mode; if this causes problems for people, they can always use -dnoshowvid 2005-04-24 06:52:23 +00:00
Goober5000 ae8c507d37 eh, stupid quotes
--Goober5000
2005-04-24 05:53:15 +00:00
Goober5000 605b490d17 actually, I think this way works better
--Goober5000
2005-04-24 05:15:24 +00:00
Goober5000 ea491e3bed added FS2PATH environment variable and removed custom build stuff
--Goober5000
2005-04-24 04:47:58 +00:00
phreak 159c0affaf centered the window on the desktop if the -window command line is used. 2005-04-24 03:06:29 +00:00
wmcoolmon 2d7f231f47 Added resizing option to gr_shade. We can probably merge gr_shade and gr_rect; they do the same thing. 2005-04-24 03:02:43 +00:00
wmcoolmon 1417a0236a Might as well fix trainer messages too. 2005-04-24 03:01:56 +00:00
wmcoolmon f7e389eec4 Lowlevel (ie vertex buffer-mapping) functions for _rect and _shade 2005-04-24 02:40:40 +00:00
wmcoolmon 4f94da464d Context help fixing goodness 2005-04-24 02:39:36 +00:00
wmcoolmon 2e35d7571c Moved gr_rect and gr_shade to be API-nonspecific as the OGL/D3D functions were virtually identical 2005-04-24 02:38:31 +00:00
Goober5000 3575982079 subsystem fix
--Goober5000
2005-04-24 02:10:53 +00:00
wmcoolmon 6f93eb7ca8 Removed GL_SECTIONS 2005-04-23 01:17:09 +00:00
taylor 4dc7881df8 wurrps 2005-04-22 02:32:18 +00:00
wmcoolmon 131bac2b53 Minor updates to the GUI, and added some code that will (hopefully) resize HUD images in nonstandard resolutions. I couldn't test it; got an out of memory error. 2005-04-22 00:34:55 +00:00
taylor e030989f59 sexp to swap the skybox in mission, not tested in FRED, hopefully I didn't mess this up too much 2005-04-21 15:59:42 +00:00
taylor 51cc8377d2 initial changes to mission loading and status in debug builds
- move bmpman page in init to an earlier stage to avoid unloading sexp loaded images
 - small changes to progress reports in debug builds so that it's easier to tell what's slow
 - initialize the loading screen before mission_parse() so that we'll be about to get a more accurate load time
fix memory leak in gamesnd (yes, I made a mistake ;))
make sure we unload models on game shutdown too
2005-04-21 15:58:08 +00:00
taylor 5a75bba686 make sure we don't try to process chatbox_close() more than once 2005-04-21 15:53:24 +00:00
taylor d0ad20c79d stupid little comment fix, no big deal 2005-04-21 15:52:24 +00:00
taylor 1fe7c55885 fix source/dest memory overwrite that Valgrind was complaining about 2005-04-21 15:51:40 +00:00
taylor f63d3a01f1 we can't resize compressed textures so... don't, fixes rendering problems when not at max texture detail 2005-04-21 15:50:47 +00:00
taylor 981c2e4601 update of bmpman and model bitmap management, well tested but things may get a bit bumpy
- use VM_* macros for bmpman since it didn't seem to register the memory correctly (temporary)
 - a little "stupid" fix for dds bitmap reading
 - fix it so that memory is released properly on bitmap read errors
 - some cleanup to model texture loading
 - allow model textures to get released rather than just unloaded, saves bitmap slots
 - bump MAX_BITMAPS to 4750, should be able to decrease after public testing of new code
2005-04-21 15:49:21 +00:00
wmcoolmon fe81f39299 Nonstandard res fix. 2005-04-20 08:32:01 +00:00
wmcoolmon 3460e06701 Fix silly armor.tbl parse error. 2005-04-20 08:26:49 +00:00
phreak dd41824dc5 NMONO should not interfere with the debug window 2005-04-20 04:34:42 +00:00
phreak 72f1bb21ab get the cheat keys for "force weapon" working again 2005-04-20 04:34:01 +00:00
phreak 95db195410 CVS file header. take 1 2005-04-20 04:29:50 +00:00
phreak dc2e5a8ef9 fix for the slow firing turret problem 2005-04-20 04:27:56 +00:00
wmcoolmon 31f7d6dd34 Lock time compression when autopilot is engaged 2005-04-19 23:03:42 +00:00
taylor 904a63b7e5 try not to buffer output to the speech dev so that the text doesn't just show up some time in the future 2005-04-19 06:29:28 +00:00
taylor a8713687ae we might actually be needing to load a model here ;) 2005-04-19 06:27:54 +00:00
taylor 5f7ce77177 small compiler warning fixes, more 'always true' stuff 2005-04-19 06:26:56 +00:00
taylor 75f276cff4 don't try to allocate 0 bytes of memory when there are no shield tris, weird memory stuff frightens me 2005-04-19 06:25:23 +00:00
taylor a35470e783 8 months I've been meaning to put this in the Linux tree, me == moron 2005-04-19 06:22:20 +00:00
Goober5000 48959c177c model and class changes should be all set now
--Goober5000
2005-04-18 08:35:28 +00:00
Goober5000 a0e945bf21 better subsystem comparison
--Goober5000
2005-04-18 06:59:16 +00:00
Goober5000 a0305a1fc6 removed ship->alt_modelnum as it was essentially duplicates of ship->modelnum; changed the alt modelnum stuff accordingly
fixes for ship_model_change and change_ship_type
--Goober5000
2005-04-18 05:27:26 +00:00
taylor 78f22aea2f some extra checks to make sure we don't act on invalid gamesnds (fix for WCS) 2005-04-18 03:31:27 +00:00
taylor 777a5dbab0 more accurate play position for OpenAL when AL_BYTE_LOKI is used (Jens Granseuer) 2005-04-18 03:30:05 +00:00
Goober5000 0a72f49270 more sexp goodness
--Goober5000
2005-04-18 03:16:57 +00:00
taylor d4799821f8 updated Linux joystick code that's a bit less insane speed wise
remove ability to build without joystick support, no reason to keep it around
fix unusable warning flag with libjpeg building
2005-04-17 05:38:29 +00:00
phreak b87907a3be fixed lasers drawing backwards 2005-04-16 18:43:17 +00:00
wmcoolmon d950a6d8da Fixed the lab; Made the storybook look less grotesque without skins. 2005-04-16 08:13:34 +00:00
wmcoolmon af4ce5c886 Eh, what the hey. Maybe I should've taken the breathalyzer test. :) 2005-04-16 04:19:21 +00:00
wmcoolmon 7fd2b592b4 More optional tag-making for ships.tbl 2005-04-16 04:16:57 +00:00
wmcoolmon 1e4e53bf80 Minor changes; made even more fields in ships.tbl optional. 2005-04-16 03:36:13 +00:00
wmcoolmon 1745959ed7 Removed an unneeded semicolon 2005-04-16 03:05:05 +00:00
wmcoolmon 255570da57 Added type "exponential base"; equation is 'final_damage = (x^damage)' 2005-04-15 23:19:13 +00:00
taylor b24cd07398 fix ambient light 2005-04-15 11:42:27 +00:00
taylor 085db31507 stupid <expletive-delete> terminal, I <expletive-deleted> <expletive-deleted>!!! 2005-04-15 11:41:28 +00:00
taylor 092315362e new GCC = new warning messages, yippeeeecvs commit code/parse/encrypt.h code/parse/encrypt.cpp code/scramble/scramble.cpp 2005-04-15 11:36:55 +00:00
taylor 6a655dc469 add scramble port
support both FS1 (8bit and 7bit) and FS2 style encryption
2005-04-15 11:35:18 +00:00
taylor b217d73a44 proposes that WMC be subject to a breathalyzer test before commit ;) 2005-04-15 11:32:26 +00:00
taylor d78b715166 div-by-zero fix for snd_time_remaining() 2005-04-15 11:28:41 +00:00
taylor d55e7cc900 some cleanup to prevent utilities linking all game libs 2005-04-15 11:27:53 +00:00
wmcoolmon 443c49cbf9 It's amazing how many possible bugs you can catch simply by doing something completely different than coding 2005-04-15 07:19:29 +00:00
wmcoolmon 0cbd23c615 One final oops (hopefully). 2005-04-15 06:59:05 +00:00
wmcoolmon 55f7fdc264 Another oops. 2005-04-15 06:56:02 +00:00
wmcoolmon 7241244f70 Er, oops 2005-04-15 06:40:54 +00:00
wmcoolmon d0ed305d43 Local codebase commit; adds armor system. 2005-04-15 06:23:18 +00:00
Goober5000 b3e0314930 bumped sexp limit
--Goober5000
2005-04-14 20:03:16 +00:00
phreak 41fdb1da08 Updated the message of a required extension that hasn't been found.
It was referencing the old Glide engine.
2005-04-13 23:24:21 +00:00
Goober5000 3b2eee464a fixed the compile errors (thanks Phreak)
--Goober5000
2005-04-13 22:31:53 +00:00
Goober5000 b6980737f0 removed spurious folder
--Goober5000
2005-04-13 22:17:27 +00:00
taylor 039e34ffaa I totally blame that on the keyboard 2005-04-12 19:53:44 +00:00
taylor 99136873c0 more demo support (Jens Granseuer) 2005-04-12 19:22:48 +00:00
taylor 7516eae124 not sure what that file was doing there... 2005-04-12 19:22:00 +00:00
taylor 84a3455035 many, many compiler warning and header fixes (Jens Granseuer)
fix free on possible NULL in modelinterp.cpp (Jens Granseuer)
2005-04-12 05:26:38 +00:00
taylor 9b86e6966b more support for 'make dist' (Jens Granseuer) 2005-04-12 05:24:48 +00:00
phreak 8388a394c1 ambient light is set in mission 2005-04-12 02:10:09 +00:00
phreak 120c01f735 ambient_light_level added to the mission structure 2005-04-12 02:07:00 +00:00
phreak 189e5fe678 gr_set_ambient_light() function for the ambient light sliders in FRED 2005-04-12 02:04:56 +00:00
taylor fc35ceeffc changes to facilitate 'make dist' 2005-04-11 10:16:26 +00:00
taylor 8698cece32 un-revert previous revert since it does apparently affect MinGW (Alpha0) 2005-04-11 10:15:11 +00:00
taylor 30fc4cc19f some limits.h fixes to make GCC happier
revert timer asm change since it doesn't even get used with Linux and couldn't have been the slowdown problem
2005-04-11 05:50:36 +00:00
taylor 17ac979ae7 make sure use an insensitive case check for Messages[] names (Jens Granseuer)
little clarification of if-else block in message_training_que()
2005-04-11 05:48:34 +00:00
taylor e37bdddb71 _endthread() doesn't take an argument so do support one (Jens Granseuer)
debug variable fixes in freespace.cpp (Jens Granseuer)
as a safety catch we should Assert() on future usage of things we don't yet support in *nix _splitpath()
2005-04-11 05:45:38 +00:00
taylor be7f62118c some demo related fixes (Jens Granseuer) 2005-04-11 05:42:02 +00:00
taylor 7079b22535 add version checks for autoconf and automake
fix wacky wxFRED2 check (Jens Granseuer)
2005-04-11 05:40:21 +00:00
wmcoolmon 8b414664c5 Fixed some paths stuff. 2005-04-09 07:50:41 +00:00
wmcoolmon 0b89fec44c *crosses fingers* 2005-04-08 20:03:59 +00:00
wmcoolmon fb90a4caaf Did things in a somewhat less hackish manner; note that 'Update project' will only update the anjuta directory; you will have to update file, and then manually select the fs2_open/ directory to update *everything* 2005-04-06 18:47:02 +00:00
wmcoolmon 3e633a7021 Presumeably, I fixed building in anjuta for anyone who can run
autogen.sh
2005-04-06 18:22:49 +00:00
wmcoolmon 4f7a1a73c7 Fixed anjuta project file so it would run from projects subdirectory. 2005-04-06 18:12:17 +00:00
wmcoolmon 4dd746e46d Added some comments to the new turret helper functions. 2005-04-06 18:10:40 +00:00
taylor a89a6f6186 add audio files for OpenAL, build with USE_OPENAL define to use OpenAL 2005-04-05 12:03:03 +00:00
taylor 6c822c7993 fix memory error from GL extension list that occurs in certain circumstances 2005-04-05 11:50:57 +00:00
taylor 67eb07aae2 update what sound files get used 2005-04-05 11:49:37 +00:00
taylor 5a34ecf947 remove acm-unix.cpp, replaced by acm-openal.cpp since it's properly cross-platform now
better error handling for OpenAL functions
Windows can now build properly with OpenAL
extra check to make sure we don't try and use too many hardware bases sources
fix memory error from OpenAL extension list in certain instances
2005-04-05 11:48:23 +00:00
taylor 4df7becbea handle iostream problems on GCC pre-3.x
fix spacing on wxFRED stuff (yes, I'm that anal)
2005-04-05 11:41:33 +00:00
taylor 586190fb8e s/vector/vec3d/g, better support for different compilers (Jens Granseuer) 2005-04-05 05:53:25 +00:00
Goober5000 2059ed3528 tweaks
--Goober5000
2005-04-03 11:47:01 +00:00
Goober5000 fc42a097eb brought weapon loadout banks into agreement with ship info banks
improved error reporting on apply-to-all
--Goober5000
2005-04-03 08:48:31 +00:00
phreak ba27712ccd put First_secondary_index back in so FRED can compile.
The weapons list is also sorted whenever all loading is done so lasers and beams always
come before missiles.  FRED's loadout code needs this behavior to stick.
2005-04-02 21:34:08 +00:00
Goober5000 02fb161187 fixed a few errors in apply-to-all
--Goober5000
2005-04-01 08:50:25 +00:00
taylor 826be871bc fix hanging on exit with OpenAL
some better error handling on OpenAL init and make it more Windows friendly too
basic 3d sound stuff for OpenAL, not working right yet
2005-04-01 07:33:08 +00:00
taylor 6958a3be52 *that blasted Enter key*, just fixing the log... nothing to see here... 2005-04-01 07:31:10 +00:00
taylor 6576b9bf69 some minor Linux fixage 2005-04-01 07:29:40 +00:00
taylor 77a4348695 code/ship 2005-04-01 07:27:32 +00:00
taylor f1f9396d4f go back to 24-bit depth, 32 didn't help any with ATI bugs 2005-04-01 07:25:54 +00:00
mrduckman a550f19877 Made a change for wxWidget checks, checking for 2.4.2 version. 2005-03-31 21:12:23 +00:00
Goober5000 aea447768f whoops
--Goober5000
2005-03-31 12:45:22 +00:00
Goober5000 68c7b774e6 implemented the apply-to-all wing loadout button
--Goober5000
2005-03-31 12:43:51 +00:00
Goober5000 ce89e0d560 fix type mismatch
--Goober5000
2005-03-31 12:38:24 +00:00
Goober5000 111fa9a728 changed a bunch of literal constants to their #define'd keywords
--Goober5000
2005-03-31 11:11:56 +00:00
taylor 001f85c695 forget the swaps for OSX 2005-03-30 16:06:52 +00:00
taylor 23ab20680a a little Linux happiness 2005-03-30 16:06:26 +00:00
taylor aff41f6382 basic wxFRED2 building, only works on Linux for now 2005-03-30 16:05:42 +00:00
wmcoolmon cdfbe82f07 Whoops. 2005-03-30 05:37:22 +00:00
wmcoolmon 8316e86843 Made it so *Snd fields in ships.tbl and weapons.tbl take the sound name
as well as its index (ie "L_sidearm.wav" instead of "76")
2005-03-30 02:32:41 +00:00
Goober5000 591a76e0bd fixed version log
--Goober5000
2005-03-30 01:27:49 +00:00
Goober5000 a9ba9ccea8 added header back in, with a small tweak for the .cpp
--Goober5000
2005-03-30 01:23:32 +00:00
Goober5000 9d30ba0210 removed mixed-case header file
--Goober5000
2005-03-30 01:20:05 +00:00
Goober5000 5f32fc582f set up the main menu options
--Goober5000
2005-03-29 13:35:53 +00:00
Goober5000 c519d635f1 fixed browse info error
--Goober5000
2005-03-29 09:57:02 +00:00
Goober5000 272627527b wxFRED is now dependent on code.lib
--Goober5000
2005-03-29 08:15:44 +00:00
Goober5000 1406ef90ec whew... bare-bones "hello world" wxFRED base finally implemented!
--Goober5000
2005-03-29 07:55:19 +00:00
wmcoolmon fbad2dcdc0 Removed some warnings under Linux/GCC 2005-03-29 07:03:16 +00:00
wmcoolmon b24d6815bc Added some comments to #defines to make reading easier 2005-03-29 06:36:37 +00:00
wmcoolmon a28a052ac6 Fixed extern to compile under Linux 2005-03-29 06:28:52 +00:00
phreak 71c2ae7fca global variable "Jump_nodes" needs external linkage for FRED 2005-03-29 03:42:07 +00:00
phreak fb1d118622 get_num_elements() method, probably coded incorrectly, but its needed for FRED 2005-03-29 03:40:15 +00:00
Goober5000 1dbfce5ea7 added storybook to the MSVC6 project
--Goober5000
2005-03-29 02:50:48 +00:00
mrduckman b4e502737c Added OpenGL include dir parameters 2005-03-28 13:25:18 +00:00
taylor bbefc0b90e fix to snd_time_remaining() to make sure we are getting the correct index into Sounds[] 2005-03-28 00:40:09 +00:00
mrduckman fe8a8cc8e7 Syntax correction 2005-03-27 21:13:05 +00:00
mrduckman dbacdf939b Added /kill IRC Command 2005-03-27 21:06:31 +00:00
wmcoolmon 728ee7e21f Forgot to replace 'ship' with 'ai' after copy-paste 2005-03-27 17:33:51 +00:00
Goober5000 0f94de5dd8 bah 2005-03-27 13:37:15 +00:00
Goober5000 6351a5becf rewrote the weapon cheat cycle functions to avoid recursion
--Goober5000
2005-03-27 13:23:05 +00:00
Goober5000 881f1c6077 two new sexps
--Goober5000
2005-03-27 13:00:40 +00:00
Goober5000 2dfa5cdd45 clarified max hull/shield strength names and added ship guardian thresholds
--Goober5000
2005-03-27 12:28:35 +00:00
taylor 413cdab6b7 will hopefully fix the slowdown from mission to mission (thanks Alpha0) 2005-03-27 08:57:52 +00:00
taylor e4827d8110 this is what coding on an empty stomach will get you 2005-03-27 08:51:25 +00:00
wmcoolmon 7fe64c20b0 Bizarre combo of fopen() and close() 2005-03-27 08:12:53 +00:00
taylor 4dfb7611ed fill in some stuff for timer and mmio calls, not 100% but it works ok 2005-03-27 06:17:54 +00:00
taylor 233a8c3134 don't use a platform specific ifdef since the OpenAL code may work under Windows now too 2005-03-27 06:16:46 +00:00
taylor 885ab83dba mmio callbacks work on Linux now and fix problem where system ogg.h would get used rather than the local one 2005-03-27 06:15:31 +00:00
taylor 4df106d0e6 update for streaming support and platform independance 2005-03-27 06:14:30 +00:00
taylor 54707bc916 some pilot file fixing when going between multi and single (partial fix) 2005-03-27 06:12:38 +00:00
taylor 0d4ab080a9 make use of new OpenAL define since it's not platform specific anymore 2005-03-27 06:08:42 +00:00
taylor 3b3aafd920 weapon_num can be 0 so let that through 2005-03-27 06:07:54 +00:00
taylor a1509554e7 update with current files 2005-03-27 06:07:00 +00:00
taylor 3dd13913da initial import of OpenAL streaming (many thanks to Pierre Willenbrock for the missing parts) 2005-03-27 05:48:58 +00:00
taylor 6581a79466 unix specific version is obsolete 2005-03-27 05:47:31 +00:00
wmcoolmon f8b4ba66bc Fixed possible infinite loop problem
----------------------------------------------------------------------
2005-03-27 04:16:19 +00:00
wmcoolmon ab323f6b2a Fixed missing/invalid variables 2005-03-27 03:04:09 +00:00
wmcoolmon 535f8fc3d6 Forgot to define 'i' outside of for scope...ironically, in the OGL code. 2005-03-27 02:59:27 +00:00
wmcoolmon 8cba1f3939 Some fixes 2005-03-26 07:53:32 +00:00
wmcoolmon 18ddb1f6ad Cleaned out old code + fixed min problem 2005-03-26 01:49:46 +00:00
wmcoolmon dc3d359393 Added the storybook 2005-03-26 00:26:06 +00:00
Goober5000 31b5327765 removed unreferenced variable
--Goober5000
2005-03-25 22:36:01 +00:00
wmcoolmon 622ac05c63 Small change now that the storybook is in CVS 2005-03-25 07:35:22 +00:00
wmcoolmon 6319d41ab6 Updated MSVC6 project file for AI move 2005-03-25 07:12:05 +00:00
wmcoolmon 19ea0c5b11 Removed old AI files from CVS 2005-03-25 07:03:12 +00:00
wmcoolmon 9471ebced4 Added taylor's old-weapon code fix 2005-03-25 07:01:53 +00:00
wmcoolmon fbf776164b Big, massive, codebase commit. I have not removed the old ai files as the ones I uploaded aren't up-to-date (But should work with the rest of the codebase) 2005-03-25 06:57:38 +00:00
wmcoolmon feee088277 Initial AI code move commit - note that aigoals.cpp has some escape characters in it, I'm not sure if this is really a problem. 2005-03-25 06:45:13 +00:00
taylor 1630965ce8 I think I deserve a medal or something for that one :) 2005-03-25 01:10:51 +00:00
taylor bb556e9c7f s/gr_ogl_/gr_opengl_/g
add empty gr_opengl_draw_line_list() so that it's not a NULL pointer
make gr_opengl_draw_htl_sphere() just use GLU so we don't need yet another friggin API
2005-03-24 23:42:21 +00:00
taylor b0ec8041de make sure we don't go one over the number of message avis 2005-03-24 23:38:49 +00:00
taylor 9e329634b3 fix GCC building 2005-03-24 23:37:25 +00:00
taylor 7843ed8770 fix compiler warnings with mismatched types and unused variables
cleanup some debug messages so they can be turned off if needed
get rid of extra strstr() check for thrusters since it should never get that far anyway
page_in/page_out of model glows should be better now
removed a bunch of unneeded casts and get type specific math functions right
2005-03-24 23:36:14 +00:00
taylor 008582fce5 make sounds.tbl dynamic
"filename" will never be larger than 33 chars so having it 260 is a waste (freespace.cpp)
2005-03-24 23:31:46 +00:00
taylor 8ecfbed208 (re)move some uneeded variables to fix compiler warnings 2005-03-24 23:29:33 +00:00
taylor 851fc877d0 make sounds.tbl dynamic
have snd_time_remaining() be less stupid
some OpenAL error fixerage
be able to turn off some typically useless debug messages
2005-03-24 23:27:26 +00:00
taylor 3ff8fff6af use SWARM_MISSILE_DELAY again so that it's easier to keep up with
fix compiler warnings
2005-03-24 23:24:01 +00:00
taylor 74ae69a49b make sure we will get the right error message 2005-03-24 23:22:59 +00:00
wmcoolmon 3df75bed77 no more MSVC compiler warning 2005-03-24 05:50:07 +00:00
phreak 37034092d4 Starfield bitmaps should now draw in non-htl mode 2005-03-23 20:09:23 +00:00
phreak 8e98e16796 Some specular values in g3_draw_perspective_bitmap() were being incorrectly set. fixed that 2005-03-23 20:08:33 +00:00
taylor 1c2d7163c1 fix version check for drivers that support OpenGL 2.0+ 2005-03-22 00:36:48 +00:00
phreak 0e2d83529b Orb correctly displays in 640x480 2005-03-21 23:19:55 +00:00
phreak c1bc6871c3 Add a function to check whether any duplicate jumpnode names exist 2005-03-20 21:07:10 +00:00
phreak 12c6e04b17 export the functions that deal with the creation and destruction of the starfield buffer.
FRED needs them
2005-03-20 20:02:29 +00:00
phreak d2912daaac draw paths and docking points using HTL 2005-03-20 20:01:15 +00:00
phreak 983881e398 lol forgot to commit the function pointer stuff 2005-03-20 18:05:04 +00:00
phreak 822b4d9c01 high-level implementation for gr_draw_htl_line and gr_draw_htl_sphere 2005-03-20 00:11:27 +00:00
phreak 8074a129cd Added gr_draw_htl_line and gr_draw_htl sphere
There still needs to be D3D versions implemented, but OGL is done.
Follow that or ask phreak about how its implemented/
2005-03-20 00:09:07 +00:00
wmcoolmon 844ac565ef OpenGL display lists 2005-03-19 21:03:54 +00:00
Goober5000 40eeea76d8 corrected misinformation in comment about surface shields (implicit surface
shields were removed for meshed ships)
--Goober5000
2005-03-19 20:45:23 +00:00
wmcoolmon c7b5a70830 small bool fix 2005-03-19 20:35:45 +00:00
bobboau 4972df4cdf adding d3d state block files 2005-03-19 18:18:04 +00:00
bobboau 028fd5c930 added new graphic functions for state blocks
also added a class formanageing a new effect
2005-03-19 18:02:35 +00:00
bobboau 1397a84db7 added a geometry batcher and implemented it in sevral places
namely: lasers, thrusters, and particles,
these have been the primary botle necks for some time,
and this seems to have smoothed them out quite a bit.
2005-03-16 01:35:59 +00:00
phreak 9523481fe2 properly handle using the old method of selecting primary weapons.
i forgot a return statement so the new method was used instead
2005-03-16 00:37:42 +00:00
wmcoolmon 00a413d3b0 Commited placeholder turret funcs. 2005-03-16 00:18:31 +00:00
taylor dd6d061488 make sure w,h,bpp are useable before trying to assign values to them 2005-03-15 17:10:58 +00:00
Goober5000 038cb865be *fixed some sexp declaration formatting
*implemented string comparison sexps
*simplified numeric comparison sexps
*fixed numeric comparison (especially equals) sexps to actually work on all their arguments like they were designed to
--Goober5000
2005-03-15 07:26:52 +00:00
phreak f46914eab9 Awesome 2-for-1 deal!!!
Firstly, the Colossus should now warp out correctly.  No more warphole forming inside of it
Secondly, muzzleflashes now are generated at the gunmounts of the firing ship.
2005-03-15 01:40:07 +00:00
Goober5000 a71305bdc3 properly fixed the out-of-bounds error, as well as a few other errors of the same kind
--Goober5000
2005-03-14 23:34:59 +00:00
Goober5000 9ef30029aa rolled back Phreak's commit
--Goober5000
2005-03-14 23:33:22 +00:00
wmcoolmon 69231d79ff Hopefully this will fixx0r Num_sounds 2005-03-14 23:31:54 +00:00
wmcoolmon 22a4cfc835 Whoops, this isn't needed. 2005-03-14 06:38:31 +00:00
wmcoolmon db1c760a3c Commented out now-unneccessary Int3() 2005-03-14 06:38:06 +00:00
wmcoolmon 70f831bc22 Added memory display thingy to loading screen, if command line is specified and build is a debug build. Also made screenshots go up to 9999 2005-03-14 06:36:30 +00:00
wmcoolmon c20117ef22 Made sounds dynamically allocated 2005-03-14 06:33:38 +00:00
taylor 0e92b61ebf fix for mouse cursor problem when running in a window 2005-03-14 03:38:54 +00:00
taylor f36b06ee40 speedup grow/shrink time for the warp to avoid the big size skips 2005-03-14 03:24:25 +00:00
phreak 5739cfb2d0 Got rid of the stealth check that only applied to cloaked ships. This should
fix some errorneous behavior that caused the ai to target the player
2005-03-14 02:52:58 +00:00
taylor 7b8ff3d087 enable 32-bit to 16-bit TGA conversion with -tga16 cmdline option (experimental)
fix crash when upgrading from original campaign stats file to current
2005-03-13 23:07:36 +00:00
wmcoolmon 087c0be980 Squashed compiler warnings 2005-03-13 08:44:10 +00:00
wmcoolmon 1f1153bc57 Commented out unneeded variables 2005-03-13 08:38:05 +00:00
wmcoolmon c54e4875bd Might as well sync this 2005-03-13 08:37:01 +00:00
taylor 06dc37d064 gotta use MIN/MAX and not min/max now 2005-03-13 08:33:55 +00:00
wmcoolmon c32522129b Hud fixing goodness. I also removed some obsolete code for displaying HUD weapons. 2005-03-13 08:32:28 +00:00
taylor 0f50203063 fix various compiler warning messages
make sure screenshot count doesn't get too high
fix movies playing twice in redalert missions
reset time compression for redalert missions and cmdbriefings, just in case
2005-03-13 08:04:43 +00:00
phreak 50b2cd65fa extra checks in find_parent_rotating_submodel() 2005-03-12 23:53:27 +00:00
phreak a036fc3bea doubled default spawn angle from 180 to 360 since it seems to track better 2005-03-12 21:08:01 +00:00
phreak b2c098ee44 the code for the damaged-escort-priority-all sexp started
overwriting outside ofarray bounds.  goodbye call stack... erm goodbye bug.
2005-03-12 20:48:33 +00:00
taylor 1f92bafc8f helps to get the stupid check right 2005-03-12 19:28:47 +00:00
taylor 50baf2c401 forgot this one, jpeg stuff 2005-03-12 07:42:05 +00:00
phreak 440b39a3ee Fixed a bug where the orb would incorrectly render under alternate FOVs.
Updated the functions that scramble the contacts so the blips show up
somewhat near where they should be.
2005-03-12 06:03:07 +00:00
wmcoolmon ed45cfb078 whee! 2005-03-12 05:21:36 +00:00
taylor 249bfeb9fe absolute header location for jpeglib.h in jpgutils.cpp (thanks WMC)
update VC6 project files to correct versions that work properly with internal libjpeg
2005-03-12 04:59:15 +00:00
wmcoolmon 68ec71efad Fixx0red odd drag problems 2005-03-12 04:44:24 +00:00
wmcoolmon a42a4ec0f0 New commandline option "-noparseerrors" 2005-03-12 03:09:55 +00:00
taylor 4504bea340 was causing strange hangs due to really large values, don't know if this will help but SDL should take care of error checking this way 2005-03-11 14:16:02 +00:00
taylor d395341b1c forgot to remove this with the MIN/MAX change 2005-03-11 14:14:05 +00:00
taylor a3f509766a apparently this change never got in 2005-03-11 14:11:53 +00:00
taylor 69130eb9fe ignore the typical build specific files 2005-03-11 14:00:01 +00:00
wmcoolmon bac63f2faf Isn't the extern needed too? causes linking errors on my system w/o it, although it compiles fine. 2005-03-11 01:37:35 +00:00
wmcoolmon bedf8a6157 Not really. I've got lib files in my main VC.NET libs directory, and include files in grouped subdirectories under my VC.NET include directory. it keeps my HD free of scattered SDK directories and helps keep conflicts down. 2005-03-11 01:34:19 +00:00
wmcoolmon 947e8b16fb Oops, gotta remember to commit main codebase stuff when fixing FRED 2005-03-11 01:28:23 +00:00
wmcoolmon fd9f14053a I like comments 2005-03-11 01:27:17 +00:00
taylor 4821082a53 fix screwed up stars coloring in OGL 2005-03-10 21:16:16 +00:00
taylor 56774f66d0 maybe WMC can leave the include alone now ;) 2005-03-10 16:16:52 +00:00
taylor 76b12d5465 build file updates to use the internal jpeglib now 2005-03-10 16:15:18 +00:00
taylor fcac6d58c2 internal libjpeg files 2005-03-10 16:13:54 +00:00
taylor f3dcea6db1 initial libjpeg project file 2005-03-10 16:10:47 +00:00
bobboau 030267adf3 fixed a local/global conflict 2005-03-10 15:35:21 +00:00
taylor 119a28190f change min/max to MIN/MAX to fix GCC problems
add lab stuff to Makefile
build unbreakage for everything that's not MSVC++ 6
lots of warning fixes
fix OpenGL rendering problem with ship insignias
no Warnings() in non-debug mode for Linux (like Windows)
some campaign savefile fixage to stop reverting everyones data
2005-03-10 08:00:18 +00:00
wmcoolmon dfcf412627 Commit for Bobboau. This causes the lab to crash in some circumstances. 2005-03-09 23:45:18 +00:00
bobboau 386efe7325 added a new interface render funtion 2005-03-09 03:23:32 +00:00
Goober5000 d63f7075a9 whoops 2005-03-08 04:41:39 +00:00
Goober5000 a24fde6280 edited for language ;)
--Goober5000
2005-03-08 03:50:25 +00:00
bobboau c78c8c0a43 minor change to high level render target code 2005-03-08 02:31:51 +00:00
Goober5000 1fdfc4bca8 rolled back my original code on the support ship CTD; thanks taylor :)
--Goober5000
2005-03-07 20:12:36 +00:00
bobboau bf878a6322 commit of render target code, d3d should be totaly functional,
OGL still needs implementation.
2005-03-07 13:10:22 +00:00
taylor a77e725968 can't believe I missed something that obvious. *hides in shame* 2005-03-06 17:16:08 +00:00
taylor e69a6f945b don't Assert() when repair_objp is NULL (support ship object is invalid until it's done with warpin) 2005-03-06 16:43:40 +00:00
wmcoolmon c6e589c31a Whoops! 2005-03-06 11:32:40 +00:00
wmcoolmon cc62873cb3 RE-fixed stuff. Ogg support. Briefings. 2005-03-06 11:23:45 +00:00
wmcoolmon e27299e03b Switched out model_unload with model_page_out_textures, as it was causing crashes in release mode. 2005-03-06 08:30:22 +00:00
wmcoolmon c2d671deac fix0r for negative values in textboxes, and ubytes 2005-03-05 20:46:12 +00:00
taylor 70d2885e0b make sure we don't scale the restore_screen bitmap, it's already the correct size 2005-03-05 19:11:07 +00:00
taylor ff7451ccc0 don't let hud messages walk off screen when res is GR_640 2005-03-05 18:59:28 +00:00
bobboau a09aba049c made all the gr_d3d_tmapper variants use dynamic a vertex buffer rather
than drawprimitiveup, this also means that these functions can now
handle as much poly data as you might want to through at them
2005-03-04 03:24:44 +00:00
taylor 6be13dc50b animated beam muzzle glows 2005-03-03 16:40:29 +00:00
taylor 6b54aa9784 lockup fixes, and it's Linux friendly too :) 2005-03-03 16:18:19 +00:00
taylor b5381eb23e support for TMAP_FLAG_TRILIST
extra check to make sure OGL closes down right under Windows
increased depth buffer, it was too small to compare when 32bpp was used
2005-03-03 16:16:55 +00:00
bobboau a600ceca96 fixed a small error from my earlier commit. 2005-03-03 14:29:39 +00:00
Kazan f4296903ce !Om_tracker_flag = non-pxo 2005-03-03 12:58:25 +00:00
Goober5000 abeaab1602 AUGH! Stupid hidden bugs... this one is V's fault
--Goober5000
2005-03-03 08:41:53 +00:00
wmcoolmon 00211ea1f0 Added new files to the project. Hopefully this works; I have no way to test it. 2005-03-03 08:16:26 +00:00
wmcoolmon ca97992985 Oops 2005-03-03 07:32:55 +00:00
wmcoolmon 8850cbcb38 Removed my Assert(true)s :p 2005-03-03 07:30:15 +00:00
wmcoolmon 382e540086 Made HUD shield icon auto-generation off unless "generate icon" ship flag is specified for the ship. 2005-03-03 07:13:17 +00:00
Goober5000 b9d5898908 removed the "error" in the new docking code
--Goober5000
2005-03-03 06:41:40 +00:00
wmcoolmon 20c60b021f Merge of WMC's codebase. "Features and bugs, making Goober say "Grr!", as release would be stalled now for two months for sure" 2005-03-03 06:05:32 +00:00
taylor f81a818afa well that was good and wrong 2005-03-03 05:32:11 +00:00
wmcoolmon 58b5bae0cb Turret AI code optimizations. If freaky stuff happens, call WMC() 2005-03-03 03:55:03 +00:00
wmcoolmon 69e5efdd91 This should really be like this to prevent crashing 2005-03-03 03:53:18 +00:00
bobboau 811c572cf8 added trilist suport to the poly rendering functions
and a gr_bitmap_list function that uses it
2005-03-03 02:39:14 +00:00
taylor 0c6f8bbefd use the back buffer for screen saves, this didn't work on Windows at one
point but I'm out of things to try and it may be ok after other fixes
2005-03-03 00:33:41 +00:00
taylor a58856e0d5 more NO_NETWORK/INF_BUILD goodness for Windows, takes care of a few warnings too 2005-03-02 21:24:48 +00:00
taylor 9ce18ac6e5 better support for Inferno builds (in PreProcDefines.h now, no networking support)
make sure NO_NETWORK builds are as friendly on Windows as it is on Linux/OSX
revert a timeout in Client.h back to the original value before Linux merge
2005-03-02 21:18:20 +00:00
taylor 5bdb318371 that one should never have slipped passed me (Linux specific) 2005-03-02 03:13:00 +00:00
taylor 3659d10464 make sure starfield bitmaps render when not in HTL mode
slight header fix for osapi.h
add some string overflow protection to modelread and bmpman
s/NO_NETWORKING/NO_NETWORK/g  (Inferno builds)
2005-03-01 23:08:24 +00:00
taylor bf26a96691 unbreak Linux build (not valid C/C++ anyway, block scope) 2005-03-01 23:05:38 +00:00
bobboau 4625702437 oh, hey look I've commited something :D
animation system, weapon models detail box alt-tab bug, probly other stuff
2005-03-01 06:55:45 +00:00
taylor 438f9360e1 uugh, missed the initial tree move (WMC: probable locking problem) 2005-02-28 01:24:02 +00:00
wmcoolmon d54288be7f Removed unneccessary variable 2005-02-28 00:29:52 +00:00
wmcoolmon 3f2266581c Added a white component to lightning so it isn't just a big blue block 2005-02-27 23:42:07 +00:00
wmcoolmon 5085b17246 Some HUD work 2005-02-27 23:27:50 +00:00
Goober5000 ecd3f09e74 First stage of "apply to all ships in this wing" weapon loadout button code.
Button hooks only, pending interface art.  The "apply-to-all" code itself
still has to be written.
--Goober5000
2005-02-27 14:09:27 +00:00
wmcoolmon aa8a4447ef Nonstandard res stuff 2005-02-27 10:38:06 +00:00
wmcoolmon 0ea465d45f More nonstandard res stuff 2005-02-27 07:08:22 +00:00
wmcoolmon 6c1468d59d nonstandard res HUD stuff 2005-02-27 07:07:47 +00:00
taylor 345a4b396d few more compiler warning fixes (didn't mean to commit iostream.h change)
lower warning level to 3 to stop MSVC6 from complaining about C++ headers
2005-02-23 13:17:05 +00:00
taylor ed21106256 more consolidation of various graphics variables
some header cleaning
only one tmapper_internal for OGL, don't use more than two tex/pass now
seperate out 2d matrix mode to allow -2d_poof in OGL and maybe fix missing
   interface when set 3d matrix stuff doesn't have corresponding end
add dump_frame stuff for OGL, mostly useless but allows trailer recording
2005-02-23 05:11:13 +00:00
taylor 5b28717fec compiler warning fixes (for MSVC++ 6)
have the warp effect only load as many LODs as will get used
head off strange bug in release when corrupt soundtrack number gets used
   (will still Assert in debug)
don't ever try and save a campaign savefile in multi or standalone modes
first try at 32bit->16bit color conversion for TGA code (for TGA only ship textures)
2005-02-23 05:05:39 +00:00
taylor 85ff0f7030 even more bm_unload() -> bm_release() changes 2005-02-23 04:57:29 +00:00
taylor df2d335539 more bm_unload() -> bm_release() changes 2005-02-23 04:55:09 +00:00
taylor 144429e984 some bm_unload() -> bm_release() changes to save bmpman slots 2005-02-23 04:51:56 +00:00
wmcoolmon 9cf34e208c Multi-res support 2005-02-21 09:00:58 +00:00
Goober5000 f64849dc72 restored release version of some cheat codes; removed a cheat for cloaking
--Goober5000
2005-02-21 05:40:16 +00:00
wmcoolmon 853b8e79f3 Camera code updates (subtitles) 2005-02-20 23:14:00 +00:00
wmcoolmon 6a6069354d Trails stuff, moved ship docking func declaration so FRED could get to it. 2005-02-20 23:13:01 +00:00
wmcoolmon d66b99c9f4 Fix0r3d trails 2005-02-20 23:11:51 +00:00
wmcoolmon c195c0aaf2 More trails updating goodness 2005-02-20 08:24:19 +00:00
wmcoolmon d7f483708a Smartified shipcontrails 2005-02-20 08:22:48 +00:00
wmcoolmon 333c370d71 Trails update: Better, faster, stronger, but not much more reliable 2005-02-20 07:39:34 +00:00
Goober5000 c5222f828c restored original behavior for cheat code time dilation
--Goober5000
2005-02-20 05:22:44 +00:00
wmcoolmon a828e0e934 Removed trails limit 2005-02-19 07:57:03 +00:00
wmcoolmon 9c87d92c91 linklist isn't needed for this 2005-02-19 07:52:56 +00:00
wmcoolmon 833e99e6a7 OpenGL gradient fix for nonstandard resolutions 2005-02-19 07:50:15 +00:00
wmcoolmon af3332d595 Fixes for debriefing window in nonstandard res 2005-02-18 21:14:03 +00:00
wmcoolmon 97119e182a Fixed line misalignment at nonstandard res in the campaign room 2005-02-18 20:50:40 +00:00
wmcoolmon a504a33138 More nonstandard res fixing 2005-02-18 09:58:40 +00:00
wmcoolmon cd741318d3 Since the screen can be wider than 1200 px now, don't auto-cull brackets if they're that big. 2005-02-18 09:54:41 +00:00
wmcoolmon d0f50e30e4 Updates for better nonstandard res support, as well as a fix to the Perseus crash bug I've been experiencing. Bobb, you might want to take a look at my change to grd3d.cpp 2005-02-18 09:51:07 +00:00
Goober5000 2ab0a4a032 really fixed the build warning
--Goober5000
2005-02-18 09:03:34 +00:00
wmcoolmon f73d8075c6 If a vertex buffer fails to be made, don't crash. 2005-02-18 08:05:16 +00:00
wmcoolmon fc8e4a077e Attempt to get rid of compiler warnings 2005-02-18 05:24:26 +00:00
wmcoolmon 83272bbd2f Added $Tech Model (after +Tech Description) 2005-02-18 04:54:44 +00:00
wmcoolmon 153526208d "-ingame" command line option 2005-02-16 10:00:40 +00:00
taylor d553a0d2c5 fix cleanup to avoid breaking the slider when it's still needed 2005-02-15 02:15:04 +00:00
taylor 5732d2f126 clean up some model related globals
code to disable individual thruster glows
fix issue where 1 extra OGL light pass didn't render
2005-02-15 00:06:27 +00:00
taylor 88950ad717 don't try and draw starfield bitmaps if they aren't valid
make AB thruster stuff in ship_create() a little less weird
replace an Int3() with debug warning and fix crash in docking code
make D3D Textures[] allocate on use like OGL does, can only use one anyway
2005-02-15 00:03:36 +00:00
taylor 60d1234579 make hudparse GCC 3.4 friendly (WMCoolmon way want to check this with tbl)
fix OSX compile problem
debug message in weapons_page_in() should have been real debug message
2005-02-14 23:59:23 +00:00
taylor 74f77cf920 fix mouse click issues in weapon/ship select screen
skip real VCR controls for Closeup check rather than using hardcoded values
2005-02-14 23:56:51 +00:00
taylor 7192f32409 make loading screen shader a bit taller
add i.o to credits for Linux and OSX code
add libjpeg and ogg stuff to credits for license compliance
replace an Int3() with a debug message in the hud code
2005-02-14 23:54:11 +00:00
wmcoolmon b1d397e91b More explicit calculation handling 2005-02-13 08:42:41 +00:00
wmcoolmon 42cbf081d0 3D models in weapons selection screen and nonstandard resolution fixes for ship selection screen. 2005-02-13 08:41:25 +00:00
wmcoolmon ddc47ef2f2 nonstandard resolution-friendly function updates 2005-02-13 08:38:54 +00:00
wmcoolmon 931f4f2df6 Made messages display properly in nonstandard resolutions 2005-02-13 08:37:57 +00:00
wmcoolmon 97c87a6bf8 Lockon should now work properly in nonstandard resolutions 2005-02-13 08:36:51 +00:00
wmcoolmon 85386190d2 while loops are dangerous things... 2005-02-12 22:49:24 +00:00
taylor 0ffcef0fc8 fix Error() check so that it doesn't hit on MAX_BUFFERS_PER_SUBMODEL-1 2005-02-12 12:17:54 +00:00
taylor 96645bff74 fix possible crash in bm_get_section_size()
get jpeg_read_header() working properly
VBO fixes and minor optimizations
2005-02-12 10:44:11 +00:00
taylor 9bd125e1de fix an issue with bm_set_components()
abs is for ints fabsf is for floats (camera.cpp)
make the in-cockpit stuff OGL friendly
2005-02-10 14:38:50 +00:00
wmcoolmon 5b549c7d4a Got rid of a couple annoying compiler warnings 2005-02-10 04:05:42 +00:00
wmcoolmon 550ef67140 Addition of the -clipdist argument. 2005-02-10 04:02:37 +00:00
wmcoolmon 7be677573e Low-level code for better hi-res support; better error reporting for vertex errors on model load. 2005-02-10 04:01:43 +00:00
taylor 65bea0960c update/add .cvsignore files for project file changes
silence warning about depreciated strings.h stuff for MSVC 2005
final model_unload() stuff for WMCoolmon, put in missionweaponchoice.cpp
remove really old project files
2005-02-08 23:49:59 +00:00
taylor 0ddb694d5c moved to projects 2005-02-08 05:19:34 +00:00
taylor de6cadea7d moved to projects directory 2005-02-08 05:18:02 +00:00
taylor fd8c41243e add something to the README about projects 2005-02-08 05:14:17 +00:00
taylor 40193dcfa7 new projects directory and files 2005-02-08 05:11:19 +00:00
taylor 75d63a8bb5 should fix linker error in libjpeg 2005-02-07 08:33:14 +00:00
wmcoolmon 5d1ca5e7c6 Updated camera code 2005-02-06 22:21:25 +00:00
taylor a685b68033 more post merge happiness 2005-02-05 04:15:36 +00:00
taylor 36da5e1a16 add libjpeg and ogg stuff 2005-02-05 00:52:51 +00:00
taylor ab78ba209c fix a few things post merge 2005-02-05 00:30:49 +00:00
taylor 4ae7263242 merge with Linux/OSX tree - p0204-3 2005-02-04 23:29:32 +00:00
taylor b1128630e4 merge with Linux/OSX tree - p0204-2 2005-02-04 20:06:10 +00:00
taylor b906b0fcce merge with Linux/OSX tree - p0204 2005-02-04 10:12:33 +00:00
phreak b723200206 revert to default d-missile behavior if the electroinics parameters aren't specified.
added an option to customize the old-style disruption calculation as well.
2005-02-03 01:26:45 +00:00
taylor 81d967eab5 only model_load() if we using a ship other than the current one 2005-02-02 15:09:06 +00:00
taylor 2673720ce8 merge with Linux/OSX tree - p0202 2005-02-02 10:36:23 +00:00
taylor 03bb0c45a4 OGG fix for streams 2005-02-01 06:54:20 +00:00
taylor 8eef49b990 merge with Linux/OSX tree - p0131-2 2005-01-31 23:27:55 +00:00
taylor 40516e52a4 merge with Linux/OSX tree - p0131 2005-01-31 10:34:40 +00:00
taylor 7a31d39759 merge with Linux/OSX tree - p0130
remove extra brace in cfile.cpp
2005-01-30 18:32:42 +00:00
taylor 2407f4f0d9 it's -nosound not -noaudio 2005-01-30 14:09:29 +00:00
taylor fa0172afb0 merge with Linux/OSX tree - p0130 2005-01-30 12:50:08 +00:00
Goober5000 2952838d64 bah - rolled back the HTL fix that doesn't really work
--Goober5000
2005-01-30 10:49:26 +00:00
Goober5000 f9db9a5810 optional flags default to false I should think
--Goober5000
2005-01-30 09:36:19 +00:00
Goober5000 a26e7a0a49 nitpicked some boolean tests, and fixed two small bugs
--Goober5000
2005-01-30 09:27:41 +00:00
wmcoolmon 8400768e9a Make sure hudnavigation uses the correct draw_brackets_Square 2005-01-30 03:28:17 +00:00
wmcoolmon a51ff7379b This isn't needed anymore 2005-01-30 03:27:09 +00:00
wmcoolmon be4fa8cef9 HUD updates 2005-01-30 03:26:11 +00:00
wmcoolmon 8b4df0aaff Don't try and create a vertex buffer with no vertices (Seems to cause CTD) and fix to brackets in nonstandard res 2005-01-30 03:24:39 +00:00
wmcoolmon 85bd57fb74 Improved user-friendliness - give an Error instead of a CTD 2005-01-30 03:23:22 +00:00
wmcoolmon 3dba61c334 If a required string doesn't exist, give an error instead of a warning...doi. 2005-01-30 01:38:26 +00:00
wmcoolmon 84d991e191 Made a bunch of ship.tbl variables optional 2005-01-30 01:34:39 +00:00
phreak e4fd785fbd smart shield stuff. enabled by command line for now, but this will be changed in the future, i just want people to test it.
-phreak
2005-01-29 16:31:55 +00:00
phreak 54a3a76774 smart shield command line stuff. this will be changed in the future, but i want people to test it.
-phreak
2005-01-29 16:30:47 +00:00
phreak 8a20ab1088 fixed error message again :)
-p
2005-01-29 15:40:22 +00:00
argv 2d41918dae Fixed compile errors due to several source files not having been updated to
reference "Min/Max_draw_distance" instead of "MIN/MAX_DRAW_DISTANCE".

-- _argv[-1]
2005-01-29 09:19:45 +00:00
wmcoolmon dae81d157b Clipping stuff 2005-01-29 08:12:20 +00:00
wmcoolmon a014e5227c When drawing the viewer_obj, temporarily clip less close up for in-cockpit models. 2005-01-29 08:11:41 +00:00
wmcoolmon 633bca17d9 Various updates; shader, clipping 2005-01-29 08:09:47 +00:00
wmcoolmon e19e89b20f Various updates; shader, assert, and clipping 2005-01-29 08:08:24 +00:00
wmcoolmon 9eba78035a Update to work with optimized shader func 2005-01-29 08:06:54 +00:00
wmcoolmon 68a26cf7d5 Ahh, the sweet smell of optimized code 2005-01-29 08:04:15 +00:00
Goober5000 e3077951ca docking fixes for FRED
--Goober5000
2005-01-29 05:34:30 +00:00
Goober5000 9d79b2e8d5 updated Freespace2 project
--Goober5000
2005-01-29 00:58:01 +00:00
Goober5000 ecd3cddeca added bitarray.h to the code project
--Goober5000
2005-01-29 00:37:10 +00:00
wmcoolmon 38de54f03a Added better too-many-textures error message 2005-01-28 23:45:23 +00:00
taylor 49d25dce7c less hacky and faster version... *hopes no one noticed the stupid mistake* 2005-01-28 13:26:14 +00:00
Goober5000 e4d74ff3cb fixed Bobboau's spelling of 'relative'
--Goober5000
2005-01-28 11:57:36 +00:00
Goober5000 c789bf7509 cleaned up some build warnings
--Goober5000
2005-01-28 11:39:18 +00:00
Goober5000 ee26a8a8f6 changed a bunch of transpose-rotate sequences to use unrotate instead
--Goober5000
2005-01-28 11:06:23 +00:00
taylor 06540c61b3 little cleanup to get rid of compiler warnings
add some memory management to help keep size of techroom down
new hotkey Ctrl-Shift-S to show all ships rather than just viewable
make Weapon_list allocate on load just like Ship_list
unload all textures and models on techroom_close()
2005-01-28 10:00:59 +00:00
taylor 72a5f1fa53 add model_page_out_textures() for use in techroom
make model_page_in_textures() load more textures
2005-01-28 09:56:44 +00:00
Goober5000 ba13b76ffe finished implementing docking to a rotating submodel
--Goober5000
2005-01-28 09:01:04 +00:00
phreak a70d0b3144 shockwave weapons now work properly with the electronics (d-missible) tag
added in a "randomness factor" for electronics parameters.  This adds or subtracts
a random value between 0 and this factor to the disruption time.  This was hard coded
to be 4 seconds in retail.
2005-01-28 04:05:05 +00:00
wmcoolmon a853432699 Better debrief memory handling 2005-01-28 03:00:56 +00:00
wmcoolmon afa8c96236 Fixed crash bug in techroom 2005-01-28 02:57:59 +00:00
Goober5000 88c4e9880b dock points on rotating submodels is *almost* working
--Goober5000
2005-01-27 11:26:23 +00:00
Goober5000 4ffaf24ab8 added a useful bit of information to vm_vec_rotate and vm_vec_unrotate
--Goober5000
2005-01-27 05:26:07 +00:00
wmcoolmon c2c4c1a4ea Ship autorepair, requested by TBP 2005-01-27 04:23:18 +00:00
wmcoolmon c09b89127b Camera code 2005-01-27 04:16:28 +00:00
Goober5000 291215d6a9 important bugfix
--Goober5000
2005-01-26 21:42:19 +00:00
phreak 23e73f2b0d added ogg and objectdock files to project 2005-01-26 14:57:19 +00:00
Goober5000 6f7f3296e0 hm... added a necessary bugfix for something very badly designed
--Goober5000
2005-01-26 06:58:37 +00:00
Goober5000 6c89a3310c whoops... need to free variable blocks for special hitpoints
--Goober5000
2005-01-26 06:49:50 +00:00
Goober5000 579972dd62 AHA... squashed another bug
--Goober5000
2005-01-26 05:44:10 +00:00
Goober5000 c7916f4483 fixed a nitpicky thing
--Goober5000
2005-01-26 05:42:37 +00:00
argv 3dff6606f2 Removed the implicit surface shield on mesh-shielded ships.
-- _argv[-1]
2005-01-26 03:40:43 +00:00
Goober5000 69ab027ecf Bah - I am a moron. :) I see the reason why rand shouldn't work
multiple times.  It's been fixed thus.

I also added a rand-multiple sexp for any times when people do
want multiple random numbers.

--Goober5000
2005-01-26 01:52:21 +00:00
Goober5000 ee175fcfd3 dockpoints now rotate with rotating subobjects
--Goober5000
2005-01-26 01:26:09 +00:00
Goober5000 bf2a2cf7cc species will now load from a default table instead of being initialized via code
--Goober5000
2005-01-25 23:32:46 +00:00
Goober5000 0094f97f3c more cool parsing stuff
--Goober5000
2005-01-25 22:47:37 +00:00
Goober5000 77cc78e5e7 separated one parsing function into two
--Goober5000
2005-01-25 22:21:45 +00:00
Goober5000 6f1eed006f streamlined some redundant stuff
--Goober5000
2005-01-25 21:28:58 +00:00
wmcoolmon 5b09ed5b78 Instead of trying to allocate a ridiculously large buffer if the file is defined but doesn't exist, give a warning. Someone with nebula-code experience should probably double-check this; also added jpg and TGA support. 2005-01-22 22:53:07 +00:00
wmcoolmon 86ad73d71b Nitpick - can be NULL by default 2005-01-22 22:02:28 +00:00
wmcoolmon 5017882299 Fix0red the ext error. Always make sure you have room for the string terminator. :) 2005-01-22 20:29:05 +00:00
taylor 7d6f0afc73 crap 2005-01-21 21:12:52 +00:00
taylor 8989ee4abf cleanup debug messages for texture loading making the output more readable and useful 2005-01-21 08:58:32 +00:00
taylor c85f1bfa4e make Subsys_status dynamic but allocate in blocks for speed and to help prevent memory fragmentation 2005-01-21 08:56:50 +00:00
taylor 0fe03690f8 slightly better memory management 2005-01-21 08:54:53 +00:00
taylor 227298f10b add -rlm cmdline option to switch to local viewpoint lighting calculations (OGL only for now) 2005-01-21 08:29:04 +00:00
taylor 388fa7ac45 fill in gr_opengl_set_texture_addressing()
add support for non-power-of-two textures for cards that have it
temporary crash fix from multiple mipmap levels in uncompressed formats
2005-01-21 08:25:15 +00:00
taylor 926c12c560 make sure we can still use TGAs (16-bit) when Cmdline_jpgtga is not set, PCX still takes precedence per retail 2005-01-21 08:20:44 +00:00
Goober5000 8cafc52ff3 fixed a crazy error
--Goober5000
2005-01-18 06:15:33 +00:00
Goober5000 6483947732 fixed a silly error
--Goober5000
2005-01-18 06:14:29 +00:00
Goober5000 8b6dab73be variables can be specified in training messages too now
--Goober5000
2005-01-18 01:20:03 +00:00
wmcoolmon 0d8d459deb OGG fixes, ship selection fixes 2005-01-18 01:14:17 +00:00
Goober5000 5f9778d505 clarified a bunch of sexp stuff and fixed a bug
--Goober5000
2005-01-18 00:14:37 +00:00
argv a023302cbb Surface shields.
See forum thread:
http://dynamic4.gamespy.com/~freespace/forums/showthread.php?s=&threadid=29643

-- _argv[-1]
2005-01-17 23:35:45 +00:00
Goober5000 5937327c44 variables can now be displayed in messages
--Goober5000
2005-01-17 22:46:32 +00:00
wmcoolmon f29529494c Attempt to fix the crash when a player ship's subsystems receives damage, and it has a lot (ie player ship is a capital ship).This seems to be controlled by SUBSYSTEM_MAX, which also controls the number of subsystems saved in red alert missions. 2005-01-17 06:35:35 +00:00
wmcoolmon a1d0a19ec5 Added "show ship" ship flag 2005-01-16 23:18:04 +00:00
wmcoolmon 55635a499e Added VM_TOPDOWN view; Added 2D mission mode, add 16384 to mission +Flags to use. 2005-01-16 22:39:10 +00:00
wmcoolmon 582b4ea365 Current version of the new techroom code -C 2005-01-15 05:53:18 +00:00
argv 718e2a71ec Revision 2.42 (Goober's fixes) broke "no pierce shields". Fixed.
-- _argv[-1]
2005-01-14 23:08:17 +00:00
wmcoolmon 97c909de30 gr_curve 2005-01-14 05:28:58 +00:00
taylor 0a49604e83 plug leak from VBO crash fix 2005-01-13 04:55:57 +00:00
Goober5000 7a2c197144 hmm, rolled back one of my clarifications since it caused things to get messed up
--Goober5000
2005-01-13 03:33:07 +00:00
phreak 82a82b2bae difficulty table changes. this lets modders specify how the difficulty level affect
how the AI behaves and controls advantages given to the player based on the
skill level.

--phreak
2005-01-13 02:25:52 +00:00
Goober5000 9aa9bfaaf1 forgot to remove a comment
--Goober5000
2005-01-13 01:10:33 +00:00
Goober5000 134a3668ae fixed another nasty bug
--Goober5000
2005-01-12 23:38:42 +00:00
Goober5000 00b0a8d148 fixed a nasty bug where dock pointers would run off a cliff and crash
--Goober5000
2005-01-12 04:45:33 +00:00
Goober5000 6111162808 two minor but important bugfixes to the multiple ship docking
--Goober5000
2005-01-12 00:52:42 +00:00
phreak 63d43fbfb0 new hud is deault off now. this should fix the disappearing gauges problem. 2005-01-12 00:20:27 +00:00
phreak 6f2275c4ab nude hud? was this some kind of freudian slip of a sort or what? 2005-01-12 00:18:00 +00:00
phreak 55b3af43e8 fixed hud offsets bug 2005-01-12 00:17:09 +00:00
Goober5000 144f8f3a4b multiple ship docking :)
don't tell anyone yet... check the SCP internal
--Goober500
2005-01-11 21:38:51 +00:00
Goober5000 0b5a25446a made a capitalization thing consistent
--Goober500
2005-01-11 21:28:24 +00:00
Goober5000 1ddc459df6 fixed two small things with physics
--Goober500
2005-01-11 21:25:58 +00:00
taylor cfe8a03ff3 fully working (??) -loadonlyused, allocate used_weapons[] and ship_class_used[] only when needed 2005-01-11 04:05:23 +00:00
wmcoolmon 3e4f71fe29 Bug-guard 2005-01-10 06:58:12 +00:00
wmcoolmon f236be7241 Debriefing screen updated to only use memory while open 2005-01-10 04:45:09 +00:00
wmcoolmon 18ac53bb5d Small fix, so we don't try to delete the same thing twice 2005-01-10 04:44:03 +00:00
wmcoolmon ebd866660e Techroom and Barracks now allocate memory only when open, and only for the number of ships currently loaded 2005-01-09 22:27:38 +00:00
wmcoolmon 4a4e834199 Fix for music directory parent 2005-01-09 21:40:07 +00:00
wmcoolmon eee1d07cf5 Sound quality in Freespace 2 is now controlled by SoundSampleBits, and SoundSampleRate. Also, some sounds will use hardware rather than software buffers if available. 2005-01-08 10:00:59 +00:00
wmcoolmon 6539724237 Function pointers to inline functions is a no-no... 2005-01-08 09:57:27 +00:00
phreak 21bb39d102 fixed the bug where the player couldn't use the target hud in reticle key. 2005-01-07 23:15:44 +00:00
argv 4a93077ddf Added missing #include.
-- _argv[-1]
2005-01-07 14:00:04 +00:00
Goober5000 30c6e6582b gah
--Goober5000
2005-01-06 00:39:34 +00:00
Goober5000 b8e4e24434 changed argument from dist to dist_squared
--Goober5000
2005-01-06 00:37:32 +00:00
Goober5000 926b788fc9 added vm_vec_dist_squared_to_line
--Goober5000
2005-01-06 00:27:34 +00:00
Goober5000 c425a9c12b small speedup in shpere_tri_edge (spelling should be fixed...); now distance is only calculated once
--Goober5000
2005-01-06 00:22:01 +00:00
taylor 15e395f6a4 make sure we're not loading weapons that are left over from larger missions 2005-01-05 23:17:38 +00:00
taylor cf35f79402 more -loadonlyused fixes 2005-01-03 18:47:06 +00:00
taylor 431812cd6d stupid mistake 2005-01-03 18:46:03 +00:00
taylor d0cf0ced4a dynamic allocation of num supported OpenGL lights
add config option for more realistic light settings
don't render spec maps in nebula to address lighting issue
2005-01-03 18:45:22 +00:00
phreak a6dbf2facd made custom loading screens work if only one resolution has been specified. 2005-01-03 01:05:08 +00:00
Goober5000 56da3a6bf6 got rid of a nasty nasty bug in the beam collision function, and cleaned up some of Bobboau's old comments
--Goober5000
2005-01-02 23:22:22 +00:00
taylor 55323b32f1 make use of MR_NO_FOGGING to render models without fog 2005-01-01 19:47:26 +00:00
taylor 49c005525e add MR_NO_FOGGING flag to easily render models without fog (warp model, targetbox models) 2005-01-01 19:45:32 +00:00
wmcoolmon fafb5bd1e8 Erg, always make sure CVS is completely up-to-date. 2005-01-01 19:37:05 +00:00
argv 075fdeaa5c Since Taylor's asteroid targeting code does not use the
TURRETS_SHOOT_ASTEROIDS #define, remove it from preprocdefines.h. We can
put it back from an old rev if people decide to use my code instead of his,
which seems unlikely.

-- _argv[-1]
2005-01-01 13:14:19 +00:00
taylor 065ec54a46 good OpenGL spec mapping
fix VBO crash with multitexture using same uv coord data
little speedup of opengl_tcache_frame()
error message to make sure hardware supports the minimum texture size
move OpenGL version check out of the extention printout code
disable 2d_poof with OpenGL
2005-01-01 11:24:23 +00:00
taylor e7eb31a0df asteroid targetting code for capships, enabled by default, matches FS1 behavior 2005-01-01 10:38:23 +00:00
wmcoolmon d340b8da04 NEW_HUD stuff, turned off this time. :) It's in a state of disrepair at the moment, doesn't show anything. 2005-01-01 07:18:48 +00:00
Goober5000 a17eca915c CVS checkin of bitarray.h; use this for large arrays of boolean values
--Goober5000
2004-12-31 03:48:12 +00:00
argv 149629e1e2 I've just been informed that turrets do not shoot asteroids in the retail
game, and that this implementation causes them to shoot at the parent ship,
too. I'll deal with this later; in the mean time, use
"#define TURRETS_SHOOT_ASTEROIDS" to cause turrets to shoot asteroids.

-- _argv[-1]
2004-12-31 03:13:08 +00:00
Goober5000 05948719b1 stupid parenthesis fix
--Goober5000
2004-12-30 21:41:24 +00:00
taylor c2e4c526d0 don't use cfopen() for upgrade check, it was giving strange results 2004-12-30 16:25:22 +00:00
taylor 4da2a92335 make sure swprintf() doesn't think szFile is already a wide-character string 2004-12-30 16:23:39 +00:00
argv 65b1250353 * For some reason, turret AI wasn't shooting at asteroids. It never has,
but it did in the retail game, and it should. The code to target asteroids
  was apparently missing, so I reimplemented it, and turrets shoot at
  asteroids again.
2004-12-30 08:07:52 +00:00
argv 562cf1e47a Quick hack to remove the 50% rate-of-fire penalty when primary weapons are
linked. "#define NO_LINKED_PRIMARY_PENALTY" to enable this change; it's
disabled by default.

-- _argv[-1]
2004-12-30 07:26:21 +00:00
taylor 7ae710ace6 make sure the file gets closed in pilot_file_upgrade_check() 2004-12-28 16:20:33 +00:00
taylor 611ce79893 fix some hud stuff getting drawn multiple times, don't show target data if HUD_disabled_except_messages is set 2004-12-26 22:45:58 +00:00
Goober5000 5ceb4a2291 hud-disable-except-messages now resets after each mission
--Goober5000
2004-12-26 20:46:34 +00:00
wmcoolmon 4f719b2c4d Fixed text not displaying for single-weapon sips. 2004-12-25 19:17:23 +00:00
wmcoolmon 4b5f47441b Quick update to tempfix possible bug. 2004-12-25 17:45:38 +00:00
wmcoolmon 6b3c4a3bbe Fixed a couple of blonde moments. 2004-12-25 17:02:18 +00:00
wmcoolmon 2f8c97d99d Fix to modular tables workaround with Fs2NetD 2004-12-25 16:42:59 +00:00
wmcoolmon 3d527efc50 Sync to current NEW_HUD code 2004-12-25 09:28:41 +00:00
wmcoolmon 7dd62135a3 Fix to modular tables workaround with Fs2NetD + Sync to current NEW_HUD code 2004-12-25 09:27:41 +00:00
wmcoolmon 4071a37ef4 Fix to modular tables workaround with Fs2NetD 2004-12-25 09:25:41 +00:00
wmcoolmon dd6eea5406 Ogg support for WIN32 2004-12-25 00:23:46 +00:00
wmcoolmon 840a2b37b5 Added .ogg in proper directories 2004-12-25 00:22:54 +00:00
Goober5000 762d41f41c resorted command-line options and added an option for WMC's ballistic gauge
--Goober5000
2004-12-24 19:36:12 +00:00
wmcoolmon e0b48bec6f NEW_HUD compiles now. :) 2004-12-24 05:07:05 +00:00
wmcoolmon 28b3a8cffa Proposed HUD system stuffs - within NEW_HUD defines. 2004-12-24 01:07:19 +00:00
wmcoolmon 431335b27d Ballistic primary ammo-gauge to the right of the HUD, support for weapon images in list. 2004-12-24 00:41:23 +00:00
wmcoolmon 237ae621a4 Removed unneccessary function call (.0000001 ms speed increase!) 2004-12-23 23:36:30 +00:00
wmcoolmon f959999594 Added +Hud Image: for weapons, which replaces the weapon name in the list with an image. 2004-12-23 23:35:02 +00:00
wmcoolmon 997d57faae Proposed HUD system stuffs - within NEW_HUD defines. 2004-12-23 23:30:45 +00:00
wmcoolmon 1f2a891c7a Proposed HUD system stuffs - within NEW_HUD defines. 2004-12-23 23:08:21 +00:00
phreak 911528b6d7 commits for scramble-messages and unscramble-messages
-phreak
2004-12-23 15:58:55 +00:00
phreak 9b6620e21c added a pragma message if DevIL isn't compiled into the build 2004-12-22 23:05:48 +00:00
taylor 17fc45faba add a popup to make sure people know about pilot upgrade 2004-12-22 21:49:05 +00:00
taylor 59add586e3 safety check against very large missions 2004-12-22 21:48:21 +00:00
taylor bb472f8669 version bump to 3.6.5 2004-12-22 21:47:37 +00:00
wmcoolmon 2f807f5793 Quick fix to hudparse.cpp; If this causes any problems, roll it back and I'll take another look at it. 2004-12-22 09:09:38 +00:00
fryday a770aeab31 Fixed a tiny error in bob's code in d3d_init_environment (which seems to be called even
if there's no -env command-line) which created the cube-map and didn't check
if the creation of it failed. Added the same sanity check to d3d_render_to_env
2004-12-20 20:28:15 +00:00
fryday afa8e9b947 Commented out ATL dependencies (And changed one macro to an swprintf instead)
Tiny change in animplay ( pow(2.0, ...) instead of pow(2, ...)) because VS2K5
throws an ambiguity error over that.
2004-12-20 20:18:30 +00:00
taylor 6c733d9f7b fix crash from dynamically allocated Personas 2004-12-17 06:43:01 +00:00
Goober5000 4474d26e5b move wing name initialization to ship_level_init
--Goober5000
2004-12-15 17:32:19 +00:00
Goober5000 9ca91d3518 commented dumbfire lead indicator back in, because you need to know where your missiles are going
--Goober5000
2004-12-15 15:22:23 +00:00
Goober5000 d4823f735a added Verify, an error checking macro that works in both release and debug modes
--Goober5000
2004-12-15 15:14:03 +00:00
Goober5000 4f87d063b8 new version of stristr that doesn't need to allocate memory
--Goober5000
2004-12-14 17:23:52 +00:00
Goober5000 eaae1243e6 allow different wing names than ABGDEZ
--Goober5000
2004-12-14 14:46:13 +00:00
wmcoolmon 3ce44dcdfa Apparently I never commited -mpnoreturn... 2004-12-11 09:37:50 +00:00
wmcoolmon 17f4291b70 Changed music modular table ending to *-mus.tbm, in case a miscellaneous modular table is needed. 2004-12-11 09:03:08 +00:00
taylor 31019d38a2 dymanic allocation of Personas 2004-12-10 17:21:00 +00:00
taylor bca69ce180 fix old V bug when cancelling the pilot select screen 2004-12-05 23:47:18 +00:00
bobboau f56c5d230e sevral feature additions that WCS wanted,
and the foundations of a submodel animation system,
the calls to the animation triggering code (exept the procesing code,
wich shouldn't do anything without the triggering code)
have been commented out.
2004-12-05 22:01:12 +00:00
taylor 45caba7c72 support uncompressed DDS images
use TexSubImage2D for video anis
2004-12-05 01:28:39 +00:00
taylor 0fc13dfa87 text of -no_set_gamma cmdline option shouldn't specify D3D since it works in OGL too 2004-12-02 11:20:33 +00:00
taylor f5b60aa156 make OGL use same gamma reg setting as D3D since it's the same ramp
have OGL respect the -no_set_gamma cmdline option
reset gamma to default on OGL exit to make sure the desktop doesn't stay wrong
2004-12-02 11:18:15 +00:00
taylor 023d5ffab0 not used at the moment but that code was stupid 2004-12-02 11:14:29 +00:00
taylor a4760e9c70 little reorg to flags so Experimental won't show up twice
add/update the wiki links since none of them worked before
remove all options that require an argument since they won't work
2004-11-29 18:04:53 +00:00
taylor a58587d3a5 make sure we are checking the right bitmap_id 2004-11-29 18:02:01 +00:00
taylor 3b35a4f9c1 more EFF fixes - can't believe I forgot all this crap 2004-11-27 22:08:21 +00:00
taylor 6ddaabcead Linux tree merge 2004-11-27 10:51:01 +00:00
taylor d706747bd1 correct positions for default graphics with no table
compiler warning fix
2004-11-27 10:50:32 +00:00
taylor 503ea74554 make sure the old behavior still applies to everything that's not a beam 2004-11-27 10:49:14 +00:00
taylor 128a6d840f some fixes for position problems on the HUD in non-standard resolutions
few compiler warning fixes
2004-11-27 10:48:03 +00:00
taylor a0b4747c57 this should get movies working again in D3D and help OGL too 2004-11-27 10:42:18 +00:00
taylor e237b9d8ba couple of LAN game vs. FS2NetD fixes 2004-11-26 08:41:11 +00:00
taylor 0bd342af4a fix briefing related crash(es) (forgot I had this) 2004-11-24 20:12:25 +00:00
taylor 1c8018a5ab fix 2d warp in D3D, add cmdline option for 3d warp 2004-11-23 19:29:13 +00:00
taylor 5760eaf5fc try and protect the bitmap_entry stuff a bit better
fix the transparent support ship, again, but correctly this time
2004-11-23 00:10:06 +00:00
taylor ea4341a938 make sure species_defs.tbl can be found outside of root[0] and in VPs 2004-11-22 06:17:57 +00:00
Kazan a410c7f132 dumbbugfix 2004-11-21 16:07:22 +00:00
Kazan 83f954520c conflict res 2004-11-21 15:59:45 +00:00
taylor 29963bfe39 support for animated beam sections
various weapon-only-used fixes
remove the -1 frame fix since it was fixed elsewhere
2004-11-21 11:38:17 +00:00
taylor 163b45fdab some weapon-only-used loading fixes and general page-in cleanup
page in all ship textures from one function rather than two
2004-11-21 11:35:17 +00:00
taylor 73eda1ee69 page in all frames at once rather than separately (old code that wasn't updated) 2004-11-21 11:33:23 +00:00
taylor 2ea42c0928 newline fix (got tired of seeing this) 2004-11-21 11:31:46 +00:00
taylor af3afff65c move warning fixes from il_func.cpp to irc.cpp since that's where they are coming from 2004-11-21 11:31:02 +00:00
taylor 1651717c41 make hud_disabled_except_messages() do everything at once, add it to hud_show_radar() and hud_show_target_model() so those don't show up (bug #271) 2004-11-21 11:29:53 +00:00
taylor 71b718a3b9 some 64-bit OS comaptibility fixes 2004-11-21 11:27:31 +00:00
taylor c619e7b3b7 split bm_load_sub() into fast (memory only) and slow (disk only) versions
EFF bug fix for fps and much better error handling
2004-11-21 11:26:39 +00:00
Goober5000 6e5ee3312d #pragma'd a bunch of warnings
--Goober5000
2004-11-18 00:05:37 +00:00
Goober5000 14b29354bb added two new sexps
--Goober5000
2004-11-17 22:23:13 +00:00
taylor 9460f0c613 don't set gamma ramp while running FRED 2004-11-04 22:49:13 +00:00
taylor ff083e9600 note to self: copy is down pat, now just learn how to paste, moron 2004-11-04 08:33:44 +00:00
taylor 008a450cfd animate weapon glow/bitmaps properly while in flight, make sure
we don't exceed bitmap frame numbers, don't try to calculate
frame for particle spew animations since particle_render_all()
does that for us already
2004-11-02 08:32:38 +00:00
Goober5000 1e5edb91a7 tweaked some project settings
--Goober5000
2004-11-02 01:48:20 +00:00
taylor 863475d8d0 make use of Knossos_warp_ani_used flag - thanks Goober5000 2004-11-01 20:57:04 +00:00
taylor 5194bb5f80 new pilot code 2004-10-31 22:07:27 +00:00
taylor 2c6f07a416 compiler warning fixes, maybe fix issue that would cause cap ships to not fire beam weapons 2004-10-31 22:06:42 +00:00
taylor 664c3bf797 s/OGL_inited/OGL_enabled/g 2004-10-31 22:05:30 +00:00
taylor 031b923385 be sure to initialize splodeing_texture, fix issue that would cause loading problems for glows 2004-10-31 22:04:33 +00:00
taylor db75f373b3 little cleanup 2004-10-31 22:02:47 +00:00
taylor d2badfc49e new bmpman merge support, add PreProcDefines.h a few new places 2004-10-31 22:00:57 +00:00
taylor 200588c3b0 support external parsing sources without hurting currently parsing file (for EFF code) 2004-10-31 21:57:30 +00:00
taylor 5511c94080 new bmpman support, new OGL fixes don't need the freaky neb lighting fix anymore 2004-10-31 21:56:09 +00:00
taylor e4460b46f3 s/fisrt/first/g 2004-10-31 21:55:00 +00:00
taylor bd3855b315 new pilot code support, no-multiplayer and compiler warning fixes, center mouse cursor for redalert missions 2004-10-31 21:53:24 +00:00
taylor 00f6a2ee32 fix math error that was hitting Assert()'s and making OGL models flip around for no reason 2004-10-31 21:49:49 +00:00
taylor 4594df128c faster setting of 0 spec values (Kazan), comment out second (dumbfire?) lead indicator since it just looked wierd constantly being offset 2004-10-31 21:48:42 +00:00
taylor a3b330bdf5 bmpman merge 2004-10-31 21:46:38 +00:00
taylor 01a1403f67 Linux tree merge, better DDS support, texture panning 2004-10-31 21:46:10 +00:00
taylor a09c6beb5c Linux tree merge, single array for VBOs/HTL 2004-10-31 21:45:13 +00:00
taylor d589bcd911 Linux tree merge, use linear mag filter, small FRED fix, AA lines (disabled), use rgba colors for 3dunlit, proper gamma adjustment, bmpman merge 2004-10-31 21:42:31 +00:00
taylor 401dbfc523 move some otherwise bmpman stuff into grd3dbmpman.cpp 2004-10-31 21:40:11 +00:00
taylor 6cc7c6fcbd bmpman merge 2004-10-31 21:39:24 +00:00
taylor 7e37fee039 reinit device if lost - one of the D3D people should make sure this isn't stupid 2004-10-31 21:38:25 +00:00
taylor 0e2d84c60e s/fisrt/first/g, bmpman merge 2004-10-31 21:36:39 +00:00
taylor 647a03d53c OGL_enabled, s/fisrt/first/g 2004-10-31 21:35:53 +00:00
taylor 97e7b62860 rename __ASSERT check to _ASSERT to fix constant warning message - why did no one else fix this? 2004-10-31 21:34:39 +00:00
taylor da03d81df6 rename OGL_inited to OGL_enabled to match D3D version 2004-10-31 21:33:05 +00:00
taylor 194717b0c8 no networking with Inferno builds, basic 64-bit OS support 2004-10-31 21:32:27 +00:00
taylor ccf5d144b5 bump COUNT_ESTIMATE, reset time compression at the start of a mission, new pilot file support, add feature_disabled popup 2004-10-31 21:31:34 +00:00
taylor 87552b959c lots of cleanup with support for bmpman changes, full Linux/OSX support 2004-10-31 21:30:01 +00:00
taylor 1a384df3ce EFF animation support 2004-10-31 21:29:00 +00:00
taylor bf0a46d3f6 support new pilot code, Linux code tree merge, don't use same pilot directory for Inferno builds 2004-10-31 21:28:38 +00:00
taylor e0570a7677 bmpman merge, EFF animation support, better page in stuff, dozen or so smaller fixes and cleanup 2004-10-31 21:26:27 +00:00
taylor 738c92e036 change case of opengl files so I can stop worrying, add gropenglbmpman files 2004-10-31 21:24:11 +00:00
taylor 56e60218b3 #define if !#defined, add USE_DEVIL and FS2_SPEECH commented out 2004-10-31 21:23:08 +00:00
taylor 0dad90aa7f initial import from bmpman merge 2004-10-31 21:21:11 +00:00
Goober5000 9abdc3e9ae whoops
--Goober5000
2004-10-31 02:26:15 +00:00
Goober5000 35e62e4777 added Knossos_warp_ani_used flag for taylor
--Goober5000
2004-10-31 02:04:34 +00:00
taylor aa5d98a918 make sure all spec colors are set to 0 in hud_tri() 2004-10-18 17:13:36 +00:00
Goober5000 6e0f31092e fixed FRED bug that changed special arguments to (null)
--Goober5000
2004-10-18 09:27:47 +00:00
phreak 1c98f5954d Made WMCoolmon's hud target info brackets recognize alt-names
--phreak
2004-10-15 13:10:06 +00:00
Goober5000 19b5126542 added change-alt-name
--Goober5000
2004-10-15 10:03:09 +00:00
Goober5000 b5fa66428c cleaned up some sexp stuff and added wing capability to kamikaze sexp
--Goober5000
2004-10-15 09:21:55 +00:00
Goober5000 6a0d138a08 extra coding insurance
--Goober5000
2004-10-15 08:14:07 +00:00
Goober5000 14804a1396 tweakage
--Goober5000
2004-10-14 23:03:37 +00:00
Goober5000 38dbeab543 added ability for variable names to be used as special arguments
--Goober5000
2004-10-14 22:28:27 +00:00
Goober5000 41fdb82dd1 more ubersexp bugfixing
--Goober5000
2004-10-14 01:19:17 +00:00
Goober5000 91af9dbfc0 fixed a few when-argument bugs
--Goober5000
2004-10-13 10:46:49 +00:00
Goober5000 c3cc9f8e21 added toggle-subsystem-scanning ship flag
--Goober5000
2004-10-12 22:47:15 +00:00
Goober5000 1429123da4 added contrail speed threshold
--Goober5000
2004-10-12 07:34:45 +00:00
Goober5000 93973d4a49 added the no-bank ship flag (which works) and the affected-by-gravity flag
(which won't work until I implement gravity points)
--Goober5000
2004-10-11 22:29:25 +00:00
taylor df028f3714 make sure windowed mode gets the correct size 2004-10-10 22:15:10 +00:00
taylor 6937a4d1e2 warp mouse to center screen on mission start 2004-10-10 22:12:57 +00:00
taylor 19680f4ebd holy crap at the copy-paste error 2004-10-10 16:59:37 +00:00
taylor 8a450c6b4d almost forgot this for the IBX stuff 2004-10-09 18:08:33 +00:00
taylor dacc345814 one more try to fix the memory leak and end-of-mission crash for talking head anis 2004-10-09 17:58:48 +00:00
taylor 349459c502 better debugging for g3_end_frame() - mostly for FRED2 2004-10-09 17:54:32 +00:00
taylor fc9655bde3 safer handling of missing shield ani 2004-10-09 17:51:23 +00:00
taylor faac91b3be da simple IBX code, back to old line rendering for models since it should be faster for OGL now 2004-10-09 17:48:58 +00:00
taylor eaa75f0a3f da simple IBX code 2004-10-09 17:45:45 +00:00
taylor 6ca850fbe6 don't use DevIL to read the header, slightly more sane error checking 2004-10-09 17:44:10 +00:00
Kazan f035fff922 interface corruption fix - thanks taylor (MAX_BITMAPS upped to 7000) 2004-10-06 22:02:54 +00:00
Kazan 625220a856 Autopilot convergence collision fix for ai_fly_to_ship() and ai_waypoints() -- mathematically expensive, only usable by autopilot 2004-10-03 21:41:11 +00:00
Kazan 134aeb0085 fix autopilot formation bug 2004-09-28 22:51:41 +00:00
Kazan 7d51c61184 | is binary or, || is boolean or - please use the right one
autopilot velocity ramping biasing
made debugged+k kill guardianed ships
2004-09-28 19:54:32 +00:00
taylor ec523fdf0b fix logic error, may be support ship rearm fix 2004-09-26 20:58:29 +00:00
taylor 849e22dfff handle lost devices better, fix movie crash 2004-09-26 16:24:51 +00:00
taylor d334ab504a proper OGL line drawing in HTL... hopefully 2004-09-24 22:40:23 +00:00
Goober5000 09f3d78d1c some ubersexp fixes
--Goober5000
2004-09-24 02:13:00 +00:00
Goober5000 363313ee59 fixed two bugs... still more bugs to be found :p
--Goober5000
2004-09-23 23:52:58 +00:00
Goober5000 48371badfc ubersexp implementation complete
--Goober5000
2004-09-23 22:51:07 +00:00
Goober5000 cd3bb82030 a bunch of work on the actual implementation of when-argument
--Goober5000
2004-09-23 05:53:00 +00:00
Goober5000 2f0a9985de further work on ubersexp framework
--Goober5000
2004-09-22 21:52:22 +00:00
Goober5000 83887ad91b fixed some small problems in the framework - should be working nicely now;
next step is the actual sexp implementation :-P
--Goober5000
2004-09-22 08:32:05 +00:00
Goober5000 7c6bde8551 checking in framework for when-argument special ubersexp
--Goober5000
2004-09-22 06:56:45 +00:00
tbird d355d6be5c Modified the image loading to accept 24 and 32 bit images 2004-09-22 03:50:13 +00:00
Goober5000 35441575e7 a bit of reordering
--Goober5000
2004-09-17 08:07:52 +00:00
Goober5000 92424ee0e3 changed around the logic for the 3D warp effect
--Goober5000
2004-09-17 07:12:23 +00:00
Goober5000 bb4974a467 moved ssm stuff to header file so it would work in FRED
--Goober5000
2004-09-17 07:11:02 +00:00
Goober5000 d5cc98338e removed player-not-use-ai and changed player-use-ai to take an argument
--Goober5000
2004-09-17 00:28:32 +00:00
Goober5000 ea30714b53 changed toggle-hud to hud-disable; added hud-disable-except-messages
--Goober5000
2004-09-17 00:18:18 +00:00
et1 12ce22b1a4 Use yellow warp anim when doing exit jump with "-tbpwarpeffects" 2004-09-10 13:55:49 +00:00
et1 e2865c4576 Implemented "+WeaponMinRange" token. Fixed a crash issue with fighter launch checks 2004-09-10 13:54:21 +00:00
et1 14cbcbf2ac Command line option for TBP for warp stuff, "-tbpwarpeffects" 2004-09-10 13:51:45 +00:00
et1 c71f96710f Implemented "+WeaponMinRange" token 2004-09-10 13:50:09 +00:00
Goober5000 f787dd331d fix0red something weird
--Goober5000
2004-09-05 20:05:16 +00:00
Goober5000 33b42b554e whoops, fixed this for debug mode
--Goober5000
2004-09-05 19:41:31 +00:00
Goober5000 5ac6b0a787 we definitely want browse info... and Sticks wants a mapfile too
--Goober5000
2004-09-05 19:25:02 +00:00
Goober5000 11ae968eb6 fixed a few warnings
--Goober5000
2004-09-05 19:23:24 +00:00
Goober5000 48a882755e MultiUi.cpp should not be in the "Freespace2" project
--Goober5000
2004-09-05 18:42:31 +00:00
Goober5000 a179aa698b fixed a warning
--Goober5000
2004-09-02 04:02:44 +00:00
phreak a69435baa1 MISSION_FLAG_USE_NEW_AI fixes for bomber+ missile selection, rapid dumbfire
firing and primary weapons selection
2004-09-01 01:26:20 +00:00
phreak 2f4ff28011 created the mission flag MISSION_FLAG_USE_NEW_AI
this lets old missions use the retail AI so they are balanced.  new missions would
be able to select this in fred so designers can take advantage of it.
2004-09-01 00:58:46 +00:00
Goober5000 6cef921092 fixed a small bug in the custom hitpoints mod
--Goober5000
2004-09-01 00:22:36 +00:00
Goober5000 4c53554eae when calculating damage for scoring, don't count beams unless they're fired by a fighter or bomber
--Goober5000
2004-08-31 23:36:28 +00:00
Kazan ec7681b75d small standalone-related multibug fix
prohibited execution of process_debug_keys(int) while Game_mode & GM_MULTIPLAYER
2004-08-26 18:19:36 +00:00
Goober5000 0d46b06833 fix0red some warnings
--Goober5000
2004-08-23 07:48:09 +00:00
Goober5000 6316b4a4e4 warp effect is back to FS2 default
--Goober5000
2004-08-23 04:32:40 +00:00
Goober5000 85d7186bf6 ship-tag and ship-untag sexps
--Goober5000
2004-08-23 04:32:06 +00:00
Goober5000 b5ae16e463 ship-tag and ship-untag
--Goober5000
2004-08-23 04:00:15 +00:00
Goober5000 acbb64b9b4 modularized tag stuff in preparation for sexp
--Goober5000
2004-08-23 03:34:34 +00:00
Kazan 63af0632df wakka wakka - fix minor booboo 2004-08-20 05:13:08 +00:00
Kazan 60d31003cf added preprocdefines.h to prevent what happened with fred -- make sure to make all fred2 headers include this file as the _first_ include -- i have already modified fs2 files to do this 2004-08-11 05:06:36 +00:00
phreak cb22efe237 fixed the -orbradar launcher string 2004-08-08 02:56:54 +00:00
phreak 3a7f5f7320 added radarorb.cpp and radarorb.h to project 2004-08-05 02:18:17 +00:00
phreak bf2870d53b forgot to commit orb change 2004-08-05 02:15:27 +00:00
phreak 5024413d68 orb radar rendering style 2004-08-02 22:54:07 +00:00
phreak e418257394 orb radar rendering style 2004-08-02 22:43:03 +00:00
phreak 4640a5eea4 added -orbradar to enable orb rendering for the radar 2004-08-02 22:40:59 +00:00
phreak c55568852b -phreak command line changed to -dualscanlines 2004-08-01 02:31:18 +00:00
et1 21448785ec Implemented "+SwarmWait:"-token and fixed weapon glow tails 2004-07-31 08:58:07 +00:00
et1 4acd808412 Implemented "+SwarmWait:"-token 2004-07-31 08:57:22 +00:00
et1 806e9eefd1 Fixed inaccuracy problems with non-homing swarmers 2004-07-31 08:54:38 +00:00
et1 4634470897 Make missing briefing icon message to tell the icon missing 2004-07-31 08:53:46 +00:00
et1 670d6a9078 If weapon loadout anim is missing, warn instead of int3 2004-07-31 08:52:45 +00:00
et1 1bf056b5ca Disabled ship shield load check for TBP 2004-07-31 08:51:47 +00:00
Kazan 3aae4e73f2 bugfixes 2004-07-29 23:41:22 +00:00
Kazan bd64ca2cb9 unbug the JS bug i caused --- kazan 2004-07-29 19:37:50 +00:00
taylor 1c6ef1c02c fix NULL pointer and try to prevent in future, remove excess commands in opengl_cleanup() 2004-07-29 09:35:29 +00:00
Kazan 1119146fcd fs2_open.exe was suffering the same problem as fred2 -- it was just a little less obvious 2004-07-29 03:49:44 +00:00
taylor 45d5f46063 plug memory leaks 2004-07-29 03:41:46 +00:00
Kazan a5407aff0a making another bug a little bit more dead inside :D 2004-07-27 20:09:12 +00:00
Kazan be1fba0b34 squished another 2004-07-27 18:52:11 +00:00
Kazan d1186a73ab i love it when bugs go crunch (autopilot ai fixup) 2004-07-27 18:04:09 +00:00
Goober5000 cb8f3dd3e2 outline of ship-tag and ship-untag sexps
--Goober5000
2004-07-26 21:26:45 +00:00
Goober5000 33144fdad4 updated launcher link
--Goober5000
2004-07-26 21:19:05 +00:00
Kazan 89e6af4fb5 remove MCD complete 2004-07-26 20:47:56 +00:00
Kazan a1c0d95647 remove MCD 2004-07-26 20:19:04 +00:00
Kazan a4dbb0ee88 add conditional compilation directive 2004-07-26 19:39:49 +00:00
Kazan a4e1bcfd2d Autopilot system completed -- i am dropping plans for GUI nav map
All builds should have ENABLE_AUTO_PILOT defined from now on (.dsp's i am committing reflect this) the system will only be noticed if the mission designer brings it online by defining a nav point
Fixed FPS counter during time compression
2004-07-26 17:54:05 +00:00
Goober5000 3ad5ea54fb last bit of Unix fixorage
--Goober5000
2004-07-26 17:50:02 +00:00
Goober5000 2b9cdc2689 more #ifndef fixorage
--Goober5000
2004-07-26 17:39:20 +00:00
Goober5000 5a9eee5a12 fixored a problem when using the command-line compiler to compile everything under Windows
--Goober5000
2004-07-26 16:11:41 +00:00
Kazan ff8edc4adc only disable afterburning during AIM_WAYPOINTS and AIM_FLY_TO_SHIP while AutoPilotEngaged 2004-07-25 19:27:51 +00:00
Kazan d83dbd88c4 -fred_no_warn has become -no_warn and applies to both fred and fs2
added new ai directive (last commit) and disabled afterburners while performing AIM_WAYPOINTS or AIM_FLY_TO_SHIP
fixed player ship speed bug w/ player-use-ai, now stays in formation correctly and manages speed
made -radar_reduce ignore itself if no parameter is given (ignoring launcher bug)
2004-07-25 18:46:30 +00:00
Kazan 7af6e41fa1 i have absolutely nothing to say about that subject 2004-07-25 00:31:31 +00:00
taylor b3c084db06 fix problem with sectioned menu bitmaps in OGL 2004-07-21 00:03:46 +00:00
wmcoolmon 37cdc6a4fe Fixed ifdef, was missing ship_decal_system otherwise 2004-07-20 04:03:21 +00:00
Kazan e9a29ac2e6 nothing major 2004-07-18 04:07:26 +00:00
taylor f7ffb89690 stupid braces... 2004-07-17 19:01:15 +00:00
taylor 77fcc86c14 fix set_*_matrix overcompensation, makes OGL work again 2004-07-17 18:59:01 +00:00
taylor f0dddf2854 oops, I can't spell 2004-07-17 18:49:57 +00:00
taylor d23c3a6e4d various OGL and memory leak fixes 2004-07-17 18:46:09 +00:00
taylor 26726238b5 don't use bitmap sections by default, openil_close() 2004-07-17 18:43:46 +00:00
taylor 51d8809a22 Bob say we fix OGL, so me fix OGL <grunt> 2004-07-17 18:40:40 +00:00
taylor 92e696a6ea force image orientation in DevIL 2004-07-17 18:38:04 +00:00
taylor cae2b33d34 make old warpmap and new glow bitmap 3D unlit to render right in OGL 2004-07-17 09:29:13 +00:00
taylor e1ab4e4532 add CF_SORT_REVERSE to real sort routine, makes CF_SORT_TIME work again 2004-07-17 09:26:00 +00:00
taylor 21fe0590ed make sure avi and mpg movies get added to file cache 2004-07-17 09:03:29 +00:00
taylor 0d76068eb8 add .deps directory to ignored entries 2004-07-17 09:00:38 +00:00
taylor f6faea6f81 misspelled filename 2004-07-17 08:59:25 +00:00
wmcoolmon 72c34be6f9 I though I fixed this... 2004-07-15 00:16:46 +00:00
wmcoolmon 65da0763f7 Better -load_only_used handling; added mark_weapon_used(weapon ID), which does check for IDs of -1. 2004-07-14 01:27:01 +00:00
wmcoolmon baed9715df Better -load_only_used handling 2004-07-14 01:26:10 +00:00
Kazan 8d2fa0418a adding mcd 2004-07-12 16:37:01 +00:00
Kazan f7dd512ba8 MCD - define _MCD_CHECK to use memory tracking 2004-07-12 16:33:09 +00:00
Kazan 9c9006f55e fix a small multibug in tables validation (I had added this once before.. where did it go) 2004-07-12 14:38:13 +00:00
wmcoolmon 177698e014 More in-game stuff, mostly for restricted games 2004-07-12 03:34:55 +00:00
wmcoolmon 70834437dd Only send ships on the player's team 2004-07-12 03:26:03 +00:00
Kazan a501d4b688 removed a couple pointless useless messages from the debug console 2004-07-12 03:19:17 +00:00
wmcoolmon cb0360016d ... 2004-07-12 03:04:33 +00:00
wmcoolmon 55f179db5c Oops. :p 2004-07-12 03:04:03 +00:00
wmcoolmon e8c844b32a Ingame joining stuff - use -rt to enabled/disable 2004-07-12 02:50:48 +00:00
bobboau b8fb999660 added the working decal code 2004-07-11 03:22:54 +00:00
wmcoolmon 93964edfed Fixed bug with the base ship flag I unwittingly introduced. 2004-07-10 08:03:13 +00:00
Kazan 3a89eeffc9 minor bugfixes - oh yeah reenabling a rule for multistats :P 2004-07-10 03:18:23 +00:00
Kazan 72ac50ca24 fs2netd 1.0 RC5 full support - Rank and Medal updates 2004-07-09 22:05:32 +00:00
wmcoolmon 6f8e5b4447 Fixed conditional. 2004-07-09 07:32:55 +00:00
wmcoolmon 64efe3e91c Fixed HUD escort list for dogfight mode, and for any usage. 2004-07-09 05:53:05 +00:00
wmcoolmon eda444a92b Re-implemented nomotiondebris, as Bobb overwrote it when he commited his changes. 2004-07-09 05:52:19 +00:00
wmcoolmon 7999173fc7 Moved set_current_hud, as well as added a conditional to hud_positions_it; it shouldn't and won't be executed on a standalone server. 2004-07-08 22:08:21 +00:00
wmcoolmon a4c2329316 Moving set_current_hud, to ensure compatibility with multiplayer. 2004-07-08 22:06:56 +00:00
Kazan e2b8ce4d5d fixed a typo in one of the fs2netd strings
played with WMCoolmon's hacked up escort list
2004-07-07 23:34:08 +00:00
Kazan 13ee198069 FS2NetD: C2S Ping/Pong, C2S Ping/Pong, Global IP Banlist, Global Network Messages 2004-07-07 21:00:08 +00:00
Kazan 84e74a8abf minor multi fix 2004-07-06 23:45:34 +00:00
Kazan a1903268ad small multifix 2004-07-06 19:59:37 +00:00
bobboau f36d1802df FVF code, only the data that is needed is sent off to the card,,
OGL can take advantage of this if they want but it won't break
anything if they don't. also state block code has been implemented,
that's totaly internal to D3D no high level code is involved.
2004-07-05 05:09:21 +00:00
wmcoolmon a8beea705e Replaced some more Int3s with Warnings and Errors. 2004-07-03 08:23:00 +00:00
wmcoolmon 0e60209a24 Error handling for fire_beam instead of just calling Int3() 2004-07-03 07:55:22 +00:00
wmcoolmon 5187223a76 Removed function pointer w/ default arguments for compatibility with .NET Sorry, you'll just have to add that "0" by hand. :p 2004-07-03 06:08:54 +00:00
Kazan d99263ed75 working on autonav 2004-07-01 16:38:19 +00:00
phreak eb489320e1 function pointer radar update.
will enable us to make different radar styles that we can switch between
2004-07-01 02:07:54 +00:00
phreak 1b906e0369 function pointer radar update.
will enable us to make different radar styles that we can switch between
2004-07-01 01:54:59 +00:00
bobboau 5019375c1f implemented index buffered background bitmaps,
OGL people you realy should get this implemented
2004-07-01 01:12:33 +00:00
wmcoolmon 3f1f149312 Support as well as the extern for "-load_only_used"; this way everything that includes cmdline.h doesn't have to be recompiled. 2004-06-29 06:02:34 +00:00
wmcoolmon 698f4e0e16 Added "-load_only_used", which makes FS2 load only used weapon data 2004-06-29 06:00:45 +00:00
wmcoolmon c089510571 Fixed weapon miniinfo display 2004-06-28 10:00:33 +00:00
bobboau e2bb83fbdb high level index buffer suport and d3d implementation,
OGL people need to get this working on your end as it's broke now
2004-06-28 02:13:08 +00:00
wmcoolmon 16b030459f Bad return 2004-06-27 01:48:17 +00:00
wmcoolmon 2fbdb960f6 Unneccessary warning removed, small change for VC6. 2004-06-27 01:47:16 +00:00
wmcoolmon e80f8b391d Commented out ogg header 2004-06-27 01:45:23 +00:00
wmcoolmon 231f9a0246 Minor optimizations and removal of an errant !stricmp 2004-06-26 19:24:24 +00:00
wmcoolmon eb26a123cf Minor optimizations 2004-06-26 19:23:54 +00:00
wmcoolmon 2b8c618b27 Displayed escorts now settable up to MAX_COMPLETE_ESCORT_LIST via "$Max Escort Ships:" in hud_gauges.tbl
Escort list is now hud_gauges.tbl compatible.
2004-06-26 03:19:53 +00:00
wmcoolmon 7d0c23b02b Added "-targetinfo" to toggle info next to targeted object. 2004-06-26 00:28:05 +00:00
wmcoolmon 1fc27844ce Basic target info next to targeted object. 2004-06-26 00:27:20 +00:00
wmcoolmon d6d0be0a3c Added teh FS2 ogg support files. Not in the project so you still don't need the SDK. 2004-06-22 23:15:17 +00:00
wmcoolmon 94b5611023 Nonworking OGG support for sound (not music) added, disabled load-only-used-weapons code, modification to sound system registry code.
OGG code has been commented out, so you don't need the SDK yet.
2004-06-22 23:14:10 +00:00
wmcoolmon 5142d17030 Added support for -nomotiondebris 2004-06-19 22:16:20 +00:00
wmcoolmon 6bcd42f543 Added -nomotion debris command line option; also re-ordered categories. 2004-06-19 22:15:48 +00:00
randomtiger d00f29b663 Changed startup code to catch D3D9 request from launcher.
No actual startup code has been implemented.
2004-06-19 12:45:47 +00:00
wmcoolmon 633d2c58e2 Only used weapons paged in instead of all, fixed music box in FRED, sound quality settable with SoundSampleRate and SoundSampleBits registry values 2004-06-18 04:59:55 +00:00
wmcoolmon 55d46b3801 Bumped MAX_MISSION_MESSAGES to 500 2004-06-15 21:05:30 +00:00
wmcoolmon d329ae66ae Bumped MAX_SEXP_NODES to 3500 2004-06-15 21:04:18 +00:00
wmcoolmon 54d0d3bd2c Added hud-set-color and get-current-speed 2004-06-15 20:49:22 +00:00
wmcoolmon 9a50e83dce hud-set-color SEXP 2004-06-09 00:18:50 +00:00
wmcoolmon a98bc2643a Fix0red the current target's hud info appearing in the corner of the screen. 2004-06-08 01:12:58 +00:00
wmcoolmon 3bf411f705 Added +Color: option for custom gauges. 2004-06-08 00:35:43 +00:00
wmcoolmon 2d0dc11c64 Warpout failure bug fixingness 2004-06-07 07:36:08 +00:00
randomtiger 30c3556abc Commented out mprintf, it was swamping debug console.
Uncommented some code which I hope has plugged the memory leak.
2004-06-06 20:04:28 +00:00
randomtiger 6a3569280a Added new compression option -pcx32dds, build posted in RSB forum.
Changed flag because of launcher bug, have fixed launcher bug, will distribute later.
Also removed experimental flag from launcher flag list, stupid people were reporting bugs on unfinished code.
2004-06-06 12:25:20 +00:00
randomtiger 76215199f1 Added pcx compression option -pcx32dds, build posted in RSB forum.
Also removed experimental flag from launcher flag list, stupid people were reporting bugs on unfinished code.
2004-06-06 11:16:42 +00:00
wmcoolmon 3d8b7de265 More HUD update stuff. Coordinates are now floats, addparent is now obsolete. 2004-06-05 23:31:12 +00:00
phreak 4bc768fc32 spawn weapons can now be specified to be spawned at different angles other than
the sphere thats used in retail
2004-06-05 19:15:39 +00:00
phreak e34938c8dc added static_random_cone which is used for spawn angle features in multi 2004-06-05 19:14:42 +00:00
wmcoolmon 254efe0d53 Lotsa stuff. Custom gauges w/ ANIs support added, SEXPs to set gauge text, gauge image frames, and gauge coords. These SEXPs and toggle-hud reside in the Hud/change category. 2004-06-01 07:31:57 +00:00
wmcoolmon cdfd1299f0 Update to make images (not animations) work 2004-05-31 08:54:13 +00:00
wmcoolmon c005dc7dad Custom HUD support, better loading, etc etc. 2004-05-31 08:32:25 +00:00
wmcoolmon 9193af0210 Final draft of the HUD parsing system structure. May change how individual coord positions are specified in the TBL. -C 2004-05-30 08:04:49 +00:00
wmcoolmon 12eef3702d First bugfix in this!: Don't want Freespace exiting if it can't load a hud_gauge file. 2004-05-29 04:09:04 +00:00
wmcoolmon 480175df7d Added HUD gauges placement table, "hud_gauges.tbl" or "*-hdg.tbm" table module 2004-05-29 03:02:53 +00:00
wmcoolmon 8ae9aaebf8 Spotted something that might be a problem. 2004-05-29 03:01:00 +00:00
wmcoolmon e7ac8a5d12 Added stuff_float_list 2004-05-29 02:52:17 +00:00
wmcoolmon 6710e15c5c Modular music tables 2004-05-28 23:37:30 +00:00
wmcoolmon f5c586edaf Made HUD.tbl obsolete. Info is now taken directly from $Shield_icon in ships.tbl
Now this table can be used for something more useful...say, hud gauge positions?
2004-05-27 00:49:26 +00:00
wmcoolmon 16163aad45 Fixed cf_matches_spec; small bug was introduced. 2004-05-26 22:02:36 +00:00
wmcoolmon 1cb372a8e7 Added weapons_expl modular table, updated cfilesystem to work with modular tables, fixed loading order, fixed ship loading error messages 2004-05-26 21:02:27 +00:00
wmcoolmon e22820c475 Ship & weapon modular table files 2004-05-26 03:52:08 +00:00
wmcoolmon 9469dee1b8 Modular ship table support. Uses *-shp.tbm , with the same structure as a normal ships.tbl. Individual sections are optional and entries with the same name will override previous settings. -C 2004-05-26 02:31:39 +00:00
wmcoolmon 71aecd3927 Scratch that - .tbm is a better extension 2004-05-26 02:29:44 +00:00
wmcoolmon a8f2fb5c24 Added table chunk extension 2004-05-26 02:26:14 +00:00
wmcoolmon 5a4a0f9710 Updated function calls for VC7 use 2004-05-25 00:38:11 +00:00
wmcoolmon f5bbbff05b cleared up an ambiguous call for VC7 2004-05-25 00:26:25 +00:00
wmcoolmon fc0251d305 Updated to use <fstream> instead of <fstream.h> and fixed an un/signed disagreement 2004-05-25 00:24:00 +00:00
wmcoolmon 7129774def Updated to use <iostream> instead of <iostream.h> 2004-05-25 00:21:39 +00:00
taylor fc71fe2c0e filename case change 2004-05-24 07:25:32 +00:00
taylor de55362fe1 filename case change 2004-05-24 07:14:13 +00:00
taylor 4df953f3bd The Great Linux Merge 2004-05-24 07:04:25 +00:00
taylor a867b1979c add .cvsingore files 2004-05-24 04:12:07 +00:00
taylor 8acb0872ac autoconf/automake cleanup 2004-05-24 04:10:47 +00:00
taylor 4afe186dc4 disable COLOR_MATERIAL, for nvidia drivers 2004-05-13 00:17:20 +00:00
phreak 87c5d993dc got rid of the color material call, nebulas should blind the player 2004-05-12 23:24:35 +00:00
phreak a0666e9591 don't fog the warp model if its being rendered 2004-05-12 22:50:31 +00:00
phreak 593285a975 renamed the warp model variable from 'wm' to 'Warp_model' 2004-05-12 22:49:14 +00:00
taylor 7096ffbc98 do page in unlock but not for gr_preload() stuff 2004-05-11 23:08:55 +00:00
phreak 490678193a fixed an array bounds error that was causing debug builds to crash when
rendering a ship
2004-05-11 19:39:29 +00:00
phreak 3d3c197dc0 fixed the white boxes appearing on unlit bitmaps 2004-05-11 16:48:19 +00:00
Goober5000 7ac03c7835 completed the FRED import conversion stuff that I started ages ago
--Goober5000
2004-05-11 02:52:12 +00:00
Goober5000 887239e1d4 fixed the AWACS help message
--Goober5000
2004-05-10 13:07:22 +00:00
Goober5000 ea415cce97 made primary and secondary banks quite a bit more friendly... added error-checking
and reorganized a bunch of code
--Goober5000
2004-05-10 10:51:54 +00:00
Goober5000 409e068104 fixored the handling of no lasers and no engines... the tests should check the ship,
not the object
--Goober5000
2004-05-10 08:03:31 +00:00
Goober5000 b4ec7e4e34 fixed $quote and $semicolon... it was simply a matter of moving the spot where
the replacement occurred
--Goober5000
2004-05-10 06:14:40 +00:00
Goober5000 7ad5b133ff fixed warp decision
--Goober5000
2004-05-10 06:11:47 +00:00
phreak 01bc1043e4 bumped to 3.6!!!! 2004-05-09 23:32:40 +00:00
taylor dad23b95db prefer ani over pcx for ship textures 2004-05-09 15:02:00 +00:00
Goober5000 23a79af4dc small fix
--Goober5000
2004-05-08 01:08:48 +00:00
Kazan 39bbccebfc Sorry Guys! 2004-05-07 23:50:14 +00:00
Goober5000 b32d1c7fa9 added Righteous1's Y bug hack
--Goober5000
2004-05-07 19:06:45 +00:00
taylor b318f01819 ...missed one... 2004-05-06 22:39:37 +00:00
taylor 7e8ca9a005 DDS mipmap reading, remove unneeded bm_unlock() during page in 2004-05-06 22:35:26 +00:00
taylor 6f657470fe get mipmap count off of DDS textures for later use 2004-05-06 22:31:02 +00:00
taylor dfc59ef087 fix DDS textures 2004-05-06 22:26:52 +00:00
taylor b09c3b3491 make sure JPG and DDS files are added to the file cache for maps and effects 2004-05-06 22:12:14 +00:00
Kazan c63f80dbaf Abandon strdup() usage for mod list processing - it was acting odd and causing crashing on free()
Fix condition where alt_tab_pause() would flipout and trigger failed assert if game minimizes during startup (like it does a lot during debug)
Nav Point / Auto Pilot code (All disabled via #ifdefs)
2004-05-03 21:22:23 +00:00
randomtiger 66556fe514 fl_abs(theta_goal.xyz.z) < 0.001f is reporting using mprintf now instead of assert 2004-05-03 09:27:16 +00:00
randomtiger d4d41d8eff Fixed D3D fogging on R7000 2004-05-03 08:41:24 +00:00
taylor 12d6469ee7 don't use HTL line fix with Fred 2004-05-02 16:01:38 +00:00
Goober5000 d0f604c81a added a comment
--Goober5000
2004-05-02 03:05:23 +00:00
taylor f5f347109c comment out avi free code for now 2004-05-02 01:26:52 +00:00
randomtiger 4195c0e9fa FS2_open will now take flag settings from cmdline_fso.cfg not cmdline.cfg.
This means retail FS2 will not crash because of fs2_open flags.
The new version of the launcher (v5) must used to setup flags now.
Anyone distributing pre 3.6 builds should make this clear and 3.6 should come with Launcher v5.
2004-05-01 22:47:23 +00:00
taylor f87fbdb857 add some error handling to vm_strdup() 2004-05-01 21:53:39 +00:00
Kazan d97912ce37 bah! stupid me "NULL" not "null" - i hate when i do that 2004-05-01 21:47:43 +00:00
Kazan 1b725c3ac4 changed delete[] to free(), checked for null, if null ERROR 2004-05-01 21:45:31 +00:00
Kazan ab23820319 delete[] str_temp
A null check on str_temp is not needed - take a close look at the for loop
2004-05-01 19:49:31 +00:00
taylor 8c7614ac34 add CF_TYPE_MISSIONS to physical check to avoid network transfer problems 2004-05-01 19:33:20 +00:00
Goober5000 63b9d44968 added an assert
--Goober5000
2004-05-01 17:37:09 +00:00
Kazan 8887c8a07e Multiple -mod - "-mod ModA,ModB,ModC" in order of priority
Giving you:
Root: ModA
Root: ModB
Root: ModC
Root: Fs2Default
Root: CDRom
2004-05-01 17:10:37 +00:00
Goober5000 8367ed5943 extra insurance
--Goober5000
2004-04-30 22:20:27 +00:00
Kazan 6ceeeb7239 Lobby screen only shows when PXO_LOBBY is defined 2004-04-30 18:33:22 +00:00
taylor 1e5fe42652 fix create game buttons 2004-04-27 20:43:32 +00:00
taylor b9802a0d6e add NULL check to game_hacked_data() to prevent crash 2004-04-27 20:41:58 +00:00
Goober5000 343423adc2 added back in Kazan's line: now you can slow down in cheat mode
whether you press tilde or not
--Goober5000
2004-04-26 19:50:04 +00:00
Goober5000 961cfbe12e rolled back Kazan's change
--Goober5000
2004-04-26 19:43:07 +00:00
Kazan 1207801f77 -no_fps_capping 2004-04-26 18:23:48 +00:00
Kazan fd816a1a5b Be careful when modifying other peoples changes - make sure they still work, and do things the simple way
DON'T TOUCH THE CUSTOM BUILD PATH
2004-04-26 17:27:17 +00:00
taylor e086613047 forgot to remove some safety checks that aren't needed anymore 2004-04-26 15:51:26 +00:00
taylor c121c18b4f mark view cutscenes ignoring extension and file case 2004-04-26 13:11:11 +00:00
taylor 5e0b6a687f cvs log header, mark cutscenes viewable for later, gr_flip() to fix OGL white flash 2004-04-26 13:09:20 +00:00
taylor 2ccaf8f927 respect -glow and -spec 2004-04-26 13:05:19 +00:00
taylor c94d4bea59 light setup changes, support cmdline ambient value 2004-04-26 13:02:27 +00:00
taylor 7528ef0fef DevIL stuff 2004-04-26 13:00:56 +00:00
taylor 901e565798 convert to dos format, add DevIL stuff 2004-04-26 12:57:47 +00:00
taylor 7323c9e0da 32-bit targa and jpeg loaders, bug fixes, some preload stuff 2004-04-26 12:44:54 +00:00
taylor 054bcf6dec minor fixes, HTL lines, 32-bit texture support 2004-04-26 12:43:58 +00:00
taylor 79a01657a7 gr_preload() pointer for use in bmpman.cpp 2004-04-26 12:41:46 +00:00
taylor ff5ee510a3 correct header to keep cvs log, minor changes 2004-04-26 12:39:49 +00:00
taylor b4f3e252d0 use d3_draw_rod() for lightning arcs (for OGL fix), fix debris making HUD in OGL disappear 2004-04-26 12:38:35 +00:00
taylor c10a141861 don't try to load glow maps if they are disabled 2004-04-26 12:37:10 +00:00
taylor a83e3a6223 add color and HTL support for g3_draw_rod() 2004-04-26 12:36:10 +00:00
taylor 76d820d0f4 32-bit support with DevIL 2004-04-26 02:14:38 +00:00
taylor b0ece8eb3a initial checkin 2004-04-26 02:05:17 +00:00
taylor e5f836df4b initial checkin 2004-04-26 01:58:17 +00:00
taylor e4256a1cd3 s/idex/idx/ for brief_unload_anims() 2004-04-26 01:41:52 +00:00
taylor 06e8db1bf8 better anim free stuff, disable for now to prevent CTD 2004-04-26 01:40:53 +00:00
taylor c84fbacb8b use absolute moddir path, faster cfilesystem searching 2004-04-26 00:26:37 +00:00
taylor cba0190e05 don't preload every sound (fixes some slowdowns), snd_preload option support 2004-04-26 00:25:08 +00:00
taylor 39e9479ac8 novbo and snd_preload cmdline options, fix moddir getting appended space 2004-04-26 00:23:26 +00:00
Goober5000 f8f1ef779e made time dilation only available in cheat mode; also fixed an obscure CTD
--Goober5000
2004-04-25 06:31:53 +00:00
Kazan 9fccd4c2d0 Fixed Lobby screen showing up while exiting from non-tracker games
Time dialiation up to 1/4
2004-04-24 15:44:22 +00:00
randomtiger 8dc2c082c3 Added -2d_poof command which allows access to 2D poof rendering
Added -radar_reduce to launcher flag description structure
2004-04-18 19:39:13 +00:00
taylor 7ec25aa692 let language reg setting override auto detection 2004-04-14 23:17:26 +00:00
taylor 3835d0758b render lightning unlit so that it works in OGL 2004-04-14 10:27:24 +00:00
taylor e4ab7f2254 don't page in neb poofs unless in a neb2 mission, fix OGL whiteout issue 2004-04-14 10:25:50 +00:00
taylor abbd2a260e fix for lines and shaders - shouldn't be textured 2004-04-14 10:24:51 +00:00
taylor 892cf38736 fix extra large model with -ship_choice_3d in OGL 2004-04-14 00:37:36 +00:00
Goober5000 cc9afc7d3e fixed the custom hitpoints subsystem bug
--Goober5000
2004-04-13 05:42:45 +00:00
phreak f210455827 put in the correct fields for the CVS comments to register
fixed a glowmap problem that occured when rendering glowmapped and non-glowmapped ships
2004-04-13 01:55:41 +00:00
randomtiger 55f84acd98 Adding batching functions here and there and into gr_screen for use with OGL when its ready. 2004-04-11 13:56:33 +00:00
randomtiger b6f02b52cb Fixed movie playing code for fresh install. Removed NO_DSHOW_CODE paths. 2004-04-11 13:43:26 +00:00
Goober5000 b21ab3282d quashed the slider bug!
--Goober5000
2004-04-10 16:55:45 +00:00
Goober5000 1f3318524b some formatting 2004-04-10 16:55:23 +00:00
phreak e2e5a24926 moved an assignment statement inside an #ifdef block so dds works in release mode 2004-04-09 20:32:31 +00:00
phreak 1120cdaa03 fixed DDS not working in OpenGL. there was a misplaced Assert() 2004-04-09 20:07:56 +00:00
phreak 25c7c7c8af got rid of some compile warnings 2004-04-08 20:13:17 +00:00
righteous1 07a01628a0 Backing out mainhall audio fix attempt. 2004-04-08 05:00:13 +00:00
phreak edae245b0e changed around the order of some function calls to get the target model
properly rendering in the hud targetbox
2004-04-07 17:20:24 +00:00
righteous1 fdde5a6713 Updated to call alt_tab_pause() function to draw pause screen and discontinue sounds when the game is minimized. -R1 2004-04-07 03:32:45 +00:00
righteous1 28508f0be4 Updated to add alt_tab_pause() function to draw pause screen and discontinue sounds when the game is minimized. -R1 2004-04-07 03:31:53 +00:00
Goober5000 1502269102 code.dsp should definitely have browse info checked
--Goober5000
2004-04-06 16:25:06 +00:00
Goober5000 d496969846 commented out one of Bobboau's hacks because it was messing stuff up
--Goober5000
2004-04-06 16:19:11 +00:00
Goober5000 e7ee4f4ef1 ugh - added back in something that Bobboau removed
-Goober5000
2004-04-06 05:42:49 +00:00
phreak 7f25fcf05f oops, hanging ')' 2004-04-06 05:28:07 +00:00
phreak 4551cda108 properly commented Local SSM code.
put in some estimation code so the Local SSMs warp in closer to moving ships
2004-04-06 05:26:59 +00:00
phreak 105e95a991 Local SSMs now working again after the code for setting the jumpout/jumpin
times for the missile were removed.
2004-04-06 04:53:21 +00:00
phreak 2257b4efde added a control config option for the wireframe hud targetbox i enabled ages ago 2004-04-06 03:09:53 +00:00
phreak d53c6289dc removed gropenglw32x.cpp (obsolete) and gropengl2d.cpp (unused and accidentaly committed) 2004-04-06 01:51:36 +00:00
phreak d5bc0051fb added comments (terms of use, commit history) to the tops of files 2004-04-06 01:37:21 +00:00
Kazan 4477777cd4 make custom build work again 2004-04-06 01:11:41 +00:00
phreak d81cfcbbba OpenGL files spilt up to make developing and finding bugs much easier 2004-04-03 20:29:53 +00:00
Kazan 42e936b6b1 FRED fixes 2004-04-03 18:11:21 +00:00
Goober5000 f6007413de fixed some stub functions and a bunch of compile warnings
--Goober5000
2004-04-03 06:22:33 +00:00
bobboau 12b3ffb6b9 commiting recent minor bug fixes 2004-04-03 02:55:50 +00:00
randomtiger 034f987d38 Changed D3D secondry texture system to be off by default to save mem.
Added some friendly names for parameters.
2004-04-02 18:25:16 +00:00
taylor d3ca761e30 don't use interface anis as ship textures 2004-04-01 15:31:22 +00:00
taylor f8dcf11f99 close out briefing menu bitmaps before entering mission 2004-04-01 15:29:39 +00:00
taylor a780021f7b don't load all starfield bitmaps on level load 2004-04-01 15:28:42 +00:00
Goober5000 f43da62c3e got rid of all those nasty warnings from xlocale and so forth; also added comments
for #pragma warning disable to indicate the message being disabled
--Goober5000
2004-03-31 05:42:29 +00:00
Goober5000 6487bd1ff4 got rid of Bobboau's SAFEPOINTs in hudtarget.cpp
--Goober5000
2004-03-31 04:24:49 +00:00
taylor bb870a6926 handle movie file extensions better 2004-03-30 08:30:38 +00:00
phreak 6216fb09da fixed a minor bug where the version checker
would complain even if the correct version of OpenGL was present
2004-03-29 02:24:20 +00:00
taylor a1751c30ab runtime language selection, mantis:0000133 2004-03-28 17:49:55 +00:00
randomtiger 98e7e86697 Movies now use win32 calls to clear the screen before playback. 2004-03-27 23:23:36 +00:00
randomtiger c488360abc Committed possible fix to cutscene listing problem in techroom, as described in mantis. 2004-03-27 22:27:07 +00:00
randomtiger c38d9601c8 Bug fix for video playback. 2004-03-21 17:38:18 +00:00
bobboau aa60ef5bcc fixed a texture loading bug 2004-03-21 10:34:05 +00:00
randomtiger e611d3d74e Fixed a bug that was causing windowed movie playback and a crash.
Added some batching redirection.
2004-03-21 09:41:54 +00:00
bobboau 24a9694494 fixed -spec comand line option,
probly some other stuf
2004-03-20 21:17:13 +00:00
randomtiger 55671189f0 Added base for a general dynamic batching solution.
Fixed NO_DSHOW_CODE code path bug.
2004-03-20 14:47:14 +00:00
randomtiger 8e595a903c New command line parameter: -d3d_lesstmem causes D3D to bypass V's secondry texture system. 2004-03-19 14:51:55 +00:00
randomtiger 2e49d55faf Further D3D texture system simplification. 2004-03-19 12:35:58 +00:00
randomtiger 08d8e0799a Removed -d3d_notmanaged param.
Tided D3D texture code. Merged remaining section code into the rest of the system.
Prepared for removal of code causing waste of memory for secondry store of textures.
2004-03-19 11:44:04 +00:00
bobboau 5d54009c21 new fighter beam code
fixed old after burner trails
had to bump a few limits, working on some dynamic solutions
a few fixed to background POF rendering
fixing asorted bugs
2004-03-17 04:07:32 +00:00
randomtiger fcc33b856f Added new launcher flag construction code. 2004-03-16 18:37:02 +00:00
phreak b8d48fac23 really fixed opengl shields this time 2004-03-16 17:41:12 +00:00
randomtiger 4c27f96902 Commented out shield fix that broke shield rendering for D3D.
Fix didnt appear to work for OGL so I didnt bother to if(OGL) it.
2004-03-16 11:52:17 +00:00
phreak 9fde027411 bumped MAX_SOUNDS to 450 if INF_BUILD is defined 2004-03-12 16:26:39 +00:00
phreak 2af460314d bumped MAX_GAME_SOUNDS to 400 if INF_BUILD is defined 2004-03-12 16:23:49 +00:00
Kazan a639da2973 irc 2004-03-10 20:51:16 +00:00
Kazan 9cbbb6fd03 generally it helps if i actually add and commit the files i want to modify on a different system 2004-03-10 19:11:40 +00:00
Kazan 20a083c859 partially complete IRC - so i can work on it on my laptop 2004-03-10 18:45:09 +00:00
Kazan 685880a7b6 Disabled multithreaded TCP_Socket in favor of safer single threaded
FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
2004-03-09 17:59:01 +00:00
Kazan 9010d21b32 more fs2netd stuff 2004-03-09 00:02:16 +00:00
phreak 841774f69f fugly hack to get skyboxes working in HT&L. please port stars_draw() to use HT&L
so this hack can be removed
2004-03-08 22:16:32 +00:00
Kazan 04e34810e0 Lobby GUI screen restored 2004-03-08 22:02:39 +00:00
phreak dcfc77364e fixed a bug so that shields now render in Opengl HT&L 2004-03-08 22:01:29 +00:00
phreak be2d15fc4f made a minor logical fix to gr_opengl_tmapper_internal
disabled pcx32 and jpgtga flags if they were defined by the user
2004-03-08 21:57:04 +00:00
phreak 014e261af1 split the star and space debris rendering loops into their own separate functions
this makes it easier to edit them if we ever need to and it also increases readability
i also brought some variable declarations outside of the rendering loops
2004-03-08 21:55:20 +00:00
randomtiger f343c2f7b1 Added complete stub system to replace software. 2004-03-08 18:36:21 +00:00
Kazan 30ae2da9cd Did, undo 2004-03-08 15:06:24 +00:00
Kazan 9236bd6d7c *crosses fingers* 2004-03-08 15:03:27 +00:00
Kazan 85f05019b5 [Incomplete] Readd of Software renderer so Standalone server works
Also FS2NetD changes
PS: CVS crashing mid-transaction and leaving stale locks = annoying++
2004-03-08 14:53:11 +00:00
Kazan 6509badc36 [Incomplete] Readd of Software renderer so Standalone server works 2004-03-07 23:07:20 +00:00
randomtiger 21856a78e5 If user has stub ani's dshow code will fail gracefully instead of throwing up an error. 2004-03-07 14:02:22 +00:00
bobboau 6ee175e65d fixed motion debris
animated laser textures
and added a new error check called a safepoint, mostly for tracking the 'Y bug'
2004-03-06 23:28:24 +00:00
Goober5000 2f067ae8aa weapons now display counts up to 9999, instead of just 999
--Goober5000
2004-03-06 00:19:23 +00:00
Goober5000 fcc38162c5 d'oh!
--Goober5000
2004-03-05 23:54:48 +00:00
Goober5000 771e6b2faa made awacs only ask for help in the main fs2 campaign
--Goober5000
2004-03-05 23:41:04 +00:00
Kazan 28cc2957c8 Fixed mission validation (was returning false positives) 2004-03-05 21:24:53 +00:00
Kazan 1e99847291 Fixed mission validation (was returning false positives) 2004-03-05 21:19:39 +00:00
Goober5000 2edd420943 Uber pass at reducing #includes
--Goober5000
2004-03-05 09:02:13 +00:00
phreak 852ec76549 fixed the lack of ships in the hud targetbox
prevented other functions calls to glColor3ub() from messing
with the color of textures in gr_opengl_render_buffer().  this was causing some
minor rendering bugs
2004-03-05 04:33:09 +00:00
phreak 7caf442717 made OpenGl use the matrix api if called by g3_start_**** or g3_done_instance 2004-03-05 04:16:20 +00:00
randomtiger e1ca009d9a Think I have fixed dshow window focus error, will tidy code when confirmed. 2004-03-04 20:56:43 +00:00
Kazan 5b591c2c4c LAN works A1 Supar! 2004-03-04 05:57:45 +00:00
Goober5000 55c7d0e0fc preliminary checking of globals.h
--Goober5000
2004-02-28 20:26:10 +00:00
randomtiger 6a2cadb08f Removed a few uneeded if DIRECT3D's.
Set laser function to only render the effect one sided.
Added some stuff to the credits.
Set D3D fogging to fall back to vertex fog if table fog not supported.
2004-02-28 14:14:57 +00:00
Goober5000 0ccb8a19dc commented a slide_face_ship that I missed before
--Goober5000
2004-02-28 01:36:20 +00:00
bobboau 7d87db1939 fixed a Z buffer error in HTL submodel rendering,
and glow points,
and other stuff
2004-02-27 04:09:56 +00:00
Goober5000 e94733df9c added DONT_SHOW_WARNINGS compile branch
--Goober5000
2004-02-25 05:53:32 +00:00
Goober5000 a69f3bd271 removed an old function
--Goober5000
2004-02-23 07:45:38 +00:00
Kazan d7905cd06a FS2NETD License Comments 2004-02-21 00:59:43 +00:00
randomtiger 244b9718d5 Added * to - conversion for start mission code to allow launcher missions with '-' in them.
Currently the parsing code counts that as a flag and messes it up.
2004-02-20 21:58:07 +00:00
randomtiger 020379cf40 Removed some uneeded code between NO_DIRECT3D and added gr_zbias call, ogl is set to a stub func.
Changed -htl param to -nohtl. Fixed some badly named functions to match convention.
Fixed setup of center_alpha in OGL which was causing crash.
2004-02-20 21:45:41 +00:00
randomtiger 183587f8b4 Changed memory leak detection to happen after atexit all other calls.
This will mean it doesnt report leaks that are cleared by just before the game quits by preset functions.
2004-02-20 18:04:27 +00:00
bobboau a963f3ccc1 pluged memory leaks,
3D HTL lasers (they work perfictly)
and posably fixed Turnsky's shinemap bug
2004-02-20 04:29:57 +00:00
bobboau e540947704 fixing lighting bug I accedently introduced 2004-02-16 21:53:40 +00:00
randomtiger b94f8cddde Use _REPORT_MEM_LEAKS compile flag in code.lib to get a report of memory leaks from malloc calls. 2004-02-16 21:22:15 +00:00
phreak 6fd1ef440b grr fixed a warning message i didn't see 2004-02-16 16:15:04 +00:00
phreak cd2b9d9871 made the window command line tag recognize non-standard resolutions 2004-02-16 16:09:59 +00:00
randomtiger eb1b936ff1 Oops, put two files back in, went a bit too far.
Added NO_DSHOW_CODE as a temp solution to Bobs compiling problem.
2004-02-16 12:53:43 +00:00
randomtiger 8bf7c4076b Removed a lot of files that we dont need anymore.
Changed htl to be on by default, command now -nohtl
Changed D3D to use a 2D vertex for 2D operations which should cut down on redundant data having to go though the system.
Added small change to all -start_mission flag to take you to any mission by filename, very useful for testing.
Removed old dshow code and took away timerbar compile flag condition since it uses a runtime flag now.
2004-02-16 11:47:34 +00:00
bobboau 9a76ae8d12 fixed sevral asorted matrix errors,
OGL people make sure I didn't break anything,
most of what I did was replaceing falses with (if graphicts_mode == D3D)
2004-02-15 06:02:32 +00:00
bobboau a9dc8db3bb fixed bug involving 3d shockwaves, note I wasn't able to compile the directshow file, so I ifdefed everything to an older version,
you shouldn't see anything diferent, as the ifdef should be set to the way it should be, if it isn't you will get a warning mesage during compile telling you how to fix it
2004-02-15 03:04:25 +00:00
Goober5000 b99a6b6af2 hmph... fixed some bugs
--Goober5000
2004-02-14 04:26:58 +00:00
randomtiger 397699ec31 Please note that from now on OGL will only run with a registry set by Launcher v4. See forum for details.
OK, these changes effect a lot of file, I suggest everyone updates ASAP:
Removal of many files from project.
Removal of meanless Gr_bitmap_poly variable.
Removal of glide, directdraw, software modules all links to them, and all code specific to those paths.
Removal of redundant Fred paths that arent needed for Fred OGL.
Have seriously tidied the graphics initialisation code and added generic non standard mode functionality.
Fixed many D3D non standard mode bugs and brought OGL up to the same level.
Removed texture section support for D3D8, voodoo 2 and 3 cards will no longer run under fs2_open in D3D, same goes for any card with a maximum texture size less than 1024.
2004-02-14 00:18:37 +00:00
randomtiger 3529db4d37 Turned off fog in OGL for Fred.
Simulated speech doesnt say tags marked by $ now.
The following are fixes to issues that came up testing TBP in fs2_open and fred2_open:
Changed vm_vec_mag and parse_tmap to fail gracefully on bad data.
Error now given on missing briefing icon and bad ship normal data.
Solved more species divide by zero error.
Fixed neb cube crash.
2004-02-13 04:17:14 +00:00
phreak 694d089fe0 fixed a bug where the inferno build would get lower limits for MAX_PERSONAS if INF_BUILD was defined 2004-02-12 22:29:55 +00:00
Goober5000 de560ceb29 fixed the barracks crash bug
--Goober5000
2004-02-10 21:47:47 +00:00
matt 73c417bf70 Fixed issue with ships being rendered off center
in the HUD target box. Much easier than I
thought
-- Sticks
2004-02-10 05:07:38 +00:00
Goober5000 dfc06acfd3 fixed a small bug in FS1-compatible music
--Goober5000
2004-02-08 03:35:08 +00:00
Goober5000 1b0a949dc5 fix for undestroyable subsystems
--Goober5000
2004-02-07 05:11:08 +00:00
Goober5000 4e7667842b hehe, fixed the subsystem compare so it's not destructive :-p
and also fixed the model checking routine
--Goober5000
2004-02-07 01:25:15 +00:00
Goober5000 5129749cb8 made FS2 able to account for subsystem mismatches between ships.tbl and the
model file - e.g. communication vs. communications
--Goober5000
2004-02-07 00:48:53 +00:00
Goober5000 1fe6fa8b06 tweakage
--Goober5000
2004-02-06 23:17:43 +00:00
Goober5000 7034e99aa5 commented my tmap_num Asserts
--Goober5000
2004-02-06 23:00:29 +00:00
Goober5000 47e55fe686 fixed a small HUD bug I introduced
--Goober5000
2004-02-06 22:58:18 +00:00
Goober5000 668ddde68b fixed a small compatibility bug
--Goober5000
2004-02-06 21:26:07 +00:00
Goober5000 ea259b8961 ugh... okay, *really* fixed the head thing this time
--Goober5000
2004-02-06 21:25:43 +00:00
matt 3428289778 Fix for bad ambient lighting in non-htl -Sticks 2004-02-06 05:55:46 +00:00
Goober5000 12c9238f62 fixed a few random bugs
--Goober5000
2004-02-05 14:31:45 +00:00
Goober5000 360060f59d fixed the talking head error
--Goober5000
2004-02-05 14:29:33 +00:00
randomtiger 720b16befb Small changes, deleted old dshow stuff 2004-02-05 01:41:33 +00:00
Goober5000 def739c279 commented a decal function that someone missed
--Goober5000
2004-02-04 10:14:58 +00:00
Goober5000 0e9af797e5 changed spec and glow to be off by default; command lines are now -spec and -glow
--Goober5000
2004-02-04 10:14:25 +00:00
Goober5000 17665a6333 more player ai stuff
--Goober5000
2004-02-04 09:21:36 +00:00
Goober5000 58b82fefd8 got rid of unnecessary double semicolons
--Goober5000
2004-02-04 09:02:45 +00:00
Goober5000 66cb87e18f made code more uniform and simplified some things,
specifically shield percentage and quadrant stuff
--Goober5000
2004-02-04 08:41:04 +00:00
Goober5000 564fb3fd19 fixed Asserts in two places and commented out an unneeded variable
--Goober5000
2004-02-04 04:28:15 +00:00
randomtiger 89fe89775c Fixed OGL fogging in HTL
Changed htl laser function to work in D3D, commented out until function flat bug is fixed
2004-02-03 18:29:30 +00:00
phreak e112deb37a commented out decal references 2004-01-31 04:06:29 +00:00
phreak a6189c4fdd changed "now" to unsigned int 2004-01-31 03:56:46 +00:00
phreak ff7dca2d05 commented out decal references 2004-01-31 03:54:50 +00:00
phreak d83d4098de commented out file pending rewrite 2004-01-31 03:52:41 +00:00
Goober5000 3c2e1de05e whew - I just went through all the code I ever added (or at least, that I could
find that I commented with a Goober5000 tag) and added a bunch of Asserts
and error-checking
--Goober5000
2004-01-30 07:39:09 +00:00
randomtiger 492597e3b2 Added malloc montoring system, use -show_mem_usage, debug exes only to get an ingame list of heap usage.
Also added -d3d_notmanaged flag to activate non managed D3D path, in experimental stage.
2004-01-29 01:34:02 +00:00
phreak 9078d2aea6 bumped MAX_AI_CLASSES to 30 if INF_BUILD is defined 2004-01-26 23:07:43 +00:00
randomtiger c74f634e79 Fix to blurring of interface bitmaps from TGA and JPG.
Changes to the pointsprite system, better but not perfect yet.
2004-01-26 20:03:51 +00:00
randomtiger 72f0a923e0 I have submitted the new movie playing code despite the fact in D3D it sometimes plays behind the main window.
In OGL it works perfectly and in both API's it doesnt switch to the desktop anymore so hopefully people will not experience the crashes etc that the old system used to suffer from.
2004-01-24 15:52:26 +00:00
randomtiger 23be3b5605 Added the D3D particle code, its not bugfree but works perfectly on my card and helps with the framerate.
Its optional and off by default, use -d3d_particle to activiate.
Also bumped up D3D ambient light setting, it was way too dark.
Its now set to something similar to the original game.
2004-01-24 14:31:27 +00:00
randomtiger 49491fac75 Font and other small changes for Fred 2004-01-24 12:47:48 +00:00
randomtiger 8ebf284993 Fixed serious memory leak causes by use of -pcx32 flag 2004-01-23 00:14:27 +00:00
phreak 0a072d7403 bumped MAX_POLYGON_MODELS to 300 if INF_BUILD is defined. 2004-01-21 17:37:48 +00:00
phreak e862231feb added MAX_DRAW_DISTANCE to the ship selection display. This will only take effect if the ani isn't there 2004-01-21 17:37:04 +00:00
phreak f7df30b549 bumped MAX_PERSONAS to 25 if INF_BUILD is defined. 2004-01-21 17:34:31 +00:00
phreak 3f87bea143 added MAX_DRAW_DISTANCE constant 2004-01-21 17:33:47 +00:00
phreak e1dce56a56 added version string message if build is an inferno build 2004-01-21 17:32:05 +00:00
Goober5000 9ae52aa90a whoops, messed up the speech slightly
--Goober5000
2004-01-20 23:56:28 +00:00
Goober5000 2523a62878 added some initialization to get rid of warnings
--Goober5000
2004-01-20 23:01:52 +00:00
Goober5000 1762e4a6be got rid of some warnings... it actually looks like Gr_gamma_lookup can be changed
from int to ubyte, because everything that accesses it converts to a ubyte  O.o
--Goober5000
2004-01-20 22:59:09 +00:00
Goober5000 e691cbc995 changed the speech stubs to #defines
--Goober5000
2004-01-20 22:50:18 +00:00
Goober5000 f98f7e12be commented the variables in a commented function
--Goober5000
2004-01-20 22:39:06 +00:00
Goober5000 7034b6a0f0 First of all, this should be more readable, second of all, old_fog_color wasn't
initialized and VC++ is complaining.  Someone want to fix this?
--Goober5000
2004-01-20 22:37:44 +00:00
Goober5000 d240e24ef1 bumped MAX_SEXP_NODES to 3000
--Goober5000
2004-01-20 22:20:41 +00:00
Goober5000 8f497bfac7 er... corrected some inexplicable code... Bobboau, mind explaining?
--Goober5000
2004-01-20 22:13:06 +00:00
Goober5000 23601fda0d heat-seekers now home in on hidden ships
--Goober5000
2004-01-20 22:10:01 +00:00
randomtiger 278eedf7ad *** empty log message *** 2004-01-19 00:57:18 +00:00
randomtiger efe43d3466 Some more small changes for Fred OGL 2004-01-19 00:56:10 +00:00
randomtiger e19577e35c Few more small changes for Fred OGL 2004-01-18 14:55:08 +00:00
randomtiger 42568915bd A couple of FRED_OGL changes. 2004-01-18 14:03:23 +00:00
randomtiger 6ca2f86255 Changed the #ifndef FRED I added to #ifndef FRED_OGL so they only effect OGL FRED compile 2004-01-18 13:17:55 +00:00
randomtiger 32b0a71369 Some small changes to the main codebase that allow Fred_open OGL to compile. 2004-01-17 21:59:56 +00:00
Goober5000 2cf3e96a6b I think this will fix the problem of the death head ani sometimes incorrectly playing
--Goober5000
2004-01-14 21:12:24 +00:00
Goober5000 cc187b758d added error checking for an annoying crash when running an out-of-range
sound; also, Phreak misspelled "tertiary"
--Goober5000
2004-01-14 07:07:14 +00:00
Goober5000 ea11ea8a63 fixx0red a bug
--Goober5000
2004-01-14 06:38:41 +00:00
Goober5000 33212b6499 made set-support-ship number align with general FS convention
--Goober5000
2004-01-14 06:34:07 +00:00
randomtiger ef1880b03a Added new D3D particle module, will commit the code that uses it when its bug free. 2004-01-13 02:19:59 +00:00
randomtiger 077d4b2a54 Added fix for fogging debris in D3D htl. 2004-01-12 21:12:42 +00:00
phreak 07b00e2fae fixed a null pointer 2003-12-19 05:58:44 +00:00
phreak 018159b822 oops switched the signs in a comparison. thats what was causing debug builds to go haywire 2003-12-18 15:35:52 +00:00
phreak 7f20e9109f added a MAX_BUFFERS_PER_SUBMODEL define so it can be easily changed if we ever want to change the 16 texture limit 2003-12-17 23:25:10 +00:00
phreak 2cb5a44f3e fixed some logic when dealing with parsing local ssms 2003-12-17 20:38:26 +00:00
phreak 450ac81a1e added ai code for "small only" weapons. works for turrets at the moment 2003-12-17 16:42:20 +00:00
phreak dd840fe227 "small only" weapons flag added. weapon shoots at small ships like fighters 2003-12-17 16:41:25 +00:00
phreak 57772da95b disabled tertiary weapons support pending a rewrite of critical code 2003-12-16 21:06:21 +00:00
phreak e672918122 disabled tertiary weapons support pending a rewrite of critical code 2003-12-16 20:55:13 +00:00
phreak 6b00a67df0 made gr_set_proj_matrix use the MIN/MAX_DRAW_DISTANCE constants 2003-12-16 20:48:41 +00:00
phreak 8e68228c86 created two constants
MAX_DRAW_DISTANCE = 250000
MIN_DRAW_DISTANCE = 1
2003-12-16 20:42:36 +00:00
phreak 0cae377b72 replaced asserts in parse_ship with more descriptive warnings 2003-12-15 21:36:42 +00:00
phreak d343e5b73a made turrets use bob's $shots code 2003-12-15 21:32:59 +00:00
phreak 72cb0142b2 upped MAX_WEAPON_TYPES to 300 when INF_BUILD is defined 2003-12-15 21:30:24 +00:00
randomtiger ffdef38781 Put render state and other direct D3D calls repetition check back in, provides speed boost.
Fixed bug that caused fullscreen only crash with DXT textures
Put dithering back in for tgas and jpgs
2003-12-08 22:30:02 +00:00
randomtiger 0578517f3a D3D now supports loading for DXT1-5 into the texture itself, defaults to on same as OGL.
Fixed bug in old ship choice screen that stopped ani repeating.
Changed all builds (demo, OEM) to use retail reg path, this means launcher can set all them up successfully.
2003-12-05 18:17:07 +00:00
randomtiger f994cdac45 Added DDS image support for D3D
Added new command flag '-ship_choice_3d' to activate 3D models instead of ani's in ship choice, feature now off by default
Hopefully have fixed D3D text batching bug that caused old values to appear
Added Hud_target_object_factor variable to control 3D object sizes of zoom in HUD target
Fixed jump nodes not showing
2003-12-04 20:39:10 +00:00
randomtiger 1f16f9dc23 Changed -t32 flag to -jpgtga
Added -query_flag to identify builds with speech not compiled and other problems
Now loads up launcher if videocard reg entry not found
Now offers to go online to download launcher if its not present
Changed target view not to use lower res texture, hi res one is already chached so might as well use it
2003-12-03 19:27:01 +00:00
Goober5000 dbaf87c202 fixed CVS log header so that changes would update more cleanly
--Goober5000
2003-12-02 03:16:16 +00:00
randomtiger 391c18e9e7 Undid my node fix, it introduced a lot of bugs, update again if you have that version. 2003-11-29 17:13:54 +00:00
fryday 026e23d8ed Fixed normal loading in OpenGL HT&L.
Fixed lighting in OpenGL HT&L, hopefully for the last time.
Added a test if a normal is valid during model load, if not, replaced with face normal
2003-11-29 16:11:46 +00:00
randomtiger 8a579733c0 Small changes to D3D setup 2003-11-29 15:48:11 +00:00
randomtiger cfc99c4f23 Rendering jumpnodes in htl via the old system to make them display again, appears to be so cheap it wouldnt be worth the effort to convert it to true htl. 2003-11-29 14:54:35 +00:00
randomtiger dac33aeb71 Turned off D3D file mapping, its using too much memory which may be hurting older systems and doesnt seem to be providing much of a speed benifit.
Added stats command for ingame stats on memory usage.
Trys to play intro.mve and intro.avi, just to be safe since its not set by table.
Added fix for fonts wrapping round in non standard hi res modes.
Changed D3D mipmapping to a good value to suit htl mode.
Added new fog colour method which makes use of the bitmap, making this htl feature backcompatible again.
2003-11-29 10:52:10 +00:00
fryday 29af6aefbc Got lasers to work in HT&L OpenGL
Messed a bit with opengl_tmapper_internal3d, draw_laser functions, and added draw_laser_htl
2003-11-25 15:04:46 +00:00
Goober5000 99e6883251 fixed an old omission
--Goober5000
2003-11-25 02:32:16 +00:00
Goober5000 2513b23ad9 fixed bug in tech-reset-to-default
--Goober5000
2003-11-24 18:18:00 +00:00
Goober5000 d64d8ce6e0 fixed a bug introduced by Penguin for running with NO_NETWORK defined
--Goober5000
2003-11-23 00:59:01 +00:00
fryday 2f994399e9 Changed default alpha value for lasers in OpenGL to be like in D3D
Fixed Glowmaps being rendered with GL_NEAREST instead of GL_LINEAR.
Dynamic Lighting almost there. It looks like some normals are fudged or something.
2003-11-22 10:36:32 +00:00
phreak ad100d79dc changed PLAYER_MAX_DIST_WARNING to 700000 (700km)
changed PLAYER_MAX_DIST_END to 750000           (750km)

this makes the playing field much bigger
this way you don't get the "return to the field of battle messages"
in the future we should have the mission designer set this limit
2003-11-21 22:30:45 +00:00
randomtiger c11ed4873b Almost fully working 32 bit pcx, use -pcx32 flag to activate.
Made some commandline variables fit the naming standard.
Changed timerbar system not to run pushes and pops if its not in use.
Put in a note about not uncommenting asserts.
Fixed up a lot of missing POP's on early returns?
Perhaps the motivation for Assert functionality getting commented out?
Fixed up some bad asserts.
Changed nebula poofs to render in 2D in htl, it makes it look how it used to in non htl. (neb.cpp,1248)
Before the poofs were creating a nasty stripe effect where they intersected with ships hulls.
Put in a special check for the signs of that D3D init bug I need to lock down.
2003-11-19 20:37:25 +00:00
bobboau bbc8d83f37 got assert to work again 2003-11-17 06:52:52 +00:00
bobboau 9e0128f705 made the poly list dynamicly alocated,
started work on fixing the node model not rendering,
but most of that got commented out so I wouldn't have to deal with it
while mucking about with the polylist
2003-11-17 04:25:58 +00:00
Goober5000 c90c94b39f clarified and pruned debug spew messages
--Goober5000
2003-11-16 09:42:38 +00:00
Goober5000 9fc627aee5 language 2003-11-16 04:09:27 +00:00
Goober5000 edbc336888 fixed briefing scroll and display of "more"
--Goober5000
2003-11-16 04:08:47 +00:00
randomtiger 70ed9547a7 Put TGA and JPG stuff on -t32 flag
Put 32 bit PCX stuff on -pcx32 (still has bugs)
Added multisample checking on device initialisation
Changed unrecognised parameter message (as requested) to be more user friendly
Speech now chooses voice based on reg value set by launcher v3.1
2003-11-15 18:09:34 +00:00
Kazan 70ae616b0d *WARNING* Multi Compatability with previous versions now in question *WARNING*
[But that's ok, i incremented the multi version number the other day so that it will say "you don't have a compatable version"]

I upped the MAX_PACKET_SIZE from 512 to 4096 -- try and bust multi with more than ?130? ships now :D
2003-11-14 22:47:37 +00:00
Kazan 5801e69441 PXO_SID changed from unsigned to signed 2003-11-13 03:59:54 +00:00
Goober5000 d77dccf068 added Bobboau's real name to the credits, with his permission
--Goober5000
2003-11-12 06:05:00 +00:00
Kazan c157da28f6 (Kazan) /me slaps forehead... make sure things compile before committing.. sorry guys 2003-11-12 00:44:52 +00:00
Kazan a09b61d39e A few multi tweaks - fixed a couple warning-killing collisions between goober and me (kazan) 2003-11-12 00:31:45 +00:00
phreak ecfd1a015f changed g3_done_instance() calls to take a parameter to pop the T&L matrices 2003-11-11 18:12:41 +00:00
phreak 046e438380 made some functions that are there for 2d drawing not modify T&L matrices 2003-11-11 18:06:49 +00:00
phreak 0fd9bdff5e support for GL_ARB_vertex_buffer_object. should run real fast now with _VERY_
high poly ships
2003-11-11 18:05:02 +00:00
phreak 01e93d672c made g3_done_instance take a parameter that decides wether to pop the matrix stack.
without it, underflows would have been caused
2003-11-11 18:04:06 +00:00
phreak cd417c2158 made some g3_start_instance_matrix calls not affect any of the HT&L graphics
calls since they were called for internal calculations for 2D stuff
2003-11-11 17:59:27 +00:00
bobboau 2a522859ad shit load of bug fixing, much of it in nebula and bitmap drawing 2003-11-11 03:56:13 +00:00
Goober5000 1e6803a7fd ubercommit - basically spelling and language fixes with some additional
warnings disabled
--Goober5000
2003-11-11 02:15:47 +00:00
matt 1cf142d5d7 Fixed the projection matrix issues -Sticks 2003-11-10 02:44:36 +00:00
Goober5000 f1c749650c fixed spelling
--Goober5000
2003-11-09 07:36:52 +00:00
Kazan 4356a59467 a couple of htl functions being called in nonhtl (ie NULL functions) problems fixed
conflicts in cmdline and timerbar.h log entries
cvs stopped acting like it was on crack obviously
2003-11-09 06:31:40 +00:00
Goober5000 d3374eaabf edited for language
--Goober5000
2003-11-09 04:09:18 +00:00
Kazan 3ce9785fde Timerbar was enabled in both release and debug - so i made it a command line option "-timerbar"
DONT FUCK WITH OTHER PEOPLES INCLUDE PATHS
DONT MESS WITH EXEC NAMES (leave it fs2_open_r and fs2_open_d) or paths!
2003-11-08 22:25:47 +00:00
Kazan 4c6e954a04 yeah.. why didn't this commit last time 2003-11-08 21:55:03 +00:00
Goober5000 84cffa91f2 fixed a bug in my sexp code
--Goober5000
2003-11-08 04:31:02 +00:00
phreak 59bfbd24b1 reenabled timerbar 2003-11-07 20:55:15 +00:00
randomtiger cf61ab2454 Fixed a nohtl call to htl funcs (crash with NULL pointer)
Fixed a bug with 32bit PCX code.
Fixed a bug in the d3d_string batch system that was messing up screen shaking.
Added a couple of checks to try and stop timerbar push and pop overloads, check returns missing pops if you use the system.
Put in a higher res icon until we get something better sorted out.
2003-11-07 18:31:02 +00:00
Goober5000 9cb8408105 added some credit stuff
--Goober5000
2003-11-07 07:12:21 +00:00
phreak 82524891f5 fixed up some of the matrix functions that were causing problems
bob: i there is an important change here. i don't know if its going to cause any d3d problems
2003-11-06 22:49:22 +00:00
phreak 3b43f42ac8 added gr_start_**_matrix() and gr_end_**_matrix() around where 3d stuff is rendered 2003-11-06 22:47:37 +00:00
phreak aa3fe0ae83 added gr_start_**_matrix() and gr_end_**_matrix() around where ships are rendered 2003-11-06 22:47:02 +00:00
phreak 90adfed3f4 bob's stack functions implemented in opengl 2003-11-06 22:36:04 +00:00
randomtiger 694cab8b52 Added my batching solution for more efficient d3d_string.
Its part of the new grd3dbatch module, most of this isnt in use but it might help out later so I've left it in.
2003-11-06 21:10:26 +00:00
Kazan 28d7008b91 slight change to .dsp - leave the damn release target as fs2_open_r.exe already
added myself to credit
killed some of the stupid fscking warnings (including doing some casting and commenting out unused vars in the graphics modules)
Release builds should have warning level set no higher than 2 (default is 1)
Why the hell are we getting warning's about function selected for inline expansion... (killing them with warning disables)
FS2_SPEECH was not defined (source file doesn't appear to capture preproc defines correctly either)
2003-11-06 20:22:18 +00:00
matt baad5ab1a1 Added myself to the credits. -Sticks 2003-11-06 19:35:51 +00:00
randomtiger f0a1351b3d Added -d3d_no_vsync command to make turning off vsync optional.
Removed 32bit command, it doesnt do anything.
Made aa multisample reg check safe.
2003-11-03 18:07:26 +00:00
bobboau ea3b09b621 modified trails to render with tristrips now rather than with stinky old trifans,
MUCH faster now, at least one order of magnatude.
2003-11-02 05:50:08 +00:00
bobboau 0cc2b10c45 new matrix handeling code, and fixed some problems with 3D lit verts,
several other small fixes
2003-11-01 21:59:22 +00:00
Kazan fc0d71bd72 lil update 2003-10-30 15:30:23 +00:00
fryday 76dd81e73b Added code to handle MR_NO_ZBUFFER in d3d VB rendering code. 2003-10-30 08:20:36 +00:00
randomtiger eb1e903fbb D3D particle flicker fix, also fixes explosions and thruster glows 2003-10-29 18:18:52 +00:00
randomtiger 22f7acf0fb Updated timerbar code to work properly, also added support for it in OGL.
In D3D red is general processing (and generic graphics), green is 2D rendering, dark blue is 3D unlit, light blue is HT&L renders and yellow is the presentation of the frame to D3D. OGL is all red for now. Use compile flag TIMERBAR_ON with code lib to activate it.
Also updated some more D3D device stuff that might get a bit more speed out of some cards.
2003-10-29 02:09:18 +00:00
Goober5000 9ccd7a9006 tweakage
--Goober5000
2003-10-28 23:59:02 +00:00
randomtiger 731f460f7d Added -no_set_gamma flags
Fixed up some more non standard res stuff
Improved selection of device type, this includes using a pure device when allowed which means dev should not use Get* functions in D3D
Made fade in credits work
Stopped a call to gr_reser_lighting() in non htl mode when the pointer was NULL, was causing a crash loading a fogged level
Deleted directx8 directory content, has never been needed.
2003-10-27 23:04:23 +00:00
randomtiger 2851362007 Fixed hulls not drawing (with Phreaks advise).
Put my 32bit PCX loading under PCX_32 compile flag until its working.
Fixed a bug with res 640x480 I introduced with my non standard mode code.
Changed JPG and TGA loading command line param to "-t32"
2003-10-26 00:31:59 +00:00
phreak 7fe84d4e7c added an INF_BUILD option to bump max sounds to 400 if INF_BUILD is defined 2003-10-25 20:42:19 +00:00
bobboau a5729efca3 adding FOF stuff,
and fixed a small error in the matrix code,
I told you it was indeed suposed to be gr_start_instance_matrix
in g3_done_instance,
g3_start_instance_angles needs to have an gr_ API abstraction version of it made
2003-10-25 06:56:07 +00:00
phreak 38aa953754 fixed some old bugs that reappeared after RT committed his texture code 2003-10-25 03:27:50 +00:00
randomtiger ad224416de Implemented support for 32bit TGA and JPG for D3D
Also 32 bit PCX, but it still has some bugs to be worked out
Moved convert_24_to_16 out of the bitmap pfunction structures and into packunpack.cpp because thats the only place that uses it.
2003-10-24 17:35:05 +00:00
phreak c2e8ed3074 added code to render the user-defined skybox 2003-10-23 23:49:12 +00:00
phreak f4821c63f2 added code for the mission parser to recognize user defined skyboxes 2003-10-23 23:48:03 +00:00
randomtiger 4c0f6ab31f Bobs changes (take 2) 2003-10-23 18:03:25 +00:00
fryday bbe7d70bb1 Simplified model rendering, and it fixed up a serious bug on my system in which models with submodels didn't get their hull rendered 2003-10-23 13:53:36 +00:00
phreak 112f2cb5c8 commented out some mprintfs that kazan missed 2003-10-22 23:10:14 +00:00
phreak f6bdec81fe added gr_flip_window back in. its used in FRED 2003-10-21 18:23:15 +00:00
phreak 6e93c0772a cleaned up a bunch of repeated code 2003-10-20 22:32:37 +00:00
Goober5000 eeb0bcc3c6 added min, max, and avg sexps
--Goober5000
2003-10-20 11:49:18 +00:00
randomtiger 5132c845b0 Set gamma to 1.0 when quitting, someone was getting it carrying onto the desktop 2003-10-19 17:44:30 +00:00
phreak ea32ed86c9 clipping planes now work 2003-10-19 01:10:05 +00:00
phreak 2488f81b45 changed gr_start_instance_matrix(void) to gr_start_instance_matrix((vector*, matrix*) 2003-10-18 02:46:45 +00:00
phreak c40b01e40e edited gr_d3d_start_instance_matrix to make it take a vector* and a matrix*, but it doesn't do anything yet 2003-10-18 02:45:39 +00:00
phreak 9a4d8e46ef oops! forgot to bracket something off with an if :rolleyes: 2003-10-18 02:43:59 +00:00
phreak c9c0b38de5 switched around positions of gr_start_instance_matrix and gr_end_instance_matrix 2003-10-18 01:59:02 +00:00
phreak 591c5baca0 hardware transformation is working. now lighting needs to be done 2003-10-18 01:22:39 +00:00
randomtiger c9c5bdd7bb Big restructure for D3D and new modules grd3dlight and grd3dsetup 2003-10-17 17:18:43 +00:00
randomtiger 8ab51d480c D3D now has its own gamma system (stored in GammaD3D reg entry) that effects everything.
Put in Bobs specular fog fix.
2003-10-16 17:36:29 +00:00
Kazan cae9cec74b couple more types in species_defs.cpp, also finished up "Da Species Upgrade" 2003-10-16 16:38:17 +00:00
Kazan 16a51d7bf8 fixed typo in fallback code array index 2003-10-16 01:55:26 +00:00
randomtiger a338355f78 Added incomplete code to allow selection of non-standard modes in D3D (requires new launcher).
As well as initialised in a different mode, bitmaps are stretched and for these modes
previously point filtered textures now use linear to keep them smooth.
I also had to shuffle some of the GR_1024 a bit.
Put my HT&L flags in ready for my work to sort out some of the render order issues.
Tided some other stuff up.
2003-10-16 00:17:18 +00:00
Kazan 84cec97f57 Da Species Update :D 2003-10-15 22:03:27 +00:00
randomtiger 79f0e02ec2 Implemented hardware fog for the HT&L code path.
It doesnt use the backgrounds anymore but its still an improvement.
Currently it fogs to a brighter colour than it should because of Bob specular code.
I will fix this after discussing it with Bob.

Also tided up some D3D stuff, a cmdline variable name and changed a small bit of
the htl code to use the existing D3D engine instead of work around it.
And added extra information in version number on bottom left of frontend screen.
2003-10-14 17:39:18 +00:00
Goober5000 08dd57a3f9 tweaked a thingy with FS1-style music to make deciding the style less of a hack
--Goober5000
2003-10-14 16:47:34 +00:00
Goober5000 e30a7913b7 commented back in null vector warning, because any code that flags this
is buggy and should be fixed (and it only pops up in release builds anyway)
--Goober5000
2003-10-14 16:27:01 +00:00
matt 4d337c3fa7 prelim reworking of lighting code, dynamic lights work properly now
albeit at only 8 lights per object, although it looks just as good as
the old software version --Sticks
2003-10-13 19:39:20 +00:00
Kazan 5895ef7a46 Added Log Comment Thingy to these files 2003-10-13 06:02:50 +00:00
Kazan 9e870cd2d1 Removed a bunch of Useless *_printf()s in the rendering pipeline that were just slowing stuff down
Commented out the "warning null vector in vector normalize" crap since we don't give a rats arse
Added "beam no whack" flag for beams - said beams NEVER whack
Some reliability updates in FS2NetD
2003-10-13 05:57:50 +00:00
Kazan f51b8ec8bb #Kazan# FS2NetD client code gone multithreaded, some Fred2 Open -mod stuff [obvious code.lib] including a change in cmdline.cpp, changed Stick's "-nohtl" to "-htl" - HTL is _OFF_ by default here (Bobboau and I decided this was a better idea for now) 2003-10-12 03:46:23 +00:00
matt 773556dd2d Added -nohtl command line param to disable HT&L, nothing is IFDEFd
out now. -Sticks
2003-10-10 03:59:41 +00:00
phreak ae39e8614f grabbed the most current version from: http://oss.sgi.com/projects/ogl-sample/ABI/ 2003-10-08 21:01:21 +00:00
argv 4ffeb7d3db Negative repeat count means repeat indefinitely. A trivial change, it should not break anything. 2003-10-08 06:32:06 +00:00
Goober5000 f58c06b028 fixed some warnings
--Goober5000
2003-10-07 03:43:22 +00:00
Kazan d865f3520c Oopsie! Forgot to commit these with the rest of the fs2netd TCP update 2003-10-06 04:33:11 +00:00
phreak 3c19786ae3 bug squashing.
preliminary tnl work done
2003-10-05 23:40:54 +00:00
Kazan 25939ab572 fs2netd now TCP 2003-10-04 22:42:23 +00:00
phreak a5fcf64a5f shinemapping completed. it works!
-phreak
2003-10-04 00:26:43 +00:00
Goober5000 562f5e7f6a updated FRED to import FS1 default weapons loadouts as well as missions
--Goober5000
2003-09-30 04:05:09 +00:00
Goober5000 3106f14f92 added the option to import FSM missions, added a replace function, spruced
up my $player, $rank, etc. code, and fixed encrypt being misspelled as 'encrpyt'
--Goober5000
2003-09-28 21:22:59 +00:00
Kazan 436276a812 ##Kazan## Quick little update of fs2netd stuff to resolve a few issues 2003-09-26 15:34:26 +00:00
bobboau 1a2be91e2a commiting Hardware T&L code, everything is ifdefed out with the compile flag HTL
still needs a lot of work, ubt the frame rates were getting with it are incredable
the biggest problem it still has is a bad lightmanegment system, and the zbuffer
doesn't work well with things still getting rendered useing the sofware pipeline, like thrusters,
and weapons, I think these should be modifyed to be sent through hardware,
it would be slightly faster and it would likely fix the problem

also the thruster glow/particle stuff I did is now in.
2003-09-26 14:37:16 +00:00
Kazan 0b87224e39 ##Kazan## FS2NetD Completed! Just needs some thorough bug checking (i don't think there are any serious bugs)
Also D3D8 Screenshots work now.
2003-09-25 21:12:24 +00:00
Kazan eff6a6efc4 ##KAZAN## FS2 Open PXO --- W00t! Stats Storage, everything but table verification completed! 2003-09-24 19:35:59 +00:00
Kazan edd5287f84 ##KAZAN## - FS2NetD Support! (FS2 Open PXO) -- Game Server Listing, and mission validation completed - stats storing to come - needs fs2open_pxo.cfg file [VP-able] 2003-09-23 02:42:54 +00:00
unknownplayer 71f159840b Minor bugfix to the 3D ship code. There still may be some cases where it will
fail to load the model file it needs, but I'm at present mystified as to why.
2003-09-16 13:30:16 +00:00
unknownplayer 854041749b Changed the ship selection window to load the 3D FS2 ship models instead
of the custom *.ani files. It just does a techroom rotation for now, but I'll add
more features later - tell me of any problems or weirdness caused by it, or if
you don't like it and want it as an option only.
2003-09-16 11:56:46 +00:00
fryday a4a77744d6 Rollback killed my lens-flare. D'oh. 2003-09-15 12:34:09 +00:00
wmcoolmon dac335f3dd Changed "cell" to "Cmdline_cell" -C 2003-09-14 19:02:06 +00:00
wmcoolmon 275ba09a3b Changed "nospec" to "Cmdline_nospec" -C 2003-09-14 19:00:36 +00:00
wmcoolmon 40ab7fc0f3 Changed "nospec" and "cell" to "Cmdline_nospec" and "Cmdline_cell" 2003-09-14 19:00:02 +00:00
wmcoolmon 3b16380936 Added "-safeloading" command line parameter, which uses old fs2_retail-style loading code -C 2003-09-14 18:32:41 +00:00
Goober5000 67e18e30a7 fixed case-sensitivity bugs and possibly that Zeta wing bug
--Goober5000
2003-09-13 20:59:54 +00:00
Goober5000 293e984d60 added some minor things, such as code cleanup and the following:
--turrets will not fire at cargo
--MAX_SHIELD_SECTIONS substituted for the number 4 in many places
--supercaps have their own default message bitfields (distinguished from capships)
--turrets are allowed on fighters
--jump speed capped at 65m/s, to avoid ship travelling too far
--non-huge weapons now scale their damage, instead of arbitrarily cutting off
----Goober5000
2003-09-13 08:27:29 +00:00
Goober5000 35bf641cb7 clean rollback of all of argv's stuff
--Goober5000
2003-09-13 06:02:08 +00:00
Goober5000 c86461fd22 fixed a bunch of compile-time errors and warnings
--Goober5000
2003-09-12 03:57:01 +00:00
Goober5000 498edeb86e grr...fixed more stuff
--Goober5000
2003-09-12 03:17:33 +00:00
Goober5000 e6c7719bf4 clarified stuff and tweaked the damage ratio for big ships
--Goober5000
2003-09-12 02:08:57 +00:00
Goober5000 e907a052e5 why was the bomb commented out?
--Goober5000
2003-09-12 01:43:57 +00:00
Goober5000 6f089c21c5 added XSTR and fixed readability
--Goober5000
2003-09-12 01:38:13 +00:00
Goober5000 3d8ad87da9 rolled back _argv[-1]'s supercilious commit -- fyi, INF_BUILD is used by
the Inferno campaign
--Goober5000
2003-09-12 01:23:53 +00:00
Goober5000 92a0ed3c6d cleaned up some logic
--Goober5000
2003-09-12 01:12:49 +00:00
argv 988b86238f Removed #ifdef INF_BUILD -- this is only referenced once, so what the hell is it for? 2003-09-12 01:02:50 +00:00
argv f2c019adc3 Minor cosmetic fix. 2003-09-12 00:34:05 +00:00
Goober5000 bda256f095 nitpicked the number 4 to the constant MAX_SHIELD_SECTIONS
--Goober5000
2003-09-12 00:12:13 +00:00
Goober5000 77e48b4849 made code a bit more readable
--Goober5000
2003-09-11 23:59:32 +00:00
Goober5000 0ea85483dc minor fix because initialization is done in various routines
--Goober5000
2003-09-11 23:39:01 +00:00
Goober5000 54a034da9a Rolled back _argv[-1]'s changes to the sexp infrastructure, which would
have broken a huge amount of stuff and created some nasty bugs.
Also commented most of _argv[-1]'s new sexps pending consolidation,
and added a placeholder help entry for the one good sexp.
--Goober5000
2003-09-11 23:21:54 +00:00
argv 84d249db18 New weapon table flags, configurable beam whacking, subsystem display names, new energy system, modified the meaning of big damage. 2003-09-11 19:48:00 +00:00
argv 5a1b5233b8 Random beam slash, new energy system, redefinition of what hurts big ships (beams don't), subsystem display names, configurable beam whacking. 2003-09-11 19:45:34 +00:00
argv 3a88ee37ed Made the EMP flash message look a little better. 2003-09-11 19:44:27 +00:00
argv 67464a2ad4 New energy system, fixes, random beam slash, don't slash if targeting a subsystem, surface shields, singular shields, configurable beam whacking, friendly beam fire does full damage. 2003-09-11 19:43:43 +00:00
argv e1775947ec Fix really nasty crash bug when not all stars table entries have a flare. 2003-09-11 19:39:55 +00:00
argv f18771b309 New energy system, fixes, apply skill damage scaling to all ships, new energy system. 2003-09-11 19:39:03 +00:00
argv 1716850f80 Fix fast player ships missing the subspace tunnel when jumping out, increased max simultaneous ship explosions to 16, new energy system. 2003-09-11 19:36:20 +00:00
argv 9ff5945744 New energy system, ship table flag big guns in front, increase max ship types to 400. 2003-09-11 19:34:29 +00:00
argv 13d91d590b New energy system, singular shield support, some new ship table flags, no draw of thrusters when they are off, fixes. 2003-09-11 19:33:07 +00:00
argv 4611c36631 Singular shield support, and a couple of fixes. 2003-09-11 19:28:52 +00:00
argv 0d5eb222a9 All kinds of changes, from AI intelligence to singular shield support. 2003-09-11 19:27:30 +00:00
argv 3508e8d309 Ship flag big guns in front. 2003-09-11 19:26:13 +00:00
argv cafe8965c1 New energy system. 2003-09-11 19:25:00 +00:00
argv 5604bced59 All player ships may now carry turrets, not just bombers. 2003-09-11 19:24:11 +00:00
argv 08e2943edb Lateral movement speed is now affected by engine power. 2003-09-11 19:23:18 +00:00
argv 656623be9c Several new sexps, such as power drain control. Also increased maximum sexp operators to 4096, though there may be another limit at 1024. 2003-09-11 19:18:13 +00:00
argv 3ccc1da630 Singular shield support. 2003-09-11 19:16:45 +00:00
argv 01c12c8010 Surface shields. 2003-09-11 19:15:29 +00:00
argv dbd2ee4f3c New energy system, table subsystem flags including beam free by default, subsystem display name. 2003-09-11 19:14:14 +00:00
argv 84a5ae3268 Ship flag2 beam-free-all. 2003-09-11 19:12:40 +00:00
argv 949d8446f1 Don't restore saved loadouts on scramble missions. 2003-09-11 19:11:36 +00:00
argv f7e17e90a7 Crash avoidance, ship flag2 beam-free-all. 2003-09-11 19:10:33 +00:00
argv f0078cc8fc Singular shield support, beam-free-all ship flag2, negative repeat count means repeat indefinitely. 2003-09-11 19:09:44 +00:00
argv 833164823d Negative repeat count means repeat indefinitely. 2003-09-11 19:08:11 +00:00
argv 77deede2de Turret display names. 2003-09-11 19:07:11 +00:00
argv 085a0aa0d4 Singular shield support, and a couple of other things. 2003-09-11 19:06:27 +00:00
argv 3edcb0a519 New energy system support. 2003-09-11 19:05:10 +00:00
argv c6ba1645a1 New energy system, auto ETS, etc. 2003-09-11 19:04:36 +00:00
argv e1d2dfcf9e Various new command-line options, stuffed into my own Argv_options struct to avoid namespace pollution. 2003-09-11 18:55:23 +00:00
fryday dccaa30202 Added Lens Flares, enabled by optional table entry in stars.tbl on a per-sun basis 2003-09-10 11:38:31 +00:00
fryday e205ab47a2 Fixed specular for dynamic lights, optimized it a bit 2003-09-09 21:26:23 +00:00
matt a2e351779d Broke stars last commit, fixed -Sticks 2003-09-09 17:18:25 +00:00
matt f85ca67666 Added -nospec cmd line param to disable specular -Sticks 2003-09-09 17:10:55 +00:00
Goober5000 e1261c0340 if player has primitive sensors, hud will not display shield icons or message sender brackets
--Goober5000
2003-09-09 05:51:14 +00:00
randomtiger 89e4dc4fd5 Checked in new speech code and calls from relevent modules to make it play.
Should all work now if setup properly with version 2.4 of the launcher.
FS2_SPEECH can be used to make the speech code compile if you have SAPI 5.1 SDK installed.
Otherwise the compile flag should not be set and it should all compile OK.

- RT
2003-09-07 18:14:54 +00:00
drevil fa480451d1 Changed sender to [email protected] instead of just 'fs2source' to
get around member only posts to mailing list requirement
2003-09-07 12:46:59 +00:00
drevil a42cf30bdb Testing commits. 2003-09-07 12:42:46 +00:00
wmcoolmon 225bc96739 Added "+Subsystem Repair Ceiling:" after "+Hull Repair Ceiling:" (formerly "+Support Repair Ceiling:" 2003-09-06 20:41:52 +00:00
wmcoolmon e15beaa7f9 Added ability to limit subsystem repairs 2003-09-06 20:40:01 +00:00
wmcoolmon fcc1ea98c4 Minor bugfix (changed an == to >=) 2003-09-06 19:14:50 +00:00
wmcoolmon afb0e066b0 Added optional mission parameter "+Support Repair Ceiling", which sets what percentage a support ship can repair a ship's hull to. 2003-09-06 19:09:24 +00:00
wmcoolmon 7b5548642a Made it possible to limit how much support ships repair a ship's hull. 2003-09-06 19:07:31 +00:00
matt 5f1898c503 Minor d3d star popping fix 2003-09-05 22:35:33 +00:00
Goober5000 7854fb293f bah - fixed a dumb bug
--Goober5000
2003-09-05 10:41:48 +00:00
Goober5000 1e04df322c merged num-ships-in-battle and num-ships-in-battle-team, making the
team argument optional
--Goober5000
2003-09-05 05:06:32 +00:00
Goober5000 fb12c1df6e merge of Phreak's and my sexp.cpp
--Goober5000
2003-09-05 04:48:03 +00:00
Goober5000 c4fcafccc5 merge of Phreak's and my sexp.h
--Goober5000
2003-09-05 04:39:55 +00:00
Goober5000 cfbc2ebb46 well, let's see here...
* persistent variables
* rotating gun barrels
* positive/negative numbers fixed
* sexps to trigger whether the player is controlled by AI
* sexp for force a subspace jump

I think that's it :)
--Goober5000
2003-09-05 04:25:29 +00:00
phreak 4a85d415e5 fixed a small bug in num-ships-in-battle-team
added an option to loop sounds played by play-sound-from-file
2003-09-05 02:15:34 +00:00
bobboau 94c2fab5b0 an asortment of bugfixes, mostly with the specular code,
HUD flickering should be completly gone now
2003-08-31 06:00:42 +00:00
phreak d6b179d3b5 added num-ships-in-battle and num-ships-in-battle-team sexp 2003-08-30 21:59:48 +00:00
Goober5000 32f7fd2c11 bumped version to 3.5.5
--Goober5000
2003-08-30 20:55:09 +00:00
phreak 5a858562cc fixed some random specular lighting bugs 2003-08-30 14:49:01 +00:00
Goober5000 eb800ebbbc implemented rotating barrels for firing primary weapons
--Goober5000
2003-08-28 20:42:18 +00:00
Goober5000 f3bd46dab2 trying to commit
--Goober5000
2003-08-28 06:17:29 +00:00
Goober5000 b11a8c02a0 trying to commit
--Goober5000
2003-08-28 05:46:52 +00:00
Goober5000 7564ecb19f added percent-ships-disarmed and percent-ships-disabled
--Goober5000
2003-08-27 02:04:54 +00:00
Goober5000 65fd9ef338 added is-ship-type, is-ship-class, lock-rotating-subsystem, and free-rotating-subsystem;
also fixed the argument and return values for various sexps so that they work
properly for negative numbers
--Goober5000
2003-08-27 01:38:00 +00:00
Goober5000 aab49a95db fixed a strange thing that Bobboau inexplicably put in
--Goober5000
2003-08-27 01:36:22 +00:00
Goober5000 f0110fab45 added extra code to enable playing of FS1 music tracks
--Goober5000
2003-08-25 04:46:53 +00:00
Goober5000 3c053feb30 added replacement of $rank with the player's rank in any string that appears
in-game (same as with $callsign); also bumped the limit on the length of text
allowed per entry in species.tbl
--Goober5000
2003-08-25 04:45:57 +00:00
Goober5000 68fde7a8ce fixed unreachable code
--Goober5000
2003-08-25 04:39:17 +00:00
bobboau abf067f708 specular code should be bugless now,
cell shadeing has been added activated via the comand line '-cell',
3D shockwave models, and a transparency method I'm calling edge and center alpha that could be usefull for other things, ask for details
2003-08-22 07:35:09 +00:00
Goober5000 0151279a55 bumped max intel entries to 30
--Goober5000
2003-08-22 07:24:07 +00:00
Goober5000 633c391b4d implemented $callsign to add the player callsign in a briefing, message, or whatever
--Goober5000
2003-08-22 07:01:57 +00:00
phreak fee9ff59ef warp effects and fireballs have their own distinct colors 2003-08-22 03:39:35 +00:00
randomtiger 290da64ffe Fixed switching - RT 2003-08-21 20:54:39 +00:00
phreak 46479ac3a0 added specular highlights. still needs shine mapping 2003-08-21 15:07:45 +00:00
phreak 016e525f62 zeroed out the specular fields since they caused some flickering 2003-08-21 15:04:17 +00:00
Goober5000 58cb8f4a36 yet another attempt to commit dsp files
--Goober5000
2003-08-21 09:00:58 +00:00
Goober5000 240c74da4e fixed set-support-ship sexp
--Goober5000
2003-08-21 09:00:19 +00:00
Goober5000 897d3f8ad5 fixed turret text display for non-laser weapons
--Goober5000
2003-08-21 08:31:24 +00:00
Goober5000 3916653149 ships that have no afterburners will no longer have the afterburner gauge drawn
--Goober5000
2003-08-21 06:31:19 +00:00
Goober5000 0baf2f7bc9 primary weapons will now truncate properly at a '#' symbol, just like secondaries
--Goober5000
2003-08-21 06:18:52 +00:00
Goober5000 ef83ecbc05 removed an extraneous thingy
--Goober5000
2003-08-21 06:11:32 +00:00
Goober5000 53834ee415 Ballistic primaries will now deplete ammo correctly - that is, ammo will be
reduced by the number of firing points, not necessarily 1.
--Goober5000
2003-08-21 06:11:09 +00:00
Goober5000 7dcc40de8a "Fixed" the ballistic primary rearm bug. I have no idea how... I have to assume
it's a bug in MSVC.
--Goober5000
2003-08-21 05:50:00 +00:00
wmcoolmon edfd3fdc85 Modified find_file_location to speed up file loading. 2003-08-20 08:14:50 +00:00
wmcoolmon 39e9cddb5f Made cfile_delete return 0 on failure, 1 on success 2003-08-20 08:12:08 +00:00
wmcoolmon 450ea5c63e Added error screens to the barracks and start screens when a pilot file can't be deleted 2003-08-20 08:11:28 +00:00
bobboau 36668ce6a1 update for the specmapping code includeing
suport for seperate specular levels on lights and
optional strings for the stars table
code has been made more organised,
though there seems to be a bug in the state selecting code
resulting in the HUD being rendered incorectly
and specmapping failing ocasionaly
2003-08-16 03:52:24 +00:00
bobboau 8cacc9b1a0 Specular 'shine' mapping;
useing a phong lighting model I have made specular highlights
that are mapped to the model,
rendering them is still slow, but they look real purdy

also 4 new (untested) comand lines, the XX is a floating point value
-spec_exp XX
the n value, you can set this from 0 to 200 (actualy more than that, but this is the recomended range), it will make the highlights bigger or smaller, defalt is 16.0 so start playing around there
-spec_point XX
-spec_static XX
-spec_tube XX
these are factors for the three diferent types of lights that FS uses, defalt is 1.0,
static is the local stars,
point is weapons/explosions/warp in/outs,
tube is beam weapons,
for thouse of you who think any of these lights are too bright you can configure them you're self for personal satisfaction
2003-08-12 03:18:34 +00:00
bobboau 03dd93b79d slightly better implementation of the new zbuffer thing, it now checks only three diferent formats defalting to the 16 bit if neither the 24 or 32 bit versions are suported 2003-08-09 06:07:24 +00:00
phreak ee79809edc added code to take into account a tertiary reactor pod 2003-08-06 17:50:01 +00:00
phreak 257675bb93 changed the weapon ammo gauges to show additional ammo if a tertiary ammo pod is being used 2003-08-06 17:44:20 +00:00
phreak d9a01620f6 since the launcher has a space between 1024 and 768 for the videocard string, i changed the detection to reflect this
also changed intro.mve to intro.avi since we can't use MVEs
2003-08-06 17:42:47 +00:00
phreak 3b15d779d6 since the afterburners are routed through the physics engine, i needed to route the boost pod through here too 2003-08-06 17:39:49 +00:00
phreak 19796f7538 added a thing to set max thrust when tertiary boost pod is engaged 2003-08-06 17:39:04 +00:00
phreak e594563d00 preliminary work on tertiary weapons. it doesn't really function yet, but i want to get something committed 2003-08-06 17:37:08 +00:00
phreak 15d394edbf changed default texture filtering to GL_LINEAR 2003-08-06 17:26:20 +00:00
phreak b07476fc96 optimized the way cloaking is handled 2003-08-06 17:24:57 +00:00
bobboau d3e4c5c30b glow maps, for some reason they wern't in here, they should be now,
also there is some debug code for changeing the FOV in game,
and I have some changes to the init code to try and get a 32 or 24 bit back buffer
if posable, this may cause problems for people
the changes were all marked and if needed can be undone
2003-08-05 23:45:18 +00:00
phreak 839be403b1 ai now properly uses rapid fire dumbfires 2003-08-03 23:38:08 +00:00
phreak 5c2c0ab09f changed some z-buffer stuff so it doesn't clip as noticably 2003-08-03 23:35:36 +00:00
inquisitor 81f8a9e375 cleanup of old makefile dsws 2003-07-22 14:11:06 +00:00
fryday 4386cab9bc added fsspeech.cpp fsspeech.h speech.cpp speech.h into code/sound
They include RT's speech code. Add the preprocessor definition FS2_SPEECH to enable text-to-speech at compile-time.
Requires the Microsoft speech SDK Version 5.1 (around 55MB download).
2003-07-19 16:10:48 +00:00
phreak 00773de340 fixed a dumb bug 2003-07-16 23:12:44 +00:00
phreak 450bd1e213 lighting in the render functions now work for opengl as they do in d3d 2003-07-15 16:09:46 +00:00
phreak 2092c2705f trails now properly alphablend in ogl as it does in d3d 2003-07-15 16:07:12 +00:00
phreak e592c64d8f higher particle limits for opengl. now matched d3d 2003-07-15 16:06:24 +00:00
phreak 0f275acc12 the game handles colored laser lighting for opengl now.
this used to be exclusive to d3d
2003-07-15 16:05:33 +00:00
phreak af1da198b3 the cutscene section in the techroom does not append *.mve onto a filename 2003-07-15 02:58:08 +00:00
phreak e75e4b5640 opengl now doesn't try to shutdown when its not running.
could cause problems on startup
2003-07-15 02:53:54 +00:00
phreak 9ed49694bf ships now decloak when firing 2003-07-15 02:52:40 +00:00
phreak b0088c67ba cloaked ships will reduce brightness with distance 2003-07-15 02:51:43 +00:00
phreak 3505a530d0 fixed a warning.
previous cvs message should read: cloaked ship will decloak if a turret fires
2003-07-15 02:51:01 +00:00
phreak ec87a1f3ad cloaked ships now are less visible with distance 2003-07-15 02:41:41 +00:00
phreak 0c9c758dbd fixed problem where beams that ignore shields do not fully damage the target
disabled attenuation for beams, pending rework
2003-07-15 02:39:59 +00:00
phreak 17a9178c8b models that are fully cloaked draw front-to-back 2003-07-15 02:37:59 +00:00
phreak 7628e19f26 changed the model_setup_cloak() function to allow an alpha value 2003-07-15 02:36:54 +00:00
phreak 97b506ca15 added a debug key to cloak targeted ship ~+shift+x 2003-07-15 02:35:59 +00:00
phreak 7c1c973917 fun work optimizing the cloak effect 2003-07-15 02:34:59 +00:00
randomtiger e7340e703b Random Tiger 6/7/2003
fs2_open now uses the registry entry 'VideocardFs2open' instead of 'Videocard' to store its video settings. To run fs2_open now you MUST use the launcher I have provided.

Launcher binary:      http://mysite.freeserve.com/thomaswhittaker/c_code/freespace/Launcher.rar
Launcher source code: http://mysite.freeserve.com/thomaswhittaker/c_code/freespace/Launcher_code.rar

I have also taken the opertunity to fix a few bugs in the launcher and add a new feature to make selecting mods a bit easier.

The launcher now uses some files in the freespace project so it should be put into CVS with the rest of the code inside the 'code' directory (still in its 'Launcher' dir of course). Currently the launcher wont compile since speech.cpp and speech.h arent in cvs yet. But once Roee has checked in that will be sorted.

I have also removed the internal launcher from the D3D8 module.
Please contact me if you have any problems.

When trying to run the exe after updating I get an error parsing 'rank.tbl' but im fairly sure thats nothing to do with me so I'll just have to leave it for now because I'm still using a 56K modem and cant afford to find out.
2003-07-06 00:19:25 +00:00
phreak 1fa5e2bf54 support for cloaking added. needs a cloakmap.pcx
to cloak the players ship, activate cheats and press tilde + x
some more work can be done to smooth out the animation.
2003-07-04 02:30:54 +00:00
phreak dc12e5dd1e changes for cloaking implemented 2003-07-04 02:28:37 +00:00
phreak 2c62498b62 added support for cloaking.
i will need to contact someone who knows d3d to get this to work
2003-07-04 02:27:48 +00:00
phreak 2eb193101a tilde + x cloaks a ship 2003-07-04 02:26:15 +00:00
phreak 11d8d11b04 ai now properly fires bomber+ missiles at capital ships. 2003-07-02 03:31:27 +00:00
phreak 37b0bd28ce added support for weapons that only fire when tagged
also added limited firing range for local ssms
2003-06-25 03:21:03 +00:00
phreak 13cccac317 added support for weapons that only fire when tagged 2003-06-25 03:19:40 +00:00
phreak 4fce3b9610 changed around ai code to take into account a limited lock range for local ssms 2003-06-25 03:16:32 +00:00
phreak fc22d35695 weapon energy cheat does not carry over from mission to mission 2003-06-25 03:13:48 +00:00
phreak 091c8b4d7e display lock triangle for local ssms only if its in range specified in weapons.tbl 2003-06-25 03:13:02 +00:00
phreak 8d4512a612 added turret-tagged-specific and turret-tagged-clear-specific sexps 2003-06-19 18:12:12 +00:00
phreak c80bab1fcc undefined DBUGFILE_ACTIVE for release builds 2003-06-16 16:39:42 +00:00
phreak ca0683ecfa fixed a small bug where rotating subobjects wouldn't work on a player ship
also changed "+PBank Capacity:" to "$PBank Capacity:" when parsing
ballistic primaries. goob knows about this
2003-06-16 03:36:08 +00:00
phreak 31cfd8011f fixed a bug where local ssms may miss the warphole when entering subspace 2003-06-14 22:56:17 +00:00
phreak 371f2e3869 capital ship turrets that use the "huge" flag will not target bombs
this will prevent large beams from shooting the player if he shoots a bomb at a destroyer
2003-06-14 21:22:42 +00:00
phreak cd48667a38 added a warning that will display if a modder puts in a local ssm that:
is a laser or beam
doesn't home
2003-06-13 15:33:57 +00:00
phreak 45d02246ee local ssms fired without lock will not enter subspace at all 2003-06-12 21:21:26 +00:00
phreak 25e339a4d6 local ssm warpin is now handled better than what i committed earlier 2003-06-12 17:45:54 +00:00
phreak 155f0f1cce fixed a minor bug where local ssms will warpin at 0,0,0 if their target was destroyed while in subspace 2003-06-12 16:54:06 +00:00
phreak 807ee34c9d turrets now properly use local ssms 2003-06-12 16:53:16 +00:00
phreak 123515a33d i hate to update again so soon, but i forgot to mark hostile local ssms that
were in stages 2 or 4 as warping so their blip color would then be blue
2003-06-11 03:15:17 +00:00
phreak cc741f5029 i hate to update again so soon, but there was a compile warning that i accidently passed over 2003-06-11 03:13:39 +00:00
phreak 0fc5f831fc local subspace missiles are now in game. yay 2003-06-11 03:06:07 +00:00
phreak ecf181a2c7 the ai can now use local ssms. they are able to use them at *very* long range 2003-06-11 03:03:16 +00:00
phreak 000257bd8e the radar will not show stage 3 local ssms 2003-06-11 03:01:27 +00:00
phreak 30cbbfedf3 changed around collision code to handle the possible variance in speeds when using local ssms 2003-06-11 03:00:50 +00:00
phreak 47cd793262 local ssm stuff for hud.
they are always in lock range due to the subspace drive on them
they also can't be targeted when in stage 3.
2003-06-11 02:59:48 +00:00
phreak ed6be03aa0 the real position is now copied in g3_rotate_vertex 2003-06-08 17:39:35 +00:00
phreak afd83a21fb added a vector in the vertex struct that stores the real world position
the x,y,z variables do not accurately reflect the real position
this is for opengl fogging
2003-06-08 17:38:21 +00:00
phreak 4a030dfb73 debris is now properly fogged 2003-06-08 17:31:37 +00:00
phreak e4b6bc70bc fixed a compile error that was accidently committed 2003-06-08 17:29:51 +00:00
phreak fcaa985c2d bmp_gfx_get_components now works with 32 bit opengl 2003-06-07 21:08:09 +00:00
phreak 3574628259 fixed minor fogging bug 2003-06-07 20:51:06 +00:00
phreak be71b9f6b5 final fix (hopefully) to zero mass value bug 2003-06-04 15:32:54 +00:00
phreak 5f5fe2b8cc fixed a small bug
ai_select_primary_weapon may have a null pointer passed to it.
2003-06-04 15:31:49 +00:00
phreak 5ff5467673 added some code that took advantage of opengl fogging stuff 2003-06-04 15:28:24 +00:00
phreak 809b0155df added Sesquipedalian's kamikaze and not-kamikaze sexps 2003-05-24 16:47:58 +00:00
phreak 1e6670c1b7 defined USE_OPENGL
should eliminate the "unable to init 104" warnings
2003-05-22 19:41:52 +00:00
drevil bda9f63f59 Updated cvs administrative files. 2003-05-22 15:14:39 +00:00
phreak ea966211b5 fixed *minor* problem where ships that were disabled during warpout were not
registering on sensors
2003-05-21 21:07:31 +00:00
phreak 1771fd2d3b fixed disappearing ship bug when a ship is disabled during warpout 2003-05-21 20:28:53 +00:00
phreak 7dd22631a9 hud is drawn when in chase camera for player 2003-05-21 20:27:07 +00:00
phreak 7146c9f90c improved chase camera code.. you can now fight using this camera 2003-05-21 20:26:07 +00:00
phreak 63a90da345 improved glowmap rendering speed 2003-05-21 20:23:00 +00:00
phreak 29a0e77753 clarified an error message in subsys_set 2003-05-15 19:08:24 +00:00
phreak 1760554305 game_loading_callback_init() now displays a user-defined loading screen 2003-05-09 23:54:59 +00:00
phreak 3f391d36b2 possible fix to ships with no mass values 2003-05-09 23:53:32 +00:00
phreak fee9efe1db changed around code in parse_mission_info() to support user-defined loading screens 2003-05-09 23:52:01 +00:00
phreak c8a2551a6e added fields to the "mission" struct to allow for user-specified loading screens 2003-05-09 23:51:04 +00:00
phreak 9e5a3781b7 fixed old bug that created "mouse trails" during a popup screen
a result of doing something a long time ago that i thought was right, but wasn't
2003-05-07 00:52:36 +00:00
phreak fa960dc625 if "Show Background" is not set it FRED,
it used to show background bitmaps and suns
not anymore
2003-05-05 21:27:46 +00:00
Goober5000 364767a0b4 fixed small bug inadvertently added by Phreak affecting the custom hitpoints
mod; also fixed a small bug in the new disruption mod (disrupting all subsystems,
as opposed to only those within the weapon radius)
--Goober5000
2003-05-05 20:55:44 +00:00
phreak abdd8a6a79 minor fred bug fixed 2003-05-05 20:13:07 +00:00
phreak 15be002888 added my real name 2003-05-05 19:29:24 +00:00
phreak af9f703302 added additional error info incase gr_opengl_flip() fails for some unknown reason 2003-05-04 23:52:40 +00:00
phreak 944981b835 ABtrails are only processed if they are using a bitmap.
this should be the end of the "missiles without trails" bug
2003-05-04 20:51:14 +00:00
phreak f7760d69c0 bumped MAX_TRAILS to 500 because of afterburner trails 2003-05-04 20:50:06 +00:00
phreak b63c14fcb7 minor fix in gr_opengl_flip()
should be end of the "unable to swap buffer" error
2003-05-04 20:49:18 +00:00
phreak 7ec2608d58 beams can't fire when disrupted.
cycle ends if the beam is firing and shooting ship is disrupted
2003-05-04 20:21:00 +00:00
phreak 881b31f7fa ships that are disrupted now have arcs around them much like the emp effect 2003-05-04 20:08:04 +00:00
phreak 6be53b57e1 fixed mispelling 2003-05-04 19:51:28 +00:00
phreak 13338a1c76 added multipliers for beam turrets and sensors for disruptor missiles 2003-05-03 23:47:04 +00:00
phreak f843302d16 background stars are now somewhat colored, just here as a sort of useless feature test 2003-05-03 16:58:40 +00:00
phreak f4fe757d5d changed around the way disruptor weapons work 2003-05-03 16:48:08 +00:00
Goober5000 1a410e1f09 implemented the custom hitpoints mod
--Goober5000
2003-04-29 01:03:24 +00:00
Goober5000 79fff22d2e fixed some scrolling issues; added scroll bar to mission select
--Goober5000
2003-04-06 03:56:54 +00:00
Goober5000 e6536f612a gotta love those compiler errors ;)
fixed those and cleaned up conflicts with the missile-locked sexp
--Goober5000
2003-04-05 20:47:58 +00:00
sesquipedalian 031c50768a Recommit of is-missile-locked.
I changed the sexp's category from non-campaign to training, so you may get a conflict with that.
2003-04-05 20:17:23 +00:00
Goober5000 a805b8e293 fixed some fiddly bits with scrolling and ui stuff
--Goober5000
2003-04-05 11:09:22 +00:00
Goober5000 7145251058 arg - forgot something
--Goober5000
2003-04-05 08:51:04 +00:00
Goober5000 5a5e364bee command briefing scroll buttons implemented :)
--Goober5000
2003-04-05 08:46:51 +00:00
Goober5000 6351a06b68 commit to fix the FRED compile error
--Goober5000
2003-04-04 22:11:06 +00:00
Goober5000 4dd27db603 fixed stupid spelling mistake
--Goober5000
2003-03-30 21:16:21 +00:00
Goober5000 d01ed806b9 preliminary work on adding scroll buttons to command briefings
--Goober5000
2003-03-30 21:08:42 +00:00
Goober5000 2b6c194af7 resolved a nasty bug that caused some missions to crash
--Goober5000
2003-03-30 07:27:34 +00:00
Goober5000 87409846f0 preliminary work on ai facing sexp
--Goober5000
2003-03-30 04:34:38 +00:00
sesquipedalian 88dca1dbea Aaaand nevermind... 2003-03-29 11:23:46 +00:00
Goober5000 4bf29edec3 made beams default shield piercing again
also added a beam no pierce command line flag
and fixed something else which I forgot :P
--Goober5000
2003-03-29 09:42:05 +00:00
sesquipedalian d1abacf7ae Added is-missile-locked sexp 2003-03-29 08:52:59 +00:00
Goober5000 9d6126086c yay for limit bumping!
bumped number of battle tracks and briefing/mainhall/credits tracks, both to 30
--Goober5000
2003-03-29 05:18:17 +00:00
Goober5000 4c74af0b4a got rid of an annoying compile warning
--Goober5000
2003-03-28 19:56:02 +00:00
Goober5000 fb738a9319 added beginning functionality for $Texture Replace implementation in FRED
--Goober5000
2003-03-25 07:03:30 +00:00
Goober5000 c470ecc598 argh - lol
--Goober5000
2003-03-22 08:17:34 +00:00
Goober5000 47302dd5ad bleah
--Goober5000
2003-03-22 07:24:53 +00:00
Goober5000 431b588cef bugs are bad, mmkay?
--Goober5000
2003-03-22 06:35:37 +00:00
Goober5000 0f931f0275 added play-sound-from-table, play-sound-from-file, and close-sound-from-file
--Goober5000
2003-03-22 06:11:51 +00:00
Goober5000 0a3a0c525f changed event_sexp_change_music to event_change_sexp_soundtrack
--Goober5000
2003-03-22 06:06:22 +00:00
Goober5000 c818bd61d5 yuck - fixed a nasty error when FRED provides a default value for warp-effect
and explosion-effect
--Goober5000
2003-03-21 08:33:33 +00:00
Goober5000 3e220d87f0 added get-relative-object-*, where * = x, y, and z; these sexps return the
world coordinates of a set of relative coordinates to an object; also, fixed many
places in sexp.cpp so that now sexps can accept other sexps as parameters,
wherease before they weren't able to
--Goober5000
2003-03-21 04:51:33 +00:00
Goober5000 58691c0d15 comments
--Goober500
2003-03-20 23:30:03 +00:00
Goober5000 a59a1bbaad comments
--Goober500
2003-03-20 23:20:46 +00:00
Goober5000 1d84bd94ea moved ballistic primary reload sounds to indexes 171 and 172 2003-03-20 22:58:43 +00:00
unknownplayer e777b3806e Fixed the bug with shields where it would consistently display the low detail
shield regardless of what the setting was. Turns out some OGL person was
quite thoughtless in their use of || instead of the correct && for the situation
so the game would always go for low detail shields because OGL and D3D
can't both be active at the same time!
2003-03-20 09:48:25 +00:00
Goober5000 74afd2522f implemented EMP as part of weapon-effect sexp
--Goober5000
2003-03-20 09:17:16 +00:00
unknownplayer da831bf833 Modified the command line options so they are all in lower-case characters.
Made a slight AI adjustment to how ships choose to attack turrets (they now have a 25% chance of attacking a beam turret which has fired at them from another ship)
2003-03-20 08:24:45 +00:00
Goober5000 d21190d765 implemented mission flags for no briefing or no debriefing - yay!
--Goober5000
2003-03-20 07:15:37 +00:00
Goober5000 ae2eefeb92 extended sexps
--Goober5000
2003-03-20 04:27:10 +00:00
Goober5000 c0968ba348 making sexps better
--Goober5000
2003-03-20 00:08:08 +00:00
Goober5000 d469a505c4 bit o' housecleaning
--Goober5000
2003-03-19 23:06:40 +00:00
Goober5000 34244e313b added some mission flags
--Goober5000
2003-03-19 22:49:32 +00:00
unknownplayer d77c3feef5 Woohoo! Killed two birds with one stone!
Fixed the 'black screen around dialog boxes' problem and also the much more serious freezing problem experienced by Goober5000. It wasn't a crash, just an infinite loop. DX8 merge is GO! once again :)
2003-03-19 12:29:02 +00:00
Goober5000 0fa9b99445 more housecleaning, this time for debug warnings
--Goober5000
2003-03-19 09:05:26 +00:00
unknownplayer 433688cc92 Updated the DX8 code to allow it to be run in 640x480 windowed mode. The game will only procede to do so if your registry settings are set to 640x480 to begin with, but this is accomplished simply enough. 2003-03-19 07:17:05 +00:00
Goober5000 790af7d332 added warp-effect sexp
--Goober5000
2003-03-19 06:23:28 +00:00
Goober5000 4fb733df43 added typecasting to get rid of some build warnings
--Goober5000
2003-03-19 06:22:58 +00:00
unknownplayer 0794d14a7a Fixed up a bug in the code which was causing all mission loads to crash.
As of this update, the DX merge is officially functional and complete within the CVS main branch. Tell Inquisitor we won't need to roll back at all, but Goober5000 needs to go and look at his SEXP code since he messed up a bunch of checking functions with it
2003-03-18 13:38:07 +00:00
unknownplayer 324747af39 The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can. 2003-03-18 10:07:06 +00:00
Goober5000 5377b50e53 added explosion-effect sexp and did some other minor housekeeping
--Goober5000
2003-03-18 08:44:06 +00:00
Goober5000 b745b8e545 fixed a subtle bug with EMP parsing which probably never happened and never will,
but it's nice to know it's solved :)
--Goober5000
2003-03-18 06:10:14 +00:00
Goober5000 cfa65cfe5c fixed some misspellings
--Goober5000
2003-03-18 01:44:31 +00:00
Goober5000 7d52af37fa pressing Q no longer makes a sound if the player's ship doesn't have shields
--Goober5000
2003-03-17 10:37:32 +00:00
penguin d8f9376d55 Got autoconf to build w/ dx8 libs (for cutscenes). DX8 files must be in C:/dx8 dir for now, will fix later.
Also got rid of the fs2- prefix on the object files.
penguin
2003-03-11 19:00:05 +00:00
phreak 2c95fa52f8 worked a hack to fix opengl support with dx8show movies 2003-03-07 01:00:37 +00:00
phreak 993740e06f added some hacks that shutdown and restore opengl because of cutscenes 2003-03-07 00:15:45 +00:00
Goober5000 da67b2b53c fixed what should be the last bug with bank-specific loadouts
--Goober5000
2003-03-06 09:13:43 +00:00
Goober5000 7d08fec7cc rewrote the restricted bank loadout code; it should work now
--Goober5000
2003-03-05 12:38:01 +00:00
Goober5000 6ec2c31678 cleaned out Bobboau's buggy code - about to rewrite with new, bug-free code :)
--Goober5000
2003-03-05 09:17:15 +00:00
Goober5000 e469a54429 fixed misspelling of "attenuation"
--Goober5000
2003-03-04 04:41:03 +00:00
Goober5000 2352055d98 made error message appear if EMP used without necessary parameters
--Goober5000
2003-03-04 02:25:25 +00:00
Goober5000 7892625474 fixed custom banks so that they no longer need the ":" between each entry
--Goober5000
2003-03-03 17:15:16 +00:00
bobboau 58a1497614 forgot something 2003-03-03 16:50:14 +00:00
bobboau 76d94278a8 forgot something 2003-03-03 10:29:39 +00:00
bobboau 47b2c3cd88 fixed a bug in the bank specific loadout relaiting to secondaries 2003-03-03 10:21:08 +00:00
Goober5000 1f55e87876 fixed the warp effect from always being the knossos type
--Goober5000
2003-03-03 09:53:32 +00:00
Goober5000 cdd1a0b743 changed "Subspace node activated" message to "Subspace drive activated"
--Goober5000
2003-03-03 09:31:59 +00:00
Goober5000 f864a28bb3 fixed the tech room bug! yay!
--Goober5000
2003-03-03 04:28:37 +00:00
inquisitor 993a176572 Readme word doc
-Inquisitor
2003-03-02 18:25:49 +00:00
Goober5000 414a344f33 commented an unneeded variable
-- Goober5000
2003-03-02 17:19:45 +00:00
penguin 28848dcbc8 Added type for static var
- penguin
2003-03-02 07:39:34 +00:00
penguin ea32341410 file needed by automake 2003-03-02 06:58:45 +00:00
penguin ad53507f1c file generated by autoconf 2003-03-02 06:49:23 +00:00
penguin 8f9e7cf941 Use multimedia headers in local dir, not system's (headers are not present in MinGW distribution)
- penguin
2003-03-02 06:37:24 +00:00
penguin 1f1339cb01 Added multimedia headers not present in MinGW distribution
- penguin
2003-03-02 06:28:12 +00:00
penguin e5eafea546 Tweaked for gcc
- penguin
2003-03-02 06:25:31 +00:00
penguin 373d2c201c Made a debug error message less confusing
- penguin
2003-03-02 06:10:58 +00:00
penguin ec63b64b1f Added versions of _outp() and _inp() for gcc.
- penguin
2003-03-02 06:04:00 +00:00
penguin e6da9a6d68 Added newline at end of file to keep gcc from complaining.
- penguin
2003-03-02 06:03:01 +00:00
penguin 4fac9708ec Added #ifdef WIN32 and #ifdef MSC_VER
- penguin
2003-03-02 06:01:55 +00:00
penguin 71d4bd62b2 Added #ifdef WIN32 around non-standard header file io.h
- penguin
2003-03-02 05:56:56 +00:00
penguin 3e96899ace Moved Gr_scaler_zbuffering definition to top of file
- penguin
2003-03-02 05:55:51 +00:00
penguin 51c590c6a6 ANSI C++ - namespace clash on ai_rotation; renamed type to ai_rotation_t
- penguin
2003-03-02 05:54:23 +00:00
penguin e7d1452827 Added gcc-compatible asm blocks
- penguin
2003-03-02 05:46:28 +00:00
penguin 137e7a8cdd 1. Added gcc-compatible asm code.
2. Added #ifndef NO_SOFTWARE_RENDERING
 - penguin
2003-03-02 05:45:04 +00:00
penguin 77f769b328 ANSI C++ - fixed non-compliant casts to unsigned short and unsigned char
- penguin
2003-03-02 05:43:49 +00:00
penguin c85cb1377b Added some #ifndef NO_SOFTWARE_RENDERING
- penguin
2003-03-02 05:41:52 +00:00
penguin f3362d6a2f Abort if unimplemented asm section is called
- penguin
2003-03-02 05:40:28 +00:00
penguin 043310f88a Added #ifdef _MSC_VER to MSVC-specific code
- penguin
2003-03-02 05:30:26 +00:00
penguin 46f524706c only define min() and max() if they're not already defined
- penguin
2003-03-02 05:27:44 +00:00
penguin 7b7df3caba defined FX_ENTRY and FX_CALL for gcc
- penguin
2003-03-02 05:26:23 +00:00
penguin a47ff4d7a5 1. Renamed or, og, ob vars to o_r, o_g, o_b ("or" caused gcc to choke).
2. Added #ifndef NO_SOFTWARE_RENDERING around software rendering code
3. Added #ifdef _MSC_VER around MSVC-specific exception handing code
 - penguin
2003-03-02 05:23:34 +00:00
penguin 70fc3119e7 Moved "extern int wm" declaration inside the header #ifdef block
- penguin
2003-03-02 05:12:39 +00:00
penguin 830be35c58 Added #ifdef _MSC_VER around strange exception-handling code
- penguin
2003-03-02 05:10:42 +00:00
penguin 2fff39194f ANSI C++ changes
- penguin
2003-03-02 05:07:12 +00:00
penguin fffa377d2f Removed -- this was the old Linux makefile. GNU-style makefiles are now generated by autoconf/automake
- penguin
2003-03-02 05:03:11 +00:00
penguin a819e73388 New files for autoconf/automake support.
- penguin
2003-03-02 04:53:46 +00:00
Goober5000 0562965e69 bumped alternate names from 10 to 25
--Goober5000
2003-03-02 02:10:11 +00:00
Goober5000 7928823b96 fixed the initial status bug 2003-03-01 01:15:38 +00:00
bobboau 3b92333b16 fixed the bug with fighter beams not giveing you kills 2003-02-26 02:56:55 +00:00
bobboau 7238ae9025 fixing my bug fix for the warp model, and not being able to find it 2003-02-25 16:46:01 +00:00
bobboau f6634e882c doh... forgot something in the beam rendering code 2003-02-25 07:15:07 +00:00
bobboau f99a3916de fixed a bunch of fighter beam bugs,
most notabley the sound now works corectly,
and they have limeted range with atenuated damage (table option)
added bank specific compatabilities
2003-02-25 06:22:50 +00:00
inquisitor cc9f972e80 added dxguid, ddraw, and strmiids.lib 2003-02-24 02:01:49 +00:00
inquisitor 609da60af3 added dxguid, ddraw, and strmiids.lib 2003-02-24 01:25:11 +00:00
wmcoolmon 7b794ea056 Refixed the splash screen loading code so that it still works with the demo VPs (Loading "2_PreLoad" and "PreLoad") and put logo support back in. Logo support does nothing unless "PreLoadLogo" and/or"2_PreLoadLogo" exist within the search path. 2003-02-23 20:55:57 +00:00
wmcoolmon 3f66617c68 Uncommented the sections of code that actually played a movie for a given mission. (Removed when daveb cleaned out the movie code for the release) 2003-02-23 03:13:03 +00:00
wmcoolmon f8f60965a9 Added cutscenes/movie.cpp(.h) and directx/dx8show.cpp(.h), which contain movie playing code. Don't compile these if you don't have the DX8 SDK. 2003-02-22 04:24:59 +00:00
wmcoolmon 6f0832c6d8 DirectX-specific code for movie-playing functions in cutscenes/movie.cpp. Ask RT if you have any questions about it; I just commited it :). 2003-02-22 04:20:47 +00:00
wmcoolmon 33c321d328 Movie playing code; use movie_play and movie_play_two to play movies using Directshow. Depends on directx/dx8show.cpp 2003-02-22 04:17:58 +00:00
wmcoolmon 16fdb53870 Added "os_app_activate_set" 2003-02-22 04:14:21 +00:00
wmcoolmon b5ab80797d Added "-dshowvid" command-line option, which must be set in order for movies to play. 2003-02-22 04:13:17 +00:00
phreak 1385a9c6ac stupid typo -- my bad 2003-02-16 19:00:56 +00:00
phreak a11c390fd5 fixed typecasting warnings 2003-02-16 18:55:59 +00:00
phreak a498b79b2d fixed around splash screen
2_splash.pcx is loaded in 1024x768
splash.pcx is loaded in 640x480 or 2_splash.pcx isn't found
2003-02-16 18:53:59 +00:00
phreak 6a22f2443e tweaked some more stuff 2003-02-16 18:43:13 +00:00
bobboau cd2597f3a2 added glow map nebula bug fix for d3d, someone should add a fix for glide too
more importantly I (think I) have fixed all major bugs with fighter beams, and added a bit of new functionality
2003-02-16 05:14:29 +00:00
Goober5000 d32a38c267 fixed version bumpage... the version is 3.5.0, not 3.50.0 ;)
--Goober5000
2003-02-05 07:04:31 +00:00
Goober5000 64bcc9942e made my fighterbay code more forgiving of eccentric modeling hacks...
ships can now use the Faustus hangar again :)
--Goober5000
2003-02-05 06:57:56 +00:00
phreak cf750429cb started to finalize before 3.50 release.
added support for GL_EXT_texture_filter_ansiotropic
2003-02-01 02:57:42 +00:00
phreak 32843f18f8 bumped to 3.50 2003-01-30 23:24:34 +00:00
phreak d7bd110ffe cleaned up debug output 2003-01-30 23:19:33 +00:00
phreak 36176b8eb4 enabled RGB lighting for OpenGL 2003-01-30 23:19:14 +00:00
Goober5000 8c94fbd199 finished up my fighterbay code - ships will not be able to arrive from or depart into
fighterbays that have been destroyed (but you have to explicitly say in the tables
that the fighterbay takes damage in order to enable this)
--Goober5000
2003-01-27 07:46:33 +00:00
DTP d9e1e01afc Part of bumping MAX_SHIPS to 250 max_ship_types. Server now no more Crashes on kill, when max_shiptypes is above 200. Note Client still cant join. narrowing it down. 2003-01-27 01:12:15 +00:00
DTP 8edec19426 Part of bumping MAX_SHIPS to 250 max_ship_types. Server now no more Crashes on kill, when max_shiptypes is above 200. Note Client still cant join. narrowing it down. 2003-01-27 00:51:46 +00:00
DTP 5419f3b5de temporary fix, added some // so that we can do debug builds. i expect Goober5000 will fix it soon. 2003-01-26 23:30:53 +00:00
wmcoolmon 6df0403964 Minor mod to preload screen code, added separate 1024x768 logo
-C
2003-01-26 20:04:32 +00:00
Goober5000 2bef522bfc changed change-music to change-soundtrack
--Goober5000
2003-01-26 18:37:19 +00:00
wmcoolmon 4e86a928b3 Added title screen support to retail version. When FS2 loads, it will build a list of PCX files in the current directory, then attempt to display one. If no PCX files exist, it will try to display one of the title screens defined in the code. Freespace 2 will then attempt to superimpose a logo in the upper-left hand corner of the screen. If neither can be displayed, FS2 will function normally. 2003-01-26 02:58:33 +00:00
Goober5000 254b4f6603 oops - fixed the nebula bug that wasn't completely fixed :)
--Goober5000
2003-01-26 00:20:01 +00:00
Goober5000 7373203236 added preloader to change-ship-model and change-ship-class so that the game
doesn't hesitate when switching models in the middle of missions
--Goober5000
2003-01-25 04:54:36 +00:00
Goober5000 55a4c34bab added change-music sexp and bumped MAX_SOUNDTRACKS from 10 to 25
--Ian Warfield
2003-01-25 04:17:39 +00:00
Goober5000 b060ac5928 aw, nuts - fixed a dumb bug with my new don't-collide-invisible code :p
--Goober5000
2003-01-24 03:48:11 +00:00
Goober5000 ab27958761 fixed a small nebula ship trail bug
--Goober5000
2003-01-24 03:15:11 +00:00
Goober5000 dca1600f46 fixed a few bugs in Bobboau's implementation of the glow sexps; also added
help for the sexps in sexp_tree
--Goober5000
2003-01-21 17:24:16 +00:00
bobboau 218ac8a0d7 added several sExps for turning glow points and glow maps on and off 2003-01-20 05:40:50 +00:00
Goober5000 cac96f1a44 cleaned up build output a bit
--Goober5000
2003-01-19 22:45:35 +00:00
Goober5000 55948f0db1 removed unreferenced variable
--Goober5000
2003-01-19 22:25:10 +00:00
Goober5000 c80033de55 fixed a bunch of bugs -- the support ship sexp, the "no-subspace-drive" flag,
and departure into hangars should now all work properly
--Goober5000
2003-01-19 22:20:23 +00:00
Goober5000 dd378506ee fixed fiddly code
--Goober5000
2003-01-19 09:14:05 +00:00
Goober5000 9e890d8df5 more tweaky bug fixes
--Goober5000
2003-01-19 09:10:40 +00:00
Goober5000 f4030700dc fixed two dumb bugs in the set-support-ship code
--Goober5000
2003-01-19 08:37:52 +00:00
Goober5000 b7f924ea6b actually added the set-support-ship sexp; much of the other commit was
groundwork (data types and stuff)
--Goober5000
2003-01-19 07:45:38 +00:00
Goober5000 c5c4fd08e9 oops - forgot a bit of departure code :)
--Goober5000
2003-01-19 07:13:05 +00:00
Goober5000 bf7871905e fixed a bunch of bugs - "no-subspace-drive" should now work properly for
all ships, and all ships who have their departure anchor set to a capital ship
should exit to that ship when told to depart
--Goober5000
2003-01-19 07:02:16 +00:00
Goober5000 28ef47c26f got rid of nameplate stuff (superceded by texture replacement)
--Goober5000
2003-01-19 06:44:39 +00:00
bobboau 7a6e12df06 redid the way glowmaps are handeled, you now must set the global int GLOWMAP (no longer an array) before you render a poly that uses a glow map then set GLOWMAP to -1 when you're done with, fixed a few other misc bugs it 2003-01-19 01:07:43 +00:00
Goober5000 97130623dc made "no-subspace-drive" applicable to all ships and fixed a really *STUPID*
bug that made FRED keep crashing (missing comma, bleagh!)
--Goober5000
2003-01-18 23:25:39 +00:00
phreak a1ad295557 added 'ddsutils' folder to project 2003-01-18 20:00:49 +00:00
phreak ecc552eda8 fixed around the bmpman system to now accept compressed textures 2003-01-18 19:55:16 +00:00
phreak 56d7afd8a0 texture mapper now supports DXTC compressed textures 2003-01-18 19:49:45 +00:00
phreak 46e465b1d2 added tcache flag TCACHE_FLAG_COMPRESSED 2003-01-18 19:49:02 +00:00
phreak 4c52cb0441 added some defines that deal with mages using DXTC 2003-01-18 19:48:19 +00:00
phreak 4da09ccefc these files deal with reading .dds files which use DXTC texture compression 2003-01-18 19:45:20 +00:00
Goober5000 389921bd48 added "no-subspace-drive" flag for ships
--Goober5000
2003-01-18 10:00:43 +00:00
Goober5000 e9f6827211 fixed bug I inadvertently introduced by modifying SIF_ flags with sexps rather
than SF_ flags
--Goober5000
2003-01-18 09:25:42 +00:00
Goober5000 042d935a80 fixed some really strange behavior with strings not being truncated at the
# symbol
--Goober5000
2003-01-17 07:59:09 +00:00
Goober5000 1f7fee5baa Allowed selection of either $Texture Replace, which keeps track of individual
replacement textures for a ship, or $Duplicate Model Texture Replace, which
duplicates a model and reskins it.  Use $Duplicate Model Texture Replace
if you want to substitute an animated texture or a transparent texture.
--Goober5000
2003-01-17 04:57:17 +00:00
Goober5000 ff33077291 added capability to the $Texture replace code to substitute the textures
without needing and extra model, however, this way you can't substitute
transparent or animated textures
--Goober5000
2003-01-17 01:48:50 +00:00
Goober5000 70c909302c yay! got texture replacement to work!!!
--Goober5000
2003-01-16 06:49:11 +00:00
Goober5000 900f57bc94 NOW the model duplicates work! :p
still gotta do the textures, but it shouldn't be hard now
--Goober5000
2003-01-15 23:23:30 +00:00
anonymous 41fabe25bd fixed the demo compilation. Define FS2_DEMO globally to compile as a demo. Make sure warp.pof is in your data/models directory. 2003-01-15 21:29:05 +00:00
inquisitor 1e634da6dd Test commit, ignore 2003-01-15 20:49:50 +00:00
Goober5000 a4386862f5 did the XSTR for the turret thing
--Goober5000
2003-01-15 20:49:10 +00:00
Goober5000 7435ddd89b oops, that'll introduce a bug - naming it just plain "Turret" instead
--Goober5000
2003-01-15 16:52:27 +00:00
Goober5000 f1e5508023 capship ballistic weapon displays "Cannon" on HUD instead of "Laser Turret"
--Goober5000
2003-01-15 16:48:59 +00:00
Goober5000 0fd8e46ea2 assigning duplicate models to ships now works; committing so I have a base
to fall back to as I work on texture replacement
--Goober5000
2003-01-15 08:57:23 +00:00
Goober5000 cb4764e8d0 changed most references to modelnum to use ship instead of ship_info --
this will help with the change-model sexp and any other instances of model
changing
--Goober5000
2003-01-15 07:09:09 +00:00
Goober5000 0c55ff682b added texture replacement parse - will be implemented later
--Goober5000
2003-01-15 05:24:23 +00:00
Goober5000 8659222b82 bumped main halls down to 10
--Goober5000
2003-01-15 05:19:07 +00:00
Goober5000 64b2332534 moved texture loading around a bit; added Texture_replace in preparation
for some cool stuff
--Goober5000
2003-01-15 05:18:13 +00:00
Goober5000 303278228a argh - fixed the stupid message persona bug with <any wingman>
Bobboau, please check your code!
--Goober5000
2003-01-14 06:13:23 +00:00
Goober5000 16baec8877 commented out some mprintfs that were clogging up the debug spew
--Goober5000
2003-01-14 05:53:58 +00:00
Goober5000 0b7cc9aa9d fixed minor potential bug
--Goober5000
2003-01-14 04:01:33 +00:00
Goober5000 77bc1ed93b allowed for up to 256 main halls
--Goober5000
2003-01-14 04:00:16 +00:00
Goober5000 d2969046d4 bug hunting; fixed the beam whack effect bug
--Goober5000
2003-01-13 23:20:01 +00:00
wmcoolmon b3c67343e5 Added MISSION_FLAG_NO_NEB_TRAILS and removed MISSION_FLAG_ST_OVERRIDE_NEB. Also changed code to set flags as necessary 2003-01-13 02:09:12 +00:00
wmcoolmon f26624902f Very slightly optimized code 2003-01-12 03:26:41 +00:00
wmcoolmon f96196c271 It turns out the version in the CVS did not toggle the ship trails with the flag...fixed this. 2003-01-12 00:19:55 +00:00
wmcoolmon f47b3c0fd0 Added code for "Ship Trails override Nebula" 2003-01-11 01:00:25 +00:00
Goober5000 170ac43ebe I found these two beautiful functions in ship.cpp - ship_change_model
and change_ship_type - so I made them into sexps :)
--Goober5000
2003-01-10 04:14:19 +00:00
inquisitor 93e0b43b03 Rollback to 2.7 to fix glow code issue that phreak noticed.
-Quiz
2003-01-09 22:23:38 +00:00
phreak b9c9069c5a fixed a small error in bob's glowmap code 2003-01-09 21:22:36 +00:00
phreak fdc9b42d14 fixed a small error in bob's code 2003-01-09 21:20:21 +00:00
phreak 6cb690996d glowmaps in OpenGL, yay! 2003-01-09 21:19:54 +00:00
phreak eb63396934 glowmaps unloaded if their parent is 2003-01-09 21:19:25 +00:00
Goober5000 f1aa394d29 fixed the giant thruster glow bug
--Goober5000
2003-01-09 05:55:55 +00:00
Goober5000 415969fca0 snagged a potential bug
--Goober5000
2003-01-09 05:52:25 +00:00
Goober5000 dfbd9ad9d0 fixed debriefing music in non-campaign missions
--Goober5000
2003-01-08 19:49:15 +00:00
Goober5000 a50424930b added ai-chase-any-except sexp
--Goober5000
2003-01-07 20:06:44 +00:00
phreak 9843ff7b49 fixed problem in win32_create_window() that disabled OpenGL from running in windowed mode 2003-01-07 00:02:08 +00:00
Goober5000 7ea79b3ed4 implemented keep-safe-distance
--Goober5000
2003-01-06 22:57:23 +00:00
Goober5000 b783b7e364 allowed fighters and bombers to accept the stay-near-ship and
keep-safe-distance orders
--Goober5000
2003-01-06 21:52:58 +00:00
Goober5000 60d0011159 nasssty bugs, we hates them, yesss we do, preciousssss
:)
--Goober5000
2003-01-06 20:29:28 +00:00
Goober5000 e730044cc1 cleaned up some stuff with model_set_thrust and a commented Assert that
shouldn't have been
--Goober5000
2003-01-06 19:33:22 +00:00
Goober5000 60ea566ecc a wee failsafe added
--Goober5000
2003-01-06 18:50:37 +00:00
Goober5000 fd797419dd hmm... moved +Squad Logo to immediately beneath $Name
--Goober5000
2003-01-06 17:19:14 +00:00
Goober5000 3a5a785f51 added wing configurable squad logos - put +Squad Logo: filename.pcx as
the last entry in each wing that you want (but the player's squad logo will
still be the squad logo for the player's wing)
--Goober5000
2003-01-06 17:14:52 +00:00
bobboau 65564198ef disabled decals (for now), removed the warp ray thingys,
made some better error mesages while parseing weapons and ships tbls,
and... oh ya, added glow mapping
2003-01-05 23:41:51 +00:00
Goober5000 def0b0ceb0 added capability of is-iff and change-iff to have wings as well as ships
as their arguments; also allowed a bunch of sexps to accept the player
as an argument where they would previously display a parse error
--Goober5000
2003-01-05 01:26:35 +00:00
Goober5000 01776721ab fixed the order sexp
--Goober5000
2003-01-04 23:15:39 +00:00
Goober5000 6f7d012184 Fixed some minor bugs, and added a primitive-sensors flag, where if a ship
has primitive sensors it can't target anything and objects don't appear
on radar if they're outside a certain range.  This range can be modified
via the sexp primitive-sensors-set-range.
--Goober5000
2003-01-03 21:58:08 +00:00
Goober5000 7d4d468e58 this is the way we squash the bugs, squash the bugs, squash the bugs
this is the way we squash the bugs, so early in the morning :p
--Goober5000
2003-01-02 03:09:01 +00:00
Goober5000 d1a870b372 added don't-collide-invisible and collide-invisible sexps
--Goober5000
2003-01-02 00:35:21 +00:00
Goober5000 680e55e493 added ship-vaporize and ship-no-vaporize sexps
--Goober5000
2003-01-01 23:33:34 +00:00
Goober5000 c779bae39a bumped to 3.4
--Goober5000
2002-12-31 20:09:14 +00:00
Goober5000 5a4fafec31 tweaked stuff
--Goober5000
2002-12-31 19:35:14 +00:00
Goober5000 cfcc94c2bb if it ain't broke, don't fix it
--Goober5000
2002-12-31 19:18:41 +00:00
Goober5000 8d1c8fad7c if it ain't broke, don't fix it
--Goober5000
2002-12-31 18:59:43 +00:00
Goober5000 c6cc437092 simplified end-user implementation of ballistic primaries
--Goober5000
2002-12-31 08:20:31 +00:00
Goober5000 6a30e96439 added damaged-escort-priority-all sexp
--Goober5000
2002-12-31 07:26:40 +00:00
Goober5000 95d7869aa6 fixed escort list behavior for stealthy ships
--Goober5000
2002-12-31 05:17:13 +00:00
Goober5000 95a26b87ce made force feedback stronger when firing ballistic primaries
--Goober5000
2002-12-30 06:16:09 +00:00
phreak 6c0bfdd0b7 added damage-escort-list as a new sexp 2002-12-27 20:16:18 +00:00
Goober5000 0e19a3a614 the insidious beam bug is now squashed AND committed!
--Goober5000
2002-12-27 17:58:11 +00:00
Goober5000 35350315b7 removed the existing stealth sexps and replaced them with the following...
ship-stealthy
ship-unstealthy
is-ship-stealthy
friendly-stealth-invisible
friendly-stealth-visible
is-friendly-stealth-visible
--Goober5000
2002-12-27 02:57:51 +00:00
Goober5000 8f97380d75 meh - changed is-cargo-x to is-cargo
--Goober5000
2002-12-25 01:22:23 +00:00
Goober5000 fe6bac98c7 added change-ai-class and is-ai-class, and I think I may also have nailed the
is-iff bug; did some other bug hunting as well
--Goober5000
2002-12-24 07:42:29 +00:00
Goober5000 77c5502b19 added a wee cautionary note
--Goober5000
2002-12-24 07:38:59 +00:00
Goober5000 065eb6f1d5 added set-cargo and is-cargo-x sexps
--Goober5000
2002-12-23 23:01:27 +00:00
phreak 103e4b2b22 defined USE_OPENGL for debug and release builds 2002-12-23 21:13:41 +00:00
phreak cb4e5b551f dumb typo 2002-12-23 19:25:39 +00:00
phreak c22d9a7e99 added code that displays an error if user's OGL version is less than 1.2 2002-12-23 17:52:51 +00:00
Goober5000 2b52cf3896 Bah - Andsager is a moron. :) I see no reason why rand shouldn't work
multiple times.  It's been fixed thus.
--Goober5000
2002-12-23 05:41:08 +00:00
Goober5000 5b16bd3748 Squashed some Volition bugs! :O Some of the sexps for dealing with more than
one ship would return after only dealing with the first ship.

Also added the following sexps:
is-ship-stealthed
ship-force-stealth
ship-force-nostealth
ship-remove-stealth-forcing

They toggle the stealth flag on and off.  If a ship is forced stealthy, it won't even
show up for friendly ships.
--Goober5000
2002-12-23 05:18:52 +00:00
Goober5000 40bbe0cd39 removed stipulation that "Instructor" be present for training-msg sexp to work
--Goober5000

(This is fun! :))
2002-12-23 01:47:17 +00:00
Goober5000 661dc39d9c hack: turn on ship trails if in nebula - restores backward compatibility
--Goober5000
2002-12-22 22:59:04 +00:00
Goober5000 07c240e9a1 tweaked positioning of the new HUD graphics
--Goober5000
2002-12-22 21:31:01 +00:00
Goober5000 93f20cb8e4 added primaries-depleted and primary-ammo-pct sexps -- useful for ships with
ballistic primaries
--Goober5000
2002-12-22 21:12:22 +00:00
Goober5000 e512f60386 Subcategories implemented. :) So far all that's been done is the Change menu, but other
subcategorizations are possible.  Here are the instructions from sexp.h...
"Adding more subcategories is possible with the new code.  All that needs to be done is
to add a #define here (a number from 0x0000 to 0x00ff ORred with the category that it
goes under), some appropriate case statements in get_subcategory() (in sexp.cpp) that
will return the subcategory for each sexp that uses it, and the submenu name in the
op_submenu[] array in sexp_tree.cpp."

Please note that I rearranged a whole bunch of sexps in the Operators[] array in sexp.cpp
in order to make the subcategories work better, so if you get a whole bunch of differences
or even conflicts, just ignore them. :)
--Goober5000
2002-12-22 17:22:47 +00:00
Goober5000 59442ea786 commented out the warning if you don't have the new ballistic HUD graphics - it would probably get annoying (just use the old ones without comment)
--Goober5000
2002-12-21 18:03:49 +00:00
Goober5000 ee8a7f67a7 rearranged the sexp list and got the preliminary subcategories working - still need to work on the actual submenu
--Goober5000
2002-12-21 17:58:11 +00:00
DTP c2c24787da did bit more house keeping. modfied Phreaks fps cmdline a bit, so that we dont have to specific build code.libs for fred, but can use the same code.lib for both fs2_open.exe and fred2_open.exe 2002-12-21 13:39:25 +00:00
Goober5000 60f69cb79b Updated the cargo-known-delay and cap-subsys-cargo-known-delay sexps to work correctly if set-scanned and set-unscanned are used repeatedly with the same ship or ship subsystem. In most cases, this functionality will never be needed, but it's nice to know that it's here. :) However, I should point out that cap-subsys-cargo-known-delay will recognize only the first instance of a subsystem being revealed once the ship is no longer in the mission. Here is the relevant bit I put into the sexp handling routine...
"Since there is no way to keep track of subsystem status once a ship has departed or has been destroyed, check the mission log.  This will work in 99.9999999% of all cases; however, if the mission designer repeatedly sets and resets the scanned status of the subsystem, the mission log will only return the first occurrence of the subsystem cargo being revealed (regardless of whether it was first hidden using set-unscanned).  Normally, ships keep track of cargo data in the subsystem struct, but once/ the ship has left the mission, the subsystem linked list is purged, causing the loss of this information.  I judged the significant rework of the subsystem code not worth the rare instance that this sexp may be required to work in this way, especially since this problem only occurs after the ship departs.  If the mission designer really needs this functionality, he or she can achieve the same result with creative combinations of event chaining and is-event-true."

Please note that this problem only occurs with cap-subsys-cargo-known-delay, only if the subsystem scanned status is revealed more than once, and then only after the ship is no longer in the mission.  Sufficiently rare, I figured, that I could afford to not worry about it.
--Goober5000
2002-12-20 07:17:23 +00:00
Goober5000 3bc70fc2c2 added capability of storing time_subsys_cargo_revealed
--Goober5000
2002-12-20 07:09:03 +00:00
DTP f09a3c0a09 DTP FIX, fast fix to the beam/shield bug problem. will maybe commit later when i find out why this is getting triggered when it should not 2002-12-20 00:50:41 +00:00
Goober5000 f15a879898 oops - squashed a bug :)
--Goober5000
2002-12-19 10:54:37 +00:00
Goober5000 984f3f0aa7 implemented the revised HUD weapon display for ballistic primaries
--Goober5000
2002-12-19 10:46:14 +00:00
phreak 1559d18757 tidied up game_init() a bit.. took out a bunch of unneeded ifdefs like E3_BUILD
Added option to access OpenGL from the registry keys.  searches for "OpenGL-"
whoever is in charge of the launcher might want to know this.
2002-12-18 22:21:23 +00:00
Goober5000 c2c0ca0eeb added set-scanned and set-unscanned sexps
PLEASE NOTE: These sexps will cause cargo-known-delay and cap-subsys-cargo-known-delay to not work correctly if set-scanned and set-unscanned are used more than once.  I'll fix this later.

--Goober5000
2002-12-17 03:25:30 +00:00
DTP 754c35f2f5 fix to Show_framerate. seems it will call an unresolved external error during fred builds. modified my ifndefs a bit, dsw modified to include preprocessor tag FRED. 2002-12-17 03:08:18 +00:00
DTP 2bbd5a806b wrong name :) 2002-12-17 02:22:34 +00:00
Goober5000 5891192fda cosmetic fixed; also OP_SET_SCANNED and OP_SET_UNSCANNED added in preparation for the set-scanned and set-unscanned sexp commit
--Goober5000
2002-12-17 02:21:42 +00:00
DTP 5effb36530 cleaned up after Goober5000 :). it will make a mess in debug builds. added a couple of ifndef _debugs. 2002-12-17 02:21:06 +00:00
Goober5000 bc72cea911 added functionality and fixed a few things with cargo being revealed and hidden in preparation for the set-scanned and set-unscanned sexp commit
--Goober5000
2002-12-17 02:18:40 +00:00
DTP ec8886cf09 Bumped MAX JUMP-nodes to 50. if anybody wants a Jump-node forest 2002-12-17 01:56:36 +00:00
phreak bce0cc4ca0 optimized fullscreen/minimized functions.. alot faster 2002-12-16 23:28:52 +00:00
DTP 66eaf28ac8 fixed a minor glitch, replaced <> with ", so that it takes project glXXX.h, and not compilers glXXX.h 2002-12-15 18:59:57 +00:00
phreak d728b3d745 opengl headers 2002-12-15 16:57:15 +00:00
DTP 11426ed5a2 FIX; player can now have all ships set in FRED2 as allowed playerships in singleplayer 2002-12-15 06:50:49 +00:00
DTP 386abb7000 Bumped fire_dealy on_empty_secondary to 1000 2002-12-15 06:29:24 +00:00
Goober5000 476fb7bbfc removed mission flag for fighterbay damage; instead made damage display contingent on whether the fighterbay subsystem is assigned a damage percentage in ships.tbl
--Goober5000
2002-12-14 17:09:28 +00:00
phreak c825720ae0 added a command line that displays frames per second when enabled.
use "-fps"
2002-12-14 17:09:08 +00:00
phreak 6e407fff7b copied from grgpenglw32x.cpp. 2002-12-14 16:14:52 +00:00
Goober5000 11b24d23aa added mission flag to show subsystem damage for fighterbays
~Goober5000~
2002-12-14 01:55:04 +00:00
Goober5000 2135e20299 small tweaks and bug fixes for the ballistic primary conversion
~Goober5000~
2002-12-13 08:13:30 +00:00
Goober5000 123277167b added distance-ship-subsystem sexp
~Goober5000~
2002-12-12 08:01:57 +00:00
Goober5000 4a9f85674f Full-fledged ballistic primary support added! Try it and see! :) 2002-12-10 05:43:35 +00:00
Goober5000 719579177e Full-fledged ballistic primary support added! Try it and see! :)
Fixed lead indicator behavior; Phreak's version didn't work properly.
2002-12-10 05:42:42 +00:00
Goober5000 3f6a1f33d4 Full-fledged ballistic primary support added! Try it and see! :)
Preliminary support added for selecting additional primaries (more than 2) and secondaries (more than 3) if this is implemented later.
Transports can now dock with fighters, bombers, & stealth ships.
2002-12-10 05:41:38 +00:00
DTP 688dee73c2 DTP; added decals.h and decals.cpp to the project, aswell as the directory 2002-12-10 00:44:38 +00:00
Goober5000 5fa10d82f4 fixed misspelling 2002-12-09 08:37:31 +00:00
Goober5000 4cde77929f fixed misspelling 2002-12-09 08:26:24 +00:00
bobboau 41f66ee2f3 inital decals code, if you are worried a bug is being caused by the decals code it's only references are in,
collideshipweapon.cpp line 262, beam.cpp line 2771, and modelinterp.cpp line 2949.
it needs a better renderer, but is in prety good shape for now,
I also (think) I squashed a bug in the warpmodel code
2002-12-07 01:37:43 +00:00
phreak 2ee9db9479 extension framework implemented(no extensions work YET) -phreak 2002-12-05 00:49:25 +00:00
DTP f87883712e lowered MAX_POLYGON_MODELS FROM 198 to 128 for safety reasons since we bumped back MAX_SHIP_TYPES to 130 2002-12-04 09:44:34 +00:00
Goober5000 ea22ebfe09 implemented beam-free-all-by-default mission flag 2002-12-03 23:05:13 +00:00
Goober5000 0edd905be5 added myself to the credits list :)
~Goober5000
2002-12-03 22:14:06 +00:00
Goober5000 47e2ff7500 fixed player-entry-delay bug 2002-12-03 00:00:52 +00:00
Goober5000 c011621363 fixed misspelling 2002-12-02 23:56:12 +00:00
Goober5000 8c47d95901 fixed misspelling 2002-12-02 23:26:08 +00:00
Goober5000 e08be40462 fixed misspelling of "category" as "catagory" 2002-12-02 23:24:35 +00:00
Goober5000 d7022ad67b commented out an unneeded variable (int ret) in psnet_socket_options 2002-12-02 23:18:53 +00:00
Goober5000 38f435eba8 commented out an unneeded variable (ship *shipp) in model_really_render 2002-12-02 23:16:45 +00:00
Goober5000 6f429c16ee fixed mispelling of "category" as "catagory" 2002-12-02 23:14:17 +00:00
Goober5000 dfaebd0908 fixed mispelling of "category" as "catagory" 2002-12-02 20:49:14 +00:00
Goober5000 d6abb06544 fixed mispelling of "category" as "catagory" 2002-12-02 20:37:26 +00:00
sesquipedalian d950369202 end-mission sexp added 2002-11-28 00:00:37 +00:00
sesquipedalian 745fc385e9 Added Phreak's fix for the weapons room bug. Can now view a modified weapons.tbl in the tech room without crashing 2002-11-27 01:20:51 +00:00
phreak f02a1caced added OGL_inited global. Sets to 0 even if OGL isn't defined by preproccessor
-phreak
2002-11-22 20:56:15 +00:00
phreak e547962d31 changed around some page-in functions to work with opengl
changed bm_set_components_opengl
-phreak
2002-11-22 20:55:27 +00:00
phreak 31fe8e2a4c finished off all remaining problems with 32 bit mode, fullscreen mode
and colors.  Still needs some tweaking, but works near perfect
2002-11-22 20:54:16 +00:00
phreak 1b1dc86fb6 added some opengl defines for shield detail -phreak 2002-11-22 20:52:29 +00:00
DTP 7539390fc3 DTP; fix at line 6785 in parse/SEXP.cpp, a forgotten "{", when the is tagged thing was Fixed 2002-11-20 21:22:31 +00:00
sesquipedalian ad7b508184 Adding in EdrickV's fix to the is-tagged sexp. 2002-11-19 02:15:50 +00:00
phreak 0fa37a5b62 made ogl be used if "NDEBUG" is not defined and "USE_OPENGL" is defined - phreak 2002-11-18 21:34:16 +00:00
phreak 1cbfc73384 added some lines that makes ogl work in windowed mode for fullneb - phreak 2002-11-18 21:32:48 +00:00
phreak c58ae29dd5 added some ogl functionality - phreak 2002-11-18 21:32:11 +00:00
phreak 96e442b564 complete overhaul, works in 16 bit mode -phreak 2002-11-18 21:31:36 +00:00
phreak e817f867af added bm_select_components functions for OpenGL -phreak 2002-11-18 21:27:13 +00:00
bobboau 8c8c96bb89 added nameplate code 2002-11-14 06:15:03 +00:00
bobboau f0e7af10bb added warp model and type 1 glow points
and well as made the new glow file type,
some general improvement to fighter beams,
2002-11-14 04:18:17 +00:00
phreak 4e44bcfdef updated parse_weapon to parse custom corkscrew missiles 2002-11-11 20:18:30 +00:00
phreak d4cea3a9ff changed around the 'weapon_info' struct to allow for custom corkscrew missiles 2002-11-11 20:11:02 +00:00
phreak f06b7dfd20 changed cscrew_create and cscrew_process_post
to allow for custom corkscrew properties
2002-11-11 20:09:12 +00:00
phreak 6dd4f692e2 changed a line in ship_fire_secondary to allow for custom
amounts of corkscrew missiles fired
2002-11-11 20:05:52 +00:00
inquisitor d860dc0011 Bumped to 3.3 2002-11-10 20:40:02 +00:00
DTP d5d8e66dee DTP bumped back MAX_SHIP_TYPES to 130 2002-11-10 19:57:36 +00:00
DTP ad4843b8ea -DTP reworked mod support, 2002-11-10 16:32:42 +00:00
DTP 3162ede091 -DTP reworked mod support, 2002-11-10 16:30:53 +00:00
phreak f9e3871b3e Parser error handling for fighter flak, it didn't want flak on player weapons, now it doesn't care 2002-11-06 23:22:05 +00:00
phreak 53abc32182 Fighter flak code, it doesn't blow up in your face anymore! 2002-11-06 23:21:06 +00:00
DTP 39267bcb05 Made sure, that VP and Plain files dont get added twice to the search order. Side-effect of Mod support. 2002-11-04 08:32:38 +00:00
DTP 7398df34ec DOh,uhmm, define error again, this is getting to me. 2002-11-02 23:06:59 +00:00
DTP 62c8792c2a DOh, fixed that define, learn to count DTP :) 2002-11-02 23:04:46 +00:00
inquisitor e561a547a7 Cleaned up the presentation a little, added HLP and VW, and, no offense to Kazan, removed Kazan. 2002-11-02 22:25:26 +00:00
DTP 5128907c07 DOH forgot \n 2002-11-02 22:11:35 +00:00
DTP 5ddef96ccc shameless self promotion 2002-11-02 22:10:48 +00:00
DTP e75251141a DTP Bumped Max_exited_ships from 200 to double that of MAX_SHIPS = 800 . make sense ehh. for logging effect. 2002-10-31 21:56:44 +00:00
DTP 4f419025fe DTP Quickly added something needed to cmdline.h, since otherwise we can not compile the code as it misses some externals. Thought a rollback rolled all back. 2002-10-31 21:14:16 +00:00
penguin c6cf69e4a3 Hopelessly out of date, and only applied to Linux anyhow 2002-10-31 03:49:35 +00:00
penguin 10e444df95 updated 2002-10-31 03:46:27 +00:00
inquisitor eeab39d62d Bad Committ, Rolling back 2002-10-30 20:22:30 +00:00
DTP 28e46d411b doh!, used upper case in include, dont know how much it matters for *nix systems, but here it is 2002-10-30 06:31:05 +00:00
DTP 1195eb3ada DTP Implemented basic VP files handling. mission and campaign files inside VP files found in mod dir still not supported, cheking / creating directories not implented either 2002-10-30 06:26:11 +00:00
sesquipedalian 5f779fae4c no message 2002-10-29 22:41:48 +00:00
DTP cdb274654e Crap, somebody may restore cmdline.h to 2 version before this. 2002-10-28 02:28:52 +00:00
DTP b486c02ac8 DTP; started basic implementation of mod-support
plain files only for now. fs2_open.exe -mod X will look for files in fs2/ X /all-legal-subdirectories. no checking/creating dirs yet. directories must be there.
2002-10-27 23:59:28 +00:00
randomtiger 9bcb08776c Made Phreaks alternative scanning style optional under the command line tag "-phreak"
Fixed bug that changes HUD colour when targetting debris in a full nebula. - RT
2002-10-22 23:02:40 +00:00
randomtiger d36c788e00 Fixed lighting bug that caused special pause to crash on debug build.
Also added TAB functionality for special pause that toggles HUD. - RT
2002-10-22 17:42:09 +00:00
bobboau 00bbac6ae1 inital commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam sheild hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry 2002-10-19 19:29:29 +00:00
randomtiger 40db1ce831 Added special pause mode for easier action screenshots.
Added new command line parameter for accessing all single missions in tech room. - RT
2002-10-19 03:50:29 +00:00
randomtiger bbf18d5667 Added ability to remove HUD ingame on keypress shift O
So I've added a new key to the bind list and made use of already existing hud removal code.
2002-10-17 20:40:51 +00:00
phreak 377f78db0f screenshots, yay! 2002-10-14 19:49:08 +00:00
phreak ad96da3537 further optimizations 2002-10-13 21:43:24 +00:00
phreak db8cf9134f fixed text 2002-10-12 17:48:11 +00:00
phreak 0d65873a0b dont use this one 2002-10-11 21:35:51 +00:00
phreak c38ff6302d first run at opengl for w32, only useful in main hall, barracks and campaign room 2002-10-11 21:31:17 +00:00
randomtiger abc9a3ddb1 Added us fs2_open people to the credits. Worth looking at just for that.
Added timer bar code, by default its not compiled in.
Use TIMEBAR_ACTIVE in project and dependancy code settings to activate.
Added the new timebar files with the new code.
2002-10-05 16:46:10 +00:00
phreak 650c4dea46 did glare stuff in game_sunspot_process() 2002-09-20 20:09:01 +00:00
phreak a2d1cf8f37 glare parser stuff in stars_init() 2002-09-20 20:05:29 +00:00
phreak 23c449af6c added glare variable for ambient suns
if glare is 0 then the sun glare whiteout is not shown when looking at the sun
2002-09-20 20:04:54 +00:00
phreak 2d548f46bf lead indicator for dumbfire missiles 2002-09-20 20:02:00 +00:00
phreak c3c4ce064c extra effects during cargo scan 2002-09-20 20:01:30 +00:00
randomtiger fb7a0d5257 Tiny change to DX branch to keep movie code optional (default off) 2002-08-28 21:47:02 +00:00
randomtiger f8351a9818 Woh! I sure as hell didnt modify all these files it says I did.
I will put this down to the branch! Note: I did start from a fresh checkout!
2002-08-28 10:51:04 +00:00
penguin 5aefddd246 Moved DirectX8 stuff to directx8 branch; reverted to previous 2002-08-27 13:38:58 +00:00
randomtiger facefe5872 Added new lib files: strmiids and ddraw to get dshow working
Added new command line parameter to active direct show movie play: -dshowvid
Uncommented movie_play calls and includes
2002-08-18 19:48:29 +00:00
penguin ef794efbb3 Added #include, needed for FRED 2002-08-15 04:41:17 +00:00
penguin 573a1f2fa3 updated 2002-08-13 04:31:25 +00:00
penguin a763d84b56 1. Disable CD checking
2. Add CVS tag to version string
2002-08-13 03:34:00 +00:00
penguin c06ccbb602 Bumped to version 3.2 2002-08-13 03:32:25 +00:00
drevil ffd8a5ae2a Rebuilding admin files 2002-08-11 23:08:20 +00:00
drevil aa753d5d6e Trash syncmail, it's worthless, use logaccum stuff instead 2002-08-11 23:05:15 +00:00
drevil 1cf042064f Yet more updates for syncmail 2002-08-11 22:36:01 +00:00
drevil a4e14a94d2 Correct arguments to syncmail 2002-08-11 22:22:35 +00:00
drevil 5871d644cc Change which module syncinfo "hooks" to 2002-08-11 22:20:56 +00:00
drevil 145a149873 Updated syncmail to current CVS version 2002-08-11 22:17:16 +00:00
drevil 7492c51ee6 corrected path to syncmail 2002-08-11 22:04:47 +00:00
drevil be4954a69e Adding syncmail cvs commit notification 2002-08-11 22:02:45 +00:00
DTP 875a95b82e Implented -GF4FIX commandline switch & #include "cmdline/cmdline.h" 2002-08-07 00:45:25 +00:00
DTP f6b129577b Implented -GF4FIX commandline switch 2002-08-07 00:44:13 +00:00
penguin 4d30bbba3e Updated 2002-08-06 21:21:42 +00:00
phreak 8823dc67eb added wireframe targetbox feature 2002-08-06 16:50:44 +00:00
phreak 8690c9d7f6 added Targetbox_wire variable to check what mode the
hud targetbox uses
2002-08-06 16:50:13 +00:00
phreak f70d242903 added keybing for wireframe hud,
fixed previous missile cheat
2002-08-06 16:49:22 +00:00
penguin 5b4306dbd6 Use text strings for wingmen names instead of ANI 2002-08-06 04:39:26 +00:00
penguin 013870fc6a inserted "class" keyword on "friend" definitions (ANSI C++ ) 2002-08-06 03:50:48 +00:00
penguin 0e3d4e562f Fixed problem w/ compile options for Debug mode 2002-08-06 02:43:02 +00:00
penguin 48d1ec4575 Removed a couple more include dirs I missed 2002-08-06 01:49:47 +00:00
penguin 32ad077676 Renamed ccode members to cc_or and cc_and 2002-08-06 01:49:08 +00:00
penguin 9942308fc8 Moved ChangeLog to top-level directory 2002-08-04 05:43:13 +00:00
penguin af3b97aae5 Change version display 2002-08-04 05:13:00 +00:00
penguin c3c0b0e1f4 Display fs2_open version instead of "Freespace 2" 2002-08-04 05:12:42 +00:00
penguin 9d5863bc76 Change version display location 2002-08-04 05:12:10 +00:00
penguin 4b2d436b04 Update version number to 3.1 2002-08-04 05:11:36 +00:00
penguin 404195d389 Don't write version to registry; change way version string is formatted 2002-08-04 05:11:05 +00:00
randomtiger df29aad213 Fixed Geforce 4 bug that caused font and hall video distortion.
Very small change in 'gr_d3d_aabitmap_ex_internal'

Tested and works on the following systems

OUTSIDER Voodoo 3 win98
OUTSIDER Geforce 2 win2000
Me Geforce 4 PNY 4600 XP
JBX-Phoenix Geforce 4 PNY XP
Mehrunes GeForce 3 XP
WMCoolmon nVidia TNT2 M64 win2000
Orange GeForce 4 4200 XP
ShadowWolf_IH Monster2 win98
ShadowWolf_IH voodoo 2 win98
2002-08-03 19:42:17 +00:00
wmcoolmon 026601e350 Fixed Win32 debug configuration 2002-08-03 18:35:21 +00:00
wmcoolmon 05a48addc6 Sync with makefile 1.4 2002-08-03 17:42:40 +00:00
penguin a1e9e62b6e updated 2002-08-01 04:04:01 +00:00
penguin 64ea61c93a The big include file move 2002-08-01 02:00:46 +00:00
penguin a0bbf8fd54 The big include file move 2002-08-01 01:41:11 +00:00
wmcoolmon 15e9872bb5 Fixed a bug I added in ship_do_rearm_frame 2002-07-30 18:11:25 +00:00
wmcoolmon a1f592ffef Modified to add hull repair capabilities and toggling of them via a mission flag, MISSION_FLAG_SUPPORT_REPAIRS_HULL 2002-07-30 17:57:40 +00:00
wmcoolmon 07de43ffc4 Added mission flag "MISSION_FLAG_SUPPORT_REPAIRS_HULL" for toggling Support Ship hull repair on and off 2002-07-30 17:35:22 +00:00
unknownplayer 522fa4c906 Started work on DX8.1 implementation. Updated the project files to encompass
the new files. Disable the compiler tag to use old DX code (THERE IS NO
NEW CODE YET!)
2002-07-30 14:29:15 +00:00
penguin 7611e0a2d2 Added Network/fs2ox.cpp 2002-07-29 22:24:57 +00:00
penguin 9290659edf First attempt at "fs2_open exchange" (PXO substitute) screen 2002-07-29 22:24:26 +00:00
penguin 3a88c2f9e3 We finally have a ChangeLog 2002-07-29 22:14:48 +00:00
penguin a732686bf6 Moved extern declaration of ssm_create outside of block (it wouldn't compile w/ gcc) 2002-07-29 20:48:51 +00:00
penguin 2ede27a557 added #ifdef _WIN32 around windows-specific system headers 2002-07-29 20:12:31 +00:00
penguin 8300b018f0 removed bogus #include windows.h 2002-07-29 20:12:02 +00:00
penguin 93aed25251 added #ifdef _WIN32 around windows-specific system headers 2002-07-29 19:52:48 +00:00
penguin 591563118c added #ifdef _WIN32 around windows-specific system headers 2002-07-29 19:37:21 +00:00
penguin b59b5dd5d8 added #ifdef _WIN32 around windows-specific system headers 2002-07-29 19:17:21 +00:00
penguin bb0bde6409 added #ifdef _WIN32 around windows-specific system headers 2002-07-29 19:04:48 +00:00
DTP 66a392ddae Forgot to Bump MAX_MODEL_SUBSYSTEMS from 128 to 200 2002-07-29 08:31:52 +00:00
DTP 8bfc9fa709 BUMPED MAX_POLYGON_MODELS TO 198 , MAX_SHIP_TYPES - 2 = 198 2002-07-29 08:28:00 +00:00
DTP ccbdeeff67 Bumped all MAX_SHIPS, and SHIP_LIMIT to 400.(let the mission designers decide what is good, and what is bad 2002-07-29 08:24:42 +00:00
DTP 0f1176adaf Bumped MAX_SHIP_SUBOBJECTS to 2100(2100 /(average fighter has 7 subsystems) = 400 fighters 2002-07-29 08:22:42 +00:00
DTP b75fce3d5c Bumped MAX_SUBSYS_LIST from 32 to 200 2002-07-29 08:19:41 +00:00
DTP ab68ad4855 -almission(autoload mission) commandline arguement handling implemented 2002-07-29 08:05:20 +00:00
DTP 426cf0b969 FIX; Startgame arguement dont go ahead when a singleplayer pilot is selected 2002-07-29 07:56:10 +00:00
DTP 2d1f7ba50f added -almission commandline arguement, will autoload mission i.e fs2_open.exe -almission kickass will autoload kickass.fs2 which should be a multiplayer mission. 2002-07-29 06:35:15 +00:00
DTP 69145e65f1 FIX -stargame commandline arguement will now let you quit, a thing not possible before when using the startgame arguement 2002-07-28 15:07:43 +00:00
penguin 3dcb4b380a Testing commit as penguin 2002-07-26 18:02:33 +00:00
drevil 8e996fdf67 Updated password file 2002-07-26 17:59:31 +00:00
penguin 7367d8a31f renamed 'big' and 'small' (conflict w/ MS include file) 2002-07-26 16:17:46 +00:00
penguin d5fcfc773c fixed bug where winsock.h wasn't defined 2002-07-26 16:12:05 +00:00
wmcoolmon 5cdd3a676d Added Bobboau's beam tiling code 2002-07-26 03:11:24 +00:00
wmcoolmon fd95da4c0a Added Bobboau's fighter-beam code. 2002-07-25 04:50:48 +00:00
penguin 1aa613e0f5 Added ifndef NO_STANDALONE 2002-07-22 01:39:24 +00:00
penguin 7d91a35878 Stub defines for NO_SOUND 2002-07-22 01:37:24 +00:00
penguin fa2c566b3f Linux port -- added NO_STANDALONE ifdefs 2002-07-22 01:22:26 +00:00
penguin f2b7f9718a Made more compatible w/ Win32; defines for NO_SOUND, NO_JOYSTICK, NO_NETWORK 2002-07-22 01:14:09 +00:00
penguin 08c0bd3aee Moved the dummy "sound" definitions to main program (freespace.cpp) 2002-07-22 01:10:10 +00:00
penguin 3a39133e04 More defines for winsock compatibility 2002-07-22 01:06:04 +00:00
penguin c3ec5825a4 took out GAME_CD_CHECK define 2002-07-22 01:04:37 +00:00
DTP baddd6703d Bumped Max Shield Icons to 80 2002-07-20 23:51:59 +00:00
DTP 0c3733d2cd Fixed multiplayer music. succes music on all Primary goals complete, fail music
if otherwise
2002-07-20 23:50:53 +00:00
DTP c536d49afd Fixed Secondary bank bug, where next valid secondary bank inherits current
valid banks FULL fire delay
2002-07-20 23:49:46 +00:00
DTP b031aee73a bumped MAX_MISSION_TEXT to 1000000 in code/parse/parselo.h 2002-07-20 19:21:13 +00:00
penguin c480e2c944 Fixed bug (potential access of unitialized pointer) in hud_config_render_gauges() -- thanks to DTP for finding it! 2002-07-18 20:07:49 +00:00
unknownplayer c7cd913df4 no message 2002-07-18 14:36:53 +00:00
unknownplayer 58a465e805 Revised AI primary selection code again to be more intelligent. 2002-07-18 09:55:26 +00:00
unknownplayer cf08ff0cd5 Rewrote my original algorithm to search by proportional hull damage.
Does the same thing a little better.
2002-07-18 05:38:28 +00:00
unknownplayer c839e8168a Fixed AI problems with using the maxim on fighters. 2002-07-18 03:27:38 +00:00
unknownplayer 3257777c18 Added some commentry to the low detail shield function. 2002-07-18 03:26:35 +00:00
unknownplayer 1028e14398 no message 2002-07-18 03:25:10 +00:00
unknownplayer b733679875 Altered project files to properly build debug info. Should save you all some time. 2002-07-17 23:59:56 +00:00
unknownplayer 723cbd5938 Minor commenting added to two functions. 2002-07-17 23:58:46 +00:00
wmcoolmon 0e48ea11ac Added SSM code for Tag C from Bobboau. Note that strings.tbl may need to be updated. 2002-07-17 20:04:00 +00:00
unknownplayer 57ab92645c Added a custom build step to copy to c:\games\freespace2\fs2_open.exe
when you build.
2002-07-17 12:52:01 +00:00
unknownplayer 2431f5db2c Updated to enable compilation under MSVC++ - all changes are marked
with my name ##UnknownPlayer##
2002-07-16 14:39:16 +00:00
unknownplayer 34d960638a This is the code project file. Use the workspace file I included to get at this. 2002-07-16 14:37:51 +00:00
unknownplayer 3bb26b10a3 This is the workspace for freespace2.dsp - it contains everything needed to
compile fs2_open.exe
2002-07-16 14:37:09 +00:00
unknownplayer 3cdc511b2d This is the project file to compile fs2_open. It's a real project file - use the
workspace though
2002-07-16 14:36:30 +00:00
penguin 4543d0c80c Changed so that debug make debug and release makes release :) 2002-07-16 01:15:59 +00:00
penguin 2a740ad2c8 Commented out "fs2_open.dep" stuff 2002-07-16 01:15:15 +00:00
inquisitor 7187da0233 Visual Studio files
compiles fs2_open.exe - 0 error(s), 7 warning(s)
2002-07-15 22:36:08 +00:00
wmcoolmon ab43e4d987 Added support for toggling ship trails 2002-07-15 02:11:00 +00:00
wmcoolmon 8056476db1 Added initial code for "ship-lights-on" and "ship-lights-off" SEXPs 2002-07-13 09:16:18 +00:00
penguin 4b471d6045 Added flags2 (ran out of bits in flags!) to ship struct; bit 0 will be used
to toggle Bobboau's lights.
2002-07-12 16:59:04 +00:00
penguin 8b19d7c8eb Removed dummy include file 2002-07-12 02:56:07 +00:00
penguin 90c6679f03 Fixed endian-ness of new "GLOW" IDs 2002-07-12 02:44:18 +00:00
wmcoolmon 4c73e5fe20 Added Bobboau's glow code; all comments include "-Bobboau" 2002-07-10 18:42:14 +00:00
penguin dd3a3138a7 Back-port to MSVC 2002-07-07 19:56:00 +00:00
penguin 9e8a091172 Makefile for Microsoft Visual C++ 2002-07-07 19:49:42 +00:00
drevil 5d72560a30 Adding mysterial and penguin to CVS's admin files 2002-06-08 19:21:16 +00:00
drevil 2a9c65bd3f Changing my password 2002-06-08 19:10:16 +00:00
drevil 6b4cca55be Changing my password 2002-06-08 19:04:53 +00:00
penguin c18139e73f Added machine-independent version of MulDiv (in case we don't know
the processor type)
2002-06-04 06:38:21 +00:00
penguin be6ee814c2 Minor changes 2002-06-03 05:03:45 +00:00
penguin ea6130e542 Initial revision 2002-06-03 04:34:38 +00:00
penguin 48a566a2d5 Warpcore CVS sync 2002-06-03 04:10:40 +00:00
penguin dab5b293d4 Dummy include file 2002-06-03 04:08:13 +00:00
penguin 2a2cd3c873 Warpcore CVS sync 2002-06-03 03:55:40 +00:00
penguin 51ffb56b16 Volition sources -- warpcore CVS import 2002-06-03 03:26:03 +00:00
fs2source 211e7a4284 Commited initial passwd/writers files,
inquisitor
drevil
anonymous

added

anonymous has no write access
2002-06-02 00:39:17 +00:00
fs2source 24643586f1 initial checkin 2002-06-01 21:21:20 +00:00
fs2source 08986cb47e initial checkin 2002-06-01 21:21:19 +00:00
(no author) c3d878b1b3 New repository initialized by cvs2svn. 2002-06-01 21:21:19 +00:00
27 changed files with 230 additions and 217 deletions

No files matched your search

+1 -1
View File
@@ -189,7 +189,7 @@ AM_CXXFLAGS = @D_CFLAGS@ @FS2_CXXFLAGS@
AM_LDFLAGS = @D_LDFLAGS@ @FS2_LDFLAGS@
noinst_LIBRARIES = libcode.a
noinst_PROGRAMS = @FS2_BINARY@
bin_PROGRAMS = @FS2_BINARY@
EXTRA_PROGRAMS = fs2_open_@PACKAGE_VERSION@ fs2_open_@PACKAGE_VERSION@_NOINF \
fs2_open_@PACKAGE_VERSION@_DEBUG fs2_open_@PACKAGE_VERSION@_NOINF_DEBUG \
+6 -6
View File
@@ -624,7 +624,7 @@ CAPTION "About FRED2"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,10,17,20,20,SS_REALSIZEIMAGE
LTEXT "FRED2_OPEN - FreeSpace Editor, Version 3.6.15 OpenGL",IDC_STATIC,39,8,184,10,SS_NOPREFIX
LTEXT "FRED2_OPEN - FreeSpace Editor, Version 3.6.16 RC1 OpenGL",IDC_STATIC,39,8,184,10,SS_NOPREFIX
LTEXT "Copyright © 1999 Volition, Inc. All Rights Reserved",IDC_STATIC,39,17,164,8
DEFPUSHBUTTON "OK",IDOK,229,7,48,14,WS_GROUP
LTEXT """Fred2 is the omega of all giant unwieldy pieces of code. Its big, its horrifying, and it just doesn't care. View it at your own risk."" - Dave Baranec",IDC_STATIC,39,62,238,20
@@ -2095,8 +2095,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,13,0
PRODUCTVERSION 3,6,13,0
FILEVERSION 3,6,16,9482
PRODUCTVERSION 3,6,16,9482
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -2113,12 +2113,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Volition Inc."
VALUE "FileDescription", "Fred 2 Open"
VALUE "FileVersion", "3.6.15.0000"
VALUE "FileVersion", "3.6.16.9482"
VALUE "InternalName", "Fred 2 Open"
VALUE "LegalCopyright", "Copyright © 1998"
VALUE "OriginalFilename", "fred2.exe"
VALUE "ProductName", "Fred 2 Open"
VALUE "ProductVersion", "3.6.15"
VALUE "ProductVersion", "3.6.16 RC1"
END
END
BLOCK "VarFileInfo"
@@ -2689,7 +2689,7 @@ IDC_CURSOR2 CURSOR "res\\cursor2.cur"
STRINGTABLE
BEGIN
IDR_MAINFRAME "FRED2_OPEN 3.6.15 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
IDR_MAINFRAME "FRED2_OPEN 3.6.16 RC1 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
END
STRINGTABLE
+4 -4
View File
@@ -336,8 +336,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,13,0000
PRODUCTVERSION 3,6,13,0000
FILEVERSION 3,6,16,9482
PRODUCTVERSION 3,6,16,9482
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -354,12 +354,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Volition Inc."
VALUE "FileDescription", "FreeSpace 2 Open"
VALUE "FileVersion", "3.6.15.0000"
VALUE "FileVersion", "3.6.16.9482"
VALUE "InternalName", "FreeSpace 2 Open"
VALUE "LegalCopyright", "Copyright © 1998"
VALUE "OriginalFilename", "fs2.exe"
VALUE "ProductName", "FreeSpace 2 Open"
VALUE "ProductVersion", "3.6.15"
VALUE "ProductVersion", "3.6.16 RC1"
END
END
BLOCK "VarFileInfo"
+2 -2
View File
@@ -39,8 +39,8 @@
#define FS_VERSION_MAJOR 3 // major version
#define FS_VERSION_MINOR 6 // increase by 1 for minor revs
#define FS_VERSION_BUILD 15 // bugfix release
#define FS_VERSION_REVIS 0000 // SVN revision
#define FS_VERSION_BUILD 16 // bugfix release
#define FS_VERSION_REVIS 9482 // SVN revision
#define VERSION_LOC_FNAME "version.nfo"
#define MOTD_LOC_FNAME "motd.txt"
+2 -2
View File
@@ -22,10 +22,10 @@
#define HULL_HIT_OFFSET 4 // used to access the members in shield_hit_info that pertain to the hull
typedef struct shield_hit_info
{
int shield_hit_status; // bitfield, if offset for shield quadrant is set, that means shield is being hit
int shield_show_bright; // bitfield, if offset for shield quadrant is set, that means play bright frame
int shield_hit_timers[NUM_SHIELD_HIT_MEMBERS]; // timestamps that get set for SHIELD_FLASH_TIME when a quadrant is hit
int shield_hit_next_flash[NUM_SHIELD_HIT_MEMBERS];
int shield_hit_status; // bitfield, if offset for shield quadrant is set, that means shield is being hit
int shield_show_bright; // bitfield, if offset for shield quadrant is set, that means play bright frame
} shield_hit_info;
extern ubyte Quadrant_xlate[4];
+2 -2
View File
@@ -207,7 +207,7 @@ void iff_init()
// alternate = use same method as with ship blips
// retail = use 1/2 intensities
if (optional_string("$Use Alternate Blip Coloring:"))
if (optional_string("$Use Alternate Blip Coloring:") || optional_string("$Use Alternate Blip Colouring:"))
{
stuff_boolean(&alternate_blip_color);
}
@@ -306,7 +306,7 @@ void iff_init()
// begin reading data
Num_iffs = 0;
while (required_string_either("#End","$IFF Name:"))
while (required_string_either("#End", "$IFF Name:"))
{
iff_info *iff;
int cur_iff;
+7 -2
View File
@@ -2318,8 +2318,13 @@ int parse_create_object_sub(p_object *p_objp)
{
Objects[objnum].net_signature = p_objp->net_signature;
if ((Game_mode & GM_IN_MISSION) && MULTIPLAYER_MASTER && (p_objp->wingnum == -1))
send_ship_create_packet(&Objects[objnum], (p_objp == Arriving_support_ship) ? 1 : 0);
// Goober5000 - for an initially docked group, only send the packet for the dock leader... this is necessary so that the
// docked hierarchy of objects can be created in the right order on the client side
if (!object_is_docked(p_objp) || (p_objp->flags & P_SF_DOCK_LEADER))
{
if ((Game_mode & GM_IN_MISSION) && MULTIPLAYER_MASTER && (p_objp->wingnum == -1))
send_ship_create_packet(&Objects[objnum], (p_objp == Arriving_support_ship) ? 1 : 0);
}
}
return objnum;
+5
View File
@@ -9862,6 +9862,11 @@ int ship_fire_primary(object * obj, int stream_weapons, int force)
continue;
}
// if weapons are linked and this is a nolink weapon, skip it
if (shipp->flags & SF_PRIMARY_LINKED && winfo_p->wi_flags3 & WIF3_NOLINK) {
continue;
}
// do timestamp stuff for next firing time
float next_fire_delay;
bool fast_firing = false;
+1 -1
View File
@@ -2060,7 +2060,7 @@
<property name="font"></property>
<property name="hidden"></property>
<property name="id">wxID_ANY</property>
<property name="label">FRED2_OPEN - FreeSpace Editor, Version 3.6.15</property>
<property name="label">FRED2_OPEN - FreeSpace Editor, Version 3.6.16 RC1</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticText57</property>
+1 -1
View File
@@ -3359,7 +3359,7 @@
<flag>wxALL</flag>
<border>3</border>
<object class="wxStaticText" name="m_staticText57">
<label>FRED2__OPEN - FreeSpace Editor, Version 3.6.15</label>
<label>FRED2__OPEN - FreeSpace Editor, Version 3.6.16 RC1</label>
<wrap>-1</wrap>
</object>
</object>
+13 -10
View File
@@ -2,7 +2,7 @@ dnl configure.ac for fs2_open
dnl
dnl $Id: configure.ac,v 1.31.2.4 2007-05-28 19:36:12 taylor Exp $
AC_INIT(fs2_open, 3.6.15)
AC_INIT(fs2_open, 3.6.16_RC1)
AC_CONFIG_SRCDIR(code/freespace2/freespace.cpp)
dnl we need at least version 2.54 of autoconf
@@ -116,13 +116,14 @@ case "$target" in
# linux
echo "Using 64-bit Unix defines (for $host_os)"
fs2_os_linux="yes"
D_CFLAGS="$D_CFLAGS -m64 -march=athlon64 -ansi"
D_CFLAGS="$D_CFLAGS -m64 -mtune=i686 -msse -msse2 -ansi"
D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
;;
*-*-linux*)
# linux
echo "Using Unix defines (for $host_os)"
fs2_os_linux="yes"
D_CFLAGS="$D_CFLAGS -mtune=i686 -mfpmath=sse -msse -msse2 -ansi"
D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
;;
*-*-darwin*)
@@ -384,9 +385,6 @@ if test "$fs2_os_win32" = "yes" ; then
FS2_LDFLAGS=$FS2_LDFLAGS" -L/c:/dxsdk/lib"
fi
dnl libpng
FS2_LIBS="$FS2_LIBS -lpng"
dnl OpenGL libs and CFLAGS
if test "$fs2_os_win32" = "yes" ; then
if test "x$GL_LIBS" != "x" ; then
@@ -415,8 +413,13 @@ elif test "$fs2_os_solaris" = "yes" ; then
AC_DEFINE([NO_DIRECT3D])
fi
dnl PNG libs
PKG_CHECK_MODULES([PNG], [libpng >= 1.2.20])
dnl PNG libs (libpng, falling back to libpng12)
PKG_CHECK_MODULES(
[PNG],
[libpng >= 1.2.20],
[], ## do nothing special
[PKG_CHECK_MODULES([PNG], [libpng12 >= 1.2.20])]
)
D_CFLAGS=$D_CFLAGS" $PNG_CFLAGS"
FS2_LIBS=$FS2_LIBS" $PNG_LIBS"
@@ -424,10 +427,10 @@ dnl LUA
## Checking for lua.pc and if that fails lua5.1.pc
PKG_CHECK_MODULES(
[LUA],
[lua >= 5.1.3],
[lua >= 5.1.3 lua < 5.2],
[], ## do nothing special
[PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.3], [], [
PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1.3], [])
[PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.3 lua5.1 < 5.2], [], [
PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1.3 lua-5.1 < 5.2], [])
])])
D_CFLAGS=$D_CFLAGS" $LUA_CFLAGS"
FS2_LIBS=$FS2_LIBS" $LUA_LIBS"
+4 -4
View File
@@ -83,7 +83,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_INF.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_INF.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;../../speech/lib/i386"
@@ -190,7 +190,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -304,7 +304,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_INF.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_INF.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;../../speech/lib/i386"
@@ -418,7 +418,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
+4 -4
View File
@@ -84,7 +84,7 @@
LinkLibraryDependencies="true"
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15d_INF.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_INF.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;../../speech/lib/i386"
@@ -196,7 +196,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -311,7 +311,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_INF.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_INF.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;../../speech/lib/i386"
@@ -427,7 +427,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
+20 -20
View File
@@ -29,8 +29,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying build..."
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)/wxfred2_open_trunk_INF_d.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)/wxfred2_open_trunk_INF_d.exe;$(FS2PATH)\wxfred.xrc"
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe;$(FS2PATH)\wxfred.xrc"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -80,15 +80,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib"
OutputFile="Debug_Inferno/wxfred2_open_trunk_INF_d.exe"
OutputFile="Debug_Inferno/wxfred2_open_3_6_16_RC1_INF_d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(WXWIN)/lib,$(WXWIN)/lib/vc_lib"
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug_Inferno/wxfred2_open_trunk_INF_d.pdb"
ProgramDatabaseFile=".\Debug_Inferno/wxfred2_open_3_6_16_RC1_INF_d.pdb"
GenerateMapFile="true"
MapFileName=".\Debug_Inferno\Profile\wxfred2/wxfred2_open_trunk_INF_d.map"
MapFileName=".\Debug_Inferno\Profile\wxfred2/wxfred2_open_3_6_16_RC1_INF_d.map"
SubSystem="2"
TargetMachine="1"
/>
@@ -134,8 +134,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying build..."
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)\wxfred2_open_trunk_INF_r.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)\wxfred2_open_trunk_INF_r.exe;$(FS2PATH)\wxfred.xrc"
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe;$(FS2PATH)\wxfred.xrc"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -185,15 +185,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib"
OutputFile="Release_Inferno/wxfred2_open_trunk_INF_r.exe"
OutputFile="Release_Inferno/wxfred2_open_3_6_16_RC1_INF_r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(WXWIN)/lib,$(WXWIN)/lib/vc_lib"
IgnoreDefaultLibraryNames="libc.lib,libci.lib"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\Release_Inferno/wxfred2_open_trunk_INF_r.pdb"
ProgramDatabaseFile=".\Release_Inferno/wxfred2_open_3_6_16_RC1_INF_r.pdb"
GenerateMapFile="false"
MapFileName=".\Release_Inferno\Profile\wxfred2/wxfred2_open_trunk_INF_r.map"
MapFileName=".\Release_Inferno\Profile\wxfred2/wxfred2_open_3_6_16_RC1_INF_r.map"
SubSystem="2"
TargetMachine="1"
/>
@@ -239,8 +239,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying build..."
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)/wxfred2_open_trunk_d.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)/wxfred2_open_trunk_d.exe;$(FS2PATH)\wxfred.xrc"
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe;$(FS2PATH)\wxfred.xrc"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -290,15 +290,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib"
OutputFile="Debug/wxfred2_open_trunk_d.exe"
OutputFile="Debug/wxfred2_open_3_6_16_RC1_d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(WXWIN)/lib,$(WXWIN)/lib/vc_lib"
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/wxfred2_open_trunk_d.pdb"
ProgramDatabaseFile=".\Debug/wxfred2_open_3_6_16_RC1_d.pdb"
GenerateMapFile="true"
MapFileName=".\Debug\Profile\wxfred2/wxfred2_open_trunk_d.map"
MapFileName=".\Debug\Profile\wxfred2/wxfred2_open_3_6_16_RC1_d.map"
SubSystem="2"
TargetMachine="1"
/>
@@ -344,8 +344,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying build..."
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)\wxfred2_open_trunk_r.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)\wxfred2_open_trunk_r.exe;$(FS2PATH)\wxfred.xrc"
CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)..\..\code\wxfred2\wxfred.xrc&quot; &quot;$(FS2PATH)\wxfred.xrc&quot;&#x0D;&#x0A;"
Outputs="$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe;$(FS2PATH)\wxfred.xrc"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -395,15 +395,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib"
OutputFile="Release/wxfred2_open_trunk_r.exe"
OutputFile="Release/wxfred2_open_3_6_16_RC1_r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(WXWIN)/lib,$(WXWIN)/lib/vc_lib"
IgnoreDefaultLibraryNames="libc.lib,libci.lib"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\Release/wxfred2_open_trunk_r.pdb"
ProgramDatabaseFile=".\Release/wxfred2_open_3_6_16_RC1_r.pdb"
GenerateMapFile="false"
MapFileName=".\Release\Profile\wxfred2/wxfred2_open_trunk_r.map"
MapFileName=".\Release\Profile\wxfred2/wxfred2_open_3_6_16_RC1_r.map"
SubSystem="2"
TargetMachine="1"
/>
+12 -12
View File
@@ -84,7 +84,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_NO-SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -191,7 +191,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_INF.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_INF_NO-SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -300,7 +300,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_INF_SSE.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_INF_SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -409,7 +409,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_INF_SSE2.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_INF.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -518,7 +518,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_sse.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d_SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -627,7 +627,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15d_sse2.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -741,7 +741,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_NO-SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -855,7 +855,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_INF.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_INF_NO-SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -970,7 +970,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_INF_SSE.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_INF_SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1085,7 +1085,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_INF_SSE2.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_INF.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1200,7 +1200,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_sse.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r_SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1315,7 +1315,7 @@
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
AdditionalDependencies="wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fred2_open_3_6_15r_sse2.exe"
OutputFile="$(OutDir)\fred2_open_3_6_16_RC1r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
+12 -12
View File
@@ -87,7 +87,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_NO-SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -198,7 +198,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d_INF.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_INF_NO-SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -311,7 +311,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d_INF_SSE.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_INF_SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -424,7 +424,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d_INF_SSE2.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_INF.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -537,7 +537,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d_sse.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d_SSE.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -650,7 +650,7 @@
UseLibraryDependencyInputs="false"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib ole32.lib advapi32.lib gdi32.lib user32.lib"
ShowProgress="0"
OutputFile="$(OutDir)\fs2_open_3_6_15d_sse2.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -765,7 +765,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_NO-SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -882,7 +882,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_INF.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_INF_NO-SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1000,7 +1000,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_INF_SSE.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_INF_SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1118,7 +1118,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_INF_SSE2.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_INF.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1236,7 +1236,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_sse.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r_SSE.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
@@ -1354,7 +1354,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib"
OutputFile="$(OutDir)\fs2_open_3_6_15r_sse2.exe"
OutputFile="$(OutDir)\fs2_open_3_6_16_RC1r.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;$(ConfigurationName)&quot;;../../oggvorbis/lib;../../openal/libs/win32;../../openal/libs/win64;"
+12 -12
View File
@@ -236,18 +236,18 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fred2_open_3_6_15d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_6_15d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fred2_open_3_6_15d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fred2_open_3_6_15d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_6_15r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fred2_open_3_6_15r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fred2_open_3_6_15r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fred2_open_3_6_15r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_6_15r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_6_15r_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fred2_open_3_6_16_RC1d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_6_16_RC1d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fred2_open_3_6_16_RC1d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fred2_open_3_6_16_RC1d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_6_16_RC1r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fred2_open_3_6_16_RC1r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fred2_open_3_6_16_RC1r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fred2_open_3_6_16_RC1r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_6_16_RC1r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_6_16_RC1r_SSE2</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
+12 -12
View File
@@ -235,18 +235,18 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_6_15d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_6_15r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fs2_open_3_6_15d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fs2_open_3_6_15d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fs2_open_3_6_15d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_6_15d_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fs2_open_3_6_15r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fs2_open_3_6_15r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fs2_open_3_6_15r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_6_15r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_6_15r_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_6_16_RC1d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_6_16_RC1r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fs2_open_3_6_16_RC1d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fs2_open_3_6_16_RC1d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fs2_open_3_6_16_RC1d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_6_16_RC1d_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fs2_open_3_6_16_RC1r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fs2_open_3_6_16_RC1r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fs2_open_3_6_16_RC1r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_6_16_RC1r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_6_16_RC1r_SSE2</TargetName>
<CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">Build</CustomBuildAfterTargets>
<CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">Link</CustomBuildAfterTargets>
</PropertyGroup>
+12 -12
View File
@@ -167,10 +167,10 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">
@@ -221,10 +221,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_INF_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">
@@ -275,10 +275,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_INF_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -326,10 +326,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">
@@ -377,10 +377,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_INF_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">
@@ -428,10 +428,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_INF_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
+12 -12
View File
@@ -249,18 +249,18 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fred2_open_3_6_15d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_6_15d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fred2_open_3_6_15d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fred2_open_3_6_15d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_6_15r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fred2_open_3_6_15r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fred2_open_3_6_15r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fred2_open_3_6_15r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_6_15r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_6_15r_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fred2_open_3_6_16_RC1d_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_6_16_RC1d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fred2_open_3_6_16_RC1d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fred2_open_3_6_16_RC1d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_6_16_RC1r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fred2_open_3_6_16_RC1r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fred2_open_3_6_16_RC1r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fred2_open_3_6_16_RC1r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_6_16_RC1r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_6_16_RC1r_SSE2</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
+12 -12
View File
@@ -248,18 +248,18 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_6_15d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_6_15r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fs2_open_3_6_15d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fs2_open_3_6_15d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fs2_open_3_6_15d_INF_SSE2_VS11</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_6_15d_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_6_15d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fs2_open_3_6_15r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fs2_open_3_6_15r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fs2_open_3_6_15r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_6_15r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_6_15r_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_6_16_RC1d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_6_16_RC1r</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">fs2_open_3_6_16_RC1d_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">fs2_open_3_6_16_RC1d_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">fs2_open_3_6_16_RC1d_INF_SSE2_VS11</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_6_16_RC1d_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_6_16_RC1d_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">fs2_open_3_6_16_RC1r_INF</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'">fs2_open_3_6_16_RC1r_INF_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">fs2_open_3_6_16_RC1r_INF_SSE2</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_6_16_RC1r_SSE</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_6_16_RC1r_SSE2</TargetName>
<CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">Build</CustomBuildAfterTargets>
<CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'">Link</CustomBuildAfterTargets>
</PropertyGroup>
+12 -12
View File
@@ -167,10 +167,10 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'">
@@ -221,10 +221,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_INF_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'">
@@ -275,10 +275,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_trunk_INF_d.exe"
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)/wxfred2_open_trunk_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -326,10 +326,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'">
@@ -377,10 +377,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_INF_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'">
@@ -428,10 +428,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_trunk_INF_r.exe"
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe"
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
<Message>Copying build...</Message>
<Outputs>$(FS2PATH)\wxfred2_open_trunk_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
<Outputs>$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
+18 -18
View File
@@ -56,14 +56,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fred2_open_trunk_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fred2_open_3_6_16_RC1_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT LINK32 /map
# Begin Custom Build - Copying build...
InputPath=.\Release\fred2_open_trunk_r.exe
InputPath=.\Release\fred2_open_3_6_16_RC1_r.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fred2_open_trunk_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_trunk_r.exe"
"$(FS2PATH)/fred2_open_3_6_16_RC1_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_3_6_16_RC1_r.exe"
# End Custom Build
@@ -91,14 +91,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug/fred2_open_trunk_d.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug/fred2_open_3_6_16_RC1_d.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT LINK32 /pdb:none
# Begin Custom Build - Copying build...
InputPath=.\Debug\fred2_open_trunk_d.exe
InputPath=.\Debug\fred2_open_3_6_16_RC1_d.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fred2_open_trunk_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_trunk_d.exe"
"$(FS2PATH)/fred2_open_3_6_16_RC1_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_3_6_16_RC1_d.exe"
# End Custom Build
@@ -127,16 +127,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /o"Release_Inferno/Fred2.bsc"
LINK32=link.exe
# ADD BASE LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fred2_open_trunk_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD BASE LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fred2_open_3_6_16_RC1_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release_Inferno/fred2_open_trunk_r_INF.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD LINK32 wsock32.lib winmm.lib msacm32.lib vfw32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release_Inferno/fred2_open_3_6_16_RC1_r_INF.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT LINK32 /map
# Begin Custom Build - Copying build...
InputPath=.\Release_Inferno\fred2_open_trunk_r_INF.exe
InputPath=.\Release_Inferno\fred2_open_3_6_16_RC1_r_INF.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fred2_open_trunk_r_INF.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_trunk_r_INF.exe"
"$(FS2PATH)/fred2_open_3_6_16_RC1_r_INF.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_3_6_16_RC1_r_INF.exe"
# End Custom Build
@@ -164,16 +164,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /o"Debug_Inferno/Fred2.bsc"
LINK32=link.exe
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug/fred2_open_trunk_d.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug/fred2_open_3_6_16_RC1_d.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:"Debug_Inferno/fred2_open_trunk_d_INF.pdb" /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug_Inferno/fred2_open_trunk_d_INF.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:"Debug_Inferno/fred2_open_3_6_16_RC1_d_INF.pdb" /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug_Inferno/fred2_open_3_6_16_RC1_d_INF.exe" /pdbtype:sept /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES /FORCE:MULTIPLE
# SUBTRACT LINK32 /pdb:none
# Begin Custom Build - Copying build...
InputPath=.\Debug_Inferno\fred2_open_trunk_d_INF.exe
InputPath=.\Debug_Inferno\fred2_open_3_6_16_RC1_d_INF.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fred2_open_trunk_d_INF.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_trunk_d_INF.exe"
"$(FS2PATH)/fred2_open_3_6_16_RC1_d_INF.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fred2_open_3_6_16_RC1_d_INF.exe"
# End Custom Build
+18 -18
View File
@@ -56,14 +56,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"Release\Profile\Freespace2.bsc" "Release\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fs2_open_trunk_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fs2_open_3_6_16_RC1_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT LINK32 /map /debug
# Begin Custom Build - Copying build...
InputPath=.\Release\fs2_open_trunk_r.exe
InputPath=.\Release\fs2_open_3_6_16_RC1_r.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fs2_open_trunk_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_trunk_r.exe"
"$(FS2PATH)/fs2_open_3_6_16_RC1_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_3_6_16_RC1_r.exe"
# End Custom Build
@@ -91,14 +91,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"Debug\Profile\Freespace2.bsc" "Debug\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug\fs2_open_trunk_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug\fs2_open_3_6_16_RC1_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT LINK32 /pdb:none /incremental:no
# Begin Custom Build - Copying build...
InputPath=.\Debug\fs2_open_trunk_d.exe
InputPath=.\Debug\fs2_open_3_6_16_RC1_d.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fs2_open_trunk_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_trunk_d.exe"
"$(FS2PATH)/fs2_open_3_6_16_RC1_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_3_6_16_RC1_d.exe"
# End Custom Build
@@ -127,16 +127,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"Release\Profile\Freespace2.bsc" "Release\Profile\*.sbr"
# ADD BSC32 /nologo /o"Release_Inferno\Profile\Freespace2.bsc" "Release\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fs2_open_trunk_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/fs2_open_3_6_16_RC1_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT BASE LINK32 /pdb:none /debug
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release_Inferno/fs2_open_trunk_INF_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release_Inferno/fs2_open_3_6_16_RC1_INF_r.exe" /libpath:"Release" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT LINK32 /map /debug
# Begin Custom Build - Copying build...
InputPath=.\Release_Inferno\fs2_open_trunk_INF_r.exe
InputPath=.\Release_Inferno\fs2_open_3_6_16_RC1_INF_r.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fs2_open_trunk_INF_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_trunk_INF_r.exe"
"$(FS2PATH)/fs2_open_3_6_16_RC1_INF_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_3_6_16_RC1_INF_r.exe"
# End Custom Build
@@ -164,16 +164,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"Debug\Profile\Freespace2.bsc" "Debug\Profile\*.sbr"
# ADD BSC32 /nologo /o"Debug_Inferno\Profile\Freespace2.bsc" "Debug\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug\fs2_open_trunk_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD BASE LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug\fs2_open_3_6_16_RC1_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT BASE LINK32 /pdb:none /incremental:no
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug_Inferno\fs2_open_trunk_INF_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# ADD LINK32 Quartz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib openal32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib theora_static.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /out:"Debug_Inferno\fs2_open_3_6_16_RC1_INF_d.exe" /libpath:"Debug" /libpath:"../../oggvorbis/lib" /libpath:"../../openal/libs/win32" /libpath:"../../openal/libs/win64" /libpath:"../../speech/lib/i386" /MAPINFO:EXPORTS /MAPINFO:LINES
# SUBTRACT LINK32 /pdb:none /incremental:no
# Begin Custom Build - Copying build...
InputPath=.\Debug_Inferno\fs2_open_trunk_INF_d.exe
InputPath=.\Debug_Inferno\fs2_open_3_6_16_RC1_INF_d.exe
SOURCE="$(InputPath)"
"$(FS2PATH)/fs2_open_trunk_INF_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_trunk_INF_d.exe"
"$(FS2PATH)/fs2_open_3_6_16_RC1_INF_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy /y $(InputPath) "$(FS2PATH)/fs2_open_3_6_16_RC1_INF_d.exe"
# End Custom Build
+18 -18
View File
@@ -56,19 +56,19 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"Release/Profile/wxFRED2.bsc" "Release\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release/wxfred2_open_trunk_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release/wxfred2_open_3_6_16_RC1_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT LINK32 /map /debug /nodefaultlib
# Begin Custom Build - Copying build...
ProjDir=.
InputPath=.\Release\wxfred2_open_trunk_r.exe
InputPath=.\Release\wxfred2_open_3_6_16_RC1_r.exe
SOURCE="$(InputPath)"
BuildCmds= \
copy $(InputPath) "$(FS2PATH)\wxfred2_open_trunk_r.exe" \
copy $(InputPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe" \
copy "$(ProjDir)\..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc" \
"$(FS2PATH)\wxfred2_open_trunk_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"$(FS2PATH)\wxfred2_open_3_6_16_RC1_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(FS2PATH)\wxfred.xrc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -99,19 +99,19 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"Debug/Profile/wxFRED2.bsc" "Debug\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug/wxfred2_open_trunk_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug/wxfred2_open_3_6_16_RC1_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT LINK32 /nodefaultlib
# Begin Custom Build - Copying build...
ProjDir=.
InputPath=.\Debug\wxfred2_open_trunk_d.exe
InputPath=.\Debug\wxfred2_open_3_6_16_RC1_d.exe
SOURCE="$(InputPath)"
BuildCmds= \
copy $(InputPath) "$(FS2PATH)/wxfred2_open_trunk_d.exe" \
copy $(InputPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe" \
copy "$(ProjDir)\..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc" \
"$(FS2PATH)/wxfred2_open_trunk_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"$(FS2PATH)/wxfred2_open_3_6_16_RC1_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(FS2PATH)\wxfred.xrc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -144,21 +144,21 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"Release/Profile/wxFRED2.bsc" "Release\Profile\*.sbr"
# ADD BSC32 /nologo /o"Release_Inferno/Profile/wxFRED2.bsc" "Release\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release/wxfred2_open_trunk_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release/wxfred2_open_3_6_16_RC1_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT BASE LINK32 /nodefaultlib
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release_Inferno/wxfred2_open_trunk_INF_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"Release_Inferno/wxfred2_open_3_6_16_RC1_INF_r.exe" /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT LINK32 /map /debug /nodefaultlib
# Begin Custom Build - Copying build...
ProjDir=.
InputPath=.\Release_Inferno\wxfred2_open_trunk_INF_r.exe
InputPath=.\Release_Inferno\wxfred2_open_3_6_16_RC1_INF_r.exe
SOURCE="$(InputPath)"
BuildCmds= \
copy $(InputPath) "$(FS2PATH)\wxfred2_open_trunk_INF_r.exe" \
copy $(InputPath) "$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe" \
copy "$(ProjDir)\..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc" \
"$(FS2PATH)\wxfred2_open_trunk_INF_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"$(FS2PATH)\wxfred2_open_3_6_16_RC1_INF_r.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(FS2PATH)\wxfred.xrc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -189,21 +189,21 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo /o"Debug/Profile/wxFRED2.bsc" "Debug\Profile\*.sbr"
# ADD BSC32 /nologo /o"Debug_Inferno/Profile/wxFRED2.bsc" "Debug\Profile\*.sbr"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug/wxfred2_open_trunk_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug/wxfred2_open_3_6_16_RC1_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT BASE LINK32 /nodefaultlib
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug_Inferno/wxfred2_open_trunk_INF_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"Debug_Inferno/wxfred2_open_3_6_16_RC1_INF_d.exe" /pdbtype:sept /libpath:"$(WXWIN)/lib" /libpath:"$(WXWIN)/lib/vc_lib"
# SUBTRACT LINK32 /nodefaultlib
# Begin Custom Build - Copying build...
ProjDir=.
InputPath=.\Debug_Inferno\wxfred2_open_trunk_INF_d.exe
InputPath=.\Debug_Inferno\wxfred2_open_3_6_16_RC1_INF_d.exe
SOURCE="$(InputPath)"
BuildCmds= \
copy $(InputPath) "$(FS2PATH)/wxfred2_open_trunk_INF_d.exe" \
copy $(InputPath) "$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe" \
copy "$(ProjDir)\..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc" \
"$(FS2PATH)/wxfred2_open_trunk_INF_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"$(FS2PATH)/wxfred2_open_3_6_16_RC1_INF_d.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(FS2PATH)\wxfred.xrc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -4340,7 +4340,7 @@
i386,
);
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4373,7 +4373,7 @@
i386,
);
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4552,7 +4552,7 @@
i386,
);
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4776,7 +4776,7 @@
i386,
);
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4318,7 +4318,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4350,7 +4350,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4524,7 +4524,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -4726,7 +4726,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = "3.6.15-trunk";
CURRENT_PROJECT_VERSION = "3.6.16-RC1";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;