Fabian Woltermann
4b2c2d6ef2
Fix for cf_create_directory ( #687 )
...
Changes cf_create_directory so that it can actually do what its comment says it does, namely create directories recursively.
2016-07-24 09:24:59 -07:00
m!m
3e1cd6c02f
Merge pull request #686 from The-E/screenshot_fix
...
Fixes issue with the screenshot code where the screenshot directory w…
2016-07-23 12:05:07 +02:00
Fabian
72c2d7af38
Fixes issue with the screenshot code where the screenshot directory was not created if necessary.
2016-07-23 10:00:38 +02:00
Fabian Woltermann
959226e087
Merge pull request #683 from MageKing17/cleanup/weapon-objects
...
Various cleanup related to weapon objects.
2016-07-22 14:13:42 +02:00
MageKing17
92e4b5b259
Merge pull request #684 from DahBlount/share_fire_dir_update
...
Avoid setting flags when using the share fire direction flag
2016-07-21 19:30:39 -07:00
DahBlount
8201f0ef1c
Avoid setting flags when using the share fire direction flag
...
Originally, "share fire dir" forced the "salvo mode" flag. This
interfered with the "use multiple guns" flag. In order to avoid this, I
instead made "share fire dir" if either "salvo mode" or "use multiple
guns" is not found, as those are the only two flags that, coupled with
"share fire dir" give the desired results.
2016-07-21 17:44:08 -06:00
MageKing17
df1d84fe6e
Greatly simplify scoring for weapon kills.
...
Bombs can give points for being shot down. This was being handled by a full-blown pair of damage_ship/damage_ship_id arrays, just like ships have for scoring purposes. This is ridiculous overkill when most bombs are shot down with a single pull of the trigger and means we were storing a couple hundred bytes of data that would be completely unused for the vast majority of projectiles. Now, whoever shoots down a bomb gets the points for it; period. Simple, and we can remove all scoring data from the weapon struct.
2016-07-21 14:44:24 -07:00
MageKing17
9b2e83ed3b
Minor cleanup of weapon/weapon collision code.
...
Lots of references to Weapons[A->instance] and Weapons[B->instance], despite having created pointers for them earlier in the function. Also, I have no idea what was up with the override conditional.
2016-07-21 14:44:24 -07:00
MageKing17
f7591078b9
Change collisionInfo from an mc_info object to an mc_info* pointer.
...
This seems preferable to storing an entire mc_info object on every weapon, when the vast majority of projectiles (by the very nature of the fact that they still exist) won't have collided with anything.
On the other hand, I'm not wild about allocating and freeing memory every time a weapon collides with a ship or debris. If anyone has a better solution, I'm all ears.
2016-07-21 14:44:24 -07:00
Fabian Woltermann
9a6e939f3d
Merge pull request #682 from MageKing17/cleanup/gun-convergence
...
Remove redundant code branch in gun convergence code.
2016-07-21 22:53:32 +02:00
MageKing17
eb6b77dba0
Remove redundant code branch in gun convergence code.
...
"If a or b else a" should never ever execute the "else a" branch; this appears to be an artifact left over from Wanderer's reorganization of the autoaim/convergence code in 7bb10d8 , before which standard convergence and automatic convergence were handled in separate conditionals.
2016-07-21 12:28:25 -07:00
niffiwan
c3c66c9be3
Merge pull request #677 from MageKing17/cleanup/gropengl-error-checking
...
Add some error checking to gropenl.cpp.
2016-07-21 19:19:21 +10:00
niffiwan
a63ffa65ce
Merge pull request #678 from MageKing17/bugfix/ship-tbm-countermeasure-fix
...
Make modular ship tables not reset to species countermeasures.
2016-07-21 19:18:06 +10:00
Fabian Woltermann
7176c6cba2
Merge pull request #681 from asarium/fix/stlport
...
Remove STLPort
2016-07-21 10:43:57 +02:00
asarium
8b3768ba71
Remove STLPort
2016-07-21 10:15:03 +02:00
Fabian Woltermann
d021e38f22
Merge pull request #679 from MageKing17/fred/dedicated-gpu
...
Make FRED use high-performance GPU by default.
2016-07-21 06:14:41 +02:00
MageKing17
7cc7973c23
Make FRED use high-performance GPU by default.
...
Literally a copy-paste of the code added by PR #119 from freespace.cpp to fred.cpp.
2016-07-20 12:54:49 -07:00
MageKing17
6d0b3925f0
Make modular ship tables not reset to species countermeasures.
...
If a modular ship table modifies a ship entry without specifying a "$Countermeasure type:" entry, and the species has a "$Countermeasure type:" entry, FSO would reset the ship's countermeasure type to match the species default, even if we weren't defining the class for the first time. This just adds a first_time check to the else branch to avoid that.
2016-07-20 11:45:41 -07:00
MageKing17
8df65dc3e5
Add some error checking to gropenl.cpp.
...
The first sign of a problem creating the OpenGL context for FRED should not be failing an assertion when trying to call sscanf() on the OpenGL version. I added a check that will report an error much sooner (as soon as SDL_GL_CreateContext() fails), threw some OpenGL error-checking around the glGetString(GL_VERSION) call to be on the safe side, and slapped an Assertion() in there for good measure.
Also there was a \n missing from the mprintf() call if window creation failed.
2016-07-20 11:11:13 -07:00
Fabian Woltermann
357cc882da
Merge pull request #676 from asarium/fix/msvcWarnings
...
Fix Visual Studio warnings
2016-07-20 18:49:06 +02:00
asarium
8b8c370995
Fix GCC/Clang warning
2016-07-20 14:31:27 +02:00
asarium
71a1f6c307
Fix Visual Studio warnings
...
The only major change is that all bpp variables in bmpman have been converted into ints. Before it was a mix of ubyte and int.
2016-07-20 13:49:41 +02:00
m!m
aa169af2c0
Merge pull request #675 from MageKing17/cleanup/gitignore-vc-db-files
...
Add *.VC.db and *.VC.VC.opendb to .gitignore file.
2016-07-19 19:50:01 +02:00
MageKing17
3cd6e3ce6b
Add *.VC.db and *.VC.VC.opendb to .gitignore file.
...
These are created by VS 2015 (as of update 2) and should be ignored like other local Visual Studio files. *.VC.db is a new format for the IntelliSense database (replacing *.sdf used by previous versions), and *.VC.VC.opendb is a lockfile indicating the database is in use.
2016-07-19 09:05:17 -07:00
m!m
3d5682ae7e
Merge pull request #673 from MageKing17/appveyor/version-3-7-5
...
Get rid of AppVeyor version number.
2016-07-19 12:10:27 +02:00
m!m
8b3fb148eb
Merge pull request #672 from MageKing17/bugfix/force-feedback
...
Fix a couple force feedback issues.
2016-07-19 12:09:47 +02:00
MageKing17
20d3410398
Get rid of AppVeyor version number.
...
FSO hasn't been on 3.7.3 for a while, now, and the version number is pretty irrelevant to CI in the first place.
2016-07-18 12:25:25 -07:00
MageKing17
ab23830778
Correct haptic effect for docking.
...
SDL_HAPTIC_SQUARE was removed immediately before the SDL 2.0.0 release and replaced with SDL_HAPTIC_LEFTRIGHT, due to running out of bits. SDL_HAPTIC_SQUARE is a periodic effect. SDL_HAPTIC_LEFTRIGHT is for controller rumble. Just because the latter replaced the former doesn't mean they're equivalent (and in fact they are completely different, which results in a malformed effect that won't work right, if at all). As a result, I've replaced the effect with SDL_HAPTIC_SINE, since a sine wave is the closest periodic effect to a square wave. This allows the effect to actually work, although not in exactly the same way as it would if it were actually a square wave (SDL 2.1 is supposed to contain SDL_HAPTIC_SQUARE again and presumably the effect can be changed back to a square wave whenever that happens).
2016-07-18 11:14:31 -07:00
MageKing17
19b5ee97f7
Allow force feedback to work again.
...
It turns out that SDL_HapticOpenFromJoystick() is currently bugged (I found the SDL bugzilla bug for it). SDL_HapticOpen() allows force feedback to work, with the caveat that it operates on indices and so anyone with multiple force feedback devices won't get the one matching their selected joystick. The only other alternatives are to add our own code to match the haptic device to the currently-selected joystick, to add a haptic device selector to the launcher, or to distribute a custom version of SDL that fixes SDL_HapticOpenFromJoystick(). This is the lowest-effort change (which can and should be reverted if SDL releases a new version that fixes it).
2016-07-18 11:07:10 -07:00
MageKing17
19181b016c
Merge pull request #670 from asarium/fix/joystickEvents
...
Fix joystick axis events being ignored.
2016-07-18 09:28:32 -07:00
MageKing17
343bee1eed
Merge pull request #669 from asarium/fix/joystickID
...
Only process events from the right joystick
2016-07-18 09:28:28 -07:00
asarium
9a1b143308
Fix joystick axis events being ignored.
2016-07-18 18:09:12 +02:00
asarium
d8e3b382fc
Only process events from the right joystick
...
The axis handler already checked if the right joystick was used but the
button and hat handlers didn't.
2016-07-18 14:06:14 +02:00
MageKing17
e1042da9ae
Merge pull request #668 from SamuelCho/aabitmap_alpha_channel_fix
...
Remove alpha channel check in opengl_aabitmap_ex_internal
2016-07-17 20:05:35 -07:00
SamuelCho
426a25e35e
Remove alpha channel check in opengl_aabitmap_ex_internal since it's breaking 32-bit aabitmaps.
2016-07-17 19:34:51 -07:00
MageKing17
d089fd2282
Merge pull request #667 from asarium/feature/onlyMainWindowEvents
...
Only process events that belong to the main window
2016-07-17 10:26:28 -07:00
MageKing17
f1c62b4948
Merge pull request #666 from niffiwan/fix/apng_endbyframes2
...
End apngs by frame count as well as time
2016-07-17 10:25:19 -07:00
asarium
0e653bfb78
Add documentation
2016-07-17 18:27:54 +02:00
asarium
05dda73ecd
Only process events that belong to the main window
...
SDL2 support multiple windows and differentiates the events for the
individual windows using the windowID field in the events. These changes
check if that window ID belongs to our main window and ignores any
events that don't belong to it. This allows to add another window
without screwing up the rest of FSO with its input.
2016-07-17 18:20:56 +02:00
niffiwan
4bd9c45d1d
End apngs by frame count as well as time
...
Choose that if a system is too slow to compose & render apngs fast
enough, play the anim until the last frame anyway, potentially messing
up time sync between frames, but at least don't have looped anims
stuttering as they skip back to the 1st frame from some non-end frame.
Most modern-ish systems won't see this issue unless there's lots of
apngs playing at the same time...
2016-07-17 13:48:49 +10:00
MageKing17
88f51f2f0a
Merge pull request #665 from The-E/monopub_removal
...
Bad reference removal
2016-07-16 12:25:02 -07:00
Fabian
1ea313c445
Removes references to monopub.h (removed in the AP merge) from the project files that still reference it
2016-07-16 21:11:14 +02:00
Fabian Woltermann
2eab9514a9
Merge pull request #663 from asarium/feature/exitOnSdlQuit
...
Quit game when receiving SDL_QUIT event
2016-07-16 17:09:18 +02:00
Fabian Woltermann
fd0229e44f
Merge pull request #664 from asarium/feature/unresponsive
...
Ignore all OS events when loading a mission
2016-07-16 17:09:08 +02:00
asarium
9f9809be5d
Ignore all OS events when loading a mission
...
This should fix the "Application unresponsive" errors.
2016-07-16 16:23:30 +02:00
asarium
8db274ee7f
Quit game when receiving SDL_QUIT event
...
This allows FSO to exit gracefully when receiving a SIGINT or SIGTERM
2016-07-16 15:48:22 +02:00
Fabian Woltermann
14dad6eceb
Merge pull request #662 from asarium/feature/eventListeners
...
Add API for registering custom event handler
2016-07-16 15:43:17 +02:00
asarium
0751a7ab0f
Use a vector instead of unordered_map
2016-07-16 15:18:30 +02:00
asarium
54381c2762
Fix typo
2016-07-16 15:18:30 +02:00
asarium
afef5a7309
Add API for registering custom event handler
...
May be useful for future text input or scripting implementations
2016-07-16 15:18:30 +02:00
m!m
5a0bfffc75
Merge pull request #661 from scp-fs2open/antipodes
...
SDL Everywhere Master Edition
2016-07-16 14:15:48 +02:00
Fabian Woltermann
bbaf78ad76
Merge pull request #660 from asarium/antipodes_/sync
...
Sync Antipodes
2016-07-16 13:59:09 +02:00
asarium
aa639881aa
Merge branch 'master' into antipodes_/sync
2016-07-16 13:48:12 +02:00
Fabian Woltermann
d28be156d9
Merge pull request #659 from SamuelCho/monochrome_gamma_correction
...
Fix gamma correction for colors sourced outside of textures
2016-07-14 09:58:33 +02:00
SamuelCho
e620ffbb65
Make sure we gamma correct colors coming from the GL color state or the color verts.
2016-07-13 23:58:57 -07:00
Fabian Woltermann
c4ce653431
Merge pull request #658 from SamuelCho/neb_nohtl_removal_fix
...
Fixed nebula missions from breaking scene render targets following the nohtl removal.
2016-07-13 12:44:59 +02:00
SamuelCho
ac46ee4030
Fixed nebula missions from breaking scene render targets following the nohtl removal.
2016-07-12 23:36:05 -07:00
MageKing17
10d6c48abc
Merge pull request #656 from The-E/make_beams_bright_again
...
Make beams and warps bright again
2016-07-12 13:36:16 -07:00
Fabian Woltermann
5fca2355b9
Adds TMAP_FLAG_EMISSIVE for the 2D warp effect, and ups the scaling applied to textures with that flag from 1.5 to 2.0 to better approximate the brightness beams used to have.
...
Also sets a glow texture for the 3D warp effect.
2016-07-12 21:51:39 +02:00
SamuelCho
e3ad7d213a
Merge pull request #655 from niffiwan/fix/delete_spurious_file
...
Delete spurious temp file
2016-07-11 00:18:25 -07:00
niffiwan
5b332c4400
Delete spurious temp file
...
From #654
2016-07-11 17:10:08 +10:00
m!m
d98f6f1bb1
Merge pull request #654 from SamuelCho/remove_unused_gfx_code
...
Strip out unused rendering code.
2016-07-11 09:07:45 +02:00
SamuelCho
701ae8f3b5
Removed unused variables following the rendering code removal.
2016-07-10 21:29:47 -07:00
SamuelCho
1ef7688fa1
Strip out unused rendering code.
2016-07-10 19:29:11 -07:00
z64555
fcc40b4812
Merge pull request #648 from The-E/nohtl_removal_fix
...
Fixes a small issue in the nohtl removal commit.
2016-07-09 18:30:19 -05:00
Fabian Woltermann
ef33ee490d
Fixes a small issue in the nohtl removal commit. In this case, the original line "if (!Cmdline_nohtl || (s <= 0.0f))" was replaced by "if (s <= 0.0f)", which unfortunately is not the intended behaviour here.
2016-07-10 00:53:12 +02:00
Fabian Woltermann
1469ba20ca
Merge pull request #646 from niffiwan/fix/apng_optional_caching
...
Allow apng's to not be cached
2016-07-09 13:05:42 +02:00
niffiwan
8162abc256
Allow apng's to not be cached
...
Main use case is headanis where only one is played at a time and
caching the frames merely increases memory use & fragmentation, leading
to malloc errors with heavy apng use
2016-07-09 20:04:16 +10:00
Fabian Woltermann
0b98320841
Merge pull request #644 from chief1983/antipodes_/sdl204
...
Upgrade Mac Frameworks.tgz and the libsdl folder to SDL 2.0.4.
2016-07-09 08:10:30 +02:00
MageKing17
011368dff5
Merge pull request #645 from MageKing17/feature/remove-subsystem-limit
...
Remove subsystem limit.
2016-07-08 23:08:25 -07:00
MageKing17
241c0eaa95
Remove subsystem limit.
...
Allows support for as many subsystems as available memory allows by replacing the Ship_subsystems[] pointer array with a pointer vector. It still just contains pointers to dynamically-allocated subsystem arrays (allocated in blocks of NUM_SHIP_SUBSYSTEMS_PER_SET), so this should behave almost identically to the current code.
2016-07-08 15:06:58 -07:00
Cliff
7424c41f3f
Remove the mac i386 builds from the build matrix too.
2016-07-08 15:44:46 -05:00
SamuelCho
98e56ea3e3
Merge pull request #598 from asarium/cleanup/graphics
...
Remove unused graphics functions
2016-07-08 13:12:47 -07:00
chief1983
ae8e3c3145
Upgrade Mac Frameworks.tgz and the libsdl folder to SDL 2.0.4. Remove Only Active Archs setting from Travis configuration to see if that's enough to get it to only build x64 now.
2016-07-08 14:46:55 -05:00
Fabian Woltermann
8ff201fddb
Merge pull request #641 from MageKing17/cleanup/deprecate-nohtl-and-brief-lighting
...
Deprecate -nohtl and -brief_lighting.
2016-07-08 21:32:07 +02:00
MageKing17
70529dbd5a
Deprecate -nohtl and -brief_lighting.
...
-nohtl hasn't worked for years, and -brief_lighting was always supposed to be a temporary flag before making the behavior always on.
2016-07-08 09:39:29 -07:00
Fabian Woltermann
bcb072a146
Merge pull request #636 from asarium/antipodes_/sync
...
Sync Antipodes
2016-07-07 11:35:38 +02:00
Fabian Woltermann
876663ffdc
Merge pull request #642 from SamuelCho/mac_pbr_lod_fix
...
Fix for the PBR shader compilation error on Mac
2016-07-07 11:34:36 +02:00
Samuel Cho
a43bb9ad37
OpenGL 2.1 spec doesn't support texture LOD lookups in the fragment shader unless we use GL_ARB_shader_texture_lod. Should allow PBR to work on Mac now.
2016-07-07 00:13:39 -07:00
asarium
2b5fd5e7ec
Merge branch 'master' into antipodes_/sync
2016-07-06 18:46:11 +02:00
m!m
8478f47d9e
Merge pull request #9 from chief1983/mysync
...
Undo some merge conflict clobbering in Xcode project
2016-07-06 18:25:42 +02:00
chief1983
9825d62694
Nevermind, we don't need universal support after all, we target 10.7 and 10.6 was the last 32-bit supporting OS.
2016-07-06 10:25:45 -05:00
Fabian Woltermann
7516ce039e
Merge pull request #640 from SamuelCho/physically_based_rendering
...
Physically based rendering
2016-07-06 14:01:32 +02:00
SamuelCho
75c16008c6
This function should always return the number of mip map levels.
2016-07-05 23:15:11 -07:00
SamuelCho
f5a96c33be
Some explanation for why we need OGL_EXT_FRAMEBUFFER_OBJECT to use glGenerateMipmap()
2016-07-05 23:15:10 -07:00
SamuelCho
bbab2f2b1e
Fix blending of particles dependant on if texture map has an alpha channel.
2016-07-05 23:15:10 -07:00
SamuelCho
bbae9d5242
Don't replace RGB channels of texture in the passthrough shader if it has an alpha channel when using gr_aabitmap_ex
2016-07-05 23:15:09 -07:00
SamuelCho
12edc6a53b
Fixed constant alpha not being applied to the texture map.
2016-07-05 23:15:09 -07:00
SamuelCho
dd73d8fb63
New lighting model based off of Blinn-Phong and Fresnel-Shlick. Introduced -reflect maps. New gloss parameters for specular power. High dynamic range rendering. Improved bloom pass.
2016-07-05 23:15:08 -07:00
chief1983
c1d074d5d0
One last fix, actually fixes running the game now.
2016-07-06 00:35:13 -05:00
MageKing17
539704d55a
Merge pull request #639 from jg18/ping_color_fix
...
Fix text color of ping values in server list.
2016-07-05 21:14:11 -07:00
chief1983
824e6bd817
Undo some merge clobbering.
2016-07-05 22:44:35 -05:00
jg18
b4a764e6cd
Fix text color of ping values in server list.
...
Update ping color value ranges to be more realistic. Also add orange as a
ping value text color.
2016-07-05 20:20:32 -07:00
asarium
256503cd08
Use better Frameworks file
2016-07-05 20:58:50 +02:00
asarium
a6df7eef35
Merge branch 'master' into antipodes_/sync
...
The APNG changes required some additional work. A cursor now owns the
bitmap handle that will be used for the cursor. This is required in
order to support variable FPS cursors.
2016-07-05 12:09:22 +02:00
niffiwan
74b1cdbfc5
Merge pull request #637 from asarium/ci/macosxErrorLog
...
Upload the MacOSX build log to pastebin if the build fails
2016-07-05 18:54:26 +10:00
asarium
c10338480a
Fix Windows compile
2016-07-05 10:10:53 +02:00
m!m
0af0064b6d
Merge pull request #638 from MageKing17/cleanup/read-player-controls
...
Clean up read_player_controls() somewhat.
2016-07-05 10:03:11 +02:00
MageKing17
6453fa3ed3
Clean up read_player_controls() somewhat.
...
I don't remember why I was reading this function, but I noticed that the "can_warp" and "warp_failed" variables didn't actually seem to be serving any purpose, and there was some redundant code in the PCM_WARPOUT_STAGE* case they were "used" in.
2016-07-04 18:38:17 -07:00
m!m
76ffc26680
Merge pull request #537 from niffiwan/apng_pr
...
APNG support
2016-07-04 23:34:49 +02:00
asarium
5a847268bf
Upload the build log to pastebin if the build fails
2016-07-04 22:34:46 +02:00
Fabian Woltermann
dc8079b730
Merge pull request #634 from MageKing17/bugfix/change-ship-class-subsystem-target-fix
...
Fix several problems with change_ship_type()
2016-07-04 21:49:15 +02:00
asarium
6c4de8161d
Use new Framework
2016-07-04 11:44:38 +02:00
asarium
cd2a692150
Merge branch 'master' into antipodes_/sync
2016-07-04 11:15:40 +02:00
MageKing17
28db7bb2f9
Fix several problems with change_ship_type()
...
This was a bit of a doozy.
If the player's current target changes ship class with change_ship_type(), Player_ai->targeted_subsys will still be pointing to the old subsystem list; this could cause problems (specifically out-of-bounds array accesses) when trying to e.g. look up nonexistant submodels. Similar problems occur with any other AIs targeting a subsystem on the ship in question. In order to fix this, several changes were made.
Firstly, change_ship_type() will now go through every Ai_info object looking for ones targeting a subsystem of the ship changing classes, or with an AI_GOAL_DESTROY_SUBSYSTEM goal for the ship changing classes, and convert them all to the new subsystem (if there's a match) or remove the target/goal (if there isn't), reusing the existing subsystem comparison logic (for transferring damage). Near the end, there's a Player_ai comparison to call hud_cease_subsystem_targeting(0) if necessary.
Additionally, change_ship_type() will also look through every weapon looking for anything that might be homing in on or fired from a subsystem on the ship changing types; these are handled similarly to targeted subsystems, including clearing the weapon's homing_subsys/turret_subsys attribute if a matching subsystem isn't found.
Also handles sp->last_targeted_subobject[], which contains subsystem pointers to keep track of which subsystem each player was previously targeting on that ship.
Lastly, change_ship_type() will now kill ship sparks if the model number has changed (trying to transfer sparks to matching submodels would be a herculean task and probably fail most of the time anyway, with similarly-named subobjects with different shapes so the coordinates wouldn't make sense anyway).
2016-07-03 20:28:52 -07:00
niffiwan
774140d461
Merge pull request #635 from MageKing17/bugfix/color-table-parsing
...
Fix color table parsing.
2016-07-03 21:59:38 +10:00
MageKing17
bf6cbb9f18
Fix color table parsing.
...
Accidentally forgot one array in PR #633 , causing a crash if a color table is actually present.
2016-07-03 02:17:07 -07:00
niffiwan
9a5085d7fd
Merge pull request #633 from MageKing17/feature/color-orange
...
Adds Color_orange and a corresponding color tag to colors.tbl.
2016-06-23 19:41:02 +10:00
MageKing17
bb3828b80b
Adds Color_orange and a corresponding color tag to colors.tbl.
...
Inserts "Orange" between "Bright Yellow" and "UI Light Green" and adds the default color tag "$o" to use it. (Prerequisite for using orange as a ping display color.)
Also added some comments to identify the RGB values by the corresponding color name, because as it turns out, they're awfully hard to read as-is.
2016-06-22 19:59:55 -07:00
Goober5000
ec9936138b
Merge pull request #620 from asarium/antipodes_/mouseCompileFix
...
Fix compilation with SDL 2.0.4
2016-06-20 22:25:47 -04:00
m!m
b7b89337b7
Merge pull request #631 from rtoijala/fix-vpath-builds
...
fix VPATH builds
2016-06-18 18:20:02 +02:00
Risto Toijala
5577c4e16e
fix VPATH builds
...
https://www.gnu.org/software/automake/manual/html_node/VPATH-Builds.html
VPATH builds were broken because mongoose.h was not found.
Makefile.am stated that it should be found in ../mongoose, which is
incorrect for VPATH builds. The search path should be relative to the
source tree ( i.e. $(VPATH) ).
Example:
mkdir -p build/debug
cd build/debug
../../autogen.sh
../../configure --enable-debug
make
The search path would then be (relative to the source tree)
build/mongoose, not ./mongoose as it should.
Fix this by changing ../mongoose to ./($VPATH)/../mongoose.
In the previous example, $(VPATH) is ../../../code, so the search path
is now correctly ./../../../code/../mongoose.
For in-tree builds, the path was previously ../mongoose. It is now
.//../mongoose, which is equivalent.
2016-06-18 16:02:17 +03:00
niffiwan
1d28184ce6
Merge pull request #442 from asarium/antipodes_/luaMouse
...
Improve CursorManager
2016-06-18 12:53:16 +10:00
MageKing17
3ed6874cb2
Merge pull request #629 from asarium/fix/625
...
Fix for #625
2016-06-17 08:32:37 -07:00
m!m
e0b8abc0ba
Merge pull request #609 from jg18/ping_fix
...
Fix ping calculations in server list.
2016-06-17 10:17:28 +02:00
asarium
e3664152ca
Validate fiction viewer file name
2016-06-16 19:49:34 +02:00
asarium
371c49724e
Turn invalid file error into warning
2016-06-16 19:49:34 +02:00
m!m
b2fc33563d
Merge pull request #628 from rtoijala/lua51-build-fix
...
accept lua51 as pkg-config name for Lua
2016-06-16 19:25:30 +02:00
Risto Toijala
73c20cedd3
accept lua51 as pkg-config name for Lua
2016-06-16 15:34:53 +03:00
niffiwan
b51d6f84b8
Merge pull request #626 from rtoijala/misleading-indentation
...
Fix indentation warnings
2016-06-15 20:43:13 +10:00
Risto Toijala
7d7c87c290
Fix indentation warnings
...
GCC 6 warns about misleading indentation because it counts tabs as 8
spaces. The rest of the code uses tabs, these lines use 4 spaces.
Replace spaces with tabs.
Whitespace changes only.
2016-06-15 12:40:44 +03:00
m!m
cb9c66966d
Merge pull request #619 from MageKing17/feature/spinup-without-external-models
...
Move conditional so that weapon spinup happens without external models.
2016-06-05 13:06:38 +02:00
m!m
441ac5c066
Merge pull request #621 from tomimaki/master
...
Fix compiling debug build on linux with glibc 2.23
2016-06-04 11:36:06 +02:00
tomimaki
1b65fd50a0
Fix compiling debug build on linux with glibc 2.23 ( #1 )
2016-06-04 00:11:04 +02:00
asarium
44b44bb249
Fix compilation with SDL 2.0.4
2016-06-03 19:58:50 +02:00
MageKing17
5d307d24f4
Move conditional so that weapon spinup happens without external models.
...
Moves the sip->draw_primary_models[bank_to_fire] check so that it only contains the code related to shipp->primary_rotate_ang[bank_to_fire], since that really does only matter if external models are present. The rest of the spinup code doesn't actually care about the model, though, so it seems odd (and unfair to modders) to not allow it to function just because the ship has external primary models disabled.
I also wrapped the spinup code in a basic check that winfo_p->weapon_submodel_rotate_vel is greater than zero because most weapons aren't going to have a spinup, so there's no need to perform the other calculations for them (it's probably a marginal savings at best, but since I was getting rid of the best-case savings of most ships not having external primary models enabled, I figured I may as well replace it).
Minor formatting changes to the other lines just because it took me a while to figure out what the code was doing when I first read it; "if(" changed to "if (", and line breaks inserted into the one-line conditionals.
2016-06-02 21:40:16 -07:00
jg18
d06d6e6df0
Change f2fld() macro to f2d().
2016-05-30 14:08:28 -07:00
jg18
e78327d879
Fix ping average calculation.
2016-05-30 13:59:51 -07:00
jg18
8f42977ee8
Fix ping calculations in server list.
...
Fix calculations of server ping in in-game server list. Minimize floating
point calculations, using double instead of float, avoid calling timer
twice when receiving pong, and capture pong time more precisely.
2016-05-30 13:59:51 -07:00
m!m
d60c8d5f3f
Merge pull request #615 from niffiwan/feature/player_min_speed
...
Add player minimum speed feature
2016-05-27 14:19:08 +02:00
niffiwan
278a797db2
Add player minimum speed feature
...
Allows the players ship to have a minimum speed set. If the ships speed
drops below this (per ship) value, the throttle is increased to the
minimum.
For ships that are gliding, their engines will be reactivated when the
ships overall velocity falls below the minimum speed.
Currently only sets a minimum Z speed, Y & X are ignored.
2016-05-27 20:34:15 +10:00
m!m
1a59a1c811
Merge pull request #612 from Yarn366/messages_suffix_fix
...
Fix for automatic message suffixes
2016-05-25 19:40:42 +02:00
MageKing17
96c01e6c1e
Merge pull request #613 from DahBlount/Fix-Warp-No-Collide
...
Prevent "no collide" objects from colliding during warp sequence
2016-05-25 01:07:50 -07:00
DahBlount
50496c8143
Add OF_COLLIDES check to avoid OBJ_RECALC_PAIRS
...
OBJ_RECALC_PAIRS unsets then sets the OF_COLLIDES flag, so when a ship
with "no collide" set on it warps out, the flag is essentially ignored
and the ship can collide during the warp sequence.
2016-05-24 22:54:10 -06:00
Yarn366
7d3b824428
Added a flag the message_extra struct that tells whether the base animation exists. Also changed message_play_anim() to use this flag rather than the first_frame field to decide whether to add a suffix to the name.
2016-05-23 01:10:33 -04:00
niffiwan
d3d026651e
Add __gc lua cleanup function
...
Per m!m review
2016-05-10 19:42:22 +10:00
niffiwan
7af57209e1
Add LUA support for streaming anims
2016-05-10 19:42:22 +10:00
niffiwan
67ca370cba
Fix a minor deviation from the spec
2016-05-10 19:42:21 +10:00
niffiwan
e269b77645
Convert warnings to mprintf's
...
With png & apngs sharing the same filename these warnings could fire
quite a bit, and the lack of an anim playing should be very obvious to
the modder anyway.
2016-05-10 19:42:21 +10:00
niffiwan
0e02552267
Fix bug in handling dispose operations
...
I didn't read the spec correctly; only the previous frames portion of
the output buffer is supposed to be cleared/reverted; not the entire
output buffer
2016-05-10 19:42:21 +10:00
niffiwan
6155df93d9
Minor tweaks to improve performance
...
Also updated/added a few comments
Fix a bug; last frame wasn't being processing
2016-05-10 19:42:21 +10:00
niffiwan
38c7d6e33c
Update FRED to allow *.png file selection
...
For campaign, command briefing & event editors
(plus the probably unused message editor)
2016-05-10 19:42:21 +10:00
niffiwan
d519c83697
Add comment for why we're not using .apng
2016-05-10 19:42:21 +10:00
niffiwan
b7bad1aba9
Check for nullptr before calling cfclose
2016-05-10 19:42:21 +10:00
niffiwan
886ecbf151
Fix a bunch of cfile leaks in bm_load_animation
2016-05-10 19:42:21 +10:00
niffiwan
1fd8f7afba
Cleanup apng owned resources on ctor exception
2016-05-10 19:42:21 +10:00
niffiwan
b24bea8507
Ensure total_time is set if anim is already loaded
...
i.e. fix the actual bug, not just the symptoms!
2016-05-10 19:42:21 +10:00
niffiwan
0fc4b89820
Missed weapon thruster/glow calcs
...
Thanks to Axem for finding the bug
2016-05-10 19:42:21 +10:00
niffiwan
58facec264
Fix MSVC2015 warning (int to bool conv)
2016-05-10 19:42:21 +10:00
niffiwan
e9e49f5276
Fixes per m|m's review
...
Use unique_ptr for safer pointer management
Simplify frame delay calcs when looping
Ensure animated cursor times don't lose precision
Switch Error to an Assertion
Fix LUA documentation formatting
2016-05-10 19:42:21 +10:00
niffiwan
3df84a3986
Fix travis warning signed-v-unsigned comparison
...
I reckon this is an issue with gcc 4.6.3, 4.8.4 doesn't think it's an
issue, maybe due to the way the way the constants were init'd with HEX
values
2016-05-10 19:42:21 +10:00
niffiwan
375a251334
Complete apng feature
...
Handle total_time directly requested from bm_load_animation
Make generic_anims request total_time directly
Move png-vs-apng check to apng class
Remove redundancy in apng exception messages
Update comments
2016-05-10 19:42:21 +10:00
niffiwan
87770aad8f
Add total_time output param to bm_load_animation
...
Also convert int to bool, and replace NULL with nullptr
2016-05-10 19:42:20 +10:00
niffiwan
2f1b686349
Finish conversion to new frame calc function
...
Also remove debug code
2016-05-10 19:42:20 +10:00
niffiwan
200c4c82a5
Simplify shockwave_get_framenum
...
Have get call set rather than duplicate code for calculating the frame
number
2016-05-10 19:42:20 +10:00
niffiwan
0b20b15c2c
Fix issues found by Axem
...
Fix silly issue preventing getFrame() from working
Remove infinite loop when calculating frame num
Convert more animations to use new frame calc function
2016-05-10 19:42:20 +10:00
niffiwan
78d6957be8
Tweak lua loadTexture to be able to load apngs
...
Reorder precendence of static image vs animation loading
i.e. load animations 1st if requested, then load still images
if the animation failed to load or if animations weren't requested
2016-05-10 19:42:20 +10:00
niffiwan
50c791c998
Add support for non-streaming apngs
...
i.e. apngs (pre)loaded into bmpman slots
handles apng variable frame delays
Includes new lua function (getFrames) to find the current frame for
apngs. Also uses new function to correctly display apngs for mission
loading animations, ship thrusters & engine glows.
2016-05-10 19:42:20 +10:00
niffiwan
90b35b72fb
Add support for streaming apngs
...
includes:
full-colour & hud-colour headanis
cbanims & intelanims
mainhall animations (including playing in reverse)
Notably does not support ship/weapon select anims as they need
keyframes and there isn't anywhere to specify them in the apng format
2016-05-10 19:42:20 +10:00
MageKing17
8906c735c6
Merge pull request #607 from niffiwan/feature/lua_tAnim_instant
...
Add instant flag to lua triggered anims
2016-05-08 10:57:36 -07:00
MageKing17
2ee839152c
Merge pull request #608 from niffiwan/cleanup/lua_ets_desc
...
Fix ETS virtvar comments
2016-05-08 10:57:20 -07:00
niffiwan
6be09e7157
Merge pull request #606 from MageKing17/cleanup/fred2-executable-version
...
Update FRED2_Open executable version to 3.7.5.
2016-05-08 19:32:33 +10:00
niffiwan
1715b20d30
Fix ETS virtvar comments
2016-05-08 15:05:19 +10:00
niffiwan
37497cb7d7
Add instant flag to lua triggered anims
...
Just expose the existing instant flag from the animation handling code
2016-05-07 21:10:26 +10:00
MageKing17
b62eba559b
Update FRED2_Open executable version to 3.7.5.
...
Not sure how this got missed multiple times, but better late than never.
2016-05-06 16:10:20 -07:00
Cliff Gordon
4fa84ee388
Merge pull request #600 from MageKing17/bugfix/grammar-compilation
...
Make VS 2013 and 2015 use the copy of gc.exe like 2010 does.
2016-05-01 16:01:30 -05:00
Goober5000
776f0df434
Merge pull request #592 from downwash/mantis-02851
...
Removed support for // comments in FRED
2016-04-29 02:02:25 -04:00
MageKing17
39ce7d4253
Make VS 2013 and 2015 use the copy of gc.exe like 2010 does.
...
Recent update to VS 2015 Community Edition appears to have removed gc.exe for some reason; the safest thing to do would seem to be to go back to using the copy of it we were already keeping around for VS 2010 Express.
2016-04-27 14:51:47 -07:00
m!m
c33b54464e
Merge pull request #599 from PeterMitsis/double-float-conversions
...
Minor trig cleanup
2016-04-27 11:54:06 +02:00
Peter Mitsis
e3cde7086c
hud: Simplify HudGaugeLock::renderLockTrianglesOld()
...
Uses the following trig identities to reduce the number of floating
point operations in HudGaugeLock::renderLockTrianglesOld().
sin(-x) = -sin(x)
cos(-x) = cos(x)
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
Peter Mitsis
180674154c
trig: Use floating point versions of trig functions
...
Replaces calls to double-precision floating point trig functions with
calls to single-precision floating point trig functions as follows:
cos() -> cosf()
sin() -> sinf()
tan() -> tanf()
acos() -> acosf()
asin() -> asinf()
atan() -> atanf()
This allows the compiler to avoid generating unnecessary instructions
that convert a float to a double and then a double back to a float.
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
Peter Mitsis
181b758577
Replace ANG_TO_RAD() macro with fl_radians() macro
...
Both the ANG_TO_RAD() and fl_radians() macros were serving the same
purpose; they converted an angle from degrees to radians. To reduce
code duplication, ANG_TO_RAD() was replaced with the existing
fl_radians().
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-24 21:56:06 -04:00
asarium
57f015a764
Remove unused graphics functions
2016-04-18 22:36:25 +02:00
niffiwan
3f5e30b4dc
Merge pull request #596 from MageKing17/bugfix/template-first-time
...
Make ship templates default first_time to true, like ship classes.
2016-04-18 18:56:38 +10:00
MageKing17
15dec7e508
Make ship templates default first_time to true, like ship classes.
...
Otherwise, the first_time code never gets evaluated for template-based ships and you never get engine glows from species. Fixes issue #594 .
2016-04-17 17:02:44 -07:00
downwash
7e3198392b
Removed support for // comments in FRED
2016-04-16 23:28:13 +02:00
MageKing17
f247330e4b
Merge pull request #591 from niffiwan/bugfix/mouse_hat_interaction
...
Stop joystick hat binds being triggered spuriously
2016-04-13 09:36:07 -07:00
niffiwan
6c1dd85738
Stop joystick hat binds being triggered spuriously
...
There was a bug in the controls code that meant trigger type controls
bound to a joystick hat could be triggered by unrelated mouse button
presses. i.e. bind "hat-back" to cycle secondary weapons and secondary
banks would change when you fired with left mouse button.
Root cause is left bitshifting by 32 or more, which is implementation
defined and at least on Linux/GCC resulted in the above behaviour.
2016-04-13 22:21:08 +10:00
m!m
1a5700a0cb
Make new registry configurable on commandline ( #587 )
2016-04-10 13:18:44 +02:00
Yarn366
3584164ec0
Fix for tab key on barracks screen ( #589 )
...
* Fixed tab key not actually switching between single player/multiplayer.
2016-04-10 13:02:30 +02:00
m!m
2679f97dc2
Merge pull request #586 from niffiwan/bugfix/asan_triggered_anim_memcpy
...
Fix issue with memcpy on overlapping memory
2016-04-06 13:34:38 +02:00
niffiwan
0a041aade1
Fix issue with memcpy on overlapping memory
...
Triggered animations (e.g. models with rotating afterburner flaps)
could trigger a memcpy on overlapping memory. This may not have caused
issues, but is undefined behaviour according to the spec
Also see #574
2016-04-06 20:26:34 +10:00
MageKing17
9845a1ad46
Merge pull request #580 from Goober5000/dumb_rotate_compatibility
...
use $rotate, $rotate_rate, and $rotate_time, and their $dumb_ equivalents, with proper backwards compatibility
2016-04-03 20:41:08 -07:00
Goober5000
33151e956d
fix a bug in the option comparison, and also add sanity checking for infinite rotation rates
2016-04-03 21:07:55 -04:00
Goober5000
08e565a855
use $rotate, $rotate_rate, and $rotate_time, and their $dumb_ equivalents, with proper backwards compatibility
2016-04-03 18:15:20 -04:00
Fabian Woltermann
fb61239f85
Merge pull request #582 from asarium/fix/cfilecrash
...
Fix crash in cfile.cpp
2016-04-03 23:16:35 +02:00
asarium
88ffa54ae0
Fix crash in cfile.cpp
2016-04-03 22:12:13 +02:00
m!m
5de6635111
Merge pull request #576 from PeterMitsis/cfile-cleanup
...
Cfile cleanup
2016-04-02 09:35:31 +02:00
Peter Mitsis
04dc9f28cc
cfile: Fix minor issues found during code review
...
Signed-off-by: Peter Mitsis <[email protected] >
2016-04-01 20:03:00 -04:00
Fabian Woltermann
55bdad3799
Merge pull request #579 from DahBlount/Share_Fire_Direction-Accuracy-Fix
...
Remove redundant function and add check to add "salvo mode" if "share fire direction" is found
2016-04-02 01:00:19 +02:00
DahBlount
63bb60935c
Remove redundant function and add check to add "salvo mode" if "share fire direction" is found
2016-04-01 16:26:55 -06:00
MageKing17
6d82031115
Merge pull request #577 from asarium/fix/572
...
Fix issue #572
2016-04-01 04:05:11 -07:00
asarium
05fbb8d4de
Fix issue #572
2016-04-01 12:03:19 +02:00
MageKing17
f4645e3e6c
Merge pull request #569 from downwash/mantis-03153
...
Clarified a warning message about wave tresholds (Mantis 3153)
2016-04-01 01:42:32 -07:00
Peter Mitsis
8924aa06e9
cfile: Simplify cf_delete()
...
Removes the unnecessary attempt at opening the specified prior to
calling _unlink().
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
673b8f61eb
cfile: Remove superfluous memset() in cfile_flush_dir()
...
There is no need to zero the 'stat' structure before using in stat().
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
f75f6af43a
cfile: Refactor cfile_chdir() and cfile_push_chdir()
...
Reworks cfile_chdir() and cfile_push_chdir() to extract common and
reduce code duplication.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
71a61143bf
cfile: Simplify cfile_init() and cfile_in_root_dir()
...
Removes unnecessary error checking and simplifies the logic.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
cca2a776e1
cfile: Only define cfile_chdrive() for _WIN32
...
Not only was the use of of cfile_chdrive() already conditional on _WIN32
being defined, so too was its extern declaration.
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
Peter Mitsis
8e21aa6c88
cfile: Apply 'static' keyword
...
Signed-off-by: Peter Mitsis <[email protected] >
2016-03-31 21:50:37 -04:00
MageKing17
6bb1ccc830
Merge pull request #575 from niffiwan/bugfix/controlsconfig_delete
...
Fix new[] vs delete mismatch
2016-03-31 15:47:26 -07:00
niffiwan
f6ef7c1cd6
Fix new[] vs delete mismatch
...
Found by address sanitiser
2016-03-31 20:10:16 +10:00
downwash
a4c1d8f2eb
Wing editor no longer allows invalid values for wave treshold
2016-03-28 12:38:48 +02:00
Bernard Vervaet
20c5a86dcb
Clarified a warning message about wave tresholds (Mantis 3153)
2016-03-28 00:11:29 +02:00
m!m
ccc616fec3
Merge pull request #568 from niffiwan/bugfix/cleanup_weapon_model_unload
...
Cleanup weapon_info when models are unloaded
2016-03-27 15:21:18 +02:00
niffiwan
07284cf221
Cleanup weapon_info when models are unloaded
...
Avoids the assertions at model/modelread.cpp:3062
ASSERTION FAILED: "Polygon_models[num]->id == model_num" (etc)
2016-03-27 17:04:14 +10:00
Fabian Woltermann
2b4d08e842
Merge pull request #565 from chief1983/xcode_73_upgrade
...
[xcode_73_upgrade] Apply some recommended project file changes
2016-03-25 14:18:00 +01:00
Fabian Woltermann
1e3857e385
Merge pull request #567 from Yarn366/fix_shadow_tech_room
...
Fixed ship position in ship database
2016-03-25 14:17:25 +01:00
Yarn366
8635a8b537
Fixed ship position in ship database
2016-03-24 22:07:13 -04:00
MageKing17
762691c78f
Merge pull request #566 from ln-zookeeper/master
...
Fix for Mantis 3170
2016-03-23 15:53:30 -07:00
Lari Nieminen
f8cb347a62
Fix for Mantis 3170
...
Despite what the original report claims, the ship.cpp change described in it actually works.
2016-03-24 00:23:30 +02:00
Cliff Gordon
2d2df40efb
[xcode_73_upgrade] Apply some recommended project file changes after Xcode 7.3 upgrade.
2016-03-23 13:15:51 -05:00
Cliff Gordon
f0518514a3
Merge pull request #564 from asarium/ci/macosxFail
...
Make Travis build fail if one command fails
2016-03-23 12:53:25 -05:00
asarium
64104c19a8
Make Travis build fail if one command fails
2016-03-23 17:49:35 +01:00
Cliff Gordon
847521b012
Merge pull request #563 from asarium/fix/shaderOSX
...
Fix MacOSX compilation error
2016-03-23 11:47:56 -05:00
m!m
e6d0f9f72a
Fix MacOSX compilation error
2016-03-23 16:15:28 +01:00
MageKing17
1cd9d3fb04
Merge pull request #562 from asarium/cleanup/openglShaders
...
Clean up shader loading code a bit
2016-03-23 02:10:48 -07:00
asarium
6184ae6db6
Clean up shader loading code a bit
2016-03-22 17:38:42 +01:00
MageKing17
b270ad1bb9
Merge pull request #560 from Goober5000/dumb_rotation_tweak
...
fix the $dumb_rotate turn rate calculation to align with regular $rotate
2016-03-19 14:52:10 -07:00
Goober5000
fbc0c79973
fix the $dumb_rotate turn rate calculation to align with regular $rotate
2016-03-19 17:02:55 -04:00
Fabian Woltermann
559e56d8af
Merge pull request #554 from asarium/antipodes_/prefPath
...
Unify config handling on all platforms
2016-03-18 10:17:48 +01:00
MageKing17
caf41665f4
Merge pull request #556 from MageKing17/bugfix/issue-347
...
Fix mission screen grid by changing the drawing of the lines.
2016-03-17 06:01:29 -07:00
MageKing17
90a2676f17
Fix mission screen grid by changing the drawing of the lines.
...
Instead of using the clipping plane, simply don't draw the grid below the scanline. Fixes issue #347 .
2016-03-16 16:40:56 -07:00
MageKing17
5032d06964
Merge pull request #555 from asarium/fix/model_glsl
...
Fix flag file inconsistency
2016-03-16 16:15:33 -07:00
asarium
f9f65b0795
Fix flag file inconsistency
2016-03-16 23:18:01 +01:00
asarium
d55a054228
Fix some default section scoping issues
2016-03-16 20:16:16 +01:00
asarium
54cb475d30
Unify config handling on all platforms
...
This will use SDL_GetPrefPath to determine a suitable config directory which will be used for all runtime writing. Additionally all platforms will now use the configuration ini files, the Windows registry will be deprecated. For better compatibility with current installs there is a "legacy mode" which will work like the current install. It will be used as long as the launcher doesn't write the configuration file to the new location. Migrating old installs requires copying the existing pilot files to the new location and copying any existing configuration data.
2016-03-16 19:42:52 +01:00
Fabian Woltermann
c9380f0091
Merge pull request #553 from niffiwan/cleanup/faster_debug_default_runtime_checks
...
Set Basic Runtime Checks to Default
2016-03-14 09:42:42 +01:00
niffiwan
033ba61588
Set Basic Runtime Checks to Default
...
Ref: https://randomascii.wordpress.com/2011/07/22/visual-c-debug-buildsfast-checks-cause-5x-slowdowns/
One option to speed up debug
2016-03-13 13:56:55 +10:00
Fabian Woltermann
09ce1f1846
Merge pull request #551 from asarium/fix/registry
...
Fix Windows Registry configuration
2016-03-12 15:02:07 +01:00
MageKing17
40d49eb17a
Merge pull request #552 from asarium/antipodes_/sync
...
Sync Antipodes
2016-03-11 13:55:01 -08:00
asarium
6184136ffe
Fix Windows Registry configuration
2016-03-11 12:41:59 +01:00
asarium
2d4d0081cd
Merge branch 'master' into antipodes_/sync
...
Conflicts:
code/cmdline/cmdline.cpp
code/io/timer.cpp
code/network/multi.cpp
configure.ac
projects/MSVC_2005/Fred2.vcproj
projects/MSVC_2005/Freespace2.sln
projects/MSVC_2005/Freespace2.vcproj
projects/MSVC_2005/code.vcproj
projects/MSVC_2008/Fred2.vcproj
projects/MSVC_2008/Freespace2.doxproj
projects/MSVC_2008/Freespace2.vcproj
projects/MSVC_2008/code.vcproj
projects/MSVC_2010/Fred2.vcxproj
projects/MSVC_2012/Fred2.vcxproj
projects/MSVC_2012/Freespace2.vcxproj
projects/MSVC_2012/code.vcxproj
projects/MSVC_2012/code.vcxproj.filters
projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj
projects/Xcode4/Frameworks.tgz
projects/Xcode4/Info.plist
2016-03-11 12:36:52 +01:00
MageKing17
e98fd0bab3
Merge pull request #549 from asarium/fix/fictionviewer
...
Add validation when parsing a file spec
2016-03-10 12:25:50 -08:00
asarium
a1a8a53a65
Add validation when parsing a file spec
...
This issue was spotted by Taranis who encountered an assertion caused by
an empty file name. This check will make sure that every string parsed
as a file name will at least contain one character.
2016-03-10 18:33:43 +01:00
Cliff Gordon
38b51723e0
Automated 3.7.5 versioning commit
2016-03-10 10:09:20 -06:00
Fabian Woltermann
dc708ccbbb
Merge pull request #547 from Goober5000/game_level_seed
...
improve RNG seeding
2016-02-28 22:09:57 +01:00
Goober5000
5206220f5a
simplify the random number seeding; don't seed the RNG for every mission in single player
2016-02-27 13:25:48 -05:00
Fabian Woltermann
c049e7335b
Merge pull request #535 from jg18/remove_ipx
...
Remove IPX support.
2016-02-27 00:18:39 +01:00
jg18
a05d19db6b
Re-enable TCP/IPX selector buttons.
...
Re-enable the TCP selector button and unhide the IPX selector button.
Attempting to select IPX brings up a pop-up that IPX is no longer supported.
2016-02-25 10:28:50 -08:00
jg18
cb65ca8655
Revert changes to net_addr struct format.
...
Revert changes that were made to net_addr struct format in commit 220fa18.
The net_addr struct is now the same as it was in retail.
2016-02-25 10:28:49 -08:00
jg18
1adb64e39d
Remove IPX support.
...
Remove support for the IPX protocol. The IPX selector button in the multi
options menu is now hidden, and the TCP button is disabled since there is no other option.
2016-02-25 10:28:49 -08:00
Fabian Woltermann
6c308037e8
Merge pull request #546 from SamuelCho/fred_outline_fix
...
Fixes ships in FRED only rendering wireframe instead of both wireframe and model when selected.
2016-02-25 09:25:39 +01:00
SamuelCho
706b3a7f5e
Fixes ships in FRED only rendering wireframe instead of both wireframe and model when selected.
2016-02-24 23:32:57 -08:00
niffiwan
4c23cd0d00
Merge pull request #545 from asarium/fix/iamstupid
...
Fix some issues from my previous PRs
2016-02-22 21:40:10 +10:00
m!m
1fbeccd61e
Merge pull request #544 from niffiwan/feature/bm_used
...
Add debug console command: bm_used
2016-02-22 12:24:49 +01:00
asarium
564fc9a680
Update commend to match updated code
2016-02-22 12:11:44 +01:00
asarium
688c514352
Actually dump opened files to log file
2016-02-22 12:10:46 +01:00
niffiwan
acc57397e5
Add debug console command: bm_used
...
Reports how many bmpman slots are used, with subtotals for each image
type and EFFs broken down by sub-type
2016-02-22 18:49:57 +10:00
Fabian Woltermann
e47884e0fb
Merge pull request #543 from asarium/cleanup/graphics
...
Clean up the renderer interface
2016-02-22 09:12:41 +01:00
Fabian Woltermann
81bd363d6d
Merge pull request #542 from asarium/feature/cfile_debugging
...
Add source tracking for cfiles
2016-02-21 23:34:51 +01:00
asarium
108d60330f
Clean up the renderer interface
2016-02-21 23:24:01 +01:00
asarium
58575399f5
Add source tracking for cfiles
2016-02-21 22:34:37 +01:00
Fabian Woltermann
1253575a68
Merge pull request #540 from asarium/bmpman/loading
...
Move texture loading out of graphics code
2016-02-21 17:26:17 +01:00
asarium
a1d46479d7
Remove -img2dds
2016-02-21 15:57:52 +01:00
asarium
a4043fbf21
Improve Assertion message a bit
2016-02-21 15:40:18 +01:00
asarium
83b8361dcd
Move texture loading out of graphics code
...
Currently the graphics code handles loading texture information and data
but that should be done by bmpman itself. I removed two graphics API
functions and added a new one which is called to notify the graphics
code that a texture has been loaded.
2016-02-21 15:40:18 +01:00
Fabian Woltermann
be677937ae
Merge pull request #541 from asarium/ci/unused_function
...
Disable unused function warnings in release mode
2016-02-21 15:39:24 +01:00
asarium
aebdc6328b
Disable unused function warnings in release mode
2016-02-21 12:10:30 +01:00
m!m
801b808764
Merge pull request #529 from MageKing17/bugfix/objcollide-speed-check
...
Don't assume non-turning weapons have a fixed velocity.
2016-02-14 15:04:08 +01:00
m!m
73d12d15a3
Merge pull request #532 from Goober5000/function_parameter_tweak
...
modify function headers as suggested in PR #530
2016-02-11 10:46:51 +01:00
Goober5000
c9a45c9fbd
come on, Travis, stop halting after a single warning
2016-02-11 01:13:00 -05:00
Goober5000
ddd3a7d6fe
resolve Travis warning
2016-02-11 00:50:20 -05:00
Goober5000
e302f0e456
convert the rest of the model instance functions to have model_instance_num parameters instead of object parameters
2016-02-10 23:23:44 -05:00
Fabian Woltermann
0ed147fb45
Merge pull request #533 from Yarn366/scale_gauges_fix
...
$Scale Gauges fix
2016-02-07 12:18:22 +01:00
Goober5000
da812f9433
modify the actual function calls
2016-02-06 18:05:33 -05:00
Yarn366
5e623d10b0
Moved the check for negative values in $Force Scaling Above so that $Scale Gauges can work properly
2016-02-06 16:40:08 -05:00
Goober5000
471c898df5
modify function headers as suggested in PR #530
2016-02-06 15:46:06 -05:00
MageKing17
4e9f5dc754
Merge pull request #531 from Goober5000/intrinsic_rotation_refactor
...
refactor of dumb_rotation to intrinsic_rotation
2016-02-05 11:00:28 -08:00
Goober5000
df41bbe172
refactor of dumb_rotation to intrinsic_rotation
...
This is a renaming of the Dumb_rotation infrastructure, which is now called Intrinsic_rotation. Intrinsic rotations are automatically applied to submodels without the need for an associated subsystem. Dumb rotations are now a type of intrinsic rotation, and look_at rotations will be added in a future PR. The same code will handle both; the only difference is in how the intrinsic rotation is calculated. (In the case of dumb-rotation, it is calculated the same way as normal rotation; in the case of look-at, it will be calculated using submodel_look_at.)
2016-02-05 12:40:55 -05:00
Cliff Gordon
617fd6a977
Merge pull request #519 from chief1983/project_removal_201601
...
Project removal 2016-01
2016-02-03 10:38:44 -06:00
MageKing17
54e052bc2f
Don't assume non-turning weapons have a fixed velocity.
...
Somewhat related to PR #528 , this changes the branch that assumes constant velocity from checking for an absence of the WIF_TURNS flag to checking for the presence of the PF_CONST_VEL flag (because non-turning weapons can be given an acceleration time).
2016-01-31 18:54:41 -08:00
Goober5000
17c6b7cd58
Merge pull request #528 from ln-zookeeper/master
...
Fixed $Acceleration Time not working right on non-homing secondaries
2016-01-31 16:45:29 -05:00
Lari Nieminen
f12d2395dc
Fixed $Acceleration Time not working right on non-homing secondaries
2016-01-31 23:27:52 +02:00
Goober5000
746fe56b32
Merge pull request #525 from asarium/cleanup/timer
...
Remove some unused code from timer.h/.cpp
2016-01-31 16:12:04 -05:00
Goober5000
ccd815f6a0
Merge pull request #521 from asarium/antipodes_/timerOverflow
...
Use the correct type for high resolution timers
2016-01-31 16:10:01 -05:00
MageKing17
a87af22357
Merge pull request #523 from asarium/fix/time
...
Change timestamp integer handling again
2016-01-29 16:34:15 -08:00
MageKing17
4179d95975
Merge pull request #524 from Goober5000/small_fixes
...
one small bugfix, one small comment tweak
2016-01-29 16:33:31 -08:00
asarium
fc6bc3a1c6
Remove some unused code from timer.h/.cpp
...
The removed code has been replaced by the profiling subsystem.
2016-01-29 22:00:58 +01:00
Goober5000
5bcc89be3a
one small bugfix, one small comment tweak
...
This fixes a bug where, when the skybox is changed after loading a new mission, it tries to delete its model instance which was already deleted in model_instance_free_all. Setting the instance reference to -1 when the instance is freed fixes this. (This is something that would typically be handled by the object_delete function, as it is for ship_delete, asteroid_delete, and weapon_delete, but there is no such equivalent for skyboxes.)
Since this is such a small PR, I decided to also include a stash where I restored a comment that was inadvertently deleted by Swifty's hud_lock variable scope fix PR.
2016-01-29 12:37:14 -05:00
asarium
54b2eddc14
Change timestamp integer handling again
2016-01-28 16:39:10 +01:00
Fabian Woltermann
7a7abe1b3b
Merge pull request #522 from asarium/fix/time
...
Use integer math instead of floats for timestamps
2016-01-27 20:32:05 +01:00
Fabian Woltermann
75c69271a9
Merge pull request #520 from MageKing17/bugfix/object-recycling-errors
...
Fix object recycling errors
2016-01-27 20:31:20 +01:00
asarium
64c4e4d7b4
Use integer math instead of floats for timestamps
2016-01-27 15:34:37 +01:00
asarium
75625270c9
Use the correct type for high resolution timers
2016-01-27 14:27:46 +01:00
MageKing17
1159e66168
Avoid checking for combat music if the projectile's parent was recycled.
2016-01-27 01:25:46 -08:00
MageKing17
37a98b8cf8
Check B->parent_sig before checking B->parent in objcollide.cpp.
...
Could cause problems with recycled objects (specifically, I had a crash once because "Objects[B->parent].instance" was well over MAX_SHIPS due to being a weapon instead of a ship, causing the "Ships[Objects[B->parent].instance].team" reference to fail hard).
2016-01-26 23:59:23 -08:00
MageKing17
a5b705b2c1
Store debris damage type on the debris object itself.
...
If the Object that had been assigned to that particular debris's parent wound up getting recycled and used for something else, the code in shiphit.cpp would cause a crash as soon as that debris hit something. This would happen fairly reliably in cluttered missions like BP massive battle.
2016-01-26 23:36:24 -08:00
Goober5000
76b98684cc
Merge pull request #512 from Goober5000/dumb_rotation_refactor
...
Dumb rotation refactor
2016-01-26 22:04:08 -05:00
Cliff Gordon
aa0de45ddb
Part C: Update references to these projects in the CI configs and other areas.
2016-01-26 16:51:28 -06:00
Cliff Gordon
e6855a4153
Part B: Move Xcode4 project to Xcode.
2016-01-26 16:35:26 -06:00
Cliff Gordon
f61b869c7f
Part A: Remove 5 old crusty projects.
2016-01-26 16:34:57 -06:00
Goober5000
59d6a44db3
colons are redundant
2016-01-25 19:31:52 -05:00
MageKing17
8dc4030dbc
Merge pull request #518 from Yarn366/hud_scale_limit
...
Hud scale limit (part 2)
2016-01-25 16:31:41 -08:00
Yarn366
882467cb5a
Merge branch 'master' into hud_scale_limit
2016-01-25 17:14:59 -05:00
Yarn366
5b8410de98
Values of "Force Scaling Above" that are <= 0 are now handled in adjust_base_res rather than in gauge_load_common. (This fixes a bug that prevented this parameter from working properly under certain conditions.)
...
Also removed an erroneous plus sign in adjust_base_res.
2016-01-25 17:00:08 -05:00
m!m
79f3f08543
Merge pull request #500 from Yarn366/hud_scale_limit
...
Hud scale limit
2016-01-25 22:20:16 +01:00
Yarn366
1bd7160461
Remove parameters from gauge_settings constructor and change values after struct creation.
2016-01-25 15:13:17 -05:00
Yarn366
8464e1769f
Use a constructor rather than a define to create a gauge settings struct.
2016-01-25 04:41:24 -05:00
MageKing17
32d3298646
Merge pull request #515 from asarium/antipodes_/s3tc
...
Fix s3tc texture loading
2016-01-25 01:40:16 -08:00
MageKing17
426bb7e160
Merge pull request #514 from asarium/antipodes_/fixMessage
...
Fix compilation errors in FRED
2016-01-25 01:26:27 -08:00
Goober5000
975e108841
further accommodation of the dumb-rotation movement type, including, finally, proper collision detection!
2016-01-25 01:29:51 -05:00
Goober5000
6d60bb1511
add some additional clarifying comments
2016-01-25 00:49:21 -05:00
Goober5000
28faa9e588
warn for dumb-rotation as well as regular rotation
2016-01-25 00:26:26 -05:00
Yarn366
3ccfbb6aac
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-24 23:26:19 -05:00
Goober5000
78ff02501b
improve debug warning handling
2016-01-24 21:41:31 -05:00
Goober5000
165124267a
Add model_instance handling for weapons, asteroids, and skyboxes
2016-01-24 21:28:43 -05:00
Goober5000
b9033ab2a2
fix Travis error
2016-01-24 19:00:04 -05:00
Goober5000
102efb192c
some additional error handling
2016-01-24 17:55:13 -05:00
asarium
3db8e5476e
Improve default value in scripting API
2016-01-24 23:18:51 +01:00
asarium
dcf70d2427
Fix VS 2010/2012 compilation
2016-01-24 23:18:50 +01:00
asarium
6c28b1afb9
Add grab argument for setCursorHidden
...
This should be used when hiding the cursor while in game.
2016-01-24 23:18:49 +01:00
asarium
0ecb7873e7
Doxygen documentation
2016-01-24 23:18:48 +01:00
asarium
498d0dcd1f
Don't set the cursor state every frame
...
There might still be some issues where the code assumes that the cursor state is set every frame.
2016-01-24 23:18:48 +01:00
asarium
907791498a
Fix lua documentation
2016-01-24 23:18:46 +01:00
asarium
d1af182c61
Remove LuaError when the cursor fails to load
...
That should be handled by the script calling that function
2016-01-24 23:18:45 +01:00
asarium
328bb2494a
Clean up CursorManager memory management
2016-01-24 23:18:44 +01:00
asarium
95c88cd62d
Fix compilation errors in FRED
2016-01-24 23:17:19 +01:00
asarium
3b1fc36caf
Fix s3tc texture loading
...
force_s3tc_enable needs to be set before SDL_InitSubSystem
2016-01-24 23:16:28 +01:00
MageKing17
952e277839
Merge pull request #513 from asarium/antipodes_/sync
...
Sync Antipodes
2016-01-24 14:10:23 -08:00
MageKing17
da7ec6db4d
Merge pull request #463 from niffiwan/feature/cm_decoy_once_alt
...
Allow countermeasures to decoy missiles once only (alternate solution)
2016-01-24 14:08:02 -08:00
asarium
4a869b8ec3
Merge branch 'master' into antipodes_/sync
2016-01-24 21:20:18 +01:00
Cliff Gordon
e36b5398ef
Merge pull request #516 from asarium/ci/generic
...
Use generic architecture for Travis CI
2016-01-24 12:29:14 -06:00
asarium
335cc4a114
Use generic architecture by default
2016-01-24 14:31:13 +01:00
Goober5000
4b05468f3c
update comment with a small clarification, add an assertion that the function contract is being followed, and fix an incipient bug by adding a necessary is_ship flag
2016-01-20 14:44:45 -05:00
asarium
77e832d3c9
Merge branch 'master' into antipodes_/sync
...
Conflicts:
code/cmdline/cmdline.cpp
code/cmdline/cmdline.h
2016-01-20 17:56:12 +01:00
Goober5000
26a500bf7c
address warnings flagged by Travis
2016-01-19 22:18:09 -05:00
Goober5000
81ad6dc1b5
remove a field that is now redundant
2016-01-05 01:04:46 -05:00
Goober5000
025c58c679
fix const-correctness due to Swifty's change
2016-01-05 00:56:51 -05:00
Goober5000
bb93319871
small update due to changed API
2016-01-04 23:34:30 -05:00
Goober5000
8f224a76a4
incorporate turning rate
2016-01-04 23:34:30 -05:00
Goober5000
a640015afc
tweak the creation of dumb_rotate instances; move the check for can_move below look_at and dumb_rotate
2016-01-04 23:34:29 -05:00
Goober5000
82807f2760
delete dumb rotations when we delete the associated instance
2016-01-04 23:34:29 -05:00
Goober5000
97924c0628
Add data structures and the hook to create the dumb rotations when model instances are created. This might be sufficient to get dumb rotations working for ships.
2016-01-04 23:34:28 -05:00
Goober5000
680ac9175f
move the two dumb_rotation iterations into one function (which calls a subfunction) in modelread.cpp, and add some descriptive commenting
2016-01-04 23:34:28 -05:00
Goober5000
e3c4f90287
first chunk of work to reimplementing dumb_rotate in a way that syncs with the rest of the model code
2016-01-04 23:34:27 -05:00
Goober5000
ed2bbc35eb
Merge pull request #501 from SamuelCho/kill_ship_model_start
...
Killed the last vestiges of ship_model_start/stop.
2016-01-04 22:45:03 -05:00
Fabian Woltermann
23aa8cb18d
Merge pull request #504 from niffiwan/fix/shield_hit_anim_duration
...
Allow shield hit animations to play to the end
2016-01-04 15:40:03 +01:00
Yarn366
af2725b2b7
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-04 03:58:12 -05:00
Yarn366
ca95a3c25d
Changed default gauge settings from a function to a define
2016-01-04 03:57:13 -05:00
m!m
a9b4be5928
Merge pull request #425 from Echelon9/fix/SHADER_MODEL-concept-removal
...
OpenGL: Refactor GLSL setup and remove DirectX Shader Model concept
2016-01-03 23:56:46 +01:00
Echelon9
7691c4905e
Correct comment regarding glGetString(GL_SHADING_LANGUAGE_VERSION)
2016-01-03 16:33:05 -05:00
Echelon9
9bd4fb3ac7
Lift up FXAA shader GLSL version check to opengl_post_load_shader(), out of the GLSL shader compiler preprocessor stage.
2016-01-03 16:33:05 -05:00
Echelon9
49b5d9a3b7
Fix up the revert of 0345d09a513082d15b53b045471f3fe1e3621b9b
2016-01-03 16:33:04 -05:00
Echelon9
22f14d56ea
Revert "GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards"
...
This reverts commit 0345d09a513082d15b53b045471f3fe1e3621b9b.
2016-01-03 16:33:04 -05:00
Echelon9
5f4568cc0e
OpenGL: Correct typo in one use of the __VERSION__ predefined macro
2016-01-03 16:33:04 -05:00
Echelon9
39842e7115
OpenGL: Rely on predefined macro __VERSION__ in GLSL language specification, rather than rolling our own. This predefined macro has been a language feature in all GLSL versions we support. See Section 3.3 Preprocessor.
2016-01-03 16:33:04 -05:00
Echelon9
cb90d286e5
GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards
2016-01-03 16:33:04 -05:00
Echelon9
e4c98e8527
Remove final DirectX Shader Model concepts. OpenGL GLSL version supported by the driver can be directly queried, rather than a layer of abstraction through SM2, SM3 and SM4. Allows Use_GLSL to be removed following refactoring.
2016-01-03 16:33:04 -05:00
Echelon9
5d593f0df0
Plumb through is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
a045e5d266
Refactor out -disable_glsl_model command line option, which is encoded in Use_GLSL internally
2016-01-03 16:33:04 -05:00
Echelon9
21b8e3bb52
Add helper function is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
3aa671a211
Replace SHADER_MODEL with GLSL_VERSION
2016-01-03 16:33:04 -05:00
Echelon9
d3ce9874a7
DirectX Shader Model 4.0 is equivalent to GLSL version 3.30. Source: https://www.opengl.org/wiki/Detecting_the_Shader_Model
2016-01-03 16:33:04 -05:00
SamuelCho
1cfbc24fb9
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:04:03 -08:00
SamuelCho
4a4486c9be
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:02:47 -08:00
Yarn366
a1caca08ab
Merge branch 'master' into hud_scale_limit
2016-01-03 14:18:18 -05:00
niffiwan
e32e21bcd0
Merge pull request #509 from SamuelCho/team_glow_alpha_channel
...
Only enable team glow colors if team color texture mask has an alpha channel.
2016-01-03 20:16:24 +10:00
Yarn366
3fd9b8f802
Fix the errors reported by AppVeyor and Travis CI (take 2)
2016-01-03 04:29:59 -05:00
Yarn366
890c607ad2
Fix the errors reported by AppVeyor and Travis CI (hopefully)
2016-01-03 03:56:13 -05:00
Yarn366
e2dac4b7b4
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2016-01-03 03:12:29 -05:00
Yarn366
3512fcc18e
Changed the gauge loaders to accept a pointer to the new gauge_settings struct instead of a bunch of values.
2016-01-03 03:12:00 -05:00
SamuelCho
f57e346eff
Only enable team glow colors if team color texture mask has an alpha channel.
2016-01-02 16:47:28 -08:00
niffiwan
768e097c73
Merge pull request #508 from MageKing17/cleanup/stop-exporting-no_fps_capping
...
Stop exporting -no_fps_capping to the launcher.
2016-01-03 09:20:28 +10:00
MageKing17
b0115a5f80
Stop exporting -no_fps_capping to the launcher.
...
Given the number of unintended consequences that can result from use of this command-line flag, we should return to the pre-137eb7e4d4cb0f9c153d15bbcce847347aa3d716 behavior of not including it in the exe_params[] array; anyone who knows what it does and why we don't advertise it can still use it for testing purposes, but it should prevent the typical user from turning it on without knowing exactly what can go wrong.
2016-01-02 12:19:13 -08:00
niffiwan
a23630346b
Merge pull request #505 from DahBlount/Fix-for-Coverity-#1343617
...
Fix for coverity 1343617
2015-12-31 17:40:29 +10:00
DahBlount
d4d805d6ca
Move turret_enemy_objnum check further up in block and change to Assertion
2015-12-30 23:44:04 -07:00
niffiwan
b147ea0a21
Merge pull request #506 from Karajorma/BUGFIX-RepeatCounts
...
Fix the issue with repeat counts first discovered on this thread http…
2015-12-30 21:47:27 +10:00
Karajorma
8a2eec5b4a
Fix the issue with repeat counts first discovered on this thread http://www.hard-light.net/forums/index.php?topic=90763.msg1801379#msg1801379
2015-12-30 16:56:50 +08:00
niffiwan
ee64b83aec
Allow shield hit animations to play to the end
...
Previously they'd always stop at 75% complete, and it's probably just
luck that it worked correctly for ✌️
2015-12-28 14:55:54 +10:00
MageKing17
24b58db67f
Merge pull request #479 from SamuelCho/hud_lock_fix_for_issue_456
...
My attempt to fix the HUD lock scoping issues raised by issue #456 .
2015-12-25 22:52:40 -08:00
Samuel Cho
2ddee36007
Cleaned up HudGaugeLock::render() and removed hud_draw_diamond() since that's not being used.
2015-12-25 19:34:39 -08:00
Goober5000
7e9a798101
Merge pull request #503 from Goober5000/sf2_no_disabled_self_destruct
...
add no-disabled-self-destruct ship flag
2015-12-21 11:08:38 -05:00
Goober5000
542dc68df2
add to Ship_flag_names array
2015-12-21 00:56:51 -05:00
Goober5000
b1ac0876d4
add no-disabled-self-destruct ship flag
...
Normally, ships whose weapons or engines subsystems are destroyed will
self-destruct after 90 seconds if they are part of a wing (see
ai_maybe_self_destruct). This adds a ship flag to prevent that from
happening.
2015-12-20 23:12:59 -05:00
Goober5000
7badc4dfd9
Merge pull request #476 from MageKing17/feature/weapon-bank-modular-compatibility
...
Modular tables now clear allowed weapons if +noreplace isn't specified.
2015-12-17 00:47:28 -05:00
niffiwan
036aae0ee2
Merge pull request #502 from SamuelCho/team_color_glows
...
Team color glows
2015-12-17 12:50:53 +10:00
SamuelCho
9cc70790c9
Save all the channels of the team mask, not just the red and green channels.
2015-12-16 00:57:12 -08:00
SamuelCho
7d392bd61c
Adjust the blended glow color value by how much the team mask contributes to this fragment.
2015-12-16 00:44:58 -08:00
SamuelCho
1552e02a51
Added support for glowing team color textures.
2015-12-16 00:20:15 -08:00
Fabian Woltermann
175640d60a
Merge pull request #492 from SamuelCho/faster_bmp_lookup
...
Changed bitmap_lookup to use ubyte instead of floats.
2015-12-16 06:39:50 +01:00
SamuelCho
6583066936
Don't reset lock rendering timers and switches unless we really need to.
2015-12-15 20:39:38 -08:00
MageKing17
3c564b3210
Merge pull request #494 from DahBlount/Share-Fire-Direction-Turret-Flag
...
Share fire direction turret flag
2015-12-15 12:48:53 -08:00
DahBlount
9b7ebff53a
Change NULL to nullptr and change fighter beam flag comparison from > to !=
2015-12-15 09:54:34 -07:00
DahBlount
1491d4a79a
Create "share fire direction" subsystem flag
2015-12-15 09:54:32 -07:00
Fabian Woltermann
d603c463af
Merge pull request #499 from DahBlount/Final-Attempt-at-Fixing-Environment-Reflections
...
Fix environment reflection rotation issue
2015-12-15 15:12:27 +01:00
SamuelCho
3eb47c1867
ship_render() still needs to clear out miscellaneous per-draw model data.
2015-12-14 23:19:08 -08:00
SamuelCho
2db4bc37f2
Removed unused variable sii.
2015-12-14 00:06:16 -08:00
SamuelCho
0f0f6377d0
Killed the last vestiges of ship_model_start/stop.
2015-12-13 23:51:24 -08:00
Yarn366
8e7ad5f651
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into hud_scale_limit
2015-12-14 01:41:13 -05:00
DahBlount
bade3c58eb
Normalize the position vector used in environmental reflections
2015-12-13 15:03:31 -07:00
niffiwan
d2c8943e96
Merge pull request #498 from asarium/antipodes_/sync
...
Sync Antipodes
2015-12-13 08:42:27 +10:00
asarium
deade82a19
Merge branch 'master' into antipodes_/sync
...
Conflicts:
configure.ac
2015-12-12 18:36:32 +01:00
m!m
85a36e6fd8
Merge pull request #496 from SamuelCho/missing_destroyed_subsys
...
Fixes missing destroyed submodels from the polymodel_instance rendering commit.
2015-12-09 22:26:42 +01:00
Samuel Cho
2deffc1156
Removed comment from model_set_instance that no longer describes SSF_NO_DISAPPEAR functionality.
2015-12-09 10:32:36 -08:00
Fabian Woltermann
82ae54a6e8
Merge pull request #495 from SamuelCho/no_lighting_fix
...
Restore SIF2_NO_LIGHTING functionality for ship_render().
2015-12-09 09:02:11 +01:00
SamuelCho
0062d2567a
Fixes missing destroyed submodels from the polymodel_instance rendering commit.
2015-12-08 23:53:53 -08:00
SamuelCho
7972cad563
Restore SIF2_NO_LIGHTING functionality for ship_render().
2015-12-08 20:06:27 -08:00
niffiwan
c9cff48b95
Merge pull request #493 from ln-zookeeper/master
...
Fix a small glitch in shield icon alpha range
2015-12-08 22:49:09 +10:00
Lari Nieminen
8d0624b064
Fix a small glitch in shield icon alpha range
...
Calculates the alpha range using the actual number of shield segments instead of 4.
2015-12-08 14:08:34 +02:00
SamuelCho
236857ed37
Changed bitmap_lookup to use ubyte instead of floats for the color channels. Should make reading bitmaps faster.
2015-12-07 22:59:28 -08:00
MageKing17
fa57ea358a
Merge pull request #444 from asarium/feature/benchmark
...
Add benchmark command line option
2015-12-07 02:28:15 -08:00
MageKing17
a7bf7c63de
Merge pull request #490 from Goober5000/shipfx_little_explosions_fix
...
for model vertices, use the entire range of RAND_MAX, not the range divided by 32
2015-12-05 15:45:52 -08:00
Goober5000
81676b7d3f
a few tweaks from the PR...
...
a) remove redundant (shadowing) polymodel *pm declaration
b) end Warnings with \n
c) remove no-longer-needed Asserts (they are handled by the Error check above)
2015-12-05 14:25:28 -05:00
Goober5000
e1e188a43c
use the entire range of RAND_MAX, not the range divided by 32
2015-12-05 13:02:27 -05:00
Goober5000
47286d1af2
Merge pull request #483 from chief1983/fix/292_unused_functions
...
Wrap some unused functions in a diagnostic protection pragma
2015-12-04 21:08:55 -05:00
Yarn366
fa10977e77
Added parameters that allow HUD scaling to be disabled at lower resolutions and enabled at higher resolutions.
2015-12-03 20:06:06 -05:00
Fabian Woltermann
aaa80dfa6f
Merge pull request #486 from SamuelCho/model_instance_rendering
...
Allow model rendering code to use polymodel_instance.
2015-12-03 06:34:09 +01:00
SamuelCho
59fa7bd544
Remove superfluous line.
2015-12-02 19:08:59 -08:00
m!m
3c8b47ccfc
Merge pull request #460 from MageKing17/feature/subsys-autorepair-when-disabled
...
Adds the ability for subsystems to repair themselves when disabled.
2015-12-02 21:37:20 +01:00
MageKing17
81d8d063c2
Un-cluttering the autorepair conditional by spreading it out a little.
...
Should hopefully be a bit more readable this way.
2015-12-02 12:11:20 -08:00
MageKing17
75471276fc
Adds "don't autorepair if disabled" to blacklist a specific subsystem.
...
Obviously won't do anything if "repair disabled subsystems" ship flag isn't set. If both subsystem-specific flags get set at the same time, whichever one would be default behavior (based on the presence or absence of the ship-wide flag) gets removed and a Warning generated.
2015-12-02 08:29:04 -08:00
MageKing17
89d6031c79
Adds the ability for subsystems to repair themselves when disabled.
...
Can either be set for individual subsystems via the "autorepair if disabled" flag, or set for an entire ship via the "repair disabled subsystems" flag. It will, by necessity, only have an effect if the ship's "$Subsystem Repair Rate:" is a positive number.
2015-12-02 08:29:03 -08:00
MageKing17
551d64192c
Merge pull request #481 from The-E/vm_vec_cleanup2
...
Cleanup in vecmat, aile 2
2015-12-02 08:18:37 -08:00
asarium
661678f693
Fix an issue identified by MageKing17
2015-12-02 17:07:53 +01:00
asarium
94ca29735c
Quit when the end of the mission is reached
2015-12-02 17:03:54 +01:00
asarium
20f84c179a
When benchmarking automatically accept pilot screen
2015-12-02 17:03:54 +01:00
asarium
5f622094af
Add commandline option for benchmarking
2015-12-02 17:03:54 +01:00
SamuelCho
64ad950a80
Allow model rendering code to use polymodel_instance. Removes the reliance on ship_model_start/stop for rendering models. Also fix a bunch of oversights involving blown off models in the polymodel_instance code.
2015-12-01 23:53:24 -08:00
niffiwan
a30937b041
Merge pull request #484 from chief1983/asan_flag
...
AddressSanitizer toggle flag for configure.ac
2015-12-02 13:17:18 +10:00
Cliff Gordon
764e1772b0
Remove the -Wno-unused-function hider. Should be able to fix these with this method if any more crop up on Linux.
2015-12-01 20:56:10 -06:00
Cliff Gordon
ea549ab5a0
[fix/292_unused_functions] Mark rotate_z and accurate_square_root as unused. Last part of the issues in #292 .
2015-12-01 20:56:06 -06:00
niffiwan
af22ab34d3
Merge pull request #482 from chief1983/fix/187_debugging
...
Enhance an Assert to help track down how issue 187 could happen
2015-12-02 08:35:53 +10:00
chief1983
c8785dc093
[asan_flag] AddressSanitizer toggle flag for configure.ac.
2015-12-01 16:32:32 -06:00
Cliff Gordon
870ad9e3ae
[fix/187_debugging] Enhance an Assert to help track down how issue 187 could happen.
2015-12-01 14:54:57 -06:00
The E
487f769064
Renaming vm_copy_transpose_matrix to vm_copy_transpose
2015-12-01 20:38:30 +01:00
The E
7604e82f05
Renaming vm_transpose_matrix to vm_transpose
2015-12-01 20:37:33 +01:00
The E
e0defd287a
Renaming vm_vec_crossprod to vm_vec_cross
2015-12-01 20:36:34 +01:00
The E
a413255728
Renaming vm_vec_dotprod to vm_vec_dot
2015-12-01 20:35:47 +01:00
MageKing17
d6b0e9f566
Merge pull request #480 from The-E/mat_inverse_cleanup
...
Addressing a few small issues with PR 468
2015-12-01 07:35:31 -08:00
Fabian Woltermann
22e6de42a4
Remove comment here
2015-12-01 13:04:22 +01:00
Fabian Woltermann
9548002890
Removing code that has no place here
2015-12-01 11:39:28 +01:00
Fabian Woltermann
0334bd0c3b
Addressing a few small issues with PR 468
2015-12-01 11:34:00 +01:00
Fabian Woltermann
12b98063fb
Merge pull request #474 from Goober5000/hull_hit_soundfx_fix
...
retail sounds 36 and 37 should actually be converted to 3D
2015-12-01 11:06:37 +01:00
Fabian Woltermann
854bd5ba21
Merge pull request #468 from DahBlount/Fix-reflections-for-real
...
Final fix for reflections
2015-12-01 11:04:06 +01:00
DahBlount
096029a88d
Add Doxygen comments and additional changes
2015-12-01 00:55:30 -07:00
SamuelCho
d8ab39e261
This line in the HUD lock gauge wasn't supposed to be deleted.
2015-11-30 23:48:57 -08:00
DahBlount
02d15f36b7
Change a1d to a2d
2015-12-01 00:34:55 -07:00
SamuelCho
66c9e0c136
My attempt to fix the HUD lock scoping issues raised by issue #456 .
2015-11-30 23:16:43 -08:00
DahBlount
fb29b28113
Add function to invert matrix4 and change mview to GL_env_texture_matrix to properly setup environment maps.
2015-11-30 09:36:30 -07:00
DahBlount
3fa03fcda0
Fix ENVMAP vertex shader to use the inverse of gl_ModelViewMatrix
2015-11-30 09:36:29 -07:00
niffiwan
94130f8a9e
Merge pull request #477 from asarium/antipodes_/sync
...
Sync Antipodes
2015-11-30 14:10:31 +10:00
Goober5000
cb8154a993
Merge pull request #478 from Yarn366/mantis/3096
...
Fix for Mantis 3096
2015-11-29 18:16:50 -05:00
Yarn366
a4f793e6dc
Use the same FOV for everything in the main view, and apply the pi*(4/9) correction for ships to the briefing view.
2015-11-29 17:22:48 -05:00
asarium
c43d177a72
Merge branch 'master' into antipodes_/sync
...
Conflicts:
code/freespace2/freespace.cpp
code/globalincs/pstypes.h
2015-11-29 13:29:04 +01:00
m!m
e36e9ff879
Merge pull request #473 from rtoijala/unix_modlist
...
Unix modlist
2015-11-28 19:43:47 +01:00
Risto Toijala
3287ff6b3a
unix mods: change error to warning
...
Ignore failure to open directories that the filesystem gave us.
There's nothing we can do about it.
Also improve missing mod warning.
Tiny style improvement.
2015-11-28 18:20:56 +02:00
Risto Toijala
81092417bd
unix mods: use "." instead of full cwd path to avoid error condition
2015-11-28 18:19:50 +02:00
Risto Toijala
947deb8e12
unix mods: switch parent and dir for readability
2015-11-28 18:18:26 +02:00
MageKing17
bd1aa5e455
Modular tables now clear allowed weapons if +noreplace isn't specified.
...
This makes them behave more like ship flags and should bring them around towards how modders intuitively expect using a modular table to override a ship's allowed weapons to work.
Fixes Mantis 3176.
2015-11-28 06:53:23 -08:00
Goober5000
01e4741da6
Merge pull request #475 from Yarn366/background_editor_spinner_fix
...
Fix for spinners in background editor
2015-11-28 02:22:18 -05:00
Yarn366
37f4587230
Apply rounding to orientation values so that the spinners in the background editor work properly
2015-11-28 01:56:09 -05:00
Goober5000
e11f6904b4
retail sounds 36 and 37 should actually be converted to 3D
2015-11-28 00:27:27 -05:00
MageKing17
d74981b700
Merge pull request #471 from MageKing17/feature/escort-gauge-right-aligned-names
...
Add "Right-Align Ship Names:" option to HudGaugeEscort.
2015-11-27 18:24:24 -08:00
MageKing17
6df0a704f2
Add "Right-Align Ship Names:" option to HudGaugeEscort.
...
It allows the escort gauge to render with ship names right-aligned, as the name would suggest. Changed gr_force_fit_string() to return the width instead redundantly returning the (already modified in-place) string; nothing else actually cares about the return value, so secondary impact should be nonexistent.
2015-11-27 18:22:45 -08:00
Risto Toijala
0b84c18686
also accept backslashes as path separators on unix
2015-11-27 20:16:45 +02:00
Risto Toijala
7523669819
allow subfolders in mod paths
2015-11-27 20:16:45 +02:00
Risto Toijala
b1b8ae9668
move unix modlist handling to function
2015-11-27 20:16:45 +02:00
Risto Toijala
bddf438fb6
clean up unix mod handling
2015-11-27 20:16:45 +02:00
MageKing17
87d07c9597
Merge pull request #472 from ln-zookeeper/bm_unlock_unload_fixes
...
Fixes to some bm_unlock and bm_unload calls
2015-11-26 23:53:09 -08:00
Lari Nieminen
407a2356eb
Fixed silly syntax error
2015-11-26 18:06:41 +02:00
Lari Nieminen
0c5e6c7281
Fixes to some bm_unlock and bm_unload calls
...
As requested in https://github.com/scp-fs2open/fs2open.github.com/pull/449/files#r45241401
Note that I also included the ref_count >= 1 check.
2015-11-26 16:35:23 +02:00
m!m
2bd78eee74
Merge pull request #464 from The-E/inline_vecmat_removal
...
Removing the _INLINE_VECMAT preprocessor define
2015-11-26 13:49:01 +01:00
niffiwan
256ba6f9f2
Remove proposed AI profiles flag
...
Make the new behaviour the default, the change to gameplay should be
minimal due to the 2-frame feature being by far the largest factor in
current countermeasure effectiveness
2015-11-26 18:57:36 +10:00
niffiwan
040c1f39da
Merge pull request #469 from Yarn366/more_hud_table_options
...
Shivan Hunter's requested HUD table features
2015-11-25 21:07:28 +10:00
Yarn366
8f6bdcddeb
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into more_hud_table_options
2015-11-24 16:32:45 -05:00
m!m
ed855e6e1c
Merge pull request #467 from PeterMitsis/toolchain
...
Abstract toolchain capabilities
2015-11-24 09:57:32 +01:00
Yarn366
33c7c4eae9
Added "Radar Center Offsets:" and "Radar Size:" to the 2D and 3D radar gauges
2015-11-23 19:48:04 -05:00
Yarn366
962261421e
Added "Dock Max Width:" and "Order Max Width:" to extra target data gauge
2015-11-23 18:29:40 -05:00
Yarn366
5144dba6b4
Added "Fixed Header Position:" to wingman gauge
2015-11-23 18:22:37 -05:00
Peter Mitsis
9bbebfc55e
[fix] toolchain: Abstract compiler capabilities
...
Fixes various typos from the commit titled
'toolchain: Abstract compiler capabilities'
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-23 06:54:41 -05:00
MageKing17
02fc2b29ca
Revert "Fix envmap orientation"
...
This reverts commit a033f653d0 .
2015-11-23 00:20:55 -08:00
Fabian Woltermann
b097d3e7c2
Merge pull request #466 from DahBlount/fix/mantis_0003014
...
Fix Mantis 0003014
2015-11-23 07:40:59 +01:00
DahBlount
a033f653d0
Fix envmap orientation
2015-11-22 17:02:06 -07:00
The E
4b37433c4f
Removing the _INLINE_VECMAT preprocessor define. This is something the compiler is better equipped to decide.
2015-11-22 21:00:24 +01:00
Peter Mitsis
002dc3a965
toolchain: Introduce __ALIGNED(x) macro
...
The __ALIGNED(x) macro may be used to tell the compiler to align the
symbol's address to an 'x' byte boundary. Note that 'x' must be a
power of two.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
7da81210ea
toolchain: Introduce likely() and unlikely() macros
...
The likely() and unlikely() macros may be used as hints to the compiler to
indicate whether a branch is likely or unlikely to be taken so that it may
generate code accordingly.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
57c16bd58a
toolchain: Replace __attribute__((__unused__)) with __UNUSED
...
Abstracting this allows for the possibility of other compilers to have their
own implementation of marking a variable as potentially unused without using
the __attribute__ keyword (which is not supported on all compilers).
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:07 -05:00
Peter Mitsis
13c86d9540
toolchain: Abstract compiler capabilities
...
Abstract compiler capabilities to help simplify support for various
toolchains.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-22 11:32:04 -05:00
niffiwan
338d6c9aaf
Allow countermeasures to decoy missiles once only
...
Adds ai_profiles flag
$countermeasures decoy a missile once:
Also (re)adds logging to make it easier to figure out what the
countermeasures are doing. Try adding "+countermeasures" to your
debug_filter.cfg file.
2015-11-22 20:36:03 +10:00
Goober5000
d59c4d44cc
Merge pull request #461 from niffiwan/fix/cm_float_int
...
CMEASURE_DETONATE_DISTANCE should be a float
2015-11-21 14:32:05 -05:00
niffiwan
0e07f4414e
CMEASURE_DETONATE_DISTANCE should be a float
...
Thanks to Goober5000 for noticing this
2015-11-21 21:18:08 +10:00
Fabian Woltermann
71cf169a0a
Merge pull request #457 from asarium/feature/versionCheck
...
Add "$Minimum version" to game settings table
2015-11-21 11:08:13 +01:00
Fabian Woltermann
184a583a32
Merge pull request #459 from MageKing17/bugfix/support-subsystem-repair
...
Fix support subsystem repair rate (for real this time).
2015-11-20 17:24:47 +01:00
Fabian Woltermann
fd66a432f5
Merge pull request #458 from MageKing17/cleanup/version-specific-comment-consistency
...
Improve consistency/flexibility of version-specific comments.
2015-11-20 17:23:47 +01:00
MageKing17
039359e7f2
Fix support subsystem repair rate (for real this time).
...
PR #445 was unfortunately incomplete; it fixed the time estimate for repairs, but not the actual repair part. I think I've identified which piece of code was preventing the actual repairs from working. This "repair_allocated > 0" conditional is actively preventing the "sip->sup_hull_repair_rate == 0.0f" branch from executing (so repair_allocated remains 0 and subsystems can't actually repair).
2015-11-20 06:50:49 -08:00
asarium
0bb6002f0a
Fix compilation error
...
Apparently multi_update.cpp isn't used anywhere in the code. That file
could be removed in the future.
2015-11-20 12:24:10 +01:00
MageKing17
91dbf8b751
Improve consistency/flexibility of version-specific comments.
...
matches_version_specific_tag() now uses the previously-FRED-only scan_fso_version_string() function, meaning it now supports version-specific comments with as few numbers as ;;FSO 3;; to as many numbers as ;;FSO 3.7.3.20151106;;, instead of you being required to supply exactly 3 numbers.
2015-11-20 03:22:45 -08:00
Fabian Woltermann
0c6bada5d5
Merge pull request #455 from Goober5000/set_arrival_info_sexp_help_tweak
...
improve sexp help regarding bitmasks on ship-arrival-info and ship-departure-info
2015-11-20 12:10:59 +01:00
asarium
519e89b6fa
Add "$Minimum version" to game settings table
...
This allows a modder to specify a minimum FSO version that is needed
for the mod.
2015-11-20 11:51:51 +01:00
Goober5000
ce7c7eb3f5
Merge pull request #454 from MageKing17/bugfix/lua-wing-indexer-crash
...
Fix various issues with wings in the Lua interface
2015-11-20 01:31:39 -05:00
Goober5000
8f3342f05e
improve sexp help regarding bitmasks on ship-arrival-info and ship-departure-info
2015-11-20 00:41:46 -05:00
MageKing17
6dd3158570
Make l_Wing functions handle invalid handles.
...
Indexing an invalid wing handle now returns invalid ship handles, getting its length returns 0, and getting its name returns an empty string.
2015-11-19 20:27:32 -08:00
MageKing17
004fdae08f
Clean up a couple minor issues in lua.cpp
...
A few comparisons weren't excluding their upper bounds properly, and the documentation for the l_Wing length function was the documentation for the l_Mission_Wings length function.
2015-11-19 20:20:47 -08:00
MageKing17
8fcb1ee789
Add isValid() function to l_Wing objects.
...
The l_Mission_Wings indexer will return an invalid wing if supplied an invalid name/index. However, you had no way of telling that this was the case because there was no isValid() function to test its validity.
2015-11-19 20:18:31 -08:00
MageKing17
9630d80827
Change wing_name_lookup() to wing_lookup() in l_Mission_Wings indexer.
...
Avoids inconsistency whereby some wings could be looked up by index but not by name.
2015-11-19 20:16:37 -08:00
niffiwan
e49159bd91
Merge pull request #418 from asarium/build/native
...
Use -march=native for linux builds
2015-11-20 14:10:44 +10:00
niffiwan
a13542616d
Merge pull request #452 from MageKing17/bugfix/too-many-classes-error
...
Change warning from too many ship/weapon classes to an error.
2015-11-20 14:09:28 +10:00
Fabian Woltermann
1960723f88
Merge pull request #453 from Yarn366/target_font_height_fix
...
Target bracket line height fix
2015-11-19 22:54:17 +01:00
asarium
206fbabaa5
Use -march=native for linux builds
2015-11-19 22:38:19 +01:00
MageKing17
5394b4943d
Change warning from too many ship/weapon classes to an error.
...
If a modular table broke the weapons limit, it would warn about too many weapon classes, and then not actually skip the entry, because of the "if(!replace)" conditional around it, resulting in nonsensical parsing errors. Rather than just fix this error, it was suggested on IRC (by The_E) that these problems should instead cause immediate errors. Upon reflection, this makes more sense: if the mod exceeds the limits, there's little point in loading it anyway and having things be missing.
Hopefully, eventually, these limits will be removed altogether, but until then, exceeding them should not just be a dismissible warning.
2015-11-19 12:37:45 -08:00
Yarn366
69f9d9f090
Make the target bracket gauge account for the sizes of the font and the attacker blip
2015-11-19 15:35:31 -05:00
niffiwan
1cb08e0262
Merge pull request #450 from asarium/fix/subModelRange
...
Make this Assert a little more informative
2015-11-19 07:07:09 +10:00
asarium
154a50028b
Make this Assert a little more informative
2015-11-18 18:43:19 +01:00
niffiwan
26d97ce5d7
Merge pull request #446 from asarium/antipodes_/deleteOldFiles
...
Remove some now unused files
2015-11-18 09:40:11 +10:00
niffiwan
e11771980e
Merge pull request #447 from MageKing17/bugfix/fred-message-delete-assert
...
Fix incorrect assertion in FRED's Event Editor when deleting a message.
2015-11-18 09:39:35 +10:00
MageKing17
edbec0fca9
Fix incorrect assertion in FRED's Event Editor when deleting a message.
...
The function can get called with an m_cur_msg of -1 if there are no messages defined by the mission; since this is apparently intended behavior (and causes no problems thanks to the immediately-following if-statement), may as well change this assertion.
2015-11-17 14:08:38 -08:00
asarium
f2cbb687b7
Remove some now unused files
2015-11-17 16:05:21 +01:00
m!m
2c268e4ec6
Merge pull request #437 from niffiwan/feature/aspect_lost_lock_det
...
Allow aspect missiles to die when have lost lock
2015-11-16 20:10:42 +01:00
m!m
2a9cff4f46
Merge pull request #443 from DahBlount/InBriefMissionChange
...
Add jumpToMission LUA function and a jump to hub function
2015-11-16 19:58:34 +01:00
DahBlount
9050c08bec
Add jumpToMission LUA function and a jump to hub function
...
The purpose of this function is to provide modders the capability to jump to a mission using LUA scripts. There is an optional argument for jumping to a hub mission, a good example is the JAD campaign map.
2015-11-16 10:45:59 -07:00
Goober5000
799ebe01ce
Merge pull request #445 from DahBlount/Subsys-Repair-Fix
...
Fix support subsystem repair rate
2015-11-15 20:26:18 -05:00
DahBlount
248c398ba9
Fix support subsystem repair rate
2015-11-15 17:44:26 -07:00
Goober5000
96ede6f68b
Merge pull request #433 from Yarn366/multiple_background_adjustment
...
Change criteria for using second mission background
2015-11-15 01:07:53 -05:00
Goober5000
8177c03f3f
Merge pull request #423 from niffiwan/feature/customise_cm_det_rad
...
Add two small countermeasure features
2015-11-15 01:01:39 -05:00
m!m
546339c53a
Merge pull request #440 from The-E/no_persona_defaulting
...
small error correction
2015-11-14 23:20:14 +01:00
The E
f790b3b0c6
small error correction
2015-11-14 23:13:32 +01:00
m!m
bbcfe162da
Merge pull request #439 from The-E/no_persona_defaulting
...
Adds Persona flag "$Allow substitution of missing messages:"
2015-11-14 15:54:44 +01:00
m!m
51efc000ab
Merge pull request #435 from PeterMitsis/lighting-apply-keywords
...
Lighting apply keywords
2015-11-14 14:35:57 +01:00
The E
cbad1cf10f
Addressing style comments
2015-11-14 13:30:51 +01:00
Peter Mitsis
56343f0d03
lighting: remove void keyword from empty argument list
...
Routines in the lighting module that do not have any arguments do not
need the 'void' keyword in either their definitions or declarations.
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-14 07:08:52 -05:00
The E
67d51037ff
Adds Persona flag "$Allow substitution of missing messages:"
2015-11-14 12:55:41 +01:00
Goober5000
9bd51acb58
Merge pull request #430 from niffiwan/ant-uk_backslash
...
Fix issue with backslash on UK keyboards
2015-11-14 00:18:18 -05:00
Goober5000
47d82a007f
Merge pull request #434 from asarium/multi/staticAssert
...
Check the size of data in multi packets
2015-11-13 21:20:44 -05:00
m!m
036000f79c
Merge pull request #438 from DahBlount/Damage-Attenuation-Update
...
Deprecate +Min Damage and +Max Damage, add +Attenuation Damage:
2015-11-13 21:51:58 +01:00
DahBlount
3e6fb113ee
Deprecate +Min Damage and +Max Damage, add +Attenuation Damage:
2015-11-13 12:26:04 -07:00
MageKing17
515f9fffb5
Merge pull request #431 from The-E/more_ship_classes
...
Upped MAX_SHIP_CLASSES to 500
2015-11-13 07:13:21 -08:00
asarium
28c9512727
Fix compilation
...
Now the static_asserts use the types from cstdint
2015-11-13 11:52:52 +01:00
Fabian Woltermann
e9a3e457cc
Merge pull request #426 from Yarn366/events_editor_filename_fix
...
Fix for crash in events editor
2015-11-12 19:27:17 +01:00
Fabian Woltermann
3637a9717c
Merge pull request #427 from DahBlount/Directional-Beam-Glows
...
Directional beam glows
2015-11-12 19:26:27 +01:00
niffiwan
ed6637031d
Allow aspect missiles to die when have lost lock
...
Note that aspect missiles don't lose lock when their target dies, I'll
see about adding that later
2015-11-12 19:09:59 +10:00
Peter Mitsis
f5ccad9619
lighting: Apply keywords
...
Applies the following keywords to the lighting module:
const
static
void
extern
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-11 11:20:01 -05:00
Peter Mitsis
b10de88cf0
lighting: Remove unused global variables
...
The following global variables from the lighting module were unused
and are being removed:
int cell_shaded_lightmap = -1;
int spec = 0;
Signed-off-by: Peter Mitsis <[email protected] >
2015-11-11 11:20:01 -05:00
asarium
34a7f7d60f
Check the size of data in multi packets
...
This will make sure that compiler changes that affect the size of a
type are noticed early.
2015-11-11 14:56:14 +01:00
niffiwan
1b9892f363
Remove obsolete comment
2015-11-11 22:16:35 +10:00
Yarn366
9d6b373781
Undid the function name changes
2015-11-10 23:22:34 -05:00
Yarn366
05eb4c0617
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into multiple_background_adjustment
2015-11-10 19:51:08 -05:00
Yarn366
320fd33431
If even one element in the first mission background is missing, fall back to the second background if it exists
2015-11-10 19:48:54 -05:00
niffiwan
22832957f3
Merge pull request #432 from MageKing17/bugfix/ship-turret-target-order
...
Fix ship-turret-target-order.
2015-11-11 09:26:38 +10:00
MageKing17
dba2d28265
Fix ship-turret-target-order.
...
We were declaring an array of NUM_TURRET_ORDER_TYPES ints, and then only specifying the first oindex of them; the memcpy() could've been changed to multiply by oindex instead, but it seemed cleaner to just reset new_target_order to -1 in all values and get rid of the redundant per-ship reset.
Discovered by triggering an Int3() in aiturret.cpp (line 1167 as of this writing) and finding uninitialized values in the turret_targeting_order array.
2015-11-10 14:55:55 -08:00
The E
647f6a867b
Upped MAX_SHIP_CLASSES to 500
2015-11-10 15:55:46 +01:00
niffiwan
c7866a774a
Fix issue with backslash on UK keyboards
2015-11-10 17:45:35 +10:00
DahBlount
89d072e18c
Add +Directonal Glow:
...
This goes directly below +Muzzleglow: in $Beam Info: and causes the muzzle glow to be rendered along a projected poly instead of a bitmap.
Takes a float argument that is the length of the glow.
2015-11-09 14:28:40 -07:00
Yarn366
b1e7a2a1bf
Don't add an extension to a sound's file name if the extension is supposed to be present already
2015-11-09 00:31:40 -05:00
niffiwan
4849f443aa
Missed two places to use killer_infop
2015-11-08 14:51:04 +10:00
niffiwan
aff81fe471
Countermeasures can detonate a single missile
...
As opposed to detonating all missiles within a radius. Is more
efficient than previous code that traversed the entire missile object
list to find all the missiles to detonate
Add to weapons tbl/tbm
$Countermeasure:
+Single Missile Kill: False
2015-11-08 14:42:29 +10:00
niffiwan
26d40553b2
Allow countermeasure kill-distance to be moddable
...
Trivial efficiency improvement by calculating a pointer once & reusing
it. Add more countermeasure nprintf messages
Add to weapons tbl/tbm
$Countermeasure:
+Missile Detonation Radius: 40
2015-11-08 14:41:40 +10:00
MageKing17
f876b89c24
Merge pull request #422 from niffiwan/cleanup/subsys_path_assert
...
Change Assert to Error
2015-11-07 20:20:40 -08:00
niffiwan
2c8d921d64
Change Assert to Error
...
This seems to be a data error rather than a coding error. Also provide
the user with more info to assist with tracking down the source of the
problem.
2015-11-08 13:04:13 +10:00
Fabian Woltermann
fc52668f30
Merge pull request #421 from Echelon9/fix/gr_opengl_init
...
Small tweaks to gr_opengl_init()
2015-11-07 14:35:13 +01:00
Echelon9
97c5a29b76
Better wrap to 80 character lines where sensible in gr_opengl_init()
2015-11-07 23:17:42 +11:00
Echelon9
fa9bd1c446
Whitespace clean up
2015-11-07 23:17:42 +11:00
Echelon9
04352920ee
Export opengl_tnl_init(), so that it doesn't need to be extern'd. Consistent with opengl_tnl_shutdown()
2015-11-07 23:17:42 +11:00
Echelon9
8111924f9b
OpenGL: Use the Core rather than older Extension form of GL_MAX_TEXTURE_IMAGE_UNITS
2015-11-07 23:17:42 +11:00
Echelon9
a11c69673e
Const correctness for ver in gr_opengl_init()
2015-11-07 23:17:42 +11:00
MageKing17
ee730d23c9
Merge pull request #420 from Echelon9/fix/GL_SHADING_LANGUAGE_VERSION
...
Use the Core rather than older Extension form of GL_SHADING_LANGUAGE_VERSION
2015-11-07 04:07:29 -08:00
Echelon9
0b61d0bd8e
OpenGL: Use the Core rather than older Extension form of GL_SHADING_LANGUAGE_VERSION.
2015-11-07 21:52:43 +11:00
Fabian Woltermann
0fcde305ec
Merge pull request #419 from Echelon9/fix/GLSL4-sample-keyword
...
OpenGL: As of GLSL 4.00 'sample' is a keyword
2015-11-07 08:21:42 +01:00
Echelon9
697c900a25
OpenGL: As of GLSL 4.00 'sample' is a keyword. See further Section 3.6 Keywords https://www.opengl.org/registry/doc/GLSLangSpec.4.00.7.pdf
2015-11-07 14:44:06 +11:00
m!m
fbc9ede423
Merge pull request #398 from Goober5000/g3_const
...
const-correctness inspired by #392 , because why not be masochistic
2015-11-06 16:51:32 +01:00
m!m
0f36c6905d
Merge pull request #417 from niffiwan/shadows_default_off
...
Disable shadows by default
2015-11-05 23:15:19 +01:00
niffiwan
1d66596bfb
Disable shadows by default
...
Enable shadows with -enable_shadows
-shadow_quality should still work
2015-11-06 07:59:03 +10:00
Fabian Woltermann
444874b110
Merge pull request #416 from Goober5000/shipfx_shadow_function_retval_tweaks
...
change these functions to return bool rather than int; fixes a minor warning
2015-11-05 17:35:02 +01:00
Goober5000
b704050c21
change these functions to return bool rather than int; fixes a minor warning
2015-11-05 00:36:06 -05:00
MageKing17
5676dbf9bd
Merge pull request #414 from Goober5000/issue_412_fix
...
properly close the fiction viewer when returning to the main menu
2015-11-04 03:04:09 -08:00
Goober5000
564f31aeab
properly close the fiction viewer when returning to the main menu
2015-11-04 00:54:02 -05:00
niffiwan
0ea25e79a9
Merge pull request #411 from The-E/sexp_profiling
...
Profiling support for mission events and scripts
2015-11-03 22:32:51 +10:00
The E
5a37992d3d
Adds profiling for sexp events and lua On Frame scripts.
2015-11-03 13:10:07 +01:00
Fabian Woltermann
3ade9ae1de
Merge pull request #389 from Goober5000/shipfx_eye_in_shadow_alt_pr
...
Alternative suggested PR to #384
2015-11-02 09:51:17 +01:00
Fabian Woltermann
f2aea8e69d
Merge pull request #410 from niffiwan/valgrind/ds_load_buffer
...
Fix memory leak in ds_load_buffer
2015-11-02 09:50:08 +01:00
niffiwan
5c74720265
Fix memory leak in ds_load_buffer
2015-11-01 19:33:10 +10:00
niffiwan
556e9a4447
Merge pull request #404 from Yarn366/scalable_head_anis
...
Scalable head ANIs
2015-11-01 15:41:42 +10:00
MageKing17
f48a31c610
Merge pull request #409 from asarium/antipodes_/sync
...
Sync Antipodes
2015-10-31 15:10:25 -07:00
Goober5000
1bd8e11194
Merge pull request #401 from niffiwan/fix/missionparse_ammo_II
...
Guard against negative array index reads
2015-10-31 15:08:49 -04:00
asarium
5f23381c07
Merge branch 'master' into antipodes_/sync
...
Conflicts:
code/cmdline/cmdline.cpp
code/globalincs/pstypes.h
code/globalincs/windebug.cpp
code/graphics/2d.cpp
code/windows_stub/stubs.cpp
2015-10-31 17:18:29 +01:00
m!m
bfc34953eb
Merge pull request #408 from niffiwan/coverity/modeling_update
...
Model Assert/Assertion as Coverity killpaths
2015-10-31 11:46:11 +01:00
niffiwan
1c84c54e4f
Model Assert/Assertion as Coverity killpaths
2015-10-31 20:17:12 +10:00
Goober5000
d790301fab
Merge pull request #407 from niffiwan/valgrind/control_configs
...
Fix memory leak from Control_config_presets
2015-10-31 00:31:09 -04:00
niffiwan
253d8a7eb1
Fix memory leak from Control_config_presets
2015-10-31 14:06:56 +10:00
Goober5000
dc3c5fb561
Merge pull request #406 from niffiwan/travis/fix_cov_scan_builds
...
Fix coverity_scan builds
2015-10-30 23:39:59 -04:00
niffiwan
eb1ff0f433
Fix coverity_scan builds
...
i.e. they should be building debug, not release
2015-10-31 12:51:33 +10:00
Fabian Woltermann
30564248a6
Merge pull request #405 from niffiwan/valgrind/camera_leak
...
Fix memory leak in cam_create/cam_close
2015-10-30 16:45:06 +01:00
niffiwan
9dfa67b64d
Correctly compare vector .end()
2015-10-30 22:01:06 +10:00
Yarn366
c3c7477114
Made head animations scale to the size of the gauge window. Also deprecated "Animation Background Size" parameter and added the more accurately named "Animation Size" parameter, which sets how large animations should be.
2015-10-29 14:35:08 -04:00
Goober5000
bbad1c2159
more const-correctness per PR comments
2015-10-29 09:34:18 -04:00
niffiwan
bb6e01caaf
Merge pull request #403 from Yarn366/sparky_hi_fallback_fix
...
Sparky hi fallback fix
2015-10-29 19:05:07 +10:00
Yarn366
fc941e9ca8
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into sparky_hi_fallback_fix
2015-10-28 18:26:49 -04:00
Yarn366
93e8e3ab6f
Resolutions below 1024x600 are no longer changed to 800x600 if sparky_hi_fs2.vp is missing.
...
In addition, the gr_get_resolution_class function has been added to avoid duplication of its code.
2015-10-28 18:21:31 -04:00
Goober5000
14eec21c68
Merge pull request #384 from The-E/mc_info_constructor
...
Better handling for mc_info
2015-10-28 08:48:57 -04:00
niffiwan
1ceae13be2
Guard against negative array index reads
...
Also convert Assert to Assertion to provide more info
2015-10-28 21:53:57 +10:00
niffiwan
fb20632b18
Fix memory leak in cam_create/cam_close
2015-10-28 21:26:00 +10:00
niffiwan
62fcbeaae8
Merge pull request #380 from Goober5000/wf_never_existed_removal
...
remove WF_NEVER_EXISTED
2015-10-28 19:35:46 +10:00
niffiwan
4250751ccc
Merge pull request #393 from Goober5000/convert_qsort_to_std_sort
...
convert qsort to std::sort
2015-10-28 19:33:12 +10:00
Fabian Woltermann
0a08b6348b
Revert "Removes inline keyword from mc_info_init declaration"
...
This reverts commit c789b117cf .
2015-10-28 09:19:21 +01:00
Fabian Woltermann
c789b117cf
Removes inline keyword from mc_info_init declaration
2015-10-28 08:54:03 +01:00
niffiwan
cc84210ac4
Merge pull request #399 from Goober5000/const_cast_trimming
...
remove obsolete const_casts
2015-10-28 17:13:36 +10:00
Goober5000
8a125ab019
remove obsolete const_casts
2015-10-28 00:18:31 -04:00
Goober5000
a7dcda9000
wip to avoid const_cast
2015-10-28 00:02:35 -04:00
Goober5000
bfc0948f1c
let's change this antipattern here too
2015-10-27 22:52:03 -04:00
Goober5000
75411d92bb
const-correctness inspired by 392, because why not be masochistic
2015-10-27 22:46:35 -04:00
MageKing17
afe29c60fe
Merge pull request #392 from DahBlount/CLoseup-zoom-testing
...
Fix Closeup_Pos and Closeup_Zoom
2015-10-27 17:16:50 -07:00
m!m
b0befdc1ba
Merge pull request #397 from MageKing17/bugfix/issue-396
...
Restore local SSM behavior.
2015-10-27 22:55:39 +01:00
DahBlount
51c61b5144
Change closeup_pos in draw_model_icon() to a pointer
2015-10-27 15:51:45 -06:00
DahBlount
6cf105b768
Fix Closeup_Pos and Closeup_Zoom
...
The draw_model_rotating() and draw_model_icon() functions were receiving
the whole Weapon_Info array instead of a single weapon_info object (wip
in this case).
2015-10-27 15:51:44 -06:00
MageKing17
5fd09f8557
Restore local SSM behavior broken by 88e7c83. Fixes issue #396 .
...
Not sure how I missed that when reviewing the PR, but there you go.
2015-10-27 14:48:21 -07:00
Fabian Woltermann
630ab5a3cc
Makes sure mc_info_init sets everything to safe data.
2015-10-27 08:24:06 +01:00
Fabian Woltermann
e28640ded0
Revert "Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset."
...
This reverts commit 35e34ac97c .
2015-10-27 08:15:45 +01:00
m!m
3708f101b4
Merge pull request #394 from niffiwan/valgrind/csg_read_missions
...
Fix memory leaks in mission_campaign_load
2015-10-26 23:15:24 +01:00
m!m
332b9fa4a4
Merge pull request #395 from The-E/debug_sexp_fix
...
Fix the debug sexp
2015-10-26 23:07:03 +01:00
The E
e6aa565b42
Name change as suggested by m|m
2015-10-26 20:31:24 +01:00
The E
788e28c646
Creates a new variant of Warning that is not #ifdefed out on release to make the debug sexp work as its description implies
2015-10-26 19:47:51 +01:00
Goober5000
6ccf4116fc
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into wf_never_existed_removal
2015-10-26 02:27:10 -04:00
Goober5000
c4240324fb
the comment really shouldn't have changed from the original retail '// if the current wave is zero, it never existed', because it illuminates the thought process behind the code
2015-10-26 02:26:51 -04:00
niffiwan
4fc2d9c610
Fix memory leaks in mission_campaign_load
2015-10-26 13:49:21 +10:00
Goober5000
ccc71a8e8b
looks like we'll need them in these three other files too
2015-10-25 21:20:57 -04:00
Goober5000
7dde0a79a7
that was just dumb
2015-10-25 21:14:08 -04:00
Goober5000
e895f86e44
come on, Travis
2015-10-25 20:48:02 -04:00
Goober5000
31e9a0dd7d
more linux compatibility
2015-10-25 20:23:26 -04:00
Goober5000
505de1b905
linux compatibility
2015-10-25 19:51:50 -04:00
Goober5000
b82d0c579d
convert qsort to std::sort
2015-10-25 19:16:36 -04:00
niffiwan
68d2e5f0eb
Merge pull request #391 from Goober5000/fred_completion_music_text_tweak
...
tweak the FRED and wxFRED dialog text to match the action
2015-10-26 08:46:33 +10:00
Goober5000
3c4861859b
tweak the FRED and wxFRED dialog text to match the action
2015-10-25 16:33:28 -04:00
Fabian Woltermann
8ab5cd3085
Merge pull request #390 from Goober5000/game_sunspot_process_tweak
...
small optimization of shadow checks
2015-10-24 21:51:18 +02:00
Goober5000
eaa09dd862
small optimization of shadow checks
2015-10-24 15:42:06 -04:00
Goober5000
45c8ed8926
Merge pull request #383 from niffiwan/valgrind/generic_anim_stream
...
Fix memory leaks in generic_anim_stream
2015-10-24 15:18:50 -04:00
Goober5000
1f6fc358f8
just a tweak to avoid comparing whitespace
2015-10-24 15:07:58 -04:00
Goober5000
5b8584b892
clarify the use of mc_info_init, and make sure that model_instance_num and submodel_num have the proper values
2015-10-24 15:06:58 -04:00
MageKing17
0cdac667a3
Merge pull request #385 from asarium/coverity/1093606
...
Fix Coverity 1093606 for real this time
2015-10-24 05:41:26 -07:00
MageKing17
5137787a99
Merge pull request #388 from asarium/coverity/1093600
...
Revert "Fix for Coverity 1093600: Negative array index read"
2015-10-24 05:40:56 -07:00
asarium
ddacb8cf32
Revert "Fix for Coverity 1093600: Negative array index read"
...
This reverts commit 2aa569c1e7 .
As discussed in #386 hud_squadmsg_is_target_order_valid actually doesn't properly catch cases where the target_objnum may be -1.
2015-10-24 14:16:31 +02:00
asarium
88e7c83a8e
Fix Coverity 1093606 for real this time
2015-10-24 12:53:03 +02:00
niffiwan
5b489da8a8
Merge pull request #376 from asarium/ci/fatalWarnings
...
Travis CI: Make warnings fatal errors
2015-10-24 20:08:53 +10:00
The E
35e34ac97c
Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset.
2015-10-24 09:58:38 +02:00
MageKing17
1ba35d42ae
Merge pull request #369 from The-E/player-fighterbays
...
Allow ships to arrive from hangars on player ships
2015-10-24 00:36:02 -07:00
niffiwan
409ba384b0
Fix memory leaks in generic_anim_stream
2015-10-24 15:04:13 +10:00
niffiwan
51c2a61d76
Merge pull request #382 from asarium/valgrind/1
...
Fix memory leak in bm_load_animation
2015-10-24 08:42:36 +10:00
asarium
f1fd9f9a3d
Fix memory leak in bm_load_animation
2015-10-23 22:35:56 +02:00
Goober5000
96d32b5031
remove WF_NEVER_EXISTED
2015-10-22 23:27:43 -04:00
Fabian Woltermann
21a16fbf15
Change this line back to what it was, with more accurate comment
2015-10-16 11:27:40 +02:00
Fabian Woltermann
76b6f954da
Merge pull request #377 from MageKing17/bugfix/sexps-accessing-wrong-nodes
...
Fixes numerous SEXPs accessing the wrong nodes.
2015-10-16 06:06:58 +02:00
MageKing17
064a07349f
Fixes numerous SEXPs accessing the wrong nodes.
...
Affected SEXPs include turret-set-target-order, turret-set-direction-preference, turret-set-rate-of-fire, turret-set-optimum-range, ship-turret-target-order, turret-get-primary-ammo, turret-set-primary-ammo, turret-get-secondary-ammo, and turret-set-secondary-ammo.
It's worth noting that while turret-set-direction-preference, turret-set-rate-of-fire, and turret-set-optimum-range were wrong, they were wrong in a way that wouldn't actually affect the outcome most of the time (thanks to the "if(turret == NULL)" checks simply skipping invalid subsystem names).
2015-10-15 18:58:27 -07:00
asarium
bcedaee793
Fix "uninitialized variable warning"
2015-10-14 18:54:14 +02:00
asarium
a020095b07
Disable array bounds checks in a Travis build
2015-10-14 18:44:57 +02:00
asarium
a5f918a811
Remove -ansi option as it's not supported by clang
2015-10-14 18:20:44 +02:00
asarium
4e21d9ee79
Make error fatal when doing a CI build
2015-10-14 18:09:16 +02:00
asarium
7efd107bfa
Fix format warning and syntax error
2015-10-14 18:07:45 +02:00
asarium
9f4589df65
Fix unitialized variable warning
...
GCC was complaining about an uninitialized warning but that was probably a false positive.
2015-10-14 17:51:21 +02:00
asarium
1d2153794c
Fix an overflow warning
...
Signed overflow is not well defined in the standard but unsinged it so now that is used to determine if the model index counter has overflown.
2015-10-14 17:45:46 +02:00
asarium
4a40aad107
Fix invalid index warning
...
The new version now prints the name of the help overlay that could not be added.
2015-10-14 17:44:03 +02:00
asarium
14f1ceec4d
Fix "unused return" warnings
2015-10-14 17:41:31 +02:00
Fabian Woltermann
2f78ae308b
Consistency for the doxygen comments
2015-10-13 10:17:35 +02:00
Fabian Woltermann
bc788d6cb7
More comment cleanup
2015-10-13 09:29:07 +02:00
Fabian Woltermann
f1b9c15618
More comment tweaks
2015-10-13 09:15:52 +02:00
Fabian Woltermann
eab9fab9ca
Further, non-multi-breaking changes as suggested by MageKing17.
2015-10-13 09:11:36 +02:00
Fabian Woltermann
a6d3982c7c
Merge pull request #375 from MageKing17/bugfix/homing_pos-null-check
...
Check IS_VEC_NULL(&wp->homing_pos) for det_radius and arm_radius.
2015-10-13 08:01:48 +02:00
MageKing17
7852d13ce5
Check IS_VEC_NULL(&wp->homing_pos) for det_radius and arm_radius.
...
"$Detonation Radius:" and "$Arm radius:" would both rely on wp->homing_pos being set if wp->homing_object was; however, during free flight time, wp->homing_pos remains uninitialized (a null vector). As a result, their vm_vec_dist() calls would be comparing with the distance from the mission origin (coordinates 0,0,0) instead of the actual location of whatever they were homing in on. In the case of detonation radius, this would result in instant detonation on launch if you fired within det_radius of the mission origin. In the case of arm radius, this would result in the weapon being armed during free flight if launched within the arm_radius of the origin (and yes, you could theoretically experience the effects of both of these bugs simultaneously).
Theoretically, this solution is still less than ideal (a target sitting exactly on the mission origin could cause wonkiness), but it's consistent with the IS_VEC_NULL() checks elsewhere in weapons.cpp. A "proper" solution would basically require rewriting the entire homing code... which, obviously, if somebody would like to volunteer for, I wouldn't stop you ;). In the meantime, firing a homing weapon at a target sitting on the mission origin is even less likely than firing a weapon with one of the affected attributes within a certain distance of the mission origin, which was already pretty uncommon (it took a weapon with an abnormally large detonation radius of 1 kilometer to even realize this bug existed).
2015-10-12 22:48:15 -07:00
Fabian Woltermann
ad62f1d342
Merge pull request #374 from MageKing17/bugfix/homing-object-NULL-confusion
...
Stop comparing/setting homing_object to NULL.
2015-10-13 07:23:34 +02:00
MageKing17
75ae511ae6
Stop comparing/setting homing_object to NULL.
...
The rest of the codebase uses &obj_used_list to mean "no homing target", and the inconsistency could cause all kinds of issues.
2015-10-12 16:10:05 -07:00
niffiwan
89ebdd9bc1
Merge pull request #373 from MageKing17/bugfix/turret-ammo-bank-3-typo
...
Fix a typo in the weapon editor dialogue for turret bank 3 ammo.
2015-10-13 08:27:41 +10:00
MageKing17
ccd6d1e619
Fix a typo in the weapon editor dialogue for turret bank 3 ammo.
2015-10-12 15:12:13 -07:00
Fabian Woltermann
ca47f62e94
Merge pull request #342 from asarium/antipodes_/multiDisplay
...
Add support for specifying the used display
2015-10-09 08:21:25 +02:00
Fabian Woltermann
db8990f61a
Merge pull request #365 from asarium/antipodes_/sync
...
Sync Antipodes
2015-10-09 08:19:09 +02:00
Fabian Woltermann
92ace8e983
Further comment tweaks
2015-10-08 09:49:48 +02:00
MageKing17
61f2e78515
Merge pull request #370 from Goober5000/memset_bugfix
...
fix a memset typo identified by Echelon9
2015-10-05 12:38:59 -07:00
Goober5000
ebd81d9539
fix a memset typo identified by Echelon9
2015-10-05 11:49:54 -04:00
Fabian Woltermann
d3df7ef2b1
Adds explanatory comments and applies the same logic to the net signature overload.
2015-10-05 08:08:46 +02:00
The E
99306be6cf
Amendment based on Kara's feedback. Should allow same behaviour in both SP and MP.
2015-10-04 12:23:35 +02:00
The E
6835d2bf9f
Only remove the player ship from the arrival list in singleplayer
2015-10-03 22:15:57 +02:00
Goober5000
3f9ce3b6a5
Merge pull request #368 from asarium/fix/configureType
...
Fix typo in configure.ac
2015-10-03 14:12:27 -04:00
asarium
08067bc871
Fix typo in configure.ac
2015-10-03 19:18:52 +02:00
MageKing17
415f113f4d
Merge pull request #366 from The-E/ciws
...
Fixes the logic surrounding the ciws flag
2015-10-02 13:54:52 -07:00
MageKing17
a5b504bb85
Merge pull request #367 from The-E/longer-descriptions
...
Slightly increases the length limit for tech descriptions.
2015-10-02 13:54:09 -07:00
The E
9f94568d2f
Slightly increases the length limit for tech descriptions.
2015-10-02 20:37:04 +02:00
The E
ad4fed744e
Normalizes the logic to work the same way in both cases
2015-10-02 20:22:51 +02:00
The E
0a081fb292
Fixes the logic surrounding the ciws flag
2015-10-02 19:33:09 +02:00
asarium
f08466f0f3
Merge branch 'master' into antipodes_/sync
...
Conflicts:
ci/travis/before_install.sh
ci/travis/install.sh
code/sound/voicerec.cpp
2015-10-01 22:45:10 +02:00
Fabian Woltermann
efa5dc9620
Merge pull request #364 from Goober5000/background_bitmaps_tweak
...
made background sexp errors less fatal
2015-10-01 18:18:24 +02:00
Goober5000
bfb4db1dd4
made background sexp errors less fatal
2015-09-30 23:36:47 -04:00
MageKing17
2d56358755
Merge pull request #363 from DahBlount/Fix-debug-warning-in-Min/Max-Damage-definition-code
...
Additional debub warning move
2015-09-30 14:41:00 -07:00
DahBlount
d52e27dcc4
Move debug warnings to optional_string()
...
Only check if we actually set a value for min or max damage.
2015-09-30 13:54:18 -06:00
Fabian Woltermann
12acacbba8
Merge pull request #362 from DahBlount/Fix-debug-warning-in-Min/Max-Damage-definition-code
...
Fix debug warning in min max damage definition code
2015-09-30 21:43:13 +02:00
DahBlount
3bbabea978
Add additional checks to min/max damage code
...
This checks the damage attenuation code for have a parameter being set
to 0.0f before hand to prevent debug warnings.
2015-09-30 13:19:10 -06:00
m!m
cdc43731af
Merge pull request #361 from Goober5000/cfile_null_bugfix
...
cfclose() will hit an assertion if we try to close a null pointer
2015-09-30 21:08:03 +02:00
Goober5000
edc806897f
cfclose() will hit an assertion if we try to close a null pointer
2015-09-30 15:03:00 -04:00
MageKing17
f32a6e7ab9
Merge pull request #359 from ln-zookeeper/fotg_to_master
...
Make the array bounds check actually work
2015-09-25 12:30:14 -07:00
Lari Nieminen
2e9b2de40a
Make the array bounds check actually work
2015-09-24 09:25:59 +03:00
MageKing17
69ab8c179d
Merge pull request #357 from Goober5000/fiction_viewer_conditional_support
...
Fiction viewer conditional support
2015-09-23 16:14:46 -07:00
Goober5000
37657fc537
oh rubbish
2015-09-23 18:39:51 -04:00
Goober5000
1a5a0d6a7f
change an Error to an Assertion, and made Fiction_viewer_text use nullptr instead of NULL
2015-09-23 18:38:34 -04:00
m!m
1a196cbd7a
Merge pull request #356 from MageKing17/cleanup/voice-recognition-mantis-2373
...
Voice recognition cleanup based on Mantis #2373 patch.
2015-09-23 23:32:46 +02:00
MageKing17
89a6d69e08
Voice recognition cleanup based on Mantis #2373 patch.
...
* Frees cpAudio pointer in VOICEREC_deinit()
* Validates that the ship/wing can actually take orders, and validates that it can take the specific order in question before trying to send it.
* Reports the confidence of the voice match if DEBUG_ON is set.
* Various commenting changes based on the patch.
Not included: using confidence to discard voice matches that fall below a certain confidence level. I haven't noticed a tendency towards spurious matches, and I didn't want to introduce this without additional data, especially when it might cause problems for people with different accents (and ESPECIALLY without a setting to tweak the threshold value, which the original patch did not have; it was hardcoded at 90%).
2015-09-23 14:10:02 -07:00
Goober5000
b59c015df2
fix a subtle bug caught by Travis
2015-09-22 21:32:19 -04:00
Goober5000
c90db8c498
Merge pull request #314 from MageKing17/cleanup/fred-save-refactor
...
Refactor mission saving to avoid duplicate code.
2015-09-22 21:19:23 -04:00
Goober5000
cc79554f7a
keep track of the active stage via index rather than via pointer because the vector may be resized
2015-09-22 20:39:37 -04:00
Goober5000
3df6bb82db
add basic conditional support to fiction viewer stages
2015-09-22 20:17:31 -04:00
Goober5000
56a9391e31
some const-correctness
2015-09-22 19:02:10 -04:00
niffiwan
bc5b7e6906
Merge pull request #355 from ln-zookeeper/l_cf_get_path_id_buf_fix
...
Fix possible out of bounds array access
2015-09-22 19:13:01 +10:00
Lari Nieminen
6dc3d67905
Fix possible out of bounds array access
...
If the input string is "/", then buf[-1] would get accessed and in rare cases also modified.
2015-09-22 11:43:20 +03:00
Goober5000
0d1764d42e
Merge pull request #353 from Yarn366/per_mission_ui_backgrounds
...
Per-mission UI backgrounds
2015-09-21 17:02:03 -04:00
MageKing17
f4f31084fa
Merge pull request #354 from Goober5000/no_move_collision_tweak
...
collision optimization: two objects which do not move will never coll…
2015-09-21 13:56:38 -07:00
Goober5000
5fb98551c9
collision optimization: two objects which do not move will never collide with one another
2015-09-21 16:30:19 -04:00
Yarn366
5f58aaa392
Merge branch 'master' into per_mission_ui_backgrounds
2015-09-20 21:05:46 -04:00
Yarn366
484be09275
Added support for custom fiction viewer backgrounds. Also moved the $UI parameter so it occurs just before the $File parameter.
2015-09-20 15:59:29 -04:00
m!m
26e65cc9e5
Merge pull request #350 from niffiwan/headzlessIII
...
Reduce bmpslot usage by headz
2015-09-19 12:49:11 +02:00
Fabian Woltermann
26bca473e2
Merge pull request #352 from niffiwan/headz_comment_fix
...
Fix comment for HudGaugeTalkingHead::render
2015-09-19 11:00:32 +02:00
niffiwan
0132e2a320
Fix comment for HudGaugeTalkingHead::render
2015-09-19 18:55:30 +10:00
Yarn366
873694eae2
Added unified functions for loading and saving custom UI backgrounds
2015-09-19 04:47:11 -04:00
niffiwan
0b1c916352
Merge pull request #351 from MageKing17/cleanup/scripting-call-bm_release-instead-of-bm_unload
...
Make script_state::UnloadImages() call bm_release instead of bm_unload.
2015-09-19 15:09:50 +10:00
MageKing17
835c4a7d0e
Make script_state::UnloadImages() call bm_release instead of bm_unload.
...
Should result in reduced BMPMAN slot usage with certain scripts as bm_unload() unloads the image data but holds on to the slot, while bm_release() releases the slot.
2015-09-18 21:22:07 -07:00
Yarn366
f0c0d60a11
Fiction viewer UI can now be set in mission files and game_settings.tbl
2015-09-18 21:51:24 -04:00
niffiwan
12f4bcfd9b
Reduce bmpslot usage by headz
...
As headani's (both ANI & EFF) are streamed there's no need to have
the anim data in bmpman, the streaming code does that with only two
slots, rather than one slot per ani frame
Also fix a "leak" in the streaming code use of bmpman slots. i.e. each
time a message was played another slot would be used & not released
2015-09-18 19:34:28 +10:00
niffiwan
30c8d09c55
Merge pull request #349 from MageKing17/bugfix/for-counter-double-free
...
Fix double-free with for-counter (introduced by myself).
2015-09-17 13:06:06 +10:00
MageKing17
53f7f493cf
Merge pull request #335 from ln-zookeeper/fotg_to_master
...
Fixed the $On Ship Arrive hook code as per issue #334 and PR #333
2015-09-16 19:58:01 -07:00
MageKing17
24b0b28f6a
Fix double-free with for-counter (introduced by myself).
...
In 9ec10dd I thought I was fixing a memory leak, but the actual scenario was that the freeing was just delayed until later. This removes the freeing added by 9ec10dd and changes the free() calls into vm_free() calls.
2015-09-16 19:55:24 -07:00
Yarn366
0af93bcceb
Fixed attempts to access current debriefing as an array when saving the debriefing background
2015-09-16 14:24:59 -04:00
Yarn366
9cb1af00aa
Added support for custom command briefing backgrounds
2015-09-16 14:06:15 -04:00
Yarn366
4ef212157a
Briefing backgrounds are now set with $briefing_background_xxx instead of $background_xxx
2015-09-16 02:17:53 -04:00
Yarn366
3bb9b0068c
Added support for custom debriefing backgrounds
2015-09-16 01:32:57 -04:00
Yarn366
09aa01db6b
Added support for custom weapon select backgrounds
2015-09-16 00:14:54 -04:00
Yarn366
36cc228527
Added support for custom ship select backgrounds
2015-09-15 23:49:43 -04:00
niffiwan
022e3324ce
Merge pull request #348 from MageKing17/bugfix/dont-call-popup-during-gr_init
...
Stop calling popup() during gr_init().
2015-09-16 11:15:25 +10:00
Yarn366
f41c5a2a65
Added support for custom red-alert backgrounds
2015-09-15 21:08:25 -04:00
MageKing17
d672ee885f
Stop calling popup() during gr_init().
...
While investigating issue #345 , it was discovered that `popup()` is getting called during `gr_init()` (and since this is before `gamesnd_parse_soundstbl()` gets called, the eventual call to `gamesnd_play_iface()` results in reading invalid memory). Given that this is basically relying on a feature in the middle of the function initializing it, and given that both lines are preceded by `mprintf()` calls saying basically the same thing, it seems the best solution is to just remove the troublesome lines altogether.
2015-09-15 17:59:16 -07:00
MageKing17
3329285192
Refactor mission saving to avoid duplicate code.
...
Makes save_mission_file() and autosave_mission_file() delegate to a new save_mission_internal() function. Tested and works with both manual and automatic saves.
As an aside, this fixes a slight inconsistency between manual and automatic saving (which inspired this refactor in the first place): when the order of save_fiction() and save_cutscenes() was swapped (in r10886 a.k.a. d6e0a73 ), autosave_mission_file() wasn't also changed, so autosaves of missions with "#Cutscenes" sections can't actually be loaded.
2015-09-10 13:34:57 -07:00
z64555
9df07cda5e
Merge pull request #343 from Echelon9/fix/bm_load_and_parse_eff-return-type
...
Refactor bm_load_and_parse_eff() return type to bool
2015-09-08 09:48:53 -05:00
Echelon9
d7eca39338
Refactor bm_load_and_parse_eff() return type to bool, thereby removing a TODO
2015-09-08 22:14:43 +08:00
z64555
d1e6aa2b4f
Merge pull request #344 from Echelon9/fix/bm_set_render_target-return-type
...
Refactor bm_set_render_target() return type to bool
2015-09-08 09:02:14 -05:00
Echelon9
b7aaf2e885
Refactor bm_set_render_target() return type to bool, thereby removing a TODO
2015-09-07 17:07:24 +10:00
asarium
28c40ae888
Add support for specifying the used display
2015-09-06 22:34:09 +02:00
m!m
0339f1ba62
Merge pull request #341 from MageKing17/bugfix/mantis-3173
...
Fix Mantis #3173 .
2015-09-06 14:45:28 +02:00
MageKing17
1a0f2cf0e0
Fix Mantis #3173 .
...
So in PR #294 , I made 0-damage beams call the damage-applying code so they could be used to TAG things. The way I did this was I removed the do_damage check from the conditional before the switch block that handles beams damaging things.
This was a horrible mistake.
do_damage was set to 0 if a beam dealt <= 0 damage, but before that, it would only be set to 1 if the damage timestamp had elapsed. Removing the do_damage check caused damaging beams to deal damage every frame, which obviously will cause a substantial damage increase (well, unless your framerate was so low that beams would deal less than their full damage anyway).
This commit restores the do_damage check, and simply avoids setting do_damage to 0 if the beam isn't a damaging one (the <= 0 check is moved to beam_get_ship_damage() instead, so we can skip the attenuation calculation if we're not going to deal damage in the first place).
2015-09-06 05:33:30 -07:00
niffiwan
e7136c8875
Merge pull request #339 from asarium/antipodes_/fix/openglFlip
...
Workaround for freezing when exiting abnormally
2015-09-04 09:38:41 +10:00
Lari Nieminen
473090e9e0
Made $On Ship Arrive cope with generic anchors (e.g. "<any hostile>")
...
This changes the interface of mission_set_arrival_location() to return the objnum of the anchor (if any; -1 otherwise).
2015-09-04 01:23:32 +03:00
Fabian Woltermann
d5a2238225
Merge pull request #340 from asarium/fix/unneededWarnings
...
Re-enable two gcc warnings
2015-09-03 18:10:32 +02:00
m!m
cbec552c19
Merge pull request #338 from Goober5000/sound_index_tweak2
...
Sound index tweak2
2015-09-03 17:02:38 +02:00
asarium
032aa154de
Re-enable two warnings
...
The unknown pragmas have been fixed by wrapping them in a visual studio ifdef
2015-09-03 15:38:33 +02:00
Fabian Woltermann
b23227d08d
Merge pull request #336 from asarium/antipodes_/betterStacktrace
...
Improve linux stacktraces
2015-09-03 13:39:05 +02:00
asarium
855982ac38
Workaround for freezing when exiting abnormally
...
When using the Linux AMD proprietary driver FSO gets stuck when trying to swap buffers when performing an abnormal shutdown (e.g. when exiting via a dialog). This skips the gr_flip calls when we are going to close as it doesn't matter anyway.
2015-09-03 13:09:37 +02:00
Goober5000
3b5ba969cc
change the Warning to an mprintf since technically SSM entries do not need a name
2015-09-02 22:49:31 -04:00
Goober5000
be5fdd0308
sprintf_s only works in Visual Studio; change to regular sprintf
2015-09-02 22:45:46 -04:00
Goober5000
abd31038e7
a bit of code cleanup with some robustness for SSM entry names
2015-09-02 22:45:38 -04:00
Goober5000
902fd5efbc
fix a VS2013 warning
2015-09-02 22:45:24 -04:00
Goober5000
7db9adae00
since Alarm Sound is optional, it's possible the sound index won't get assigned
2015-09-02 22:45:04 -04:00
m!m
f82a730f7e
Merge pull request #337 from Yarn366/mantis/3172
...
Fixed language autodetection
2015-09-02 23:44:08 +02:00
Yarn366
932a5230e9
Fixed language autodetection
2015-09-02 17:13:33 -04:00
asarium
a38908af19
Improve linux stacktraces
...
The new version of dumP-stacktrace uses abi::__cxa_demangle to determine the real name of a C++ function instead of printing the mangled name to the stacktrace.
2015-09-02 16:28:20 +02:00
Lari Nieminen
81d18573aa
Fixed the $On Ship Arrive hook code as per issue #334 and PR #333
2015-09-02 10:53:21 +03:00
Fabian Woltermann
fadd4e6d18
Merge pull request #327 from Goober5000/per_mission_briefing_backgrounds
...
mjn.mixael's request for per-mission briefing backgrounds
2015-08-31 09:03:05 +02:00
Fabian Woltermann
e02adc2b8f
Merge pull request #329 from asarium/antipodes_/stubsCleanup
...
Remove usage of HMMIO
2015-08-31 09:02:06 +02:00
Fabian Woltermann
6484a19094
Merge pull request #331 from AxemP/NoBeamFlashImpact
...
Removes the beam flash impact from appearing when viewing from the hit object's cockpit
2015-08-31 09:00:01 +02:00
Fabian Woltermann
66c9b7584c
Merge pull request #330 from asarium/antipodes_/messageBoxCleanup
...
Replace Win32 MessageBox with os::dialogs version
2015-08-31 08:58:54 +02:00
z64555
98fba0c00b
Merge pull request #328 from niffiwan/bmpslots
...
Add debug console command to log bmpman slot info
2015-08-30 18:47:57 -05:00
MageKing17
f95db90cc0
Merge pull request #332 from niffiwan/bmp_eff_cleanup
...
Minor bmpman/generic anim cleanup
2015-08-30 10:19:37 -07:00
niffiwan
2199863587
Minor bmpman/generic anim cleanup
...
Remove redundant Assert from bm_load_animation
Replace magic numbers in EFF streaming animations
2015-08-30 14:50:21 +10:00
asarium
d57eefde7f
Undefine MessageBox if it is defined
2015-08-29 23:01:38 +02:00
MageKing17
df8317f3ed
Merge pull request #311 from ln-zookeeper/fotg_to_master
...
Added Lua functions to read mouse/joystick sensitivity and deadzone
2015-08-29 09:38:21 -07:00
Axem
cc08e986a2
Don't need that
2015-08-29 11:19:48 -05:00
Axem
65cce032d3
Merge branch 'NoBeamFlashImpact' of https://github.com/AxemP/fs2open.github.com.git
2015-08-29 11:15:36 -05:00
Axem
b8479fba88
I am comitting this!
2015-08-29 11:15:32 -05:00
Axem
7f22a80af6
Prelim work
2015-08-29 11:14:38 -05:00
Lari Nieminen
58b8f2a33c
Added Lua functions to read mouse/joystick sensitivity and deadzone
2015-08-29 16:54:19 +03:00
asarium
451d451417
Replace Win32 MessageBox with os::dialogs version
...
Also moved SCP_MessageBox into os::dialogs namespace
2015-08-28 16:24:35 +02:00
Fabian Woltermann
d8bd42722d
Merge pull request #322 from z64555/enhancement/joy_asynch
...
joy_asynch - Enables SDL's event handling for joystick axes
2015-08-28 12:02:28 +02:00
asarium
45ba56a721
Remove usages of mmio
2015-08-28 11:47:26 +02:00
asarium
b500e072da
Use cross-platform compatible struct
2015-08-28 11:46:10 +02:00
asarium
9589751f3d
Remove now unused compatibility function
2015-08-28 10:55:07 +02:00
Fabian Woltermann
90aee951e5
Merge pull request #325 from asarium/antipodes_/fix/cursor
...
Fix cursor initialization
2015-08-27 22:29:20 +02:00
asarium
d5528551e1
Fix cursor initialization
...
Now matches the code in master and if FSO isn't launched in the correct directory displays the correct error message instead of an assertion.
2015-08-27 21:52:00 +02:00
Fabian Woltermann
47484ab363
Merge pull request #319 from asarium/antipodes_/sync
...
Sync Antipodes
2015-08-27 21:50:19 +02:00
Fabian Woltermann
0aec74ae29
Merge pull request #320 from asarium/ci/container
...
Travis CI: Switch to container infrastructure
2015-08-27 21:49:36 +02:00
asarium
4e6a1ae716
Switch to container infrastructure
2015-08-27 21:39:23 +02:00
z64555
f8d8c32d4e
Use correct C library for limits.h this time
2015-08-27 05:58:31 -05:00
niffiwan
ebca85531c
Add debug console command to log bmpman slot info
2015-08-27 20:06:35 +10:00
m!m
0954d4e4ee
Merge pull request #326 from MageKing17/bugfix/mantis-3144
...
Fix Mantis #3144 .
2015-08-27 11:46:12 +02:00
MageKing17
ddace0c233
Add clarifying comment per m!m's note on GitHub.
2015-08-27 02:43:18 -07:00
m!m
7a38519a83
Merge pull request #302 from niffiwan/coverity+travis
...
Integrate Coverity with Travis CI
2015-08-27 10:49:12 +02:00
Goober5000
05d4e44c97
mjn.mixael's request for per-mission briefing backgrounds; see http://www.hard-light.net/forums/index.php?topic=90337.0
2015-08-27 01:22:14 -04:00
MageKing17
d4d6ab3fd7
Fix Mantis #3144 .
...
Stops stripping newlines from ship descriptions, and resizes the text width according to Yarn's findings.
2015-08-26 20:36:43 -07:00
niffiwan
3754bfbfdf
Merge branch 'master' into coverity+travis
...
Conflicts:
.travis.yml
2015-08-27 12:40:33 +10:00
MageKing17
3a5f7143a2
Merge pull request #321 from Goober5000/subsystem_mprintf_fix
...
the model filename is useful to have in the debug message
2015-08-24 10:15:47 -07:00
Goober5000
b2215ddf7d
the model filename is useful to have in the debug message
2015-08-24 12:59:15 -04:00
asarium
73e6f1fc07
Fix gcc/clang compilation warnings
2015-08-24 12:20:50 +02:00
asarium
e08ba026f8
Merge branch 'master' into antipodes_/sync
...
Conflicts:
.travis.yml
code/cmdline/cmdline.cpp
code/fs2netd/fs2netd_client.cpp
code/fs2netd/tcp_client.cpp
code/globalincs/pstypes.h
code/graphics/2d.cpp
code/graphics/2d.h
code/parse/lua.cpp
code/parse/scripting.cpp
code/windows_stub/stubs.cpp
configure.ac
projects/MSVC_2012/Freespace2.vcxproj
projects/MSVC_2012/code.vcxproj
projects/MSVC_2013/code.vcxproj
projects/MSVC_2015/code.vcxproj
2015-08-24 12:10:16 +02:00
z64555
b51e8c00de
simplify joystick_read_raw_axis()
2015-08-24 03:07:42 -05:00
z64555
23b2bf5d84
Instate usage of consts instead of magic numbers
2015-08-24 03:05:10 -05:00
m!m
50feb3ed08
Merge pull request #315 from niffiwan/eff_streaming_is_done
...
Remove obsolete comments
2015-08-23 12:31:44 +02:00
niffiwan
a6f2cc5937
Remove obsolete comments
...
EFF streaming was implemented in 48e0517e (svn r9109)
2015-08-23 20:26:01 +10:00
niffiwan
545287cebf
Merge pull request #307 from asarium/ci/macosx
...
Add CI support for MacOSX
2015-08-23 19:52:15 +10:00
m!m
84a315d1db
Merge pull request #8 from niffiwan/asarium-ci_macosx
...
We need sudo; force it on
2015-08-23 10:11:43 +02:00
niffiwan
00c3733670
Merge pull request #313 from MageKing17/bugfix/fred-ship-loadout-invalid-memory
...
Replaces a reference to MAX_SHIP_CLASSES with Ship_info.size().
2015-08-23 14:10:00 +10:00
niffiwan
7fdfdc6134
We need sudo; force it on
2015-08-23 13:53:13 +10:00
MageKing17
6a69b02bbb
Replaces a reference to MAX_SHIP_CLASSES with Ship_info.size().
...
This would cause FRED to treat essentially unspecified pieces of memory as ship classes and then see if this nonsense class had the SIF_DEFAULT_PLAYER_SHIP flag set... and if so, put it in the default list of available ships. With a debug build (where the memory past the end of Ship_info is all identical for quite a ways), this could result in the default, empty mission saving as 60 megabytes.
2015-08-22 18:33:22 -07:00
Goober5000
886deddf99
Merge pull request #306 from MageKing17/bugfix/call-ssm-strike-warning
...
Fixes call-ssm-strike resulting in a Warning about a null vec3d.
2015-08-22 18:36:14 -04:00
MageKing17
360a55be63
Merge pull request #312 from MageKing17/bugfix/on-turret-fired-swarm-fix
...
Fix null pointer dereference with swarm turrets and "$On Turret Fired:".
2015-08-22 15:12:30 -07:00
MageKing17
91d25a8744
Fix null pointer dereference with swarm turrets and "$On Turret Fired:".
...
Forgot to set last_fired_turret and its last_fired_weapon_info_index, causing CHA_ONTURRETFIRED to crash as soon as a swarm turret fired.
Oops.
2015-08-22 14:29:27 -07:00
MageKing17
c990f44f82
Merge pull request #310 from ln-zookeeper/fotg_to_master
...
Supplement +Disable with +Disable: <bool>, to allow the table to enab…
2015-08-22 12:32:58 -07:00
Lari Nieminen
0d8f6f26ce
Supplement +Disable with +Disable: <bool>, to allow the table to enable binds disabled by default
2015-08-22 22:18:07 +03:00
MageKing17
55b857f269
Merge pull request #260 from ln-zookeeper/fotg_to_master
...
Whitespace and commenting tweaks
2015-08-22 11:58:19 -07:00
Lari Nieminen
00fa839d1d
Added a few comments and fixed typos in some others
2015-08-22 21:55:37 +03:00
Goober5000
ef3bb65d63
Merge pull request #305 from MageKing17/bugfix/fred-glowpoint-init
...
Makes FRED call glowpoint_init().
2015-08-22 14:17:26 -04:00
m!m
56ab9e02c8
Merge pull request #304 from MageKing17/bugfix/parselo-char-fix
...
Makes vsprintf() stop chopping off the last character. Fixes issue #298 .
2015-08-22 19:21:30 +02:00
MageKing17
cbcb053fbc
Merge pull request #309 from asarium/fix/drawSubsystem
...
Fix gr.drawSubsystemTargetingBrackets
2015-08-22 10:16:07 -07:00
asarium
b76bccb9ef
Actually set the bounds of the drawn subsystem
2015-08-22 17:16:42 +02:00
Axem
a535d66fc8
Prelim work
2015-08-22 08:36:58 -05:00
m!m
be4cac366b
Merge pull request #308 from niffiwan/gcc-warn
...
Fix gcc warning in ship/ship.cpp
2015-08-22 13:06:56 +02:00
m!m
a691e81e14
Merge pull request #303 from MageKing17/bugfix/lua-null-pointer-checks
...
Add null pointer checks throughout lua.cpp.
2015-08-22 13:06:23 +02:00
asarium
07fcd05fff
Add CI support for MacOSX
...
Requires enabling the multi-os feature of travis CI
2015-08-22 12:59:49 +02:00
niffiwan
9737994de5
Fix gcc warning in ship/ship.cpp
...
Use SIZE_T_ARG in Warning
2015-08-22 20:45:45 +10:00
MageKing17
fe1db37902
Makes FRED call glowpoint_init().
...
Avoids a constant stream of warnings when using "$Glowpoint overrides:".
2015-08-22 03:40:27 -07:00
MageKing17
238dbc5749
Makes vsprintf() stop chopping off the last character. Fixes issue #298 .
...
Also fixes saving missions in FRED, since it uses the same function.
2015-08-22 03:38:16 -07:00
MageKing17
cd3b543e56
Add null pointer checks throughout lua.cpp.
...
Previously, the "this != NULL" checks in the isValid() methods were covering most of these cases, but they were removed as part of PR #274 because clang was generating warnings because calling a method on a null pointer is undefined behavior (so the condition *should* be tautological). This performs the checks outside of isValid(), which should avoid (at least this variety of) undefined behavior while fixing the crashes that dereferencing null pointers was causing.
2015-08-22 03:36:26 -07:00
niffiwan
b3c1441d06
Integrate Coverity with Travis CI
...
This should let Coverity run a scan via Travis whenever commits
are pushed to the "coverity_scan" branch.
Some hackery is required to avoid submitting too many builds to
Coverity. See travis-ci/travis-ci#1975 for details.
2015-08-22 18:39:55 +10:00
MageKing17
fb8ffcacfd
Fixes call-ssm-strike resulting in a Warning about a null vec3d.
...
ssm_create() subtracts the start coordinates from the position of the target, and then normalizes that. Since call-ssm-strike was using the position of the target as the start coordinates, this was obviously resulting in normalizing a null vec3d, generating the spurious warning. This just makes call-ssm-strike use a point immediately behind the target's position (using the target's orientation) as the starting coordinate, thereby avoiding the warning.
2015-08-21 21:12:03 -07:00
niffiwan
0061718de4
Merge pull request #301 from MageKing17/bugfix/check-sexp-syntax
...
Fix check_sexp_syntax() so it works properly with OPF_SSM_CLASS.
2015-08-22 13:57:59 +10:00
MageKing17
d7ff43a1d1
Fix check_sexp_syntax() so it works properly with OPF_SSM_CLASS.
...
Also makes OP_BEAM_FLOATING_FIRE grab the correct ship_index for the subsystem check.
2015-08-21 13:41:45 -07:00
MageKing17
a748be2315
Merge pull request #300 from z64555/enhancement/nojoypoll
...
Removes joystick polling. Joy axes are now queried every frame.
2015-08-21 12:42:01 -07:00
z64555
f56f0c471d
Removes joystick polling. Joy axes are now queried every frame.
2015-08-21 14:32:07 -05:00
MageKing17
b610b9b246
Merge pull request #299 from niffiwan/bmp_overflow
...
Fix Coverity 1093366: Operands don't affect result
2015-08-21 09:47:02 -07:00
niffiwan
00a0b1bae7
Fix Coverity 1093366: Operands don't affect result
...
The previous check was always false, replace with something that should
safely detect uint overflow
2015-08-21 22:49:28 +10:00
Fabian Woltermann
509bd8c010
Merge pull request #294 from MageKing17/feature/beam-tagging-with-no-damage
...
Remove do_damage check before calling hit functions in beam collisions.
2015-08-21 09:32:29 +02:00
Fabian Woltermann
9afae0b64d
Merge pull request #287 from MageKing17/feature/on-turret-fired-for-all
...
Add CHA_ONTURRETFIRED support to beam and swarm turrets.
2015-08-21 09:31:32 +02:00
Cliff Gordon
0a2b97c3bc
Merge pull request #41 from MageKing17/ship_info
...
Ship_info vectorization, ship templates.
2015-08-20 21:51:18 -05:00
MageKing17
52a2ac542e
Merge pull request #296 from asarium/fix/vsprintf
...
Fix SCP_string version of vsprintf
2015-08-20 19:47:47 -07:00
Cliff Gordon
9bc635e098
Merge pull request #288 from MageKing17/feature/glide-decay-ai-profile-flag
...
Makes glide decay work even when not thrusting.
2015-08-20 21:46:42 -05:00
Cliff Gordon
f824df070b
Merge pull request #290 from MageKing17/cleanup/move-voice-recognition-grammar-files
...
Move the temporary grammar files into the build directory.
2015-08-20 21:34:10 -05:00
z64555
afe2f2dac6
Merge pull request #297 from MageKing17/bugfix/mantis-2436
...
Fix Mantis #2436 . Does the mouse mapping within player_control_read_stick vs. trying to remap later on.
2015-08-20 16:57:54 -05:00
MageKing17
72af3059e9
Fix Mantis #2436 .
...
Instead of the mouse's axes being automatically bound to heading/pitch/throttle, it finds what the axes are bound to (by looking through Axis_map_to[]) and modifies the corresponding values.
2015-08-20 14:53:01 -07:00
asarium
51832fd563
Fix SCP_string version of vsprintf
...
The previous version didn't use the c-library which would cause incompatibilities with formats that assume all format specified to be supported.
2015-08-20 22:52:49 +02:00
MageKing17
059af731a7
Merge pull request #295 from ln-zookeeper/master
...
Revert "Fixes Mantis #2436 : Mouse controls ignore the axis binds." du…
2015-08-20 13:50:01 -07:00
Lari Nieminen
b4c625c51a
Revert "Fixes Mantis #2436 : Mouse controls ignore the axis binds." due to the joystick axis problems it caused
...
This reverts commit da71e629b4 .
2015-08-20 22:07:56 +03:00
z64555
882bb85232
forgot to shift the value from sdl
2015-08-20 08:17:16 -05:00
z64555
a82784756c
Enables asychronous joystick polling
2015-08-20 07:24:40 -05:00
MageKing17
27d85189ea
Remove do_damage check before calling hit functions in beam collisions.
...
This should allow 0-damage beams to be used to apply TAG effects.
2015-08-19 22:17:05 -07:00
MageKing17
b296300365
Simplify some references to Weapon_info[b->weapon_info_index].
...
These were all referenced when there was already a weapon_info pointer to that element; it makes more sense to use that pointer instead of re-indexing Weapon_info[].
2015-08-19 22:15:23 -07:00
MageKing17
a5bff0c192
Merge pull request #293 from chief1983/fix/292_warnings_part_b
...
Fix/292 warnings part b
2015-08-19 16:47:17 -07:00
MageKing17
20279838bf
Move the temporary grammar files into the build directory.
...
These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include.
I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard.
2015-08-19 16:33:13 -07:00
Cliff Gordon
f0c4bf2e3a
[fix/292_warnings_part_b] Cast Frametime (of type fix) to int for printf specifier to avoid a warning.
2015-08-19 17:01:07 -05:00
Cliff Gordon
38e48bec16
[fix/292_warnings_part_b] Remove deprecated register type hint.
2015-08-19 17:01:07 -05:00
MageKing17
e5b7d48989
Add a couple more static_cast<int>()s to get rid of warnings.
2015-08-19 14:52:15 -07:00
Cliff Gordon
6850ac6fe0
Merge pull request #291 from asarium/fix/ssm-warnings
...
Fix warning introduced by #289
2015-08-19 16:05:42 -05:00
asarium
0c80c8d8c0
Fix warning introduced by #289
2015-08-19 22:34:08 +02:00
MageKing17
64c9b272e7
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/pilotfile/pilotfile.cpp
2015-08-19 11:53:25 -07:00
m!m
42ddd2fe5f
Merge pull request #289 from MageKing17/feature/variable-ssm-strikes
...
Allow SSM(/SSB) strikes to be more variable.
2015-08-19 20:39:29 +02:00
MageKing17
692c86c8e6
Allow SSM(/SSB) strikes to be more variable.
...
Allows specifying a min/max for count, radius, and/or offset. To make them variable, instead of e.g. "+Count:", specify "+Min Count:", which adds a requirement for "+Max Count:". Each time the strike is activated, it will pick a different random count, and each projectile in the strike will have a different random radius and offset.
2015-08-19 11:36:50 -07:00
MageKing17
ba2fe6603c
Merge pull request #274 from asarium/fix/printf
...
Fix remaining gcc/clang warnings
2015-08-19 10:37:13 -07:00
asarium
71d3139d14
Remove commented line
2015-08-19 11:26:32 +02:00
asarium
8d564da80c
Fix for loop
2015-08-19 11:26:32 +02:00
asarium
e037b08e2e
Add doxygen documentation for format macros
2015-08-19 11:26:32 +02:00
asarium
1d65102292
Fix alignment in tcp_client.cpp
2015-08-19 11:26:32 +02:00
asarium
3a69db26eb
Fix unneded checks for this != nullptr in lua.cpp
2015-08-19 11:26:31 +02:00
asarium
e075241e54
Fix unneded check for this != nullptr in object.h
2015-08-19 11:26:31 +02:00
asarium
191194dfa7
Remove part of condition that is always true
...
Fixes a clang compiler warning
2015-08-19 11:26:31 +02:00
asarium
733b020bf5
Fix unneded check for this != nullptr in wmcgui.h
2015-08-19 11:26:31 +02:00
asarium
9ec178f116
Use the right version of abs
2015-08-19 11:26:31 +02:00
asarium
fb068f6037
Fix invalid pointer comparision warning
...
This should match what the code is actually supposed to do
2015-08-19 11:26:31 +02:00
asarium
bb6045d762
Check if the compiler supports the -Wno-unused-but-set-variable flag
2015-08-19 11:26:31 +02:00
asarium
e8bb02bed3
Disable a few warnings in release mode
...
These will happen if debug builds use variables for debug checks
2015-08-19 11:26:31 +02:00
asarium
a6e93c7d46
Fix another braces warning
2015-08-19 11:26:30 +02:00
asarium
1cd7744d34
Fix "operator '?:' has lower precedence" warning
...
I think the ?: expression was meant to take precedence
2015-08-19 11:26:30 +02:00
asarium
fc3166ac52
Fix suggest braces around initialization of subobject warning
2015-08-19 11:26:30 +02:00
asarium
3826e24da2
Fix format warning in stubs.cpp
2015-08-19 11:26:30 +02:00
asarium
3ece769330
Fix format warnings in weapons.cpp
2015-08-19 11:26:30 +02:00
asarium
6ac1326dc8
Fix format warning in species_defs.cpp
2015-08-19 11:26:30 +02:00
asarium
03b26baf55
Fix format warning in ds.cpp
2015-08-19 11:26:30 +02:00
asarium
4b25b49432
Fix format warning in plr.cpp
2015-08-19 11:26:30 +02:00
asarium
721422f951
Fix format warning in pilotfile.cpp
...
Also fixes a logic error in the code (I think...)
2015-08-19 11:26:29 +02:00
asarium
509d11c29d
Fix format warning in csg.cpp
2015-08-19 11:26:29 +02:00
asarium
eb765b0c99
Fir format warnings in parselo.cpp
2015-08-19 11:26:29 +02:00
asarium
3d06468e2a
Fix format warnings in lua.cpp
2015-08-19 11:26:29 +02:00
asarium
1de9ad1ace
Fix format warnings in object.cpp
2015-08-19 11:26:29 +02:00
asarium
559198a2e4
Fix format warning in collideshipweapon.cpp
2015-08-19 11:26:29 +02:00
asarium
6b093f2ee9
Fix set but unused variable warning in multiutil.cpp
2015-08-19 11:26:29 +02:00
asarium
280ceabb45
Fix format warning in multi_options.cpp
2015-08-19 11:26:28 +02:00
asarium
ff51e79531
Fix set but unused variable warning in chat_api.cpp
2015-08-19 11:26:28 +02:00
asarium
9cbf944dee
Fix format warning in modelread.cpp
2015-08-19 11:26:28 +02:00
asarium
1ded65c3d0
Fix invalid usage of mprintf
2015-08-19 11:26:28 +02:00
asarium
c26bd197dc
Fix format warning in mainhallmenu.cpp
2015-08-19 11:26:28 +02:00
asarium
32b35ba62c
Fix format warnings in credits.cpp
2015-08-19 11:26:28 +02:00
asarium
8d5273b3c0
Fix set but unused variable warning in vecmat.cpp
...
I kept the code in comments as it may be usedful at some point.
2015-08-19 11:26:28 +02:00
asarium
6a5e660ff3
Fix format warnings in lighting.cpp
2015-08-19 11:26:28 +02:00
asarium
aaf470f49b
Fix format warning in keycontrol.cpp
2015-08-19 11:26:28 +02:00
asarium
077dc61660
Fix format warnings in hudshield.cpp
2015-08-19 11:26:27 +02:00
asarium
116df2e2c3
Fix set but unused variable warning in grstub.cpp
2015-08-19 11:26:27 +02:00
asarium
4670d5f87f
Fix set but unused variable warning in gropengltnl.cpp
2015-08-19 11:26:27 +02:00
asarium
f986d28c56
Fix format warnings in safe_string.h
2015-08-19 11:26:27 +02:00
asarium
dba0e8b458
Fix format warnings in gamesnd.cpp
2015-08-19 11:26:27 +02:00
asarium
cf68c5970e
Fix unused but set variable warnings in tcp_client.cpp
2015-08-19 11:26:27 +02:00
asarium
fc140194d3
Fix set but unused variable warning in ddsutils.cpp
2015-08-19 11:26:27 +02:00
asarium
a0b040c597
Fix unused but set variable error
...
I removed some function calls but all of them didn't have any side effects so it should be fine.
2015-08-19 11:26:27 +02:00
asarium
89e63d60b8
Fix warnings in decoder16.cpp
2015-08-19 11:26:26 +02:00
asarium
24a0b05b39
Fix unused but defined variable warning in controlsconfig.cpp
...
It's weird that shift and alt aren't used in this function but I couldn't find any reference to that in the structure for the controls config.
2015-08-19 11:26:26 +02:00
asarium
89f6794a13
Fix C++11 warning in aicode.cpp
2015-08-19 11:26:26 +02:00
asarium
f625df5c38
Fix format warning in aicode.cpp
2015-08-19 11:26:26 +02:00
asarium
37eadf4d16
Disable unreferenced function warning
2015-08-19 11:26:26 +02:00
asarium
a232a646dc
Fix size_t format warnings
2015-08-19 11:26:26 +02:00
asarium
40c81134ac
Fix "format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long int’" warning
2015-08-19 11:26:26 +02:00
asarium
a63e1a2ba1
Fix invalid usage of mprintf
2015-08-19 11:26:26 +02:00
asarium
f00af4d89f
Fix "declaration of ‘i’ shadows a previous local" warning
2015-08-19 11:26:25 +02:00
asarium
c697dcb926
Fix "comparison between signed and unsigned integer expressions" warning
2015-08-19 11:26:25 +02:00
asarium
29afbe8ef5
Use new macro for size_t printf arguments
2015-08-19 11:26:25 +02:00
asarium
6f01adfb2e
Add portable format macros for size_t and ptrdiff_t
2015-08-19 11:26:25 +02:00
asarium
6a578b3fcd
Fix non-sensical comparision
...
std::string::find_* returns std::string::npos if the token couldn't be found.
2015-08-19 11:26:25 +02:00
MageKing17
048d65d3ca
Makes glide decay work even when not thrusting.
...
For any mods that might want to keep the old behavior, adds "$glide decay requires thrust:" AI profile flag.
2015-08-19 00:50:18 -07:00
MageKing17
e94511b7aa
Add CHA_ONTURRETFIRED support to beam and swarm turrets.
2015-08-19 00:06:11 -07:00
Fabian Woltermann
8b4f7dde77
Merge pull request #277 from MageKing17/bugfix/infinite-trigger-count
...
Fix infinite trigger count not interacting correctly with "+Interval:"
2015-08-19 08:33:12 +02:00
MageKing17
990411fd0b
Merge pull request #286 from Goober5000/woutersmits_fix
...
fix an obscure edge-case sexp crash
2015-08-18 23:30:26 -07:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
Goober5000
17851dcc56
fix an obscure edge-case sexp crash
...
This bug was found by, of all people, woutersmits, while FREDding his happynewyear campaign. See http://www.hard-light.net/forums/index.php?topic=90069.0 for discussion. The crash was triggered by the use of ( validate-all-arguments ) as the entire sexp tree for one of his mission events.
This was a two-part fix. The first part was to ensure that every *-argument sexp (of which validate-all-arguments is but one) is actually used within a when-argument or every-time-argument tree. More specifically, every sexp operation that expects an argument handler should first check that the arg_handler node actually exists.
The second part was to partially revert one of Taylor's old commits:
Revision: 3644
Author: taylor
Date: Tuesday, October 24, 2006 9:17:24 AM
Message:
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
----
Modified : /branches/fs2_open_3_6_9/fs2_open/code/parse/sexp.cpp
This was intended to prevent a -1 array reference into Sexp_nodes[]. What Taylor did was to cause repeated calls of the parent_operator function to loop endlessly at the topmost parent. But there are certain edge cases (such as the one woutersmits discovered) where you need to know whether a parent is the topmost one. What Taylor should have done, and what this change does, is to keep the -1 as a valid return value but check for it in the places where it may cause an issue.
2015-08-18 21:32:14 -04:00
MageKing17
062929b8bd
Merge pull request #284 from Goober5000/sexp_assertions
...
various assertions to improve the sexp code
2015-08-18 17:56:39 -07:00
Goober5000
efce7de00d
fix syntax error, add node reference
2015-08-18 19:58:34 -04:00
Goober5000
2b032a1dbc
tweaks per MageKing17's suggestions
2015-08-18 13:27:57 -04:00
m!m
c8053d06b7
Merge pull request #285 from MageKing17/cleanup/hook-variable-removal
...
Cleanup hook variable removal
2015-08-18 17:52:10 +02:00
MageKing17
ce3755b333
Further hook variables cleanup.
...
Consolidated a few sequential calls, corrected a few instances of "ObjectB" being removed when "Object" was set, and removed a couple instances of hook variables that weren't set being removed.
2015-08-18 08:11:11 -07:00
MageKing17
313787effb
Add RemHookVars() calls to aiturret.cpp, object.cpp, and ship.cpp.
...
CHA_ONTURRETFIRED wasn't clearing its hook variables. Neither was CHA_ONWPEQUIPPED or CHA_ONWPFIRED, CHA_PRIMARYFIRE, CHA_SECONDARYFIRE, CHA_ONWPSELECTED, or CHA_ONWPDESELECTED.
2015-08-18 07:58:03 -07:00
m!m
2011e86096
Merge pull request #280 from Echelon9/antipodes
...
Fix antipodes on OS X
2015-08-18 15:55:52 +02:00
Echelon9
a3df507f8a
Remove extraneous Apple-specific code to set working directory (no longer effective).
2015-08-18 23:53:26 +10:00
Echelon9
6c153a9ff8
Establish a current working directory on OS X, which is not otherwise set when run via Finder
2015-08-18 23:49:12 +10:00
niffiwan
578083367d
Merge pull request #283 from Goober5000/comment-fix
...
* remove an incorrect comment (the *= multiplies the variable by the …
2015-08-18 18:34:59 +10:00
Goober5000
e1d3838b2e
various assertions to improve the sexp code
2015-08-18 01:00:43 -04:00
Goober5000
1bf6f822ae
* remove an incorrect comment (the *= multiplies the variable by the entire RHS; it doesn't multiply and then add)
2015-08-18 00:35:51 -04:00
Fabian Woltermann
0ce1f10fee
Merge pull request #279 from asarium/antipodes
...
Sync Antipodes
2015-08-16 22:08:51 +02:00
m!m
081eba90e5
Merge pull request #281 from Echelon9/fix/doc-cfile-init
...
Document cfile_init() function.
2015-08-16 18:15:48 +02:00
Echelon9
9487688edb
Document cfile_init() function.
2015-08-17 01:41:37 +10:00
Echelon9
6c843519a2
Fully address the OS X -psn_* command line issue.
2015-08-17 00:07:49 +10:00
asarium
b0acb49fba
Add format string macros
2015-08-15 17:10:43 +02:00
asarium
84279530d7
Merge branch 'master' into antipodes
...
Conflicts:
code/globalincs/pstypes.h
code/globalincs/windebug.cpp
code/windows_stub/stubs.cpp
projects/MSVC_2015/Freespace2.vcxproj
projects/MSVC_2015/code.vcxproj
2015-08-15 16:41:34 +02:00
m!m
2240e17413
Merge pull request #278 from Echelon9/fix/doxygen
...
Fix doxygen documentation
2015-08-15 13:29:03 +02:00
Echelon9
bd0fb590ca
Fix incorrect Doxygen comment for bm_lock().
2015-08-15 13:56:54 +10:00
Echelon9
420558d623
Fix incorrect Doxygen comment, there is no type @ret.
2015-08-15 13:55:05 +10:00
Echelon9
6061df4e65
Fix incorrect Doxygen comment for dc_draw_cursor().
2015-08-15 13:53:23 +10:00
Echelon9
830e523408
Fix incorrect Doxygen comment for opengl_shader_link_object() and keep line lengths below recommended 80 characters.
2015-08-15 13:51:23 +10:00
Echelon9
a21dd67d85
Fix incorrect Doxygen comment for opengl_shader_create() and keep line lengths below recommended 80 characters.
2015-08-15 13:49:20 +10:00
Echelon9
0319816539
Fix incorrect Doxygen comment for hud_anim_render().
2015-08-15 13:46:53 +10:00
Echelon9
9bccc64705
Fix incorrect Doxygen comment for free_object_slots().
2015-08-15 13:45:20 +10:00
m!m
81fe1e3952
Merge pull request #276 from MageKing17/bugfix/beam-create-with-coords
...
Fix beam-create with targeting coordinates instead of a ship/subsystem.
2015-08-14 21:27:32 +02:00
MageKing17
488a0f1da2
Fix infinite trigger count not interacting correctly with "+Interval:"
...
There's an undocumented feature whereby negative trigger counts are treated as infinite. However, since it doesn't use the bump_timestamp system of positive trigger counts, it'll behave more like an infinite repeat count (e.g. with "+Interval: 5" it will only check every 5 seconds instead of becoming active again after 5 seconds have passed). This just makes negative values set bump_timestamp and excludes them from resetting the timestamp if the event didn't trigger that frame (checking MEF_USING_TRIGGER_COUNT so that the other behavior is still possible if you set a negative repeat_count and don't specify a trigger_count).
2015-08-14 11:24:47 -07:00
MageKing17
d0cde03a69
Fix beam-create with targeting coordinates instead of a ship/subsystem.
...
If the subsystem was <none>, sexp_beam_floating_fire() wasn't consuming the node, resulting in it also being parsed as the X coordinate (making it always zero, because atoi("<none>") == 0).
2015-08-14 11:20:33 -07:00
Fabian Woltermann
76f67edb36
Merge pull request #275 from MageKing17/bugfix/actually-call-beam-create
...
Make beam-create actually call sexp_beam_floating_fire().
2015-08-14 19:51:29 +02:00
MageKing17
cbeb03b2d5
Make beam-create actually call sexp_beam_floating_fire().
...
Somehow, this got missed during the creation of the pull request, and I guess nobody (not even me) actually tried using it since then.
2015-08-14 10:32:27 -07:00
MageKing17
ef34e5e39e
Merge pull request #272 from MageKing17/bugfix/actually-fix-cargo-size-check
...
Actually fix the `cargo_size` check for turrets.
2015-08-13 18:08:29 -07:00
MageKing17
7b15fe0786
Do a couple more MAX_SHIP_*_BANKS to num_*_banks replacements.
2015-08-13 15:03:31 -07:00
MageKing17
fada4f514e
Make primary weapon cargo_size check first check the WIF2_BALLISTIC flag.
2015-08-13 03:59:52 -07:00
Fabian Woltermann
64f046c388
Merge pull request #273 from MageKing17/bugfix/ammo-sexp-multi-fix
...
Fix writing to undefined memory in multiplayer SEXP code for turret a…
2015-08-13 07:32:14 +02:00
MageKing17
d74d09554e
Fix writing to undefined memory in multiplayer SEXP code for turret ammo.
...
`multi_sexp_set_turret_primary_ammo()` and `multi_sexp_set_turret_secondary_ammo()` were using an uninitialized pointer instead of an uninitialized array, like every other instance of multi_get_string(). This is just begging to write to invalid memory.
2015-08-12 22:02:29 -07:00
MageKing17
d07673cbe1
Actually fix the cargo_size check for turrets.
...
So it turns out it actually was the secondary code triggering the Assertion, because `ship_system->weapons.secondary_bank_weapons[]` was full of 0s. Subach HL-7 is weapon type 0, and obviously doesn't have a `cargo_size`. I see no reason to iterate through `MAX_SHIP_PRIMARY_BANKS`/`MAX_SHIP_SECONDARY_BANKS` if there aren't that many banks being used anyway.
2015-08-12 21:18:37 -07:00
MageKing17
1684b7f85e
Make a few more changes to ship_info based on m!m's notes.
...
Copy constructor and copy-assignment are made private and unimplemented (may cause problems on VS 2010/2013? I have a vague memory of something similar needing to be removed for 2010 to work; we could always wrap 'em in an _MSC_VER check, of course). Speaking of an _MSC_VER check, adds a define for `NOEXCEPT` to `noexcept`, but only if we're not using a version of Visual Studio prior to 2015 (when `noexcept` support was added). It *should* allow the move constructor for ship_info to be used whenever the vector resizes both pre- and post-VS 2015 (and on non-MS compilers), but it could use some testing. ship_info::clone() made public (and used for ship templates instead of copy-assignment), and ship_info::move() now takes a ship_info&& object (and move-assignment/constructor use std::move() to keep it an rvalue).
2015-08-12 20:52:56 -07:00
MageKing17
4fb6f3d459
Changing a Ship_info.size() to !Ship_info.empty() as pointed out by m!m.
2015-08-12 14:39:42 -07:00
MageKing17
439ea76475
Adding static_cast<int>() to locations pointed out by m!m.
2015-08-12 14:39:12 -07:00
MageKing17
529fd197d8
Revert unintended missiongoals.cpp changes from vectorization commit.
...
I may make a separate pull request for this at some point, but it definitely doesn't belong here.
2015-08-12 14:23:36 -07:00
MageKing17
389a1a1a3d
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-08-12 14:10:10 -07:00
m!m
b3aec16833
Merge pull request #271 from MageKing17/bugfix/fix-primary-cargo-size-check
...
Fix cargo size check for primary weapons I screwed up in PR 269.
2015-08-12 23:07:37 +02:00
MageKing17
28d04bfee4
Fix cargo size check for primary weapons I screwed up in PR 269.
...
Should've checked more than just that FRED was working... d'oh.
2015-08-12 14:03:33 -07:00
MageKing17
6985b198ec
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-12 13:25:34 -07:00
MageKing17
1aa7af5167
Merge pull request #263 from Echelon9/fix/printf-issues
...
Resolve numerous format string issues
2015-08-12 13:05:17 -07:00
MageKing17
d953b2e668
Fix the Num_ship_classes reference added by PR #269 to Ship_info.size().
2015-08-11 14:42:21 -07:00
MageKing17
4fc84e61c6
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-11 14:27:48 -07:00
MageKing17
92a5839bb1
Merge pull request #270 from DahBlount/Turret_Ammo_Fix
...
Turret Ammo Fix: Default Bank and Ammo Removal location
2015-08-11 14:20:10 -07:00
MageKing17
b15dfcb906
Merge pull request #269 from MageKing17/bugfix/turret-ammo-FRED-support
...
Hopefully fix FRED and turret ammo.
2015-08-11 14:15:55 -07:00
MageKing17
cd5824073c
Fix another copy-paste error, this time in the assertions.
2015-08-10 10:05:44 -07:00
MageKing17
36f7ac9ee3
Fix another copy-paste error.
...
Well, two copy-paste errors.
2015-08-09 18:12:09 -07:00
DahBlount
5c3d7b0f64
Turret bank fix and ammo removal
...
A turret's current_primary_bank/current_secondary_bank is always
initialized to -1, this is set to 0 if it is still -1 when a turret
tries to fire. Ammo removal for swarm and corkscrew weapons is now done
using a single flag check instead of the original two.
2015-08-09 19:29:16 -05:00
MageKing17
51be6aee77
Fix copy-paste error.
...
Whoops!
2015-08-09 17:21:22 -07:00
MageKing17
d59ee5953d
Make subsys_set() use cargo_size for ammo.
2015-08-09 17:13:19 -07:00
MageKing17
3b43614ae9
Hopefully fix FRED and turret ammo.
...
Adds a get_max_ammo_count_for_turret_bank() function that the weapon editor can use for turrets instead of trying to hack the behavior into get_max_ammo_count_for_bank somehow. Adjusts weaponeditordlg.cpp to use it, and also fixes missionparse.cpp so that ammo values get correctly converted from a percentage to the number of actual missiles (but only when FRED isn't running).
2015-08-09 16:53:50 -07:00
Echelon9
930f386064
Generalise warning string if we can't provide callback operator information.
2015-08-08 18:10:26 +10:00
m!m
4a154e630f
Merge pull request #267 from DahBlount/Turret-ammo-sexp-desc
...
Fix Turret Ammo Setter SEXP Descriptions
2015-08-07 18:05:10 +02:00
DahBlount
5412f16352
Fix the descriptions of the turret ammo setter sexps
...
The setter Sexps incorrectly had the same descriptions as the getter
sexps.
2015-08-07 09:02:43 -07:00
Echelon9
efc4d62bd0
Change s/Error code/Error message/ in GUISystem::ParseClassInfo()
2015-08-06 17:56:53 +10:00
Echelon9
8160cd40dc
Change s/Error code/Error message/ in parse_glowpoint_table()
2015-08-06 17:54:41 +10:00
Fabian Woltermann
3f4861271b
Merge pull request #264 from MageKing17/update/2015-project-files
...
Update the VS 2015 project files.
2015-08-06 09:34:39 +02:00
MageKing17
1ffe2629cf
Add collision_lod and auto_shield_spread_mid_span to clone() and move().
2015-08-06 00:28:04 -07:00
MageKing17
dc80ae0c9a
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-06 00:25:42 -07:00
MageKing17
87ce8a47fc
Update the VS 2015 project files.
...
These are basically just the 2013 project files updated to use the v140_xp toolset, but this gives the MSVC_2015 folder the same improvements that the MSVC_2013 folder got in commit 66bddb9 .
2015-08-06 00:13:41 -07:00
Echelon9
c15e7ec28c
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 21:07:05 +10:00
Echelon9
aee7ee6322
Fix: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘const char*’ [-Wformat=]
2015-08-05 20:57:21 +10:00
Echelon9
6dd45acb45
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:44:37 +10:00
Echelon9
3385a0a6a3
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:38:10 +10:00
Echelon9
8f9fd97902
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:29:41 +10:00
Echelon9
85c8c718bf
Fix missing format string specifier.
2015-08-05 20:20:15 +10:00
Echelon9
4f4449958b
Fix: warning: format ‘%s’ expects a matching ‘char*’ argument [-Wformat=]
2015-08-05 20:14:48 +10:00
Echelon9
cffdbe932f
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:12:41 +10:00
Echelon9
81fa44472d
Fix: warning: too many arguments for format [-Wformat-extra-args]
2015-08-05 20:08:02 +10:00
Echelon9
0388fb065c
Fix: warning: format ‘%s’ expects a matching ‘char*’ argument [-Wformat=]
2015-08-05 20:05:19 +10:00
Echelon9
4328134c82
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 20:00:07 +10:00
Echelon9
e1c38230af
Fix: warning: format not a string literal and no format arguments [-Wformat-security]
2015-08-05 19:59:09 +10:00
Echelon9
9f2a2dd4ed
Ensure sufficient format string specifiers.
2015-08-05 19:57:58 +10:00
Echelon9
13837b07f7
Ensure sufficient format string specifiers are present.
2015-08-05 19:55:03 +10:00
Echelon9
c4ce711171
Ensure sufficient format string specifiers are present.
2015-08-05 19:51:06 +10:00
Echelon9
d686d28053
Ensure sufficient format string specifier.
2015-08-05 19:48:58 +10:00
Echelon9
b260d92898
Fix too many variables for format string.
2015-08-05 19:45:42 +10:00
Echelon9
d14b8b9a79
Fix Error() with two few format string specifiers.
2015-08-05 19:44:21 +10:00
MageKing17
33cd9c6233
Merge pull request #262 from Echelon9/fix/issue261
...
Correct Warning() in parse_startbl
2015-08-05 01:28:39 -07:00
Echelon9
c829808dd7
Correct Warning() in parse_startbl
2015-08-05 16:48:49 +10:00
Fabian Woltermann
aed2b60bcf
Merge pull request #256 from Echelon9/fix/issue255
...
Resolve Coverity-reported incorrect for() loops.
2015-08-03 12:58:13 +02:00
Fabian Woltermann
5b91bee129
Merge pull request #259 from ln-zookeeper/fotg_to_master
...
Added $Collision LOD ship table property, for using a LOD for collisi…
2015-08-03 12:57:47 +02:00
Lari Nieminen
1bf86532fe
Added $Collision LOD ship table property, for using a LOD for collision detection
2015-08-03 13:20:14 +03:00
MageKing17
f5259eb6be
Merge pull request #258 from Echelon9/fix/issue257
...
Add correct argument to printf format string.
2015-08-03 02:22:35 -07:00
Echelon9
bdc90c007b
Ensure grammar works as a whole.
2015-08-03 19:04:10 +10:00
Echelon9
88ca967d3f
Improve the warning documentation associated with a faulty ship copy flag.
2015-08-03 19:03:17 +10:00
Echelon9
9ea2ae4299
Add correct argument to printf format string.
2015-08-03 18:01:13 +10:00
Echelon9
3b26eb85ae
Resolve Coverity-reported incorrect for() loops.
2015-08-02 20:02:44 +10:00
Fabian Woltermann
4aab4a969a
Merge pull request #249 from asarium/printf_checks
...
Add format specifying macros
2015-08-01 07:47:22 +02:00
m!m
0f2562a29c
Merge pull request #254 from The-E/better_assertions
...
Make this assertion in modelanim a bit more useful.
2015-07-31 22:43:36 +02:00
The E
0450ce7621
Make this assertion in modelanim a bit more useful.
2015-07-31 22:25:25 +02:00
Fabian Woltermann
44c4c7de76
Merge pull request #251 from DahBlount/turret_ammo
...
Turret Ammo Implementation
2015-07-31 11:45:01 +02:00
Fabian Woltermann
aff0328b4f
Merge pull request #253 from jg18/fix_openal_log
...
Log OpenAL info for selected device.
2015-07-31 11:44:11 +02:00
jg18
b50bd7586c
Log OpenAL info for selected device.
...
Fix the issue pointed out by Yarn where the OpenAL info for the default
device was being logged instead of the info for the selected
device. http://www.hard-light.net/forums/index.php?topic=90070.0 .
2015-07-30 15:27:36 -07:00
DahBlount
d973c9e147
Add cases for turret ammo setter multi_sexps
...
Can't believe I forgot this part. This just ensures the sexps actually
work.
2015-07-30 15:22:31 -05:00
DahBlount
9e3cb6baa3
Multi_SEXP Turret Ammo Functions
...
This adds multiplayer functionality to the Turret getter and setter
SEXPs.
2015-07-30 15:06:04 -05:00
DahBlount
0fd43dad75
Turret Ammo SEXPs
...
This adds getter and setter SEXPs for turret ammo.
"turret-get-primary-ammo"
"turret-get-secondary-ammo"
"turret-set-primary-ammo"
"turret-set-secondary-ammo"
I also forgot to make turrets that don't have the "use multiple guns"
flag set switch banks if their first bank is empty, so that has been
fixed as well.
2015-07-29 12:25:24 -05:00
DahBlount
688baa2bb6
Turret Ammo Implementation
...
This creates the foundation of turret ammo through the "turret use ammo" subsystem flag. Turret ammo works in the same manner as ship ammo, where the ammo is equal to bank capacity divided by the cargo size of the weapon. This was tested using the Blue Planet: War in Heaven mod.
Test case: UEFg Narayana turrets 19 through 21, all of which contain Apocalypse torpedos with a $Cargo Size: of 2.5, were changed to use ammo with a $SBank Capacity of 20, resulting in a total ammo capacity of 8 torpedos. The Narayana was ordered to attack a GTCv Diomedes; it fired 8 torpedos each from turrets 19 through 21 before stopping. The mission was left to proceed for an additional 2 minutes, in which time the Narayana did not fire any more torpedos. Note: The Apocalypse takes 20 seconds to fire each 4 torpedo burst.
Conclusion: Success
2015-07-28 12:32:08 -05:00
Cliff Gordon
1b3af6fea6
Merge pull request #245 from ln-zookeeper/fotg_to_master
...
Added a +Minimum Weapon Span auto spread shield option to control the…
2015-07-27 09:12:02 -05:00
Fabian Woltermann
1d46578f00
Merge pull request #250 from asarium/antipodes_/fix/mac_psn
...
Proposed fix for #248
2015-07-26 15:25:04 +02:00
asarium
9e4ab0342c
Proposed fix for #248
2015-07-26 14:23:13 +02:00
asarium
d93f2e9d26
Add format specifying macros
2015-07-26 14:08:31 +02:00
Lari Nieminen
cacad0ba70
Fixed possibility of +Minimum Weapon Span breaking with modular tables.
2015-07-25 01:14:03 +03:00
MageKing17
1b514de28e
Merge pull request #247 from chief1983/fix/cid_1204285_divide_by_zero
...
[fix/cid_1204285_divide_by_zero] Fix CID 1204285: Division by zero
2015-07-24 13:49:05 -07:00
Cliff Gordon
f47bbed3ef
[fix/cid_1204285_divide_by_zero] Fix CID 1204285: Division by zero in set_currentItem()
2015-07-24 11:59:02 -05:00
MageKing17
33d83fe4fe
Merge pull request #246 from ln-zookeeper/master
...
Fixed bug with ship-ship collisions incorrectly choosing which quadra…
2015-07-24 00:32:35 -07:00
Lari Nieminen
202a4077a4
Fixed bug with ship-ship collisions incorrectly flashing a shield quadrant on the light ship.
2015-07-24 10:08:59 +03:00
Lari Nieminen
7b2c992380
Added a +Minimum Weapon Span auto spread shield option to control the minimum distance weapons must have traveled before being allowed to hit the shield.
2015-07-21 21:59:31 +03:00
m!m
c7bf2395a5
Merge pull request #244 from chief1983/antipodes_/merge_ce69e71
...
Antipodes /merge ce69e71
2015-07-19 09:23:01 +02:00
Cliff Gordon (chief1983)
7314b0a65f
Merge remote-tracking branch 'origin/master' into antipodes
...
Conflicts:
projects/MSVC_2013/Fred2.vcxproj
2015-07-18 18:51:19 -05:00
Cliff Gordon
ce69e7179e
Merge pull request #243 from chief1983/fix/sse_fred_name
...
Fix the output Fred SSE target name.
2015-07-18 18:46:48 -05:00
Cliff Gordon (chief1983)
fc6765144d
Fix the output Fred SSE target name. Edited in VS2013 which fixed the file's line endings to CRLF.
2015-07-18 11:02:01 -05:00
Fabian Woltermann
ce22e3a0d4
Merge pull request #239 from PeterMitsis/math-refactoring
...
Math refactoring
2015-07-17 13:35:42 +02:00
Fabian Woltermann
be628af117
Merge pull request #223 from ln-zookeeper/master
...
Fixes Mantis #2436 : Mouse controls ignore the axis binds.
2015-07-17 13:16:58 +02:00
Fabian Woltermann
27774594f3
Merge pull request #238 from asarium/antipodes_/fixNULL
...
Don't compare NULL with integer
2015-07-16 20:55:47 +02:00
asarium
5a107d3834
From chief1983: Also fix errors in rtvoice.cpp
2015-07-16 20:24:36 +02:00
Cliff Gordon
f5e97b6fc3
Merge pull request #241 from chief1983/osx_sdl203
...
[osx_sdl203] Upgrade the SDL2 framework to the latest 2.0.3.
2015-07-15 15:15:07 -05:00
Cliff Gordon
2b36cc48c7
[osx_sdl203] Upgrade the SDL2 framework to the latest 2.0.3.
2015-07-15 14:01:47 -05:00
asarium
273af3afdf
Don't mix NULL and integers
2015-07-15 17:26:18 +02:00
Cliff Gordon
75f1a5ad5c
Merge pull request #240 from chief1983/fix/badmerge_configure
...
[fix/badmerge_configure] Fix a bad merge in configure.ac
2015-07-15 10:14:10 -05:00
Cliff Gordon
f3d15d9a38
[fix/badmerge_configure] Fix a bad merge in configure.ac that duplicated some text.
2015-07-15 09:23:53 -05:00
Peter Mitsis
83d00839ed
fvi: Refactor solution to quadratic formula
...
The classic solution to the quadratic equation ...
a*x*x + b*x + c = 0
is ...
-b +- sqrt(b*b - 4*ac)
x = ----------------------
2*a
This can be optimized by substituting b = 2*B.
-2*B +- sqrt((2*B)*(2*B) - 4*a*c)
x = ---------------------------------
2*a
This expands to ...
-2*B +- sqrt(4*B*B - 4*a*c)
x = ---------------------------
2*a
And simplifies to ...
-2*B +- 2*sqrt(B*B - 4*a*c)
x = ---------------------------
2*a
-B +- sqrt(B*B - a*c)
x = ---------------------
a
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:18:47 -04:00
Peter Mitsis
b72cf669b8
Refactor bez_fact()
...
Uses an array of precalculated factorials that are accessed as a lookup table
instead of computing the factorials at runtime. This cuts down on compiled
code bloat (compiler was both unrolling and inlining the computation's loop)
everywhere it was used.
NOTE: The original implementation returned an 'int'. As a result, the largest
uncorrupted factorial it could compute was 12!. For this reason, the lookup
table only goes up to 12!.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:08:19 -04:00
Peter Mitsis
9d3dd5c322
Refactor macros fl_radians() and fl_degrees()
...
Rejiggers the macros fl_radians() and fl_degrees() to avoid unnecessary
operations. The new placement of the parentheses permit the compiler to
evaluate (PI / 180.f) and (180.f / PI) at compile time rather than run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-15 09:08:19 -04:00
Fabian Woltermann
f3adfb6afc
Merge pull request #236 from chief1983/fix/osx_xcode
...
[fix/osx_xcode] Xcode can finally compile SDL Everywhere
2015-07-15 14:57:30 +02:00
Cliff Gordon
876af805bb
[fix/osx_xcode] Don't need joy-unix.cpp in OS X now, with joy-sdl.cpp doing its job.
2015-07-13 16:36:57 -05:00
Cliff Gordon
25bce65f5a
[fix/osx_xcode] Should have done this a year and a half ago: Remove the SDLMain.* files as they are not needed with SDL2.
2015-07-13 16:36:57 -05:00
Cliff Gordon
3022fc3385
Accidentally committed changes to version string.
2015-07-13 16:36:57 -05:00
Cliff Gordon
0a7e7e84c9
update xcode with recommended changes in version 6.4.
2015-07-13 16:36:57 -05:00
Cliff Gordon
fc45026140
Test fix.
2015-07-13 16:36:56 -05:00
Cliff Gordon
bfaf474c9e
Merge remote-tracking branch 'origin/master' into antipodes
2015-07-13 16:36:40 -05:00
Fabian Woltermann
5f39c386ef
Merge pull request #234 from Echelon9/fix/clean-build
...
Clean up GCC build warnings
2015-07-12 09:54:30 +02:00
Echelon9
3e8278d698
Fix: model/modelread.cpp: warning: variable ‘flags’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:47:25 +10:00
Echelon9
37cf848f51
Fix: model/modelrender.cpp:2898:9: warning: declaration of ‘view_pos’ shadows a previous local [-Wshadow]
2015-07-11 22:36:42 +10:00
Echelon9
95f615a894
Fix: bmpman/bmpman.cpp: warning: enumeration value ‘x’ not handled in switch [-Wswitch]
2015-07-11 22:30:12 +10:00
Echelon9
bae2d3116b
Fix: controlconfig/controlsconfig.cpp:2116:13: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-11 22:15:49 +10:00
Echelon9
542c794e72
Fix: object/collideshipship.cpp:1159:12: warning: variable ‘q’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:08:52 +10:00
Echelon9
d029b82d98
Fix: ai/aicode.cpp:11855:9: warning: variable ‘dist_to_f2’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:04:41 +10:00
Echelon9
ad8064ef81
Fix warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-11 21:58:07 +10:00
Echelon9
a4e12d135b
Fix: ai/aibig.cpp:1266:10: warning: variable ‘box_dist’ set but not used [-Wunused-but-set-variable]
2015-07-11 21:39:49 +10:00
Echelon9
053ae6d287
Fix: modelrender.h:86:7: warning: ‘model_render_params::Replacement_textures’ will be initialized after [-Wreorder]
2015-07-11 21:28:01 +10:00
Fabian Woltermann
15bceee125
Merge pull request #232 from asarium/fix/snd_cfile
...
Fixes Mantis 3168: snd_load leaks cfile handles if it can't parse a file.
2015-07-11 12:29:42 +02:00
Echelon9
08e50885cb
Fix: warning: ‘opengl_vertex_buffer::ibo_size’ will be initialized after [-Wreorder]
2015-07-11 20:18:34 +10:00
asarium
e6dbb28b48
Fix for Mantis 3168: snd_load leaks cfile handles if it can't parse a file.
2015-07-11 11:36:21 +02:00
Echelon9
1e151865d4
Fix: object/collideshipweapon.cpp:67:185: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:45:38 +10:00
Echelon9
c2a2ef5682
Fix: object/collideshipweapon.cpp:39:63: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:42:15 +10:00
Echelon9
3acc777afe
Fix: model/modelread.cpp: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:40:12 +10:00
Echelon9
aa7bd5bf2c
Fix: asteroid/asteroid.cpp:1614:99: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:32:36 +10:00
Echelon9
ca2cd63a95
Fix: asteroid/asteroid.cpp:949:10: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:30:55 +10:00
Echelon9
1787b95498
Fix: ai/aicode.cpp:14896:75: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:28:59 +10:00
Echelon9
2586198e0e
Fix: asteroid/asteroid.cpp:1653:68: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:14:38 +10:00
Echelon9
b7e76de184
Fix: asteroid/asteroid.cpp:1614:98: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:12:27 +10:00
Echelon9
f656232030
Fix: asteroid/asteroid.cpp:1477:50: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:10:02 +10:00
Echelon9
e4e3064bea
Fix: asteroid/asteroid.cpp:1363:92: warning: declaration of ‘asteroid_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:07:37 +10:00
Echelon9
f804539a15
Fix: debris/debris.cpp:846:10: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:04:25 +10:00
Echelon9
ca9ae8bb8e
Fix: nebula/neb.cpp:1422:37: warning: declaration of ‘eye’ shadows a global declaration [-Wshadow]
2015-07-06 23:01:21 +10:00
Echelon9
767b39fbbc
Fix: nebula/neb.cpp:1416:33: warning: declaration of ‘eye’ shadows a global declaration [-Wshadow]
2015-07-06 22:59:55 +10:00
Echelon9
6d0996d90c
Fix: graphics/grstub.cpp:736:71: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:57:12 +10:00
Echelon9
294cf79e04
Fix: graphics/gropenglshader.cpp: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:54:10 +10:00
Echelon9
b7864cd2aa
Fix: graphics/gropenglshader.cpp:231:73: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:52:01 +10:00
Echelon9
4bf5f15f72
Fix: graphics/gropenglpostprocessing.cpp:682:79: warning: declaration of ‘shader’ shadows a global declaration [-Wshadow]
2015-07-06 22:49:38 +10:00
Echelon9
4a0e3b4c40
Fix: graphics/generic.cpp:35:117: warning: declaration of ‘anim’ shadows a global declaration [-Wshadow]
2015-07-06 22:46:23 +10:00
Echelon9
3860951b6c
Fix: graphics/*.cpp warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:36:10 +10:00
Echelon9
54003a2622
Fix: debris/debris.cpp:850:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:30:50 +10:00
Echelon9
b7bc60708c
Fix: asteroid/asteroid.cpp:953:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:29:04 +10:00
Echelon9
dc5651ab70
Fix: object/collideshipship.cpp:539:10: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-06 22:26:31 +10:00
Echelon9
f12dc5478b
Fix: ai/aicode.cpp: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-06 22:19:28 +10:00
Echelon9
8051bac868
Fix: ai/aigoals.cpp:203:48: warning: declaration of ‘ai_goal’ shadows a global declaration [-Wshadow]
2015-07-06 22:15:18 +10:00
Echelon9
d94823ef77
Fix: graphics/gropenglbmpman.cpp:561:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2015-07-06 21:47:01 +10:00
Echelon9
eda6f33d77
Fix: graphics/gropenglbmpman.cpp:561:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2015-07-06 21:41:31 +10:00
Echelon9
9db610ef2c
Fix: network/multiutil.cpp:692:76: warning: declaration of ‘net_player’ shadows a global declaration [-Wshadow]
2015-07-06 21:30:27 +10:00
Echelon9
2b8ef9e1fd
Fix: graphics/2d.cpp:2142:1: warning: declaration of ‘team_color’ shadows a global declaration [-Wshadow]
2015-07-06 21:19:56 +10:00
Echelon9
1aa858a164
Fix: graphics/2d.cpp:1874:7: warning: variable ‘t0’ set but not used [-Wunused-but-set-variable]
2015-07-06 21:17:48 +10:00
Echelon9
aae7c47748
Fix: lab/lab.cpp:943:9: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-06 21:14:45 +10:00
Echelon9
53164a169c
Fix: mission/missioncampaign.cpp:1200:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:12:11 +10:00
Echelon9
fe1b607214
Fix: mission/missioncampaign.cpp:1012:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:08:00 +10:00
Echelon9
040d157644
Fix: mission/missioncampaign.cpp:1088:12: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 21:03:30 +10:00
Echelon9
475155d62f
Fix: mission/missioncampaign.cpp:1600:6: warning: declaration of ‘mission’ shadows a global declaration [-Wshadow]
2015-07-06 20:58:53 +10:00
Echelon9
85a0bda946
Fix: model/modelanim.cpp:536:78: warning: declaration of ‘anim’ shadows a global declaration [-Wshadow]
2015-07-06 20:54:14 +10:00
Echelon9
f2c8aa665f
Fix: missionui/missionshipchoice.cpp:923:9: warning: declaration of ‘header’ shadows a global declaration [-Wshadow]
2015-07-06 19:51:45 +10:00
Fabian Woltermann
181098e1e4
Merge pull request #230 from PeterMitsis/math-optimizations
...
math/vecmat optimizations
2015-07-06 02:42:14 -07:00
Echelon9
66257146b7
Fix: model/modelcollide.cpp:1215:36: warning: declaration of ‘mc_info’ shadows a global declaration [-Wshadow]
2015-07-06 19:40:21 +10:00
Fabian Woltermann
d4d60b2645
Merge pull request #226 from asarium/fix/audiostr_cfile
...
Use the CFILE system to handle audio IO
2015-07-06 01:42:24 -07:00
Fabian Woltermann
368dcdddc2
Merge pull request #228 from asarium/antipodes
...
Sync Antipodes
2015-07-06 01:41:52 -07:00
Echelon9
60d1234abd
Fix: model/modelread.cpp:270:12: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
2015-07-05 17:13:01 +10:00
Echelon9
2bac9ba5fa
Fix: model/modelrender.cpp:780:55: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-05 17:07:39 +10:00
Echelon9
6e273ccd7f
Fix: gamehelp/contexthelp.cpp:391:9: warning: declaration of ‘font’ shadows a global declaration [-Wshadow]
2015-07-05 17:01:37 +10:00
Echelon9
4885807d82
Fix: iff_defs/iff_defs.cpp:68:4: warning: declaration of ‘temp_color_t’ shadows a previous local [-Wshadow]
2015-07-05 16:57:35 +10:00
Echelon9
444f830fdc
Fix: network/multi_voice.cpp: warning: parameter set but not used [-Wunused-but-set-parameter]
2015-07-05 16:51:16 +10:00
Echelon9
e98d84314a
Fix: network/multimsgs.cpp:8473:70: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:44:48 +10:00
Echelon9
5e9fd26028
Fix: network/multimsgs.cpp:8493:7: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:42:24 +10:00
Echelon9
3a3e901249
Fix: network/multiteamselect.cpp:1720:7: warning: declaration of ‘wing’ shadows a global declaration [-Wshadow]
2015-07-05 16:40:04 +10:00
Echelon9
1f8c1dccde
Fix: object/collidedebrisweapon.cpp:100:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:35:11 +10:00
Echelon9
0dc48f8470
Fix: object/collidedebrisweapon.cpp:45:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:32:57 +10:00
Echelon9
83a8b2bee5
Fix: object/collideshipship.cpp:457:115: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-05 16:27:21 +10:00
Echelon9
2c4fb4286c
Fix: object/collideshipweapon.cpp:470:10: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 16:19:20 +10:00
Echelon9
570f6dd581
Fix: object/collideshipship.cpp:1316:138: warning: declaration of ‘mc_info’ shadows a global declaration [-Wshadow]
2015-07-05 16:14:24 +10:00
Echelon9
b326e77574
Fix: object/collideshipweapon.cpp:543:85: warning: declaration of ‘weapon’ shadows a global declaration [-Wshadow]
2015-07-05 15:55:15 +10:00
Echelon9
6d6d3e99e5
Fix: object/collideweaponweapon.cpp:168:10: warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-05 14:25:53 +10:00
Echelon9
c7045147f3
Fix: object/collideshipship.cpp:1316:126: warning: declaration of ‘light’ shadows a global declaration [-Wshadow]
2015-07-05 14:17:53 +10:00
Peter Mitsis
3495b190d4
Streamline vm_quaternion_rotate()
...
Calculates sinf(theta * 0.5) once only instead of three times.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
62a7865f94
Streamline vm_angle_2_matrix()
...
The values of sin(0) and cos(0) are well known and do not need to be calculated
at run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
8193dbb316
Streamline vm_vec_avg_n()
...
Instead of performing three consecutive divisions, vm_vec_avg_n() now performs
one division at the start and three multiplications at the end. Recall that
multiplication is faster than division.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
95d1701794
Remove unnecessary checking before atan2_safe()
...
The routine atan2_safe() already contains a test that checks if both parameters
are zero--that is the point of the routine. Thus, there is no need for the
caller of atan2_safe() to perform that same check.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
945f655e0e
Remove unnecessary vm_vec_normalize() checks
...
The routine vm_vec_normalize() always returns a value greater than zero.
Thus, there is no need to test its return value for values that are less
than or equal to zero.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:31 -04:00
Peter Mitsis
11b65fe0bf
Remove unnecessary vm_vec_copy_normalize() checks
...
The routine vm_vec_copy_normalize() always returns a value greater than zero.
Thus, there is no need to test its return value for values that are less than
or equal to zero.
Signed-off-by: Peter Mitsis <[email protected] >
2015-07-05 00:03:27 -04:00
Echelon9
6618165926
Fix: model/modelinterp.cpp:4342:14: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-05 00:59:13 +10:00
Echelon9
6950c69ebb
Fix: model/modelinterp.cpp:2034:44: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:54:29 +10:00
Echelon9
b8ff93dad2
Fix: model/modelinterp.cpp:2603:43: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:52:39 +10:00
Echelon9
c220480075
Fix: lab/lab.cpp:2497:45: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-05 00:40:13 +10:00
Echelon9
182b297af4
Fix: model/modelrender.cpp:2560:10: warning: variable ‘objp’ set but not used [-Wunused-but-set-variable]
2015-07-05 00:30:34 +10:00
Echelon9
a0527afd55
Fix: ship/ship.cpp:3132:14: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
2015-07-05 00:04:05 +10:00
Echelon9
9283ff8227
Fix: controlconfig/controlsconfig.cpp:669:9: warning: variable ‘k’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:51:24 +10:00
Echelon9
769e98fe4c
Fix: controlconfig/controlsconfig.cpp:669:9: warning: variable ‘j’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:46:38 +10:00
Echelon9
3c48d81a52
Fix: controlconfig/controlsconfig.cpp:1443:27: warning: variable ‘len’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:41:59 +10:00
Echelon9
7f100c439a
Fix: controlconfig/controlsconfig.cpp:1442:18: warning: variable ‘jptr’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:34:40 +10:00
Echelon9
481ec12450
Fix: bmpman/bmpman.cpp:2671:12: warning: variable ‘bmp’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:29:00 +10:00
Echelon9
312648668c
Fix: anim/animplay.cpp:257:25: warning: variable ‘render_time’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:20:18 +10:00
Echelon9
f4aa493f59
Fix: anim/animplay.cpp:257:25: warning: variable ‘decompress_time’ set but not used [-Wunused-but-set-variable]
2015-07-04 23:16:08 +10:00
Echelon9
039ad64a33
Fix: ai/aicode.cpp:10715:9: warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-04 19:03:09 +10:00
Echelon9
c83a2ea2e8
Fix: ai/aicode.cpp:8169:24: warning: variable ‘time_to_enemy’ set but not used [-Wunused-but-set-variable]
2015-07-04 18:58:10 +10:00
Echelon9
edbedeb84a
Fix: ai/aicode.cpp:8017:10: warning: variable ‘eshipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:39:44 +10:00
Echelon9
d855154fa9
Fix: graphics/gropenglshader.cpp:387:7: warning: variable ‘in_error’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:33:22 +10:00
Echelon9
7fea629121
Fix: graphics/gropengltnl.cpp:696:8: warning: variable ‘rval’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:10:17 +10:00
Echelon9
183f0615e2
Fix: graphics/gropengltnl.cpp:812:6: warning: variable ‘render_pass’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:08:41 +10:00
Echelon9
e9330b4f5f
Fix: graphics/gropengltnl.cpp:1378:6: warning: variable ‘zbuff’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:52:50 +10:00
Echelon9
785398657c
Fix: menuui/readyroom.cpp:1175:15: warning: variable ‘z’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:22:59 +10:00
Echelon9
fff2d5280c
Fix: model/modelrender.cpp:2560:8: warning: variable ‘shipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:18:38 +10:00
Echelon9
cd503fd2e4
Fix: object/objcollide.cpp:1247:8: warning: variable ‘max’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:10:15 +10:00
Echelon9
e7e046f949
Fix: object/objcollide.cpp:1248:8: warning: variable ‘overlap_min’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:08:40 +10:00
Echelon9
6e6ff3c7c0
Fix: object/objectsort.cpp: warning: variable ‘wp’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:06:13 +10:00
Echelon9
4f4fe00b97
Fix: ship/ship.cpp:18381:6: warning: variable ‘clip_started’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:01:36 +10:00
Echelon9
98d6b6ce8b
Fix: weapons.cpp:7374:8: warning: variable ‘clip_plane’ set but not used [-Wunused-but-set-variable]
2015-07-04 15:55:15 +10:00
asarium
1d7ea819a3
Fix linux compilation
2015-07-03 19:34:32 +02:00
asarium
1d93fdea2e
Merge branch 'master' into antipodes
...
Conflicts:
code/freespace2/freespace.cpp
code/graphics/2d.cpp
code/network/stand_gui-unix.cpp
projects/MSVC_2012/Fred2.vcxproj
projects/MSVC_2012/Freespace2.vcxproj
projects/MSVC_2013/code.vcxproj
projects/MSVC_2013/code.vcxproj.filters
projects/MSVC_2015/Fred2.vcxproj
projects/MSVC_2015/Freespace2.vcxproj
projects/MSVC_2015/code.vcxproj
2015-07-03 19:15:43 +02:00
asarium
597000ca46
Use our CFILE system to handle audio IO
2015-07-03 19:08:56 +02:00
m!m
3180a38ae7
Merge pull request #227 from chief1983/fix/sdl_dialog_vs
...
Add the osapi/dialog files to the other VS projects.
2015-07-03 19:06:50 +02:00
Cliff Gordon (chief1983)
032c19e889
Add the osapi/dialog files to the other VS projects.
2015-07-03 11:39:09 -05:00
Goober5000
a47ac6c5ee
Merge pull request #211 from Echelon9/fix/janitorial-changes
...
Janitorial changes
2015-07-02 14:47:55 -04:00
Goober5000
da79469606
Merge pull request #224 from Echelon9/fix/issue196
...
Passing value 2.0 to asin() leads to implementation-defined result
2015-07-02 14:40:29 -04:00
Echelon9
a93215f781
Ensure input domain to asin() does not lead to irrational results (implementation defined behaviour)
2015-07-01 23:15:36 +10:00
Echelon9
58f7fb247b
Document ai_update_aim() after touching the function
2015-07-01 23:07:17 +10:00
Echelon9
aa1feb0799
Refrain from unnecessarily passing a pointer to global object to ai_update_aim()
2015-07-01 23:07:17 +10:00
Echelon9
833e7b1d7a
Ensure consistent capitalisation of ai_update_aim() parameter.
2015-07-01 23:07:17 +10:00
Echelon9
b2a07f19c2
Remove redundant parameter to compute_time_to_enemy(). Function doesn't need a pointer to the enemy objp, where it uses distance directly instead.
2015-07-01 23:07:17 +10:00
Echelon9
b38e153861
Remove redundant parameter to prioritize_goals().
2015-07-01 23:07:17 +10:00
Echelon9
39188f7926
Remove redundant parameter to ai_ignore_wing().
2015-07-01 23:07:17 +10:00
Echelon9
29fa74fd63
Remove redundant parameter to draw_brackets_diamond_quick().
2015-07-01 23:07:17 +10:00
Echelon9
8e018c5338
Clean up load_animating_pointer().
2015-07-01 23:07:17 +10:00
Echelon9
0810ae08de
Clean up definition of asteroid_process_pre().
2015-07-01 23:07:16 +10:00
Echelon9
366d409da4
Clean up definition of asteroid_process_post().
2015-07-01 23:07:16 +10:00
Goober5000
2434365103
Merge pull request #219 from PeterMitsis/fvi_apply_const_and_static_keywords
...
math/fvi: apply const and static keywords
2015-06-30 11:11:17 -04:00
Goober5000
bd18c88198
Merge pull request #77 from chief1983/fix/nat_multiplayer
...
[fix/nat_multiplayer] Fix for multiple users behind a NAT
2015-06-29 21:33:10 -04:00
Cliff Gordon
6e0f9c1cd2
[fix/nat_multiplayer] Simplify the new psnet check.
2015-06-29 16:51:49 -05:00
Cliff Gordon
5311ea4f7a
[fix/nat_multiplayer] Vestigare's submitted patch for allowing multiple users behind a NAT to connect to a remote standalone.
2015-06-29 16:50:06 -05:00
Lari Nieminen
09dfcf559e
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-06-28 18:13:51 +03:00
Cliff Gordon
0a9ae3eb46
Merge pull request #222 from scp-fs2open/revert-113-coverity/1298257
...
Revert "Fix Coverity 1298257: Uninitialized scalar var"
2015-06-28 10:00:42 -05:00
Peter Mitsis
7a59192bbb
More application of static and const keywords
...
Applies the const and static keywords to the recently restored routines.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-28 09:09:26 -04:00
Fabian Woltermann
6a0e550aac
Revert "Fix Coverity 1298257: Uninitialized scalar var"
2015-06-28 13:59:13 +02:00
Lari Nieminen
da71e629b4
Fixes Mantis #2436 : Mouse controls ignore the axis binds.
2015-06-28 14:42:17 +03:00
Peter Mitsis
ca07a428e3
Revert "Remove nine unused routines from math/fvi module"
...
This reverts commit 8cdabf6a23 .
Conflicts:
code/math/fvi.cpp
2015-06-28 07:20:34 -04:00
Fabian Woltermann
150a00a17a
Merge pull request #209 from ln-zookeeper/master
...
Fixes and enhancements for detail boxes and spheres
2015-06-27 11:43:56 +02:00
Fabian Woltermann
bdf844fc83
Merge pull request #113 from niffiwan/coverity/1298257
...
Fix Coverity 1298257: Uninitialized scalar var
2015-06-27 11:28:19 +02:00
Fabian Woltermann
464d49d182
Merge pull request #212 from Echelon9/fix/mantis3137
...
Fix Mantis 3137
2015-06-26 13:43:55 +02:00
Fabian Woltermann
3386dc6f20
Merge pull request #218 from asarium/fix/hudmessageIterator
...
Fix usage of invalid iterator in hudmessage.cpp
2015-06-26 13:42:14 +02:00
Fabian Woltermann
ff76a32508
Merge pull request #216 from Echelon9/fix/color-struct-alignment
...
Improve alignment of color struct
2015-06-26 13:41:31 +02:00
asarium
6b95037dcc
Fix usage of invalid iterator.
2015-06-25 18:22:51 +02:00
Peter Mitsis
3cb0c72ced
Apply static and const keywords to math/fvi module
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-25 07:51:53 -04:00
Echelon9
2cf8d0cc98
Improve alignment of color struct (28 bytes -> 24 bytes, c.14%).
2015-06-25 23:39:17 +12:00
Peter Mitsis
8cdabf6a23
Remove nine unused routines from math/fvi module
...
Removes the following unused routines ...
1. accurate_square_root()
2. fvi_point_dist_plane()
3. fvi_segment_plane()
4. fvi_sphere_perp_edge()
5. check_sphere_point()
6. fvi_check_sphere_sphere()
7. fvi_cull_polyface_sphere()
8. fvi_closest_point_on_line_segment()
9. fvi_closest_line_line()
2015-06-25 07:03:59 -04:00
Lari Nieminen
e0605f125c
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-06-25 13:07:41 +03:00
Fabian Woltermann
911f3d647f
Merge pull request #214 from Echelon9/fix/issue213
...
Avoid shadowed declaration of previous local 'gpoi'
2015-06-25 10:09:23 +02:00
Echelon9
2ca1f40d98
Avoid shadowed declaration of previous local 'gpoi'
2015-06-25 17:20:10 +12:00
Echelon9
b5610a5005
Proposed refactor of #Cutscenes in mission files, per wiki documentation.
2015-06-25 16:56:24 +12:00
Goober5000
341fdd3589
Merge pull request #207 from Echelon9/fix/issue206
...
Resolve order of precedence compiler warning.
2015-06-25 00:43:10 -04:00
Echelon9
7f673c8ab6
Goober5000 code review: consistency change.
2015-06-25 16:25:35 +12:00
Echelon9
ce6179a58f
Resolve order of precedence compiler warning.
2015-06-25 14:27:31 +12:00
Fabian Woltermann
83fc90c74b
Merge pull request #210 from chief1983/fix/205_cleanup
...
Fix/205 cleanup
2015-06-24 15:11:59 +02:00
Cliff Gordon (chief1983)
8c73f39e6e
Remove the files from PR 205 via IDE.
2015-06-24 00:06:29 -05:00
Cliff Gordon (chief1983)
8efaf28a8a
Revert "Fixed project files for all MSVS versions that support vcxproj"
...
This reverts commit 610f8a2ff3 .
2015-06-23 22:37:35 -05:00
Cliff Gordon (chief1983)
8a3cc22605
Revert "Remove references to AVX from VS2010 project"
...
This reverts commit 3205f42dc2 .
2015-06-23 22:37:15 -05:00
Lari Nieminen
fc9acb3a4d
Added support for detail box $box_offset.
2015-06-24 00:48:07 +03:00
Lari Nieminen
2e012969e7
Fixed detail sphere $offset not working right.
2015-06-24 00:44:13 +03:00
Lari Nieminen
84b7a06a44
Restored ability to combine detail boxes and spheres.
2015-06-23 19:53:18 +03:00
Lari Nieminen
8fd09be8a0
Replaced the static Interp_render_* variables with normal local ones.
2015-06-23 19:50:17 +03:00
Fabian Woltermann
83a7e862ae
Merge pull request #205 from Echelon9/fix/cleanup-empty-files
...
Cleanup empty files
2015-06-23 11:32:48 +02:00
Echelon9
85428f5eb4
Remove added <MinimalRebuild> option to MSVC_2012.
2015-06-23 18:44:31 +10:00
Fabian Woltermann
e73dbd1647
Merge pull request #170 from z64555/parselo
...
Organizes required_string(); Doxy's required_string() and required_st…
2015-06-23 10:16:59 +02:00
Fabian Woltermann
b11497d075
Merge pull request #183 from ln-zookeeper/master
...
Added a "no-secondary-lock-on" ship flag to disable secondary homing.
2015-06-23 10:16:24 +02:00
Fabian Woltermann
14ed049331
Merge pull request #198 from Echelon9/fix/issue197
...
Update format string specifier to unsigned int (mainhallmenu.cpp)
2015-06-23 10:14:38 +02:00
Rhys Kidd
00d4271550
Merge pull request #1 from The-E/fix/cleanup-empty-files
...
Fixed project files for all MSVS versions that support vcxproj
2015-06-23 18:14:20 +10:00
Fabian Woltermann
ff22d7b9a6
Merge pull request #200 from Echelon9/fix/issue199
...
Retval of bm_get_size (int handle) should be a size_t
2015-06-23 10:14:18 +02:00
Fabian Woltermann
ce3bb0a6a9
Merge pull request #202 from Echelon9/fix/issue201
...
Retval of bm_page_out(int handle) should be a bool
2015-06-23 10:14:00 +02:00
Fabian Woltermann
4c55ad45a0
Merge pull request #204 from Echelon9/fix/issue203
...
Retval of bm_has_alpha_channel(int handle) should be a bool
2015-06-23 10:13:34 +02:00
The_E
3205f42dc2
Remove references to AVX from VS2010 project
2015-06-23 10:11:24 +02:00
The_E
610f8a2ff3
Fixed project files for all MSVS versions that support vcxproj
2015-06-23 10:03:08 +02:00
Echelon9
0fde8c3925
Update Xcode 4+ project file for removal of empty files.
2015-06-23 16:05:01 +10:00
Echelon9
8ba1ddbbc2
Makefile removal of references to missionui/missionstats.[cpp|h].
2015-06-23 14:52:58 +10:00
Echelon9
3af13b603d
Remove empty missionui/missionstats.[cpp|h].
2015-06-23 14:46:42 +10:00
Echelon9
54508b6429
Makefile and source code removal of references to ai/ailocal.h
2015-06-23 14:39:43 +10:00
Echelon9
b62196dc0d
Remove empty ai/ailocal.h
2015-06-23 14:32:02 +10:00
Echelon9
8eeff0e06c
Remove missionrecommend.[cpp|h] from Makefile.
2015-06-23 14:30:01 +10:00
Echelon9
da9d363230
Remove empty missionrecommend.[cpp|h] files.
2015-06-23 14:23:28 +10:00
Echelon9
cb617b5e9f
Modify usage of bm_has_alpha_channel that needs to pass int to the OpenGL driver. Use ternary operator.
2015-06-23 14:05:58 +10:00
Echelon9
130a148816
Remove TODO doxygen comment.
2015-06-23 13:59:10 +10:00
Echelon9
33cae6930c
Amend retval in declaration and definition to bool.
2015-06-23 13:57:58 +10:00
Echelon9
6abba98455
Increase consistency with adjacent code style, and avoid >80 character line wrap.
2015-06-23 11:49:48 +10:00
Echelon9
0437f81999
Ensure paramater name matches between declaration and definition.
2015-06-23 11:44:47 +10:00
Echelon9
4f649f1cdb
Remove TODO doxygen comment.
2015-06-23 11:40:27 +10:00
Echelon9
e33f2e1d38
Amend retval in declaration and definition to bool.
2015-06-23 11:39:44 +10:00
Echelon9
df1c50bc47
Convert internal mem_taken type to size_t.
2015-06-23 11:07:29 +10:00
Echelon9
79597e9757
Ensure parameter name matches between declaration and definition.
2015-06-23 10:59:43 +10:00
Echelon9
6447208960
Remove TODO doxygen comment.
2015-06-23 10:48:47 +10:00
Echelon9
c061ee6324
Amend retval in declaration and definition to size_t.
2015-06-23 10:48:11 +10:00
Echelon9
57c9e1ae6a
Address putative requirement for mm/mmreg.h to have <windows.h> included first.
2015-06-23 10:16:59 +10:00
Echelon9
60aec6f6cb
Update format string specifier to unsigned int.
2015-06-22 21:40:43 +10:00
Echelon9
418b9e06d7
Simplify duplicative weapon/ includes, which are in weapon/weapon.h
2015-06-22 20:24:31 +10:00
Echelon9
d2f5575e20
Simplify duplicative ui/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
8c12affa23
Simplify duplicative species_def/ includes, which are in species_def/species_def.h
2015-06-22 20:24:31 +10:00
Echelon9
ca552b45f5
Simplify duplicative ship/ includes, which are in ship/shipfx.h
2015-06-22 20:24:31 +10:00
Echelon9
00bfe37cb4
Simplify duplicative radar/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
2964132f7d
Properly guard inclusion of playerman/managepilot.h
2015-06-22 20:24:31 +10:00
Echelon9
eb739e2a9b
Simplify duplicative pilotfile/ includes, which are in pilotfile/pilotfile.h
2015-06-22 20:24:31 +10:00
Echelon9
8c2c451e8e
Simplify duplicative parse/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
29faabdfb3
Simplify duplicative object/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
2b251e3cb3
Simplify duplicative model/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
ed2170b2ea
Simplify duplicative mod_table/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
493d9a4280
Simplify duplicative missionui/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
a7e6be3368
Simplify duplicative mission/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
dd3a6c2e50
Simplify duplicative menuui/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
97a134e51f
Simplify duplicative math/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
e613f4db7d
Simplify duplicative lab/ includes, which are in lab/wmcgui.h
2015-06-22 20:24:30 +10:00
Echelon9
47af1ff851
Simplify duplicative hud/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
4e6f525f7c
Simplify duplicative graphics/ includes.
2015-06-22 20:24:30 +10:00
Echelon9
b25feb69aa
Simplify duplicative gamesnd/ includes, which are in gamesnd/gamesnd.h
2015-06-22 20:24:30 +10:00
Echelon9
90bb4e3a7b
Simplify duplicative freespace2/ includes, which are in freespace2/freespace.h
2015-06-22 20:24:30 +10:00
Echelon9
39e1ed3403
Simplify fireball/ include logic.
2015-06-22 20:24:30 +10:00
Echelon9
45664465be
Simplify debugconsole/ include logic.
2015-06-22 20:24:30 +10:00
Echelon9
1601f83a05
Guard extraneous inclusion of globalincs/pstypes.h
2015-06-22 20:24:30 +10:00
Echelon9
ae8a310e97
Simplify duplicative camera/ includes, which are in camera/camera.h
2015-06-22 20:24:30 +10:00
Echelon9
0d35f901b3
Simplify duplicative autopilot/ includes, which are in autopilot/autopilot.h
2015-06-22 20:24:30 +10:00
Echelon9
726036b91e
Simplify duplicative bmpman/ includes, which are in bmpman/bmpman.h
2015-06-22 20:24:30 +10:00
Echelon9
c5493bb480
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
2015-06-22 20:24:30 +10:00
Fabian Woltermann
fda36a1476
Merge pull request #193 from PeterMitsis/vecmat_apply_const_and_static_keywords
...
vecmat: apply const and static keywords
2015-06-22 12:13:46 +02:00
Fabian Woltermann
e176132106
Merge pull request #194 from Echelon9/feature/make-cppcheck
...
Add 'make cppcheck' command line option.
2015-06-22 12:10:54 +02:00
Echelon9
2c36ce39af
Add 'make cppcheck' command line option.
2015-06-21 15:37:25 +10:00
Peter Mitsis
fc6f7cbbb6
Add static and const keywords to vector math routines
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-20 08:01:25 -04:00
Peter Mitsis
7c2eb53e62
Remove unused routine vm_fvec_matrix_interpolate()
...
Not only is the routine vm_fvec_matrix_interpolate() unused, it does not appear
to have been used for the duration of the project. The only reference to it
found in the history was in a removed comment. That comment indicated that it
was implemented in 1997.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-20 07:59:34 -04:00
MageKing17
bcf19f1256
Merge pull request #192 from jg18/log_enhanced_sound
...
Log usage status of enhanced sound.
2015-06-20 01:54:59 -07:00
jg18
4d6d679c7b
Log usage status of enhanced sound.
2015-06-19 23:50:14 -07:00
Fabian Woltermann
feb6d188f7
Merge pull request #188 from chief1983/fix/standalone_name_hang
...
[fix/standalone_name_hang] Prevent the standalone from hanging
2015-06-19 21:24:47 +02:00
MageKing17
179229fa81
Add max_shield_recharge and shield_impact_explosion_anim to copy/move functions.
2015-06-18 14:45:43 -07:00
MageKing17
ab9d2e20fb
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-06-18 14:40:53 -07:00
MageKing17
35813b5e0f
Merge pull request #120 from chief1983/mp_for_2012
...
Add /MP to all projects and configs in VS 2012 project files.
2015-06-18 14:14:49 -07:00
MageKing17
eff6d402f3
Merge pull request #76 from chief1983/fix/triplemon_hud
...
[fix/triplemon_hud] Yarn's triple-monitor fix
2015-06-18 14:11:51 -07:00
Cliff Gordon
3e8b62999b
[fix/standalone_name_hang] Prevent the standalone from hanging when attempting to set a name that is too long.
2015-06-17 14:14:06 -05:00
Cliff Gordon (chief1983)
c56925a830
Disable the minimal rebuilds that were enabled for debug configurations. Also contains some whitespace cleanup that VS applied automatically.
2015-06-17 10:38:15 -05:00
Cliff Gordon
28c1286c4d
Merge remote-tracking branch 'origin/master' into mp_for_2012
2015-06-17 10:15:44 -05:00
Cliff Gordon
2d662075c3
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
2015-06-17 10:11:57 -05:00
Cliff Gordon
3247fb08d0
Merge pull request #185 from FSCyborg/patch-1
...
Resolve CID 1093395 - Unnecessary sanity check
2015-06-17 10:02:17 -05:00
FSCyborg
916fce023d
Resolve CID 1093395 - Unnecessary sanity check
...
Pretty sure this is just a paranoid check. If it's negative it should get changed to at least 2 in the following line. Let me know if I have any misconceptions.
2015-06-15 16:12:22 -04:00
Fabian Woltermann
b9f9afe26a
Revert "Merge pull request #181 from PeterMitsis/math-cleanup"
...
This reverts commit 1192c1dafc , reversing
changes made to 8643fa7327 .
2015-06-15 08:58:59 +02:00
Goober5000
335f1be322
Merge pull request #177 from FSCyborg/patch-1
...
Resolve CID 1093428 & 1093429
2015-06-14 20:43:39 -04:00
MageKing17
1cc452c13e
Merge pull request #182 from DahBlount/feature/dont_spawn_if_shot
...
Create "don't spawn if shot" flag
2015-06-14 15:32:09 -07:00
Lari Nieminen
4acad3b126
Added a "no-secondary-lock-on" ship flag to disable secondary homing.
2015-06-14 22:25:54 +03:00
DahBlount
923d9851b9
Create "don't spawn if shot" flag
...
This flag prevents submunitions from being created if a parent weapon is
shot down.
2015-06-14 10:51:09 -07:00
Fabian Woltermann
1192c1dafc
Merge pull request #181 from PeterMitsis/math-cleanup
...
Math cleanup
2015-06-14 11:40:31 +02:00
Peter Mitsis
85f50d9c94
Streamline vm_quaternion_rotate()
...
Calculates sinf(theta * 0.5) once only instead of three times.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
1af0f814c9
Refactor bez_fact()
...
Uses an array of precalculated factorials that are accessed as a lookup table
instead of computing the factorials at runtime. This cuts down on compiled
code bloat (compiler was both unrolling and inlining the computation's loop)
everywhere it was used.
NOTE: The original implementation returned an 'int'. As a result, the largest
uncorrupted factorial it could compute was 12!. For this reason, the lookup
table only goes up to 12!.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
42dc0fcc74
Streamline fl_radians() and fl_degrees() macros
...
Rewrites the macros to avoid unnecessary divisions. The compiler is now free
to precalculate the scaling ratio and perform it in a single multiply. Note
that the previous placement of the parentheses meant that the compiler (at
least GCC) was performing a multiply followed by a divide.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
93639e967c
Cosmetic: Do not check for negative vector magnitudes
...
Mathematically, the magnitude of a vector can not be negative.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
3f0476a880
Streamline vm_angle_2_matrix()
...
The values of sin(0) and cos(0) are well known and do not need to be calculated
at run time.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:31 -04:00
Peter Mitsis
a92ebdc08a
Remove commented out from vm_vec_copy_normalize()
...
The commented out code was cluttering things up.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
ee40ac7089
Streamline vm_vec_avg_n()
...
Instead of perform three consecutive divisions, vm_vec_avg_n() now performs one
division at the start and three multiplications at the end. Recall that
multiplication is faster than division.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
b883078ce8
Remove unnecessary checking before atan2_safe()
...
The routine atan2_safe() already contains a test that checks if both parameters
are zero--that is the point of the routine. Thus, there is no need for the
caller of atan2_safe() to perform that same check.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
748fe8e5dd
Remove unnecessary vm_vec_normalize() checks
...
The routine vm_vec_normalize() always returns a non-zero value.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
c9003f0c9d
Remove unnecessary vm_vec_copy_normalize() checks
...
The routine vm_vec_copy_normalize() always returns a non-zero value.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
391be952f5
Add static and const keywords to vector math routines
...
Improves readability. It also has the potential to help the compiler make
better decisions.
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
Peter Mitsis
49d6474237
Update vecmat.h and vecmat.cpp file mode bits
...
Changes the file mode bits of vecmat.h and vecmat.cpp to make them consistent
with the other files under "code/math".
Signed-off-by: Peter Mitsis <[email protected] >
2015-06-13 23:14:30 -04:00
m!m
8643fa7327
Merge pull request #178 from FSCyborg/patch-2
...
Resolve CID 1093431 & 1093432
2015-06-13 20:20:06 +02:00
m!m
a71e527e04
Merge pull request #179 from FSCyborg/patch-3
...
Resolve CID 1093435 & 1093437
2015-06-13 20:16:25 +02:00
FSCyborg
8515b68c0c
Resolve CID 1093435 & 1093437
...
Should resolve issues 1093435 and 1093437. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:35:10 -04:00
FSCyborg
6393189c19
Resolve CID 1093431 & 1093432
...
Should resolve issues 1093431 and 1093432. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:26:25 -04:00
FSCyborg
418d17b4da
Resolve CID 1093428 & 1093429
...
Should resolve issues 1093428 and 1093429. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:16:56 -04:00
Fabian Woltermann
f6d0e7d97a
Merge pull request #126 from AxemP/PainFlash
...
Adding customizable pain flash and shield pain flash settings
2015-06-13 15:22:40 +02:00
MageKing17
3cb6cc305b
Merge pull request #172 from DahBlount/feature/weapon_dmg_decay
...
Weapon Damage Decay
2015-06-12 11:39:31 -07:00
DahBlount
5f63e86dde
Add sanity checks and an extra parameter
...
This adds extra sanity checks to the Weapon Damage Decay code and also
adds a new parameter for weapons that can GAIN damage is they approach
the end of their lifetime.
2015-06-12 09:56:13 -07:00
DahBlount
e8f58f5947
Create Weapon Damage Decay framework
...
This adds the $Daamge Time: and +Min Damage: entries to weapons.tbl.
These parameters are used to create damage attenuation for non-beam primary weapon.
2015-06-12 05:01:21 -07:00
Axem
27e81df523
Commit cause reasons
2015-06-11 19:50:35 -05:00
z64555
5bd09cfac5
Merge pull request #171 from DahBlount/feature/random_fire_delay
...
Add Max delay and Min Delay
2015-06-11 13:47:10 -05:00
DahBlount
58f38c2e1e
Add Max delay and Min Delay
...
This adds two weapons.tbl entries that allow a weapon to have a range of
possible fire delay times which results in random firing time. simulates
real life firing time error for the most part.
2015-06-11 08:15:22 -07:00
z64555
99a06b4839
Organizes required_string(); Doxy's required_string() and required_string_one_of()
2015-06-10 09:00:33 -05:00
Fabian Woltermann
f162db5e48
Merge pull request #161 from ln-zookeeper/master
...
Added a $Max Shield Recharge ship table entry for limiting how full t…
2015-06-10 15:18:44 +02:00
Fabian Woltermann
15b822f10f
Merge pull request #169 from z64555/ap-VS12_VS13_build_fix
...
Resolves link errors when trying to build in MSVS 2012 and MSVS 2013.
2015-06-10 15:17:34 +02:00
Fabian Woltermann
a3dedeabe4
Merge pull request #163 from asarium/antipodes_/dialogs
...
Add unified dialog handling
2015-06-10 15:16:22 +02:00
z64555
5c20006500
Resolves link errors when trying to build in MSVS 2012 and MSVS 2013.
2015-06-10 07:04:35 -05:00
Zacam
1e6455c393
Merge pull request #166 from The-E/master
...
Sets AVX instruction sets for all projects
2015-06-07 01:33:44 -07:00
The E
66c5dff14a
Sets AVX instruction sets for all projects
2015-06-07 10:30:33 +02:00
m!m
2190fccc66
Merge pull request #165 from The-E/master
...
Sets AVX output for VS2015
2015-06-07 10:25:11 +02:00
The E
6204241b7d
Sets AVX output for VS2015
2015-06-07 10:22:11 +02:00
asarium
575091aea4
Add unified dialog handling
...
This also changes the lables on the dialog to make sense and also unifies Int3 behavior by using a function provided by SDL.
2015-06-06 14:53:26 +02:00
Fabian Woltermann
00a3513c84
Merge pull request #162 from asarium/antipodes_/outwndFix
...
Fix outwnd on Unix
2015-06-05 18:26:55 +02:00
asarium
92556a5116
Fix outwnd on Unix
2015-06-05 00:08:24 +02:00
Lari Nieminen
26e31a4cf0
Added a $Max Shield Recharge ship table entry for limiting how full the shields may recharge.
2015-06-04 15:35:41 +03:00
Fabian Woltermann
421d8be977
Merge pull request #153 from Echelon9/fix/Xcode4-project-file
...
Update Xcode4+ project files for the removal of timerbar.cpp|h
2015-06-04 13:35:09 +02:00
Fabian Woltermann
7a505887ff
Merge pull request #135 from ln-zookeeper/master
...
Added customizable shield impact explosion effects, originally adapte…
2015-06-04 13:33:40 +02:00
m!m
3c229a9c81
Merge pull request #157 from AxemP/LuaOnBeamFire
...
Adds On Beam Fire scripting hook
2015-06-04 10:05:56 +02:00
Axem
4b20b46509
Commit because reasons? (Why git, why)
2015-06-03 17:44:37 -05:00
Axem
7e8557d564
Merging with new updated master
2015-06-03 17:38:52 -05:00
Fabian Woltermann
2aed7ccf71
Merge pull request #147 from asarium/antipodes_/os_sleep
...
Replace Sleep with os_sleep
2015-06-03 16:54:42 +02:00
m!m
8c3e9dcdd7
Merge pull request #154 from AxemP/LuaAfterburn+BeamFire
...
Adds Afterburner Engage/Ending scripting hooks
2015-06-03 16:26:36 +02:00
m!m
91ea6b83cf
Merge pull request #155 from AxemP/LuaApplyWhack
...
Adds applyWhack() scripting function for ship objects
2015-06-03 16:24:30 +02:00
asarium
2d47bcd9ad
Replace Sleep with os_sleep
2015-06-03 16:20:39 +02:00
Fabian Woltermann
7cf0f97e9d
Merge pull request #160 from asarium/antipodes
...
Sync Antipodes
2015-06-03 15:31:19 +02:00
asarium
7aef2c5eaf
Merge branch 'master' into antipodes
2015-06-03 12:50:21 +02:00
Fabian Woltermann
d7f54dd703
Merge pull request #151 from jg18/enhanced_sound
...
Add support for enhanced sound.
2015-06-02 08:13:42 +02:00
jg18
7fe5ba8db8
Make enhanced sound on by default.
2015-06-01 11:18:07 -07:00
jg18
faa0c5e9ee
Make minor corrections to enhanced sound.
2015-06-01 10:24:07 -07:00
Axem
61e4f739ce
Adds On Beam Fire scripting hook
2015-05-31 18:02:36 -05:00
Axem
852a4eb3fa
Tweaking formatting...
2015-05-31 17:26:03 -05:00
Axem
7975300304
Cutting out the beam fire
2015-05-31 17:20:39 -05:00
Axem
58e8c23665
Adds on Afterburner Engage, Afterburner End, and On Beam Fire scripting hooks
2015-05-31 11:51:22 -05:00
Axem
2fa7e8f096
Adds applyWhack() scripting function for ship objects
2015-05-31 11:18:45 -05:00
Lari Nieminen
037c5a06aa
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-31 14:28:52 +03:00
MageKing17
859405b62e
Merge pull request #149 from SamuelCho/mantis3163
...
Refactored how color setting is done for model rendering. Fixes Mantis 3163
2015-05-30 19:24:15 -07:00
Echelon9
2943d3f1a4
Address Xcode issue with quotes and version strings.
2015-05-31 12:07:57 +10:00
Echelon9
f2fb83801c
Update Xcode4+ project files for the removal of timerbar.cpp|h
2015-05-31 10:54:46 +10:00
Goober5000
74ae0a9395
Merge pull request #148 from SamuelCho/mantis3161
...
Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering.
2015-05-30 18:13:05 -04:00
Goober5000
aa0d424699
Merge pull request #150 from SamuelCho/skybox_render_order
...
Eliminate sorting of draw calls for skyboxes for correctness.
2015-05-30 13:03:33 -04:00
Goober5000
4fe9668fa3
Merge pull request #152 from SamuelCho/mantis3162
...
Rectified jump nodes not rendering in FRED. Fixes Mantis 3162.
2015-05-30 13:00:44 -04:00
SamuelCho
0c9996c32b
Rectified jump nodes not rendering in FRED. Fixes Mantis 3162.
2015-05-29 23:37:50 -07:00
jg18
ad910280e7
Add support for enhanced sound.
...
Add support for enhanced in-mission sound, with 128 audio channels and a
new system for specifying per-sound priorities and concurrent playback
limits using modular extensions of soudns.tbl.
2015-05-29 23:05:30 -07:00
SamuelCho
a7c1e29bf6
Eliminate sorting of draw calls for skyboxes for correctness.
2015-05-29 22:58:28 -07:00
SamuelCho
2ba39e6b6d
Refactored how color setting is done for model rendering. Fixes Mantis 3163.
2015-05-29 21:54:33 -07:00
SamuelCho
44de943a99
Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering.
2015-05-29 19:47:23 -07:00
asarium
0c705fee6f
Merge branch 'master' into antipodes
...
Conflicts:
code/debugconsole/timerbar.cpp
code/graphics/gropengl.cpp
projects/MSVC_2010/code.vcxproj
projects/MSVC_2012/code.vcxproj
projects/MSVC_2012/code.vcxproj.filters
2015-05-29 17:47:58 +02:00
m!m
661b650911
Merge pull request #145 from asarium/fix/timerbar
...
Remove unused timerbar files
2015-05-29 17:45:10 +02:00
asarium
badbe4a239
Remove unused timerbar files
2015-05-29 16:31:41 +02:00
MageKing17
db781c1a7f
Hopefully fix VS 2010 compilation.
...
Apparently VS 2010 doesn't like vector::emplace_back() with 0 arguments. A push_back() of a generic ship_info object should provide basically the same effect.
2015-05-29 02:06:04 -07:00
MageKing17
8fb0436b42
Add new variables to clone() and move().
...
Also add model_icon_angles to the constructor (let's just make absolutely sure it's zeroed out on initialization).
2015-05-28 23:56:22 -07:00
MageKing17
7e696a55d2
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Also added model_icon_angles to the ship_info() constructor, and model_icon_angles, thruster_glow_noise_mult, and min_engine_vol to ship_info::clone() and and ship_info::move().
Conflicts:
code/ship/ship.cpp
code/ship/ship.h
2015-05-28 23:49:33 -07:00
Fabian Woltermann
3b90519be4
Merge pull request #144 from asarium/antipodes_/haptic
...
[Antipodes] Add some debug code to sdl haptic initialization
2015-05-28 16:32:38 +02:00
Fabian Woltermann
0311484e12
Merge pull request #143 from asarium/antipodes_/cleanup/endian
...
[Antipodes] Unify byte order detection using SDL
2015-05-28 16:32:05 +02:00
asarium
d59dd99d28
Add some debug code to sdl haptic initialization
2015-05-28 15:43:00 +02:00
Fabian Woltermann
2e1ae8c126
Merge pull request #142 from asarium/antipodes_/cleanup/outwnd
...
Remove dead code from outwnd.cpp
2015-05-28 14:45:20 +02:00
Fabian Woltermann
b6cd096204
Merge pull request #141 from asarium/antipodes
...
Sync Antipodes
2015-05-28 14:44:34 +02:00
asarium
7eaaf94342
Unify byte order detection using SDL
2015-05-28 14:41:13 +02:00
asarium
ffcb4ca268
Use the new outwnd.cpp on every platform
2015-05-28 13:57:47 +02:00
asarium
acccaa929d
Fix compilation under linux
2015-05-28 13:56:07 +02:00
asarium
e0ce4737ec
Clean outwnd.cpp
...
It had a lot of dead code related to the unused debug output window.
2015-05-28 13:18:32 +02:00
asarium
4b6041980e
Merge branch 'master' into antipodes
...
Conflicts:
code/osapi/osapi.cpp
2015-05-28 13:07:57 +02:00
Fabian Woltermann
0bc1d365e6
Merge pull request #139 from asarium/antipodes_/joystickGUID
...
[Antipodes] Make the joystick system use GUIDs to identify the joysticks
2015-05-28 11:37:36 +02:00
asarium
e0c919baea
Change enum class back to enum
2015-05-28 11:34:31 +02:00
asarium
a7efca662d
Make the joystick system use GUIDs to identify the joysticks
2015-05-28 11:34:30 +02:00
Fabian Woltermann
9140069a85
Merge pull request #138 from asarium/antipodes_/cleanup/joy
...
[Antipodes] Remove now unused functions
2015-05-28 11:23:22 +02:00
Fabian Woltermann
fae5f227b7
Merge pull request #137 from asarium/antipodes_/cleanup/mouse
...
[Antipodes] Remove unneded functions from mouse.h/.cpp
2015-05-28 11:22:56 +02:00
Fabian Woltermann
5baa57216a
Merge pull request #136 from asarium/antipodes_/externalCode
...
[Antipodes] Update externalcode to use SDL to do DLL loading
2015-05-28 11:22:35 +02:00
Fabian Woltermann
a181616583
Merge pull request #134 from asarium/antipodes_/SDLupdate
...
[Antipodes] Update SDL to version 2.0.3
2015-05-28 11:22:18 +02:00
m!m
3030e20121
Merge pull request #140 from scp-fs2open/possible-appveyor-fix
...
Remove AppVeyor logger.
2015-05-28 11:03:00 +02:00
MageKing17
9f65ab39d0
Remove AppVeyor logger.
...
Apparently it's causing the nonsensical failures for builds of the 2013 project.
2015-05-28 00:28:11 -07:00
asarium
13f22d0ac9
Remove now unused functions
2015-05-27 15:50:42 +02:00
asarium
90efc5d1b1
Remove unneded functions from mouse.h/.cpp
2015-05-27 15:07:15 +02:00
asarium
d6460398e6
Update externalcode to use SDL to do DLL loading
2015-05-27 15:01:40 +02:00
Lari Nieminen
3e4cfa361d
Added customizable shield impact explosion effects, originally adapted from Wanderer branch.
2015-05-27 13:41:50 +03:00
asarium
9ec7a5886d
Update SDL to version 2.0.3
...
This version now works out of the box with FRED although I don't know exactly why, if it breaks in the future SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT could help fix it.
2015-05-27 12:35:50 +02:00
Fabian Woltermann
a127a8cad6
Merge pull request #133 from ln-zookeeper/master
...
Added a $Model Icon Direction ship table entry for overriding the ang…
2015-05-27 11:31:31 +02:00
Lari Nieminen
8fd0bf3f7f
Added a $Model Icon Direction ship table entry for overriding the angle from which ship icons are rendered from.
2015-05-27 12:19:06 +03:00
Fabian Woltermann
d4d4868fe7
Merge pull request #128 from asarium/antipodes_/resolutionFix
...
[Antipodes] Pick a better default resolution
2015-05-27 11:11:50 +02:00
Fabian Woltermann
af79c18752
Merge pull request #132 from z64555/ap-mousewheel
...
Expands mouse functionality.
2015-05-27 10:39:22 +02:00
z64555
3a0b78366d
Some documentation on the MOUSE_BUTTON and MOUSE_WHEEL defines
2015-05-27 03:31:29 -05:00
z64555
c2e72b0098
can haz better bool algea-bra?
2015-05-27 03:25:35 -05:00
z64555
bf3c861f19
Merge pull request #130 from The-E/antipodes
...
Adjustments to the MSVC2010 project files for AP
2015-05-27 03:14:27 -05:00
z64555
56f9f608be
Merge pull request #119 from The-E/dedicated_gpu
...
Use high-performance GPU by default.
2015-05-27 03:13:49 -05:00
z64555
69b845ef83
Adds mousewheel functions in addition to support for X1 and X2 buttons. These currently take up the same mappings as joy buttons 4 through 9.
2015-05-27 03:06:03 -05:00
Fabian Woltermann
258662ff4c
Merge pull request #104 from MageKing17/feature/subspace-beams
...
Subspace Beams
2015-05-27 10:00:44 +02:00
Fabian Woltermann
a0ed1ac897
Merge pull request #125 from ln-zookeeper/master
...
Added a $Thruster Glow Noise Mult ship table entry for decreasing/inc…
2015-05-27 09:56:45 +02:00
Fabian Woltermann
136091fc68
Merge pull request #131 from asarium/mantis/3160
...
Mantis 3160: Only set processor affinity if a commandline flag is present
2015-05-27 09:32:50 +02:00
asarium
c5cf337365
Only set processor affinity if a commandline flag is present
2015-05-27 00:31:08 +02:00
The E
0af8e800a5
Adjustments to the MSVC2010 project files for AP
2015-05-26 22:10:22 +02:00
Fabian Woltermann
6b9f475f64
Merge pull request #129 from asarium/antipodes_/VS2015
...
Fix compilation of Antipodes on VS2015
2015-05-26 21:08:49 +02:00
asarium
5471cafea5
Readd resolution switch
2015-05-26 19:57:00 +02:00
asarium
d39053d82c
Fix linking issues by directly compiling the SDL file,
2015-05-26 19:40:42 +02:00
asarium
356c2637b5
Fix VS2015 project files
2015-05-26 19:07:38 +02:00
asarium
178c69b212
Fix warnings
2015-05-25 22:09:35 +02:00
asarium
a7e8ecfe07
Use the desktop size to initialize a default video card config
2015-05-25 22:09:34 +02:00
MageKing17
69cd61637b
Merge pull request #127 from asarium/antipodes
...
Sync Antipodes
2015-05-25 11:47:41 -07:00
asarium
9d7b3dcb11
Merge branch 'master' into antipodes
...
Conflicts:
projects/MSVC_2012/code.vcxproj
projects/MSVC_2012/code.vcxproj.filters
2015-05-25 15:57:48 +02:00
Axem
e396686570
Adding customizable pain flash and shield pain flash settings
2015-05-24 09:00:30 -05:00
Lari Nieminen
72a082c9eb
Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius.
2015-05-23 00:11:43 +03:00
MageKing17
67a87a33f3
Change if-elseif chain to switch statement.
...
Somewhat easier to read this way.
2015-05-22 12:38:13 -07:00
MageKing17
b2cff0788a
Make these assertions more clear.
2015-05-22 12:37:19 -07:00
MageKing17
fa61278c10
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into feature/subspace-beams
2015-05-22 12:32:34 -07:00
m!m
585a5fe64d
Merge pull request #112 from ln-zookeeper/master
...
Added $Minimum Engine Volume to ships.tbl, with which to customize ho…
2015-05-21 19:44:26 +02:00
Lari Nieminen
81f7d272fd
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-21 18:35:32 +03:00
Goober5000
ee6cd1d204
Merge pull request #121 from MageKing17/bugfix/fred-warnings
...
Fix a couple FRED warnings.
2015-05-21 00:06:48 -04:00
Cliff Gordon
a4c1f89720
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
...
Conflicts:
code/freespace2/freespace.cpp
2015-05-20 17:15:15 -05:00
Cliff Gordon (chief1983)
9429770f3d
Add /MP to all projects and configs in VS 2012 project files.
2015-05-20 12:19:43 -05:00
m!m
2c5999b1d0
Merge pull request #114 from chief1983/rename_2011
...
[rename_2011] Rename MSVC_2011 to MSVC_2012
2015-05-20 17:32:38 +02:00
Cliff Gordon
2f152ce085
[rename_2011] Fix the appveyor config to handle the renamed project.
2015-05-20 09:27:40 -05:00
Cliff Gordon (chief1983)
3163319217
Merge remote-tracking branch 'origin/master' into rename_2011
2015-05-19 21:33:53 -05:00
Cliff Gordon (chief1983)
8e4f6afddd
Add the shadows files to the VS 2012 project. The diff looks like a lot changed, but most is apparently just whitespace. diff -w shows a clean set of file additions.
2015-05-19 21:30:32 -05:00
The E
ef9ae017b5
Make sure we use the same calling convention both times
2015-05-19 21:21:54 +02:00
The E
2c626b4eec
According to AMD and NV, these _should_ force their drivers into high-performance mode
2015-05-19 20:48:01 +02:00
MageKing17
cac6737541
Fix a couple FRED warnings.
...
Change a couple instances of setting a DWORD_PTR to -1 by explicitly casting it to a DWORD_PTR.
2015-05-19 11:39:36 -07:00
MageKing17
ab900aad1c
Avoid calling ssm_create() from ship_apply_tag() if ssm_index < 0.
...
This would happen if a TAG level 3 weapon had no specified SSM (or an invalid one). Since nothing can call ssm_create() with a negative ssm_index now, changed it to a size_t and simplified one of the verification conditionals.
2015-05-19 10:55:17 -07:00
Fabian Woltermann
a69566f8bd
Merge pull request #116 from asarium/ci/appveyor
...
Add AppVeyor configuration
2015-05-19 08:03:07 +02:00
MageKing17
67c75304e7
Merge pull request #115 from asarium/fix/luacpp
...
Fix scripting function ad.playMusic
2015-05-18 17:30:10 -07:00
niffiwan
6a88616f9b
Merge pull request #96 from asarium/fix/unordered_map
...
Change SCP_hash_map to SCP_unordered_map
2015-05-19 07:48:23 +10:00
asarium
57f709fcec
Add AppVeyor configuration
2015-05-18 23:26:38 +02:00
asarium
4a3da56ffd
Merge branch 'master' into antipodes
2015-05-18 22:29:27 +02:00
asarium
6c24aaae77
Actually get the loop variable from the lua stack
2015-05-18 21:57:44 +02:00
MageKing17
764c1ab03f
Fix F3 lab using old idx value.
...
This was causing everything to use the Ship_info index of the size of the species vector; for FS2, that meant 3, which meant GTF Ares.
2015-05-18 10:09:29 -07:00
MageKing17
cde82a9093
Get rid of erroneous assertion.
2015-05-18 10:08:12 -07:00
MageKing17
16229a9950
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-18 10:04:21 -07:00
Fabian Woltermann
7bf700f173
Merge pull request #105 from MageKing17/mantis/3139
...
Fix Mantis #3139 .
2015-05-18 18:21:49 +02:00
Lari Nieminen
742925e0d9
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-18 19:07:31 +03:00
Cliff Gordon
761de4a671
[rename_2011] Rename MSVC_2011 to MSVC_2012 since that's what the IDE actually released as.
2015-05-18 10:53:15 -05:00
m!m
8502c66e7c
Merge pull request #108 from niffiwan/coverity/1298258
...
Fix Coverity 1298258: Uninitialized scalar var
2015-05-18 11:46:56 +02:00
m!m
dcebc4aa50
Merge pull request #110 from niffiwan/coverity/1298255
...
Fix Coverity 1298255: Uninitialized scalar var
2015-05-18 11:45:10 +02:00
Lari Nieminen
54a2a3ea5b
Fixed stupid syntax error.
2015-05-18 00:49:31 +03:00
Lari Nieminen
56273906b7
Fixed incorrect volume ramping.
2015-05-17 17:04:57 +03:00
niffiwan
9df5407dfb
I think this should resolve the Travis issue
2015-05-17 19:48:18 +10:00
niffiwan
51b8e83d89
Fix Coverity 1298257: Uninitialized scalar var
...
Add all struct members to constructor (esp thrust_scale which was read
uninitialised). Remove some var sets that the constructor now sets as
defaults. Also fixes 1298248
2015-05-17 13:25:00 +10:00
Lari Nieminen
a44daaba35
Added $Minimum Engine Volume to ships.tbl, with which to customize how the ship's speed affects engine sound volume.
2015-05-17 03:33:46 +03:00
niffiwan
2d832dd11e
Fix Coverity 1298255: Uninitialized scalar var
...
Copy particle min/max life values from modelinterp
Also avoid double->float conversion
2015-05-16 21:51:39 +10:00
niffiwan
1784e880ae
Merge pull request #50 from asarium/coverity/1093690
...
Fix for Coverity 1093690: Resource leak
2015-05-16 20:05:43 +10:00
asarium
189f23a341
Change SCP_hash_map to SCP_unordered_map
...
Also uses std::unordered_map on every platform now
2015-05-16 11:40:10 +02:00
asarium
cc9109843a
Fix for Coverity 1093690: Resource leak
...
This introduces a move constructor for CJumpNode to handle freeing resources.
2015-05-16 11:20:20 +02:00
niffiwan
1deb837973
Merge pull request #102 from asarium/fix/noallocator
...
Remove SCP_vm_allocator
2015-05-16 14:13:44 +10:00
niffiwan
3859d16640
Fix Coverity 1298258: Uninitialized scalar var
...
Also fixes 1298256, 1298254, 1298253
For vertex vars use default value-initialisation to zero the struct
http://en.cppreference.com/w/cpp/language/value_initialization
Note that parts of vertex don't seem used in relevant codepaths, e.g.
the colours. A zero init approach should be safer should code change in
future.
2015-05-16 12:44:56 +10:00
MageKing17
e68261bbf3
Merge pull request #107 from niffiwan/coverity/1298268
...
Fix Coverity 1298268: Division by float zero
2015-05-15 19:01:37 -07:00
MageKing17
e2a350940a
Merge pull request #106 from niffiwan/coverity/1298261
...
Fix Coverity 1298261 Missing break in switch
2015-05-15 19:00:07 -07:00
niffiwan
6512edec77
Fix Coverity 1298268: Division by float zero
...
The div-by-zero won't be triggered by this code because the
secondaryteam is "none". Play it safe and protect the div anyway
2015-05-16 10:59:15 +10:00
niffiwan
2910a7a6eb
Fix Coverity 1298261 Missing break in switch
2015-05-16 10:36:30 +10:00
MageKing17
8efbd74cf0
Fix Mantis #3139 .
...
This make ship explosion shockwaves use the tabled damage type. The code was creating a new shockwave_create_info object, initializing it, and then only copying some of the attributes of the ship's "shockwave" shockwave_create_info member (not including damage type). It makes more sense to use copy-assignment and then specifically override the attributes that should be overridden.
2015-05-15 16:40:25 -07:00
MageKing17
05b79a41fb
Allow beams to be spawned weapons.
2015-05-15 16:28:42 -07:00
niffiwan
e24f459eaf
Merge pull request #103 from asarium/travis/badge
...
Add Travis CI badge to Readme.md
2015-05-16 09:23:02 +10:00
MageKing17
9a5fa95c54
Add subspace beam strikes.
...
Overhaul hudartillery.cpp to use STL containers (removes hardcoded limits on maximum number of strike types, simultaneously active strikes, and projectiles per strike), use modular tables, allow for different shape options, and allow beams as the weapon.
2015-05-15 16:19:44 -07:00
MageKing17
abfba82d48
Add beam-create SEXP.
...
Fires a floating beam from a given set of coordinates (like fire-beam and fire-beam-at-coordinates).
2015-05-15 16:11:36 -07:00
MageKing17
0609d3919f
Allow floating beams.
...
Makes it possible for a beam to fire from a point in space instead of a turret.
2015-05-15 16:09:35 -07:00
MageKing17
f8954cc941
Fix typo of "section" as "secion".
2015-05-15 15:28:27 -07:00
asarium
794a7f5bd1
Add coverity badge to Readme.md
2015-05-16 00:02:56 +02:00
asarium
762e7c3e24
Remove SCP_vm_allocator
2015-05-15 23:39:15 +02:00
MageKing17
41df065706
Merge pull request #101 from asarium/antipodes
...
Sync Antipodes
2015-05-15 14:31:18 -07:00
MageKing17
165fc95411
Merge pull request #100 from ln-zookeeper/master
...
Fixed a bug with the next/prev subsystem targeting keys not working i…
2015-05-15 14:29:34 -07:00
asarium
43ef44e479
Install the right SDL package
2015-05-15 18:04:30 +02:00
asarium
5a0b3305da
Merge branch 'master' into antipodes
2015-05-15 17:40:58 +02:00
Lari Nieminen
268c2558d5
Fixed a bug with the next/prev subsystem targeting keys not working if the target only has one subsystem.
2015-05-15 15:16:58 +03:00
niffiwan
34170b1cd2
Merge pull request #97 from asarium/travis/master
...
Add Travis CI config file
2015-05-15 20:39:20 +10:00
niffiwan
9147fc483f
Merge pull request #52 from asarium/fix/warnings
...
Fix compilation warnings
2015-05-15 20:37:58 +10:00
Fabian Woltermann
450bc83068
Merge pull request #99 from SamuelCho/fog_shader_fix
...
Fix errors when model shader variants use fog but don't use diffuse maps.
2015-05-15 08:11:42 +02:00
SamuelCho
65d3d59c0f
Fix errors when model shader variants use fog but don't use diffuse maps.
2015-05-14 22:40:43 -07:00
asarium
e50555c4ae
Add Travis CI config file
2015-05-14 22:20:30 +02:00
asarium
e677ed7657
Fix warning 'allocate_poly_list' : unreferenced local function has been removed
2015-05-14 17:37:41 +02:00
niffiwan
82c2805b36
Merge branch 'ln-zookeeper-master'
2015-05-14 19:44:27 +10:00
niffiwan
bf13e5053e
Merge branch 'master' into ln-zookeeper-master
...
Conflicts:
code/ai/ai_profiles.cpp
2015-05-14 19:38:19 +10:00
Fabian Woltermann
f6093feceb
Merge pull request #94 from MageKing17/bugfix/bomb-invulnerability
...
Make an AI profile flag for the aspect bomb invulnerability fix.
2015-05-14 10:54:56 +02:00
Fabian Woltermann
2ae6216c93
Merge pull request #95 from SamuelCho/bracket_trans_fix
...
Fixed ship select bracket rendering and lighting on transparent geometry.
2015-05-14 10:54:28 +02:00
asarium
a237d7faad
Fix compilation on OS X
2015-05-14 10:45:32 +02:00
asarium
77283e9c7a
Fix conversion warnings
2015-05-14 10:45:32 +02:00
asarium
f7a22d7ed0
Fix BM_TYPE to ubyte conversion warnings
2015-05-14 10:45:31 +02:00
asarium
ab1b12fdd6
Fix "conversion from 'SPPHRASERNG' to 'ULONG'" warning
2015-05-14 10:45:30 +02:00
asarium
d5938614c1
Fix "forcing value to bool 'true' or 'false'" warning
2015-05-14 10:45:29 +02:00
asarium
83bb7e144f
Fix unused function warning
2015-05-14 10:45:29 +02:00
asarium
65b1569df2
Fix macro redefinition warning
2015-05-14 10:45:28 +02:00
asarium
b849eec785
Fix "conversion from 'BM_TYPE' to 'ubyte'" warning
2015-05-14 10:45:27 +02:00
asarium
b883ebc038
Fix usage of uninitialized variable warning
2015-05-14 10:45:26 +02:00
asarium
3cfbcbe363
Fix signed < unsigned warning
2015-05-14 10:45:25 +02:00
SamuelCho
5255f129dc
Fixed gradient brackets in ship select screen. Fixed lighting for transparent meshes when using deferred lighting.
2015-05-13 20:38:17 -07:00
MageKing17
9555602823
Make an AI profile flag for the aspect bomb invulnerability fix.
...
Originally introduced in r8696 back in 2012 (hash d7d6009ea1 ), this fix changes retail balance and should be behind a flag.
2015-05-13 20:15:27 -07:00
MageKing17
9db390b553
Avoid bug in older clang versions.
...
Avoids calling std::swap() on multidimensional arrays.
2015-05-12 19:45:55 -07:00
MageKing17
48095d34e6
Fix a few typos.
2015-05-12 19:45:11 -07:00
MageKing17
51a8932f7f
Add glowpoint_bank_override_map to the ship_info operations.
2015-05-12 19:44:26 -07:00
MageKing17
274a32e1ac
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/model/modelread.cpp
code/ship/ship.h
2015-05-12 19:22:58 -07:00
Lari Nieminen
2c1d1b12cc
Allowed bay path speed modifiers to function in both pathing modes.
2015-05-13 00:35:40 +03:00
Lari Nieminen
133f059b8d
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-05-13 00:21:04 +03:00
Cliff Gordon
fbbfef9ae2
Missing project file additions for shadows to compile on OS X.
2015-05-12 15:37:44 -05:00
MageKing17
ccf623f4b1
Merge pull request #93 from asarium/antipodes
...
Sync Antipodes
2015-05-12 11:41:56 -07:00
asarium
c6e7087b60
Merge branch 'master' into antipodes
...
Conflicts:
code/graphics/2d.cpp
projects/MSVC_2013/code.vcxproj.filters
2015-05-12 20:34:35 +02:00
The E
556550fbde
Updated project files for MSVC 2015
2015-05-12 20:27:34 +02:00
Fabian Woltermann
5dfbc6d292
Merge pull request #88 from SamuelCho/soft_shadows_deferred_lighting
...
Soft shadows, deferred lighting, and various graphics improvements and optimizations
2015-05-12 20:06:33 +02:00
Lari Nieminen
4fbf65ae8b
Warn about bay path speed multipliers currently only working with the 'alt1' pathing type.
2015-05-11 19:50:13 +03:00
Lari Nieminen
c9ec754eb6
Fixed $bay arrive/depart speed multiplier not working correctly.
2015-05-11 19:09:55 +03:00
niffiwan
1fe476a9e2
Merge pull request #79 from asarium/mantis/3134
...
From LotF: Fix for Mantis 3134
2015-05-10 21:45:25 +10:00
Lari Nieminen
ffed62372f
Added ai_profiles and path metadata options to force AI ships flying bay paths to gradually accelerate/decelerate instead of flying the path at max speed.
2015-05-10 11:52:09 +03:00
MageKing17
367c060749
Merge pull request #91 from ln-zookeeper/master
...
Avoid loading the anchor ship model multiple times when resolving pat…
2015-05-09 17:13:31 -07:00
Lari Nieminen
24d16213a6
Avoid loading the anchor ship model multiple times when resolving path masks.
2015-05-10 02:23:44 +03:00
MageKing17
be57943a52
Merge pull request #90 from ln-zookeeper/master
...
Revert a part of f6e2f1d2 / r11129 which causes collision problems in…
2015-05-09 16:03:09 -07:00
Lari Nieminen
7a8c7cc6c2
Revert a part of f6e2f1d2 / r11129 which causes collision problems in some corner cases.
2015-05-09 13:42:12 +03:00
niffiwan
c85904b3c5
Merge pull request #85 from MageKing17/bugfix/random-multiple-of
...
Fix random-multiple-of.
2015-05-09 19:47:23 +10:00
MageKing17
08a1434b71
Merge pull request #89 from niffiwan/coverity/1093714_mk2
...
Fix Coverity 1093714: Negative array index read
2015-05-09 01:42:50 -07:00
niffiwan
d69b7d7e0d
Add newline to Assertion msg
2015-05-09 18:27:20 +10:00
niffiwan
93a5d82ca8
Fix Coverity 1093714: Negative array index read
...
This is very unlikely, but add an assertion anyway just in case someone
in future messes us keeping num_primary_banks & primary_bank_weapons in
sync.
2015-05-09 17:08:21 +10:00
SamuelCho
90c8025588
Code cleanup before the big soft shadows and deferred lighting merge into master.
2015-05-08 21:55:28 -07:00
SamuelCho
520b89408e
Fixed warnings related to graphics code additions.
2015-05-08 21:21:20 -07:00
SamuelCho
094c5fe302
Resolve faster ibx and improved profiling merges.
2015-05-08 20:53:59 -07:00
niffiwan
27cdf337fb
Merge pull request #74 from SamuelCho/faster_ibx
...
Greatly increase the generation speed of index buffers.
2015-05-09 13:35:54 +10:00
niffiwan
f2d3763bdd
Merge pull request #86 from MageKing17/bugfix/sexp-not-segfault
...
Fix typo in eval_not.
2015-05-09 13:30:29 +10:00
SamuelCho
96cbfb1fdf
#include <algorithm> to get faster index buffer generation working on Linux.
2015-05-08 20:20:29 -07:00
MageKing17
290d25d6ae
Fix typo in eval_not.
...
Can cause serious problems by accessing Sexp_nodes[-1].value. Caused chief1986 to segfault on OS X.
2015-05-08 16:13:35 -07:00
MageKing17
9ef7aa2432
Fix random-multiple-of.
...
I don't know if I was just tired when I wrote this originally or what, but there were two problems here; one, the for-loop condition was inverted (and since I made it a for-loop instead of a while-loop, I'm not sure why I didn't take out the "break" condition), so its contents would never actually evaluate. Two, the node matching random_argument wasn't being stored anywhere so even if the for-loop condition hadn't been wrong, it would've just used the last valid argument instead of the first argument every time. Fixes GitHub issue #84 .
2015-05-08 16:09:37 -07:00
asarium
d822f2a467
Merge branch 'master' into antipodes
...
Conflicts:
code/io/timer.cpp
timer conflict was fixed by using the performance counters of SDL instead of what the OS offers directly
2015-05-08 22:24:36 +02:00
niffiwan
a39a7530f8
Merge pull request #82 from ln-zookeeper/master
...
Added a "Show Destroyed Subsystems" flag to ship lab for viewing -des…
2015-05-08 20:32:13 +10:00
Fabian Woltermann
77ee6f100b
Merge pull request #83 from asarium/feature/betterGamesndParsing
...
Improve gamesnd modular parsing
2015-05-08 10:32:26 +02:00
asarium
88a85e4024
Improve gamesnd modular parsing
...
As requested by jg18, this improves the sound.tbl parser to properly handle +nocreate. If the file name of an entry should not be changed you have to specify <same>.
2015-05-08 08:48:17 +02:00
m!m
2223db66d2
Merge pull request #81 from asarium/antipodes
...
Sync Antipodes
2015-05-08 08:08:29 +02:00
Lari Nieminen
ce853a5f07
Added a "Show Destroyed Subsystems" flag to ship lab for viewing -destroyed submodels.
2015-05-08 01:20:58 +03:00
MageKing17
87b79774d1
Merge pull request #80 from asarium/fix/gitignore
...
Update .gitignore to include voice recognition files
2015-05-07 13:46:32 -07:00
asarium
48206c3ef8
Update .gitignore to include voice recognition files
2015-05-07 22:41:22 +02:00
asarium
2453161a54
Merge branch 'master' into antipodes
2015-05-07 22:38:11 +02:00
Fabian Woltermann
0349240a33
Merge pull request #75 from SamuelCho/profiling_microseconds
...
Improved profiling code to have a timing resolution of microseconds instead of milliseconds
2015-05-07 21:03:44 +02:00
Samuel Cho
135620dcf9
Merge branch 'faster_ibx' of https://github.com/SamuelCho/fs2open.github.com into faster_ibx
2015-05-07 09:47:41 -07:00
Swifty
60a5a6bd7c
Removal of IBX file code and related command-line options.
2015-05-07 09:46:58 -07:00
Swifty
5a68f6d830
Greatly increase the generation speed of index buffers.
2015-05-07 09:46:57 -07:00
asarium
aa6936a2a5
From LotF: Fix for Mantis 3134
...
dynamic weapon point firing causes a crash when used on a fighter with more than 6 firing points
2015-05-07 18:27:48 +02:00
niffiwan
935af40c87
Merge pull request #78 from ln-zookeeper/master
...
Make firepoint HUD gauge light up only firepoints that'll fire next
2015-05-07 20:32:28 +10:00
Lari Nieminen
42d830e62f
* Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used.
2015-05-06 23:40:40 +03:00
Swifty
7cf5a3e085
Removal of IBX file code and related command-line options.
2015-05-06 12:27:50 -07:00
Cliff Gordon
0ce31bf471
[fix/triplemon_hud] Yarn's triple-monitor fix, see http://www.hard-light.net/forums/index.php?topic=89262.0 . Patch tweaked to work around changes in 9aed627.
2015-05-06 10:40:45 -05:00
Fabian Woltermann
4d90765185
Merge pull request #48 from MageKing17/bugfix/fred-ship-editor-persona
...
Fix persona selection in FRED's ship editor.
2015-05-06 12:27:05 +02:00
niffiwan
7b82acb327
Merge pull request #73 from MageKing17/mantis/3140
...
Fix Mantis 3140.
2015-05-06 20:17:26 +10:00
niffiwan
666e1ddeeb
Merge pull request #70 from ln-zookeeper/master
...
Add optional control preset names
Also display the name in the control config page (F2)
2015-05-06 19:11:51 +10:00
Swifty
dd9f9ed921
Improved profiling code to have a timing resolution of microseconds instead of milliseconds.
2015-05-05 20:41:05 -07:00
Swifty
47c2aa0bbc
Greatly increase the generation speed of index buffers.
2015-05-05 19:08:41 -07:00
MageKing17
e59bb76f72
Get rid of warning on 64-bit compilers.
...
If size_t is bigger than an int, this line generates warnings.
2015-05-05 14:43:20 -07:00
MageKing17
202bd3a5dc
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-05 14:39:01 -07:00
MageKing17
5f43e78be2
Fix Mantis 3140.
...
Changes the "virtual frame" used for aspect locks to be 640x480 so as to correct different lock behavior due to both different aspect ratios and different resolutions. Applies a scaling factor to the drawing of the lock indicator on the HUD so that it traverses roughly the same portion of the screen regardless of resolution.
2015-05-05 12:54:07 -07:00
Cliff Gordon
e3ca0ec5b1
Merge pull request #59 from Echelon9/fix/doxygen
...
Fix doxygen documentation
2015-05-05 09:41:41 -05:00
Echelon9
464a25b457
Fix empty documentation/doxygen using .gitkeep and global .gitignore trick. Otherwise, Git does not index empty folders.
2015-05-06 00:18:28 +10:00
Echelon9
819f53721d
Revert "Fix empty documentation/doxygen using .gitignore trick. Otherwise, Git does not index empty folders."
...
This reverts commit 550998e827 .
2015-05-05 23:59:39 +10:00
niffiwan
4e68213569
Merge pull request #72 from chief1983/mantis/3158b
...
Fix for Mantis #3158 : prevent narrowing that breaks compilation in stricter compilers
2015-05-05 11:37:09 +10:00
Cliff Gordon
6b080df736
Fix for Mantis #3158 (take 2): change the size of the token used for released but active streams to fit into an int without narrowing.
2015-05-04 20:33:02 -05:00
Lari Nieminen
0bb972b141
Made it possible to name control presets, and made controls config display the current preset's name if there are multiple to choose from.
2015-05-05 00:38:24 +03:00
niffiwan
93d88650e1
Merge pull request #68 from chief1983/fix/HAVE_CXX11-freebsd
...
Fix for a 'HAVE_CXX11 already defined' warning
(related to clang on non-OSX OS's)
2015-05-05 07:34:08 +10:00
Cliff Gordon
cd399f90a1
Fix for a 'HAVE_CXX11 already defined' warning on almost every compiled object on FreeBSD.
2015-05-04 14:42:41 -05:00
Fabian Woltermann
189275da56
Merge pull request #56 from asarium/coverity/1093600
...
Fix for Coverity 1093600: Negative array index read
2015-05-03 21:57:23 +02:00
Fabian Woltermann
4c7d80cba8
Merge pull request #63 from asarium/coverity/1093530
...
Fix for Coverity 1093530: Negative array index read
2015-05-03 21:56:16 +02:00
Fabian Woltermann
4a14e26256
Merge pull request #64 from asarium/coverity/1093515
...
Fix for Coverity 1093515: Negative array index read
2015-05-03 21:55:50 +02:00
Fabian Woltermann
0fc8e53f5f
Merge pull request #65 from asarium/coverity/1237276
...
Fix for Coverity 1237276: Uninitialized scalar field
2015-05-03 21:55:04 +02:00
Fabian Woltermann
ba2a1c9e7d
Merge pull request #62 from asarium/coverity/1093555
...
Fix for Coverity 1093555: Negative array index read
2015-05-03 21:53:56 +02:00
Fabian Woltermann
115a2979b1
Merge pull request #67 from asarium/fix/aigoals
...
Fix usage of negative index
2015-05-03 21:53:01 +02:00
asarium
e9b9797b6e
Fix usage of negative index
...
I have no idea why this didn't cause any issues earlier...
2015-05-03 21:27:23 +02:00
Fabian Woltermann
08f8487023
Merge pull request #66 from asarium/antipodes
...
Sync antipodes branch
2015-05-03 16:19:44 +02:00
asarium
922f482d08
Merge branch 'master' into antipodes
...
Conflicts:
code/cutscene/cutscenes.cpp
code/freespace2/freespace.cpp
code/hud/hudconfig.cpp
2015-05-03 16:05:56 +02:00
asarium
da0ef89ac5
Fix for Coverity 1237276: Uninitialized scalar field
...
The field will contain an arbitrary value left over from earlier computations.
In subtitle::subtitle(int, int, char const*, char const*, float, float, color const*, int, bool, bool, int, int, bool): A scalar field is not initialized by the constructor
2015-05-03 14:55:06 +02:00
asarium
fe49ef63aa
Fix for Coverity 1093515: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_options_process_packet(unsigned char *, header *): Negative value used to index an array in a read operation
2015-05-03 14:44:26 +02:00
asarium
f51bc78126
Fix for Coverity 1093530: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In message_queue_process(): Negative value used to index an array in a read operation
2015-05-03 14:34:06 +02:00
m!m
711c7a7bf8
Merge pull request #61 from niffiwan/coverity-1093565
...
Fix Coverity 1093565: Negative array index read
2015-05-03 04:27:22 -07:00
asarium
ca16b4710d
Fix for Coverity 1093555: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_create_standalone_object(): Negative value used to index an array in a read operation
observer_create() will only fail in exceptional circumstances so a showing an error dialog should be acceptable
2015-05-03 13:12:23 +02:00
niffiwan
471cf4c988
Fix Coverity 1093565: Negative array index read
...
Add an assertion to catch any callers that haven't correctly set
the target_name. Also fix a minor typo in the comments
2015-05-03 20:31:16 +10:00
Goober5000
d734a36940
Merge pull request #60 from niffiwan/coverity-1093484
...
Fix Coverity 1093484
2015-05-03 02:14:34 -04:00
niffiwan
25079f5ed2
Fix Coverity 1093484
...
time_t is 64bit on 64bit systems; casting a pointer to a larger type is
dangerous, but assigning to a larger type should be fine
2015-05-03 15:42:25 +10:00
Goober5000
f0a0632d9d
Merge pull request #51 from asarium/coverity/1093689
...
Fix for Coverity 1093689: Resource leak
2015-05-02 23:47:28 -04:00
Echelon9
b8ba7f1466
Address obsolete Doxyfile sections, per Doxygen 1.8.9.1 automatic Doxyfile updater.
2015-05-03 11:39:36 +10:00
Echelon9
550998e827
Fix empty documentation/doxygen using .gitignore trick. Otherwise, Git does not index empty folders.
2015-05-03 11:23:19 +10:00
Swifty
6da0d162b8
Fixed compilation issues.
2015-05-02 17:18:51 -07:00
asarium
3528dffabd
Fix for Coverity 1093587: Negative array index read
...
The random value shouldn't be used if there are no countermeasures so this shouldn't cause any issues.
2015-05-02 23:53:39 +02:00
Swifty
c620372357
Soft shadows, deferred lighting, and various major graphics optimizations.
2015-05-02 14:35:37 -07:00
asarium
2aa569c1e7
Fix for Coverity 1093600: Negative array index read
...
hud_squadmsg_is_target_order_valid already checks if ainfo->target_objnum is less than zero so that check is not needed
2015-05-02 23:14:59 +02:00
Goober5000
584ec36f62
Merge pull request #53 from asarium/coverity/1093688
...
Fix for Coverity 1093688: Resource leak
2015-05-02 15:45:50 -04:00
Goober5000
93c46bd1f9
Merge pull request #55 from asarium/coverity/1093606
...
Fix for Coverity 1093606: Negative array index read
2015-05-02 15:45:17 -04:00
Goober5000
b6cc62c435
Merge pull request #54 from asarium/coverity/1093683
...
Fix for Coverity 1093683: Resource leak
2015-05-02 15:44:26 -04:00
asarium
00a288d53e
Fix for Coverity 1093606: Negative array index read
2015-05-02 19:41:55 +02:00
asarium
4bfea90a17
Fix for Coverity 1093683: Resource leak
2015-05-02 19:32:39 +02:00
asarium
aef3e3ac36
Fix for Coverity 1093688: Resource leak
2015-05-02 19:24:57 +02:00
asarium
a7398d7f5c
Fix for Coverity 1093689: Resource leak
2015-05-02 18:19:28 +02:00
MageKing17
0a6ab7d1f7
Fix persona selection in FRED's ship editor.
...
The old code operated under the assumption that all wingman personas would be at the start of the persona list. Since this assumption was neither checked for nor warned if violated anywhere else, I've made FRED work regardless of how they might be distributed throughout the Personas[] array.
2015-05-01 16:23:29 -07:00
MageKing17
e8bed8f892
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-05-01 13:09:32 -07:00
Fabian Woltermann
e2d740513a
Merge pull request #47 from MageKing17/mantis/2971
...
Fix for 2971 from MageKing17: Stop executing HUD code when running as standalone.
2015-05-01 08:27:01 +02:00
MageKing17
1a29b395ab
Stop standalones from executing hud_shield_quadrant_hit().
...
Also add some assertions to avoid (or at least help detect) similar errors in the future. Should fix Mantis 2971.
2015-04-30 22:10:17 -07:00
Goober5000
b2e01d6173
Merge pull request #42 from MageKing17/argument_sexps
...
*-argument sexp short-circuiting
2015-04-30 22:46:38 -04:00
Me
bc17966b08
Merge pull request #46 from DahBlount/recoil
...
Feature: add primary weapon recoil
2015-05-01 08:02:53 +10:00
MageKing17
be9990f6a5
Fix cf_file_exists().
...
Was passing the pointer to *size instead of *offset, so instead of seeing if the file didn't have an offset, we were checking if it didn't have a size.
2015-04-29 23:21:49 -07:00
niffiwan
c5bddac8fb
Merge pull request #43 from niffiwan/cpp11_mk2
...
Cpp11 support for GCC
2015-04-30 14:36:20 +10:00
DahBlount
3de25b7e3a
modifier value changes
...
We don't want to change things at run time so initialize them to
non-zero values.
2015-04-29 18:11:16 -07:00
DahBlount
2768863c36
Add ship_recoil_modifier
2015-04-29 18:01:52 -07:00
DahBlount
7b78df2363
Add "apply recoil" flag and modifier
...
This adds the "apply recoil" weapon flag and $Recoil Modifier:
weapons.tbl entry.
2015-04-29 17:26:33 -07:00
MageKing17
d84736be1c
Revert "Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used."
...
This reverts commit 5042c44904 .
(Apparently, "git revert" on a range is only inclusive of the end commit, not the starting commit.)
2015-04-29 16:35:41 -07:00
MageKing17
1591237acf
Reverting recent string of commits.
...
Since they didn't go through code review (and break compilation), reverting the recent string of commits (just used "git revert -n 5042c44..05b4635").
2015-04-29 16:19:59 -07:00
zookeeper
05b4635048
Added bay arrive/depart speed multipliers to +Path Metadata.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11271 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:19:02 +03:00
zookeeper
eef1041323
Initialize bay_arrive_speed_mult and bay_depart_speed_mult.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10731 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:17:51 +03:00
zookeeper
18058a45f7
Added ai_profiles.tbl options to force AI ships flying bay paths to gradually accelerate/decelerate instead of flying the path at max speed.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10422 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/ai/ai_profiles.cpp
2015-04-29 23:16:55 +03:00
zookeeper
fbb76863fd
Probably fixed a bug with the next/prev subsystem targeting keys not working if the target only has one subsystem.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11209 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:12:42 +03:00
zookeeper
400fd0f9a8
Fixed $Thruster Glow Noise Mult not having effect in the ship lab.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10789 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:07:41 +03:00
zookeeper
b18337754d
Added a $Model Icon Direction ship table entry for overriding the angle from which ship icons are rendered from.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10612 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:04:25 +03:00
zookeeper
92a28b71cb
Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10610 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 23:04:24 +03:00
zookeeper
0656175a72
Added a $Minimum Engine Volume ship table entry for specifying the minimum engine sound volume used when ship is stationary.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10609 387891d4-d844-0410-90c0-e4c51a9137d3
Conflicts:
code/object/objectsnd.cpp
2015-04-29 23:04:23 +03:00
zookeeper
dc820fdfc1
Avoid loading the anchor ship model multiple times when resolving path masks.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11235 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:45:57 +03:00
zookeeper
5042c44904
Made the firepoint HUD gauge light up only the firepoints which will fire next, if "dynamic primary linking" ship flag or "cycle" weapon flag is used.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11256 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:42:58 +03:00
Lari Nieminen
91000b4468
Revert "Fixed +Spread From LOD not working right."
...
This reverts commit 4b15ec4e75 .
2015-04-29 22:41:17 +03:00
Lari Nieminen
91614162f2
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-04-29 22:38:05 +03:00
zookeeper
4b15ec4e75
Fixed +Spread From LOD not working right.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@11268 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 22:36:43 +03:00
MageKing17
e84a6e8d33
Fix tech room mission lists.
...
get_mission_info() was returning an uninitialized int due to rval no longer being initialized to 0 by setjmp(). Since rval isn't actually needed anymore, I went ahead and removed it. The only bits of code that actually check the return value of get_mission_info() are the tech room's mission simulator and some of the multiplayer code, so this bug wasn't actually preventing missions from being played through the ready room.
2015-04-29 12:34:11 -07:00
niffiwan
763601033b
Remove unused function from palman.[cpp|h]
2015-04-29 21:00:19 +10:00
niffiwan
caf2876d50
Merge pull request #40 from asarium/antipodes
...
Add proper usage of SDLMain again
2015-04-29 20:58:58 +10:00
niffiwan
0ff8c8191f
Remove gcc -Wshadow warnings
2015-04-29 20:55:56 +10:00
asarium
62cfccb325
Remove the rest of no-grab
2015-04-29 12:51:47 +02:00
niffiwan
b0bb0ee3be
Remove gcc -Wunused-but-set-variable warnings
2015-04-29 20:27:49 +10:00
MageKing17
31140ab533
Make FRED use the new try-catch logic.
...
Missed during the recent parseExceptions merge; there was a usage of setjmp() during the background import dialogue.
2015-04-28 19:09:19 -07:00
asarium
5701b477f4
Remove accidentally added files
2015-04-28 21:01:00 +02:00
asarium
78c52ebcc9
Fix some merge issues
2015-04-28 21:00:41 +02:00
niffiwan
e3d1428e35
From Yarn: fix mantis 3157
...
Switch German and Polish translations of "Transport"
2015-04-28 19:36:30 +10:00
Fabian Woltermann
1d332d693d
Merge pull request #38 from asarium/feature/parseExceptions
...
Replace longjmp with exceptions
2015-04-28 07:47:53 +02:00
niffiwan
36c656c389
bah, lrn2markdown
2015-04-27 20:46:37 +10:00
niffiwan
43b8cf2221
Resolve github issue #34 (add Coverity Badge)
...
Also freshen up the new README.md contents
2015-04-27 20:43:51 +10:00
MageKing17
ad91ba61b5
Short-circuit eval_sexp() on SEXP_NAN_FOREVER.
...
Since SEXP_NAN_FOREVER is supposed to indicate that the node will always evaluate to SEXP_NAN_FOREVER, we should short-circuit the process like we do for SEXP_KNOWN_TRUE and SEXP_KNOWN_FALSE.
2015-04-27 03:11:33 -07:00
MageKing17
7dea7075e7
Clean up eval_sexp() return value comparisons.
...
From niffiwan and myself (almost entirely niffiwan). Since eval_sexp() can't actually (and shouldn't) return certain special values, remove conditions checking for them and remove the erroneous comment claiming they should be returned.
2015-04-27 03:09:45 -07:00
MageKing17
9ec10dd3e6
Fix memory leak in for-counter.
...
Switch from strdup() to vm_strdup(), and make sure the allocated strings get freed after usage.
2015-04-27 03:06:28 -07:00
MageKing17
83b59fb76c
Make *-argument SEXPs possible to short-circuit.
...
Fixes Mantis 3136. Written by niffiwan and myself. Allows the *-of SEXPs to return SEXP_KNOWN_FALSE when they can't evaluate ever again, allowing the when-argument or every-time-argument SEXP containing them to itself return SEXP_KNOWN_FALSE.
2015-04-27 03:05:18 -07:00
Lari Nieminen
418d53f169
Removed false "returns ptr to vector" comments.
2015-04-27 11:57:39 +03:00
MageKing17
15f6549087
Ship templates!
...
Restores ship templates, only working, thanks to ship_info now having a proper copy-assignment operator.
2015-04-27 00:05:57 -07:00
MageKing17
3a7307d0ce
Somewhat-related followup to Ship_info vectorization.
...
There were some references to MAX_WEAPON_TYPES in missionscreencommon.cpp that really looked like they should've been referring to Num_weapon_types (formatted similarly to some references to MAX_SHIP_CLASSES which were changed to Ship_info.size() references). Figured I might as well fix them at the same time.
2015-04-27 00:03:20 -07:00
MageKing17
bc0c7cf4c5
Vectorization of Ship_info.
...
Converts Ship_info from a ship_info[] to an SCP_vector<ship_info>. ship_info now has proper constructors, assignment operators, and a destructor. Num_ship_classes removed; various references to Num_ship_classes and/or MAX_SHIP_CLASSES (which remains for various other structures which need it) changed to Ship_info.size() instead.
This doesn't make the ship class limit dynamic, but it is a preparatory step to get there.
2015-04-27 00:01:22 -07:00
MageKing17
5daf294f25
Remove irrelevant assertion.
...
Removes assertion in ship_model_update_instance() about turrets having the ability to rotate. Matches previous change to ship_model_start() (done in r10822; see also Mantis 3061).
2015-04-26 15:51:37 -07:00
MageKing17
0bcb3f24e6
Fix automatic "$Short name:" generation.
...
Made it include srcend (i.e. the null terminator) so that treating short_name as a null-terminated string (which it should be) doesn't access invalid memory. Also removed unused "destend" pointer.
2015-04-26 13:48:11 -07:00
MageKing17
9e66027e8b
Remove unused "tspecies_names" pointer array.
2015-04-26 13:38:20 -07:00
MageKing17
d1444b45ac
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-04-26 10:04:57 -07:00
MageKing17
26553f1327
Voice recognition upgrades.
...
Switches to an in-process recognizer, removes the hard-coded wing list (which could in accessing invalid memory, when used with a custom grammar file), and fixes up the grammar file a bit.
2015-04-26 10:03:44 -07:00
Cliff Gordon (chief1983)
18ef1f77d4
FreeBSD 10 is on Clang now, -ansi doesn't mean anything here.
2015-04-26 10:27:12 -05:00
asarium
9d7e6824a5
Fix compilation
2015-04-26 15:57:52 +02:00
asarium
67cf5c31ee
Remove unnecessary function call
2015-04-25 18:55:08 +02:00
asarium
6582285676
Merge remote-tracking branch 'upstream/antipodes' into antipodes
2015-04-25 18:41:10 +02:00
asarium
900c77216a
Add usage of SDLMain again
2015-04-25 18:39:29 +02:00
Fabian Woltermann
88d1b2b520
Merge pull request #39 from asarium/antipodes
...
Merge branch 'master' into antipodes
2015-04-25 17:57:49 +02:00
asarium
7e77b5a67c
Merge branch 'master' into antipodes
...
Conflicts:
.gitignore
code/Makefile.am
code/ai/ai.h
code/ai/ai_profiles.cpp
code/ai/ai_profiles.h
code/ai/aibig.cpp
code/ai/aicode.cpp
code/ai/aiturret.cpp
code/asteroid/asteroid.cpp
code/asteroid/asteroid.h
code/bmpman/bm_internal.h
code/bmpman/bmpman.cpp
code/bmpman/bmpman.h
code/camera/camera.cpp
code/camera/camera.h
code/cfile/cfile.cpp
code/cmdline/cmdline.cpp
code/cmdline/cmdline.h
code/controlconfig/controlsconfig.h
code/controlconfig/controlsconfigcommon.cpp
code/cutscene/movie.cpp
code/cutscene/oggplayer.cpp
code/debugconsole/consoleparse.cpp
code/fred2/campaigneditordlg.cpp
code/fred2/fred.cpp
code/fred2/fred.rc
code/fred2/missionsave.cpp
code/fred2/resource.h
code/fred2/sexp_tree.cpp
code/fred2/sexp_tree.h
code/fred2/shipflagsdlg.cpp
code/fred2/shipflagsdlg.h
code/fred2/shiptexturesdlg.cpp
code/fred2/voiceactingmanager.cpp
code/freespace2/freespace.cpp
code/freespace2/freespace.rc
code/gamehelp/contexthelp.cpp
code/globalincs/alphacolors.cpp
code/globalincs/alphacolors.h
code/globalincs/version.h
code/globalincs/vmallocator.h
code/globalincs/windebug.cpp
code/graphics/2d.cpp
code/graphics/font.cpp
code/graphics/generic.cpp
code/graphics/generic.h
code/graphics/grinternal.h
code/graphics/gropengl.cpp
code/graphics/gropengldraw.cpp
code/graphics/gropenglextension.h
code/graphics/gropenglpostprocessing.cpp
code/graphics/gropenglstate.cpp
code/graphics/gropenglstate.h
code/graphics/gropengltexture.cpp
code/graphics/gropengltnl.cpp
code/hud/hud.cpp
code/hud/hud.h
code/hud/hudconfig.cpp
code/hud/hudlock.cpp
code/hud/hudmessage.cpp
code/hud/hudparse.cpp
code/hud/hudreticle.cpp
code/hud/hudreticle.h
code/hud/hudshield.cpp
code/hud/hudsquadmsg.cpp
code/hud/hudtarget.cpp
code/hud/hudtarget.h
code/hud/hudtargetbox.cpp
code/inetfile/cftp.cpp
code/inetfile/chttpget.cpp
code/io/joy.cpp
code/io/joy_ff.cpp
code/io/key.cpp
code/io/keycontrol.cpp
code/io/mouse.cpp
code/io/timer.cpp
code/localization/localize.cpp
code/localization/localize.h
code/math/fvi.cpp
code/math/vecmat.cpp
code/menuui/credits.cpp
code/menuui/mainhallmenu.cpp
code/menuui/mainhallmenu.h
code/menuui/optionsmenumulti.cpp
code/menuui/playermenu.cpp
code/mission/missionbriefcommon.cpp
code/mission/missioncampaign.cpp
code/mission/missiongoals.h
code/mission/missionmessage.cpp
code/mission/missionparse.cpp
code/mission/missionparse.h
code/missionui/missionbrief.cpp
code/missionui/missioncmdbrief.cpp
code/missionui/missiondebrief.cpp
code/missionui/missionscreencommon.cpp
code/missionui/missionshipchoice.cpp
code/missionui/missionweaponchoice.cpp
code/missionui/redalert.cpp
code/missionui/redalert.h
code/mod_table/mod_table.cpp
code/mod_table/mod_table.h
code/model/model.h
code/model/modelcollide.cpp
code/model/modelinterp.cpp
code/model/modelread.cpp
code/network/multi.cpp
code/network/multi_dogfight.cpp
code/network/multi_ingame.cpp
code/network/multi_log.cpp
code/network/multi_rate.cpp
code/network/multiteamselect.cpp
code/network/multiui.cpp
code/network/multiutil.cpp
code/network/stand_gui-unix.cpp
code/object/collideshipship.cpp
code/object/collideshipweapon.cpp
code/object/object.cpp
code/object/object.h
code/object/objectsnd.cpp
code/object/objectsort.cpp
code/osapi/osapi.cpp
code/osapi/osapi_unix.cpp
code/osapi/outwnd.h
code/parse/generic_log.cpp
code/parse/lua.cpp
code/parse/parselo.cpp
code/parse/parselo.h
code/parse/scripting.cpp
code/parse/scripting.h
code/parse/sexp.cpp
code/parse/sexp.h
code/physics/physics.cpp
code/pilotfile/csg.cpp
code/pilotfile/csg_convert.cpp
code/pilotfile/pilotfile.cpp
code/pilotfile/pilotfile_convert.h
code/playerman/playercontrol.cpp
code/radar/radardradis.cpp
code/radar/radardradis.h
code/radar/radarsetup.cpp
code/radar/radarsetup.h
code/ship/ship.cpp
code/ship/ship.h
code/ship/shipfx.cpp
code/ship/shiphit.cpp
code/sound/audiostr.cpp
code/sound/ds.cpp
code/sound/openal.cpp
code/sound/rtvoice.cpp
code/sound/sound.cpp
code/sound/voicerec.cpp
code/stats/medals.cpp
code/stats/medals.h
code/stats/scoring.cpp
code/ui/ui.h
code/weapon/beam.cpp
code/weapon/weapon.h
code/weapon/weapons.cpp
code/wxfred2/aboutbox.cpp
code/wxfred2/campaigneditor.cpp
code/wxfred2/campaigneditor.h
code/wxfred2/commandbriefingeditor.cpp
code/wxfred2/debriefingeditor.cpp
code/wxfred2/fredframe.cpp
code/wxfred2/fredframe.h
code/wxfred2/missionspecseditor.cpp
code/wxfred2/missionspecseditor.h
code/wxfred2/voiceactingmanagereditor.cpp
code/wxfred2/wxfred.xrc
code/wxfred2/wxfred2.cpp
code/wxfred2/wxfred2.h
configure.ac
fs2open.Doxyfile
jansson/LICENSE
jansson/dump.c
jansson/hashtable.c
jansson/hashtable.h
jansson/jansson.h
jansson/jansson_config.h
jansson/jansson_private.h
jansson/load.c
jansson/memory.c
jansson/pack_unpack.c
jansson/strbuffer.c
jansson/strbuffer.h
jansson/strconv.c
jansson/utf.c
jansson/utf.h
jansson/value.c
libpng/png.c
libpng/png.h
libpng/pngconf.h
libpng/pngdebug.h
libpng/pngerror.c
libpng/pngget.c
libpng/pnginfo.h
libpng/pnglibconf.h
libpng/pngmem.c
libpng/pngpread.c
libpng/pngpriv.h
libpng/pngread.c
libpng/pngrio.c
libpng/pngrtran.c
libpng/pngrutil.c
libpng/pngset.c
libpng/pngstruct.h
libpng/pngtrans.c
libpng/pngwio.c
libpng/pngwrite.c
libpng/pngwtran.c
libpng/pngwutil.c
projects/Eclipse/Freespace2/.project
projects/MSVC_2005/Fred2.vcproj
projects/MSVC_2005/Freespace2.sln
projects/MSVC_2005/Freespace2.vcproj
projects/MSVC_2005/code.vcproj
projects/MSVC_2005/wxFRED2.vcproj
projects/MSVC_2008/Fred2.vcproj
projects/MSVC_2008/Freespace2.doxproj
projects/MSVC_2008/Freespace2.vcproj
projects/MSVC_2008/code.vcproj
projects/MSVC_2010/Fred2.vcxproj
projects/MSVC_2010/Freespace2.vcxproj
projects/MSVC_2010/code.vcxproj
projects/MSVC_2010/code.vcxproj.filters
projects/MSVC_2010/wxFRED2.vcxproj
projects/MSVC_2011/Fred2.vcxproj
projects/MSVC_2011/Freespace2.vcxproj
projects/MSVC_2011/code.vcxproj
projects/MSVC_2011/code.vcxproj.filters
projects/MSVC_2011/wxFRED2.vcxproj
projects/MSVC_2013/Fred2.vcxproj
projects/MSVC_2013/Freespace2.vcxproj
projects/MSVC_2013/code.vcxproj
projects/MSVC_2013/code.vcxproj.filters
projects/MSVC_2013/libjpeg.vcxproj
projects/MSVC_2013/liblua.vcxproj
projects/MSVC_2013/libpng.vcxproj
projects/MSVC_2013/wxFRED2.vcxproj
projects/MSVC_2013/zlib.vcxproj
projects/MSVC_6/Fred2.dsp
projects/MSVC_6/Freespace2.dsp
projects/MSVC_6/code.dsp
projects/MSVC_6/wxFRED2.dsp
projects/Xcode/English.lproj/InfoPlist.strings
projects/Xcode/FS2_Open.xcodeproj/project.pbxproj
projects/Xcode4/English.lproj/InfoPlist.strings
projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj
projects/Xcode4/Frameworks.tgz
projects/codeblocks/Freespace2/Freespace2.cbp
zlib/adler32.c
zlib/compress.c
zlib/crc32.c
zlib/crc32.h
zlib/deflate.c
zlib/deflate.h
zlib/infback.c
zlib/inffast.c
zlib/inffixed.h
zlib/inflate.c
zlib/inftrees.c
zlib/trees.c
zlib/uncompr.c
zlib/zconf.h
zlib/zlib.h
zlib/zutil.c
zlib/zutil.h
2015-04-25 16:48:43 +02:00
asarium
9aed627ce7
Replace longjmp with exceptions
...
Also added a EditorConfig file
2015-04-24 15:03:59 +02:00
chief1983
f187522238
File exists wrappers for bitmaps and animations; eliminates worrying about extensions, only need the base filename and it'll tell you if it's available.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11328 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:19 +10:00
chief1983
26adf935f7
Globalize various file extension lists littered throughout the code so they can be referenced from other classes as needed, instead of being hardcoded multiple times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11327 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:18 +10:00
chief1983
d68baac787
Eliminate some redundancy with ship allowed weapon parsing.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11326 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:17 +10:00
chief1983
c3d3f4d4dd
Update OS X project to work with updated Jansson.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11325 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:17 +10:00
chief1983
cc037e3259
Upgrade Jansson to 2.7.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11324 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:16 +10:00
MageKing17
0c60515662
Record mission loading time in the debug log.
...
(Just changes a printf into an mprintf.)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11323 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:15 +10:00
MageKing17
ec88fdbae1
Minor objectsnd.cpp cleanup.
...
Should be all nonfunctional changes (yes, even those "else" branches that look like they change behavior; functionally speaking, those branches shouldn't get hit because FSO will delete the sounds when they shouldn't apply).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11322 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:10 +10:00
MageKing17
83414b238d
Remove required_string_3() and required_string_4().
...
Replaced with usage of required_string_one_of(). (required_string_either() not removed due to different behavior.)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11321 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:09:06 +10:00
MageKing17
a233f62afb
Remove some redundant code in parselo.cpp.
...
7 cases in stuff_string() (both versions) were using identical code. Consolidated into one branch for clarity.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11320 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:31 +10:00
MageKing17
8ef442205c
Fix minor problem with weapons.cpp.
...
If "@Laser Color2:" is defined for a weapon and you override that weapon with a modular table (even if that override entry doesn't actually contain any data), the weapon's laser_color_2 value would get defaulted to its laser_color_1 value. Now, only do that if changing laser_color_1 and the RGB values of the two colors matched before.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11319 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:31 +10:00
MageKing17
66bddb970c
Commit various updates to the MSVS 2013 project files, following discussion in #scp.
...
Fixes Mantis 3104, amongst other minor issues. Given the existence of the Community Edition, decided to make FS2_SPEECH and FS2_VOICER defined by default. Setup release builds for debugging symbols. Corrected a few inconsistencies between configurations.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11318 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:30 +10:00
chief1983
4ecc546e34
Backport (?) r3727 and 3733 from fs2_open-unstable_old, the old CVS unstable branch.
...
3727: added MadProf's voice recognition enhancements
3733: fix spelling, and synch with voicerec.cpp
See http://www.hard-light.net/forums/index.php?topic=37643.msg880793#msg880793 for more information.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11317 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-23 12:08:29 +10:00
MageKing17
aaec401c8f
Removing unused code from hud.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11315 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-19 00:10:27 +10:00
MageKing17
6f1e33938c
Fix a possible crash with -reparse_mainhall.
...
Left over pointer towards a structure that had been cleared and rebuilt could cause a crash. Found (and fix tested) by Axem. Also thanks to z64555 for bouncing ideas back and forth until this solution was found.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11314 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:07 +10:00
chief1983
c4d1ed526c
Other half of version bump to 3.7.3, I will probably have that automated by the next release cycle.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11310 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:06 +10:00
chief1983
161e7498c4
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11309 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 18:12:04 +10:00
m_m
e3311f36ac
Fix for Mantis 3156: Fighter beam range depends on target radius
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11307 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-18 00:09:10 +10:00
MageKing17
ed11f9a1c1
Fix objnum/instance confusion in comm menu.
...
Could cause orders to be grayed out for the wrong ship, due to it happening to have an objnum matching the instance of the ship you were ordering.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11305 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-17 06:07:54 +10:00
niffiwan
e0e3cffab6
Update credits for 3.7.2
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11304 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-16 00:08:49 +10:00
z64555
b6d48faf4d
BMPMAN doxy effort. Also defines EXAMPLE_PATH in the doxyfile to enable use of the @example command, which references code snippets as examples.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11303 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-14 00:06:58 +10:00
zookeeper
73d6483df6
Typo-fixed and clarified some SEXP argument descriptions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11302 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-12 12:07:23 +10:00
zookeeper
3952713eba
Fixed "get-ets-values" to "get-ets-value" in the help string.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11301 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-12 12:07:22 +10:00
z64555
617c530a3b
From Echelon9 and myself. Resolves some typos with the debug console parser.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11300 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 18:11:42 +10:00
niffiwan
8c0f95ced8
Fix mantis 3150
...
Use and set music volume changes requested by sexp_adjust_audio_volume()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11299 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 12:12:06 +10:00
Goober5000
78f9c8f82c
related to Mantis #3130 - don't create a VBO if we're not supposed to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11298 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-11 12:12:03 +10:00
m_m
9ad5d09c0a
From LotF and me: Fix for Mantis 3146: Crash when pressing enter key in empty region of main hall
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11296 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-31 18:58:28 +10:00
MageKing17
b61779e852
Fix mantis #3154 .
...
Adds ON_CLBN_CHKCHANGE to the message map for the ships and weapons lists so that hitting spacebar to change the checked/unchecked status of a ship or weapon also updates the availability count.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11295 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-31 18:40:28 +10:00
m_m
2d82f7652d
Fix "Callsigns still don't work when messages come from capships" issue
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11294 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-30 17:29:39 +10:00
The_E
9284264885
Patch to add MSVC2015 support. Also fixes a few warnings its compiler threw.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11292 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-29 11:05:02 +10:00
niffiwan
3e9c19c5c7
Fix mantis 3151
...
Implement case insensitive -mod dir search on *nix
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11291 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-28 11:12:25 +10:00
z64555
cd8595cf0f
Fix for Mantis 3152: Moves the trail origin to the mathematical center of a laser bolt, if the weapon's render type is a laser.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11290 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-28 08:53:10 +10:00
The_E
1199555321
Adds a new debug output filter, "CFileDebug", which if enabled via debug_filter.cfg will print the absolute path to any file requested by the engine.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11289 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-22 13:04:55 +10:00
The_E
0808c3459f
If a text file to be read by the engine is in Unicode, abort. Could be something important we're missing.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11288 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-22 13:04:55 +10:00
niffiwan
b5fe481ab2
add script-eval-block sexp
...
This is a workaround to the sexp TOKEN_LENGTH limit
The script can be split across multiple arguments to allow scripts
longer than 32 chars (i.e. current TOKEN_LENGTH)
e.g.
( script-eval
"ba.warning('foo"
" more and more and more"
" and the rest')"
)
Kudos to Axem for suggesting the idea
(And to zookeeper for reminding me to actually commit it!)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11286 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-21 11:41:49 +10:00
zookeeper
44b786c171
Fixed a mistake in $Model Point Shield Controls.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11285 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-19 16:40:17 +10:00
MageKing17
21cbf82196
Fix mantis 3147. From Admiral MS and myself.
...
From Admiral MS: Avoid bashing orientation if trying to avoid a collision.
From myself: Bash orientation if aspect seekers are equipped.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11284 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-18 18:21:21 +10:00
zookeeper
ae32159408
Moved the fix in r11279 to a slightly more logical place.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11280 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-17 11:20:24 +10:00
zookeeper
56f694dc43
Check for and fix rare but possible discrepancy between sip->model_num and sip->subsystems[].model_num which can lead to model index collision errors.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11279 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-17 08:30:08 +10:00
zookeeper
95145a4f3f
Slightly clarified variable use.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11276 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-07 09:39:26 +10:00
MageKing17
e0527d9bc7
Fix mantis #1929 .
...
Makes the IDC_OLD_TEXTURE_LIST dropdown list use the same sorting as the old_texture_name[] array, and should also so that multiple old texture replacements for the same ship are properly erased.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11274 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-04 22:43:03 +10:00
MageKing17
4742378d50
Followup to r11266; let code use hardcoded defaults.
...
Presumably, the use of use_default_pos in load_gauge_radar_dradis() is the result of a copy&paste job, but removing it allows the default values to be used to compute coords.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11273 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-04 22:43:03 +10:00
zookeeper
a2e15f4c61
Tweaks to the argument documentation of a bunch of scripting functions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11272 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-03 16:22:51 +10:00
zookeeper
77b245eed2
Fixed shield handle not returning correct quads when indexing with the SHIELD_* enums.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11270 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-03 16:22:51 +10:00
niffiwan
a1979e704e
Coverity 1244962 Uninitialized scalar variable
...
Set default DRADIS coords to 0,0
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11266 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
23fbcb1a2f
Add indentation for previous commit
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11265 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
dc02e70716
Coverity 1093719 Negative array index read
...
Check current_bank is > -1 before using it
Note: did not alter indentation in this commit in order to make
relevant changes easier to see
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11264 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
170614f150
Coverity 1093718 Negative array index read
...
Create swip after checking that its index is > -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11263 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
5c8a6234a1
Coverity 1093705 Negative array index read
...
Probably not an issue, but to be safe removing the unused pointer anyway
i.e. the check that instance >= 0 suggests there's a possiblilty that the
pointer could contains a negative array index read
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11262 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
niffiwan
aadc41a40a
Coverity 1093495+1093498 Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11261 387891d4-d844-0410-90c0-e4c51a9137d3
2015-03-01 11:02:15 +10:00
zookeeper
2203c1e9a8
Ported r11232 from zookeeper branch: Set the Sender hook variable to nil in On Message Received hooks if message not coming from a ship.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11257 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-21 11:34:30 +10:00
MageKing17
40a9025aeb
Fixes hardpoint gauge not rendering outline.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11247 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-12 17:13:54 +10:00
MageKing17
14bd62147c
Adding a "$Briefing Grid:" interface color to colors.tbl.
...
Requested by Axem.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11245 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-12 17:13:54 +10:00
m_m
70d735ceb4
Added "On HUD Message Received" scripting hook which is invoked when the HUD receives message text to display.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11242 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-09 17:22:03 +10:00
niffiwan
7d92b1cecf
Fix mantis 3138: remove spurious warning
...
Don't warn about low rotational velocities disabling collisions for
no_collide ships
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11238 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-03 17:08:58 +10:00
zookeeper
8a50f844b0
Improved warnings text and clarified variable use in turret modelread code.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11236 387891d4-d844-0410-90c0-e4c51a9137d3
2015-02-02 17:21:53 +10:00
zookeeper
35d6a9654d
Ported r11100 from zookeeper branch: Fix various issues with $Acceleration Time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11234 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-27 18:27:41 +10:00
zookeeper
c47233ca3c
Ported r11085 from zookeeper branch: Fixed weapon particle spews not taking launch velocity properly into account if $Acceleration Time is used.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11233 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-27 18:27:40 +10:00
MageKing17
d01856d992
Fix a potential crash during ships.tbl parsing.
...
Makes parse_ship() use ship_info_lookup_sub() instead of ship_info_lookup() (shouldn't be jumping through those hoops during table parsing if they're for FS1 mission conversion), and more importantly, added an error check to ship_info_lookup() to avoid sprintf() exceeding the length of the char array.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11230 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-24 09:22:32 +10:00
chief1983
ec758aa108
Fix for Mantis 3036: This unifies the cf_exists function to behave like the other functions in the cf_exists* family, and simultaneously addresses the bug.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11222 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-23 18:35:55 +10:00
MageKing17
f5c1b6608d
Reverting r4959 per discussion on #scp and the forums.
...
Adding every "#"-variant was causing spurious errors when switching from the MediaVPs to no mod. See http://www.hard-light.net/forums/index.php?topic=88982.0 for details.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11221 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-20 18:50:38 +10:00
chief1983
7df12ebd75
Experimental flag to apply lighting to briefing window model popups. Flag should be removed and behavior made default if no issues arise after next release.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11218 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-16 18:58:02 +10:00
zookeeper
4422aaa311
Fixed an issue with disabled binds getting matched in key translation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11215 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:44 +10:00
chief1983
9ebcc3e437
Added OpenBSD to what is now a multi-BSD check.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11214 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
4f53f07681
minor modifications to mission cutscenes: change cutscene_name field to filename, because it's actually the filename of the cutscene make struct a plain old data object (no constructor) make parsing a little tidier, and make the SEXP formula and closing #end tag optional
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11213 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
61df0f18b1
add warning if a cutscene is specified that isn't in cutscenes.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11212 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
87e8170268
add optional_string_one_of, which is useful to have
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11211 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
b9a6a9f23e
instead of an Int3(), use a Warning that's only displayed once
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11210 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
MageKing17
6a77d128c9
Fixing weird problem with snd_update_3d_pos() that, honestly, baffles me as to how the code ever worked on any system.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11208 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
zookeeper
20218b0924
Added support for NONE as a value for $Key Default, for making a key unbound by default.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11206 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
zookeeper
b1f1756dd1
Fixed breakage of $Category and $Type from r10843.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11205 387891d4-d844-0410-90c0-e4c51a9137d3
2015-01-14 17:29:43 +10:00
Goober5000
7250cd13a6
add ship class texture replacement using a simplified method that doesn't require the texture_set code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11204 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-23 18:15:11 +10:00
MageKing17
b23aea5a41
Fix mantis #3068 .
...
Make hitting the "delete" key in the pilot-selection menu do the same thing as clicking on the "remove" button.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11202 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-22 18:01:31 +10:00
niffiwan
a49eb75c6e
Add warning for very fast ship-rotation values
...
Otherwise rotational collision detection is disabled for the ship
(and an int3() triggers in debug)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11201 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-20 11:54:49 +10:00
MageKing17
c8b48e4a36
Change m_badge_earned into a vector.
...
This makes it so that getting enough kills to cross the threshold for more than one badge simultaneously grants all of them (with the debriefing showing only the last one) and backs out all of them if the scoring is backed out.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11198 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-16 19:57:49 +10:00
Goober5000
709f483617
PAUSE ALL THE STREAMS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11197 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-12 16:12:16 +10:00
MageKing17
ffd74fa60b
Adding "+Available From Start:" to Medals.tbl.
...
Requested by MjnMixael.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11196 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-12 16:12:16 +10:00
Goober5000
1c826d366e
add the pauseMusic scripting function, requested by MjnMixael
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11195 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-11 18:15:36 +10:00
Goober5000
1c464864c3
fix Mantis #3132 (is-iff returns true when the target is destroyed)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11193 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-10 16:37:43 +10:00
MageKing17
a03f96ca01
Related to r11189: avoid calling factor_table::getNextSlots() if the ship doesn't have the dynamic linking flag.
...
Basically, hitting "o" on any ship with more than 6 slots in a bank could crash FSO, even without the flag. Reported by Spoon.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11192 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-10 16:37:43 +10:00
MageKing17
15fad7f58b
Correct copy-paste error in check_sexp_syntax() from the armor types commit.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11191 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-09 14:09:29 +10:00
Goober5000
f01c4bf952
fix Mantis #3135 : account for the case when the game is paused before being minimized
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11190 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
MageKing17
1d7c01181e
Fix mantis #3133 . Fixes logic errors in factor_table not being sure if it's supposed to be 0-based or 1-based at different times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11189 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
Goober5000
0162cab8bd
move this around for more logical flow
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11188 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-08 17:14:57 +10:00
Goober5000
b02af2ef6e
a more future-proof way to keep track of explicitly paused audio
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11187 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-04 16:39:40 +10:00
Goober5000
4eb1726004
this should fix Mantis #2888 (allow for head.ani files without letter suffixes)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11186 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-04 16:39:40 +10:00
Goober5000
2f734daf0d
when the game returns from a paused state, don't unpause the music paused by sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11185 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:32 +10:00
Goober5000
a516b88803
it's good to check whether the music is paused, for bulletproof-ness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11184 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:31 +10:00
Goober5000
9f12e1f56b
added a sexp to pause and unpause music that is currently playing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11183 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 20:31:31 +10:00
Goober5000
255c2912cb
minor reorganization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11182 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-03 16:23:42 +10:00
Goober5000
ac25da1bd9
remove the Error (originally Assert) from r1675 and add back the comment removed in r8005
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11181 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-01 20:37:52 +10:00
Goober5000
872bbe2a11
improve sexp code for obtaining pitch/bank/heading with the following changes: 1) use an alternate algorithm for extracting angles from an orientation matrix 2) properly round floats to integers when converting to degrees
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11180 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-29 19:53:19 +10:00
Goober5000
f7353121e6
m!m's fix for Mantis #3131 : contrary to the xt change from r11138, NULL is only returned on vm_malloc failure (so should never happen in normal execution)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11179 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-25 19:15:56 +10:00
MageKing17
f64afbecfb
From The_E, niffiwan, m_m, and myself: Fix Mantis 2404.
...
Makes "$Weapon Model Draw Distance:" actually stop external weapon models from being drawn beyond that distance (modified by detail level).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11178 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-22 08:47:11 +10:00
niffiwan
c05845cb9d
Fix mantis 3114
...
Change turret-tagged-only behaviour back to retail
Add AI profiles flag to allow use of newer behaviour (i.e. stricter)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11177 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 19:26:53 +10:00
niffiwan
a73404dbd5
Error needs LOCATION :)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11176 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 19:26:53 +10:00
The_E
fbd590cd77
Improvement for this error message
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11175 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 18:43:52 +10:00
MageKing17
e4072d6e51
Adding area-of-effect capability to Electronics weapons.
...
By adding an "+Area Of Effect" line after "+New Style:" or "+Old Style:", it causes every ship caught in the weapon's shockwave or blast to suffer electronics disruption. Requested by Black Wolf.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11173 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-21 18:43:52 +10:00
MageKing17
0417b4c335
Ensure that the debriefing code sets the font before wordwrapping.
...
Also, explicitly set the font instead of relying on Debrief_ui_window.draw() doing it implicitly.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11172 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-18 18:09:08 +10:00
MageKing17
b14b590ab1
Adding "interceptable", "turret interceptable", and "fighter interceptable" weapon flags.
...
These allow munitions to be attacked by the AI without needing to set the "bomb" flag; "turret interceptable" means it can be attacked by turrets, "fighter interceptable" means it can be shot down by fighters, and "interceptable" sets both flags simultaneously. Requested by Rheyah.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11171 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-10 17:45:58 +10:00
m_m
de57f043da
From MageKing17 and me: Fix for Mantis 3128: Docking related crash - dock_list isn't initialized This patch makes the copy constructor and the assignment operator of the object class private as it contains members that should not be copied.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11170 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-08 10:57:03 +10:00
niffiwan
487f764764
Redo Coverity 1215458 Uninitialized pointer field
...
Includes more robust checks of cmdline_parm data
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11169 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-02 19:52:04 +10:00
m_m
86510572bf
With help from MageKing17: Fix for Mantis 3123: Virtual variables and indexers that return nil break the scripting system
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11168 387891d4-d844-0410-90c0-e4c51a9137d3
2014-11-02 11:22:29 +10:00
MageKing17
e604125e5d
Minor followup to r11150.
...
The regular parsing code not using the same broken logic as parse_comments() is not the same thing as it "ignoring" too high versions, and searching for repetitions of the same token would result in just finding the first one over and over again (the likelihood of this actually mattering to anyone is minuscule, but I needed something to test commit access, and this code has been tested).
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11167 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-30 13:23:58 +10:00
Swifty
33776fc4be
gr_opengl_string retooled to use glDrawArrays. Should be a bit faster now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11165 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-29 18:47:04 +10:00
zookeeper
c13c35ec25
Fixed a FRED crash when using $Flight controls follow eyepoint orientation (patch by MageKing17).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11163 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-29 18:47:04 +10:00
zookeeper
83d6456c6a
Clarified how to set a new variable with mn.SEXPVariables.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11161 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-28 22:04:56 +10:00
zookeeper
1d55b98017
Added a little extra info to two bmpman errors.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11160 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-28 22:04:56 +10:00
m_m
bd602cc1a3
Revert 11158 as it breaks FRED compilation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11159 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
m_m
89cd36a242
Fix a crash reported by Axem related to freeing the dock list of an object. This was caused by freeing the dock list from the destructor of an object which meant that copies of an object would corrupt the original object instance. To make sure that doesn't happen again the copy constructor and assignment operator of object have been made private.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11158 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
Goober5000
414daaaed8
Mantis #3127 : fix the spatial check in the rewritten algorithm
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11157 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:23:02 +10:00
The_E
4295cd3edb
Corrects an unwanted change in formatting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11155 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:22:42 +10:00
The_E
6c48551fb3
From MageKing17: Make the lua doManeuver command behave the same way as the sexp.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11154 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-27 18:22:42 +10:00
niffiwan
866667a977
Fix mantis 3126 (from MageKing17)
...
Remove limit of 32 tbms being loaded for any given table type
2014-10-24 19:35:47 +10:00
niffiwan
d1aa2e1c37
Set 1024x768 32bit as default res on *nix
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11153 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:22 +10:00
niffiwan
07e1679138
Partial revert of r11145
...
A fake subsystem used as the firing point for fighter beams. It's
re-used for every fire point so the turret is supposed to only have 1
firepoint. i.e. energy consumption was already correctly calculated
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11152 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:21 +10:00
niffiwan
16f0ff1959
Allow fonts to set/change special char indexes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11151 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-24 19:06:21 +10:00
Goober5000
6cc96ce0c5
MageKing17 has done yeoman's work in fixing the version-specific commenting system. Thanks, MageKing17!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11150 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:40 +10:00
Goober5000
9161158996
xt branch: load stuff from the correct location
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11149 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:35 +10:00
Goober5000
557ef07079
xt branch: memset a bunch of weapons strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11148 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:33 +10:00
Goober5000
130165af9f
xt branch: WIF_MFLASH is unnecessary because we can check whether there is a muzzle flash index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11147 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:32 +10:00
Goober5000
6e56b2970f
xt branch: minor tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11146 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:31 +10:00
Goober5000
5a31e0b38e
xt branch: 1) the number of beam firing points should be the same as the number of ship firing points, because that's how we're calculating the expenditure of weapon energy 2) clear out Ship_type information when we exit the game
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11145 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:29 +10:00
Goober5000
3234a8360c
refine the calculation of effective_primary_banks... 1) optimization from xt branch: don't calculate if we only actually have one bank on our ship 2) make sure to count the current bank that we're firing, to avoid an edge case where we might have a negative fire penalty 3) make the condition logic a little clearer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11144 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:26 +10:00
Goober5000
14dfb5e73d
xt branch: minor ship.cpp fixes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11143 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:21 +10:00
Goober5000
d734f76369
xt branch: "Nothing major here, just added the same basic stuff from the nebula code to make beam glows fade out depending on how close to the eye they are. The primary reason for this was for beams on fighters, since the muzzle glows tend to block your view when they show up. Having them fade out still gives you the visual effect, but allows you to see through them as well."
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11142 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:16 +10:00
Goober5000
871bb0b19a
xt branch: minor optimizations in beam.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11141 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-17 18:25:14 +10:00
Goober5000
4f06fd2435
additional string safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11140 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-15 18:22:57 +10:00
Goober5000
e9f5c531e0
heh... Microsoft's implementation of snprintf doesn't conform to the standard!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11139 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-15 06:23:18 +10:00
Goober5000
dff2156c18
xt branch: more string safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11138 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:41 +10:00
Goober5000
f23a3c5843
SCP_string is useful here too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11137 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:40 +10:00
Goober5000
ff38449a46
string printing safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11136 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:39 +10:00
Goober5000
1318ccfa91
wut? defaulting to NULL here will cause these to never log anything...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11135 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:38 +10:00
Goober5000
65265f8ab8
fix a compile error (d'oh) and use type safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11134 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:37 +10:00
Goober5000
a541a22239
xt branch: optimize objectsort.cpp by not calculating some things every loop iteration
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11133 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:35 +10:00
Goober5000
aee1305841
according to the C standard... "The functions snprintf() and vsnprintf() write at most size bytes (including the trailing null byte ('\0')) to str." ...so we have that going for us, which is nice
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11132 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:33 +10:00
Goober5000
e43dacdcc3
xt branch: use CLAMP here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11131 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:32 +10:00
Goober5000
8e4d98bd4f
xt branch: minor tweaks to glow_points
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11130 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:31 +10:00
Goober5000
f6e2f1d236
xt branch: optimizations in modelcollide.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11129 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:25 +10:00
Goober5000
e22a4b0b5b
xt branch: add capability for custom identifiers in build names (e.g. Xt-0314)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11128 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:24 +10:00
Goober5000
11855ed3d8
xt branch: having a float version of gr_opengl_string makes text scrolling nice and smooth at high nonstandard resolutions (also, looks like quad rendering works just fine here; no need to convert to tris)
...
convert credits.cpp to use float version of gr_opengl_string; eventually Taylor wanted to make the float version standard
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11127 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:23 +10:00
Goober5000
fe775aeedf
xt branch: optimizations in fvi.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11126 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:22 +10:00
Goober5000
5c0bc126bb
xt branch: tweaks to vecmat.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11125 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:20 +10:00
Goober5000
c6364987b3
we don't need to cast because mod is a float
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11124 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 12:24:17 +10:00
Goober5000
b8a05e30a0
xt: sprintf length safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11123 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:14 +10:00
Goober5000
5f3600dc79
probably good to change the comment too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11122 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:13 +10:00
Goober5000
f2d8277452
xt branch: additional optimizations using RAND_MAX_1f
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11121 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:12 +10:00
Goober5000
31562ba811
xt branch tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11120 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 18:22:10 +10:00
Goober5000
4200bb55d7
from xt branch: remove unneeded parameters, tweak some assets, minor optimization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11119 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 12:21:51 +10:00
Goober5000
bffdef1ce5
from xt branch: add some hysteresis to asteroid fields to prevent "popping" when an asteroid exceeds the bounds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11118 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:25 +10:00
Goober5000
4dafc8ff5f
this too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11117 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:24 +10:00
Goober5000
d5e81757b0
some turret changes from the XT branch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11116 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-12 06:22:22 +10:00
Goober5000
61c97871f0
technically, this is better
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11115 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:40 +10:00
Goober5000
50f16b7d02
better method of appending ellipsis (nb: strncpy pads with 0 if string is shorter than len)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11114 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:37 +10:00
Goober5000
8688b05c91
related to Mantis #3121 , make SEXP parsing more robust, and remove some old debug/unused code in get_sexp_main()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11113 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 18:21:35 +10:00
chief1983
9a90a43801
Wrong variable type, may work in MSVC but not on clang or gcc.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11112 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-09 06:21:40 +10:00
Goober5000
15c6f18c74
remove unused debug function
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11111 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-08 18:22:27 +10:00
Goober5000
5552fbcbd9
related to Mantis #3121 , add parentheses if the string passed to runSEXP doesn't have them
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11110 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-08 18:22:24 +10:00
Goober5000
a3b7eec214
make flag checking more efficient and prevent an Int3() on bad data
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11109 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:11 +10:00
Goober5000
2d14ca7539
Parias's patch for Mantis #3102 (make show-subtitle-text positioning consistent on MP clients)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11108 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:10 +10:00
Goober5000
88abaf6de4
I forget who requested this, but this change now causes FRED to allow numeric sexps to be used for OPF_WEAPON_BANK_NUMBER
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11107 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:08 +10:00
Goober5000
3b90b65547
allow sexps which reference sounds to use either the table index or the entry name as the reference (based on a patch by m!m, see http://www.hard-light.net/forums/index.php?topic=86293.0 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11106 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 18:22:07 +10:00
zookeeper
4e0beccfc9
Reverted r10944 and r10945 for now, with the exception of the GL_TRIANGLE_STRIP->GL_QUADS fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11105 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-07 12:21:56 +10:00
Goober5000
cc76884514
well ok, revert that
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11104 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 18:20:08 +10:00
Goober5000
c3bcfc6303
don't enable nav system always... that's not how this is supposed to work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11103 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 18:20:06 +10:00
m_m
478bb022c7
Fixed a bug reported by Axem: The scripting API used the wrong functions to determine if a hud gauge is a custom hud gauge.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11102 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-06 12:20:50 +10:00
Goober5000
4037d3be68
tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11101 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-05 18:20:10 +10:00
Goober5000
85872114ee
related to Mantis #2971 : properly reset shield info when we have a null objp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11099 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
93c7775109
stupid missing parenthesis >.>
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11098 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
e15cd38a88
Between the Ashes HPC request: extend ai-chase-same-team to ai-disarm, ai-disable, and ai-destroy-subsys too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11097 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
416af26244
and on the subject of Mantis #3110 : fix the multi_sexp_deal_with_ship_flag issue that MageKing17 noticed, and tweak a sexp to be more clear
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11096 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:44 +10:00
Goober5000
cd2996f01d
MageKing17's patch for Mantis #3110 : Message Brackets not displayed with 'Invisible to Friendlies' flag
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11095 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
Goober5000
f7e3bef9b7
Between the Ashes HPC request: allow ships to attack others on the same team
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11094 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
Goober5000
31716a9348
use the OBJ_INDEX macro, because that's why we have it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11093 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
z64555
ec60984483
From MageKing17, Makes the $CD: token for cutscenes.tbl optional. Useful, since a majority of assets no longer require physical CD's.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11092 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-04 13:45:43 +10:00
chief1983
5e94b75354
Fix Mantis 3109: Revert r11079 and reopen #2888 since I didn't realize that Fred messages also often use built-in suffix appending. Need to either use FUBAR's original solution or re-engineer something else.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11090 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-29 06:19:41 +10:00
niffiwan
484b518760
Fix mantis 2804: beams can use damage factors
...
Add game_setting.tbl option that allows beams to use weapons table
Armor/Shield/Subsystem damage factors
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11089 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-27 18:20:18 +10:00
niffiwan
df3435cadd
Fix mantis 3108 (from Yarn)
...
Make parsing of DRADIS and custom hud gauges consistent with the rest
of the hud gauges
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11087 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-27 00:19:25 +10:00
Goober5000
7917b9885d
fix Mantis #2987 (AddressSanitizer: global-buffer-overflow in message_queue_process())
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11084 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
e0aaa83513
CommanderDJ's patch for Mantis #2899 (AddressSanitizer: heap-buffer-overflow in snd_play() sound.cpp)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11083 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
435b078157
Yarn's patch for Mantis #3107 (Parts of the interface code assume a font size of 10)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11082 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-25 16:40:34 +10:00
Goober5000
a3e83aacfe
CommanderDJ's patch for Mantis #3050 (Custom mainhall text is limited to 10 chars in the campaign editor)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11081 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
Goober5000
62a2fb3c00
Yarn's patch for Mantis #3106 (Font parameter in hud_gauges.tbl not parsed correctly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11080 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
chief1983
946d7a45af
Fix for Mantis 2888 - add Suffix support to disable suffixes for messages on a per message basis in messages.tbl. See the wiki.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11079 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-24 20:08:21 +10:00
niffiwan
ab3ebebc9c
Parts of mantis 3103 (From MageKing17)
...
Points 3-5 from the mantis ticket
i.e. use OPF_SSM_CLASS in appropriate places
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11078 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-22 20:17:36 +10:00
m_m
5b79ed3ea5
Fix for Mantis 3093: mn.getMissionFilenname() doesn't return a value if in GS_STATE_BRIEFING
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11077 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-22 19:59:03 +10:00
m_m
dd4c91f8b6
From Parias: Fix for Mantis 3094: Request for new scripting function: ts.playCutscene()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11076 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-18 19:11:16 +10:00
niffiwan
fc9f570374
Update .gitignore for new autoconf & libtool
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11075 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 14:03:50 +10:00
niffiwan
fb2ce33802
Fix mantis 3105 (from MageKing17)
...
Use a pointer for reading radar IFF info, not an object copy
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11074 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 13:52:21 +10:00
niffiwan
d9a4320dbb
Add missing \n to mod_table mprintf
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11073 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-13 13:52:21 +10:00
Zacam
a867c1a020
Trunk Sync - r10941
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10942 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
Zacam
38f7b9ab6c
Trunk Sync - r10935
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10936 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
Zacam
f602424270
Trunk Sync r10914
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10915 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
Zacam
9eda776332
AP Builds will now compile (post r10912 cleanup)
...
Still need to validate behaviours.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10913 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
Zacam
4952b70488
Trunk Sync - r10911
...
There are a lot of changes here that should probably be examined, namely the Debug Console (which had conflicts) and Yarn's "any resolution" mainhalls code (Which also had conflicts) but for the most part this should be fairly clean.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10912 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
z64555
4e5715058e
Fixes 2713 - "Freelook Mode Unavailable."
...
Freelook has been re-enabled with a minimal amount of changes.
Efforts to add in slew control keys as well as the ability to map the mouse to a slew axis have resulted into a much larger project than previously expected. As such, these changes will be postponed until fully complete.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10566 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:12 +10:00
The_E
88dce29920
Trunk sync r10550
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10551 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:12 +10:00
niffiwan
cd7b271b3b
Tweak autotools
...
Use libtool, remove warnings about subdirs, DIE if autogen.sh pre-reqs
aren't met
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11072 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
1ac06f8b1c
substitue main hall for displaying MjnMixael's main halls in fsport
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11046 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
7cd97633b6
Yarn's patch for Polish localization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11044 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
603e96865f
VC6 compatibility
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11043 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
5e2046c44b
use class declarations since these contain SCP_string
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11042 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
d2a6beaacc
that variable isn't actually a buffer, so change the misleading name
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11041 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
cd76a257c1
subtitles can now be as long as messages
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11040 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
6052d9c4a4
since we can replace variables in SCP_string, use that instead of an arbitrary char[256] buffer also const-correctness in the constructor
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11039 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
c866ff0061
Karajorma missed an Opps :p
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11038 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
dd353a74d8
add an Assertion about a buffer overflow vulnerability in split_str
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11037 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
b05303fa63
Opps. Only need that defined once!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11036 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
23d5913e9d
The previously committed version of multi-eval did not include the code to allow it to determine if client side scripts should also be executed on the server. This version does but will break any previously created missions.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11035 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
karajorma
04fe7fb64a
Fix Mantis 3077 (Subtitles including a message will crash multiplayer games).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11034 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
niffiwan
3052565490
Revert "Silence GCC warning variable ‘max_size’ set but not used"
...
Based on chief1983's comment that this code is still used, I'll take
the safer route of just telling gcc to shaddupaboudit
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11029 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
b63fd9a86a
Mantis #3101 : check for presence of support dockpoints in all builds, not just release
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11028 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
Goober5000
a7d6891520
MageKing17's patch: add door keys and quick start region, and fix single player / multiplayer description toggling also fix two warnings regarding int and boolean conversions
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11027 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-09 20:37:02 +10:00
niffiwan
9b37d1e0f4
Fix gcc warnings in hudconfig.cpp
...
declaration of ‘color’ shadows a global declaration [-Wshadow] (x2)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11021 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
0bebe6f98a
Partial fix for mantis 2932 (cutscenes)
...
Convert campaign viewed cutscenes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11020 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
743a27b82f
Partial fix for mantis 2932 (RA wep idx)
...
Ensure pilot conversion RA weapon indexes are always valid
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11019 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
57faea2bef
Fix mantis 3099 (from Yarn)
...
Make HCF parsing more flexible
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11018 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 15:42:09 +10:00
niffiwan
1a3336e9bd
Silence GCC warning variable ‘max_size’ set but not used
...
Code seems redundant as dscap_get_raw_data checks for a max size
anyway. And AFAIK the entire voice capture code is non-functional anyway
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11017 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
niffiwan
b88edd53bc
Followup fix for mantis 2883 (from Yarn)
...
Set Lcl_special_chars when changing fonts
Change some copyright chars to use Lcl_special_chars
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11016 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
Echelon9
cba4cc9943
Fix cppcheck (performance) Prefer prefix ++/-- operators for non-primitive types.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11015 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:06 +10:00
Echelon9
aa4b76d990
Fix cppcheck (style) Consecutive return, break, continue, goto or throw statements are unnecessary.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11014 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
Echelon9
44dc398b19
Fix cppcheck (style) Same expression on both sides of ||.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11013 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
Echelon9
85427ec76a
Fix cppcheck (warning) Logical conjunction always evaluates to false: logfile_type < 0 && logfile_type >= 2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11012 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
75e8f8642c
Fix mantis 3020 (pilot stats issue)
...
Reset pilot stats when we're creating a new CSG file. Otherwise stats
from the current pilot or campaign will be inherited by the new pilot /
campaign
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11011 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
e6b8a433f1
Fix mantis 3097 (valgrind)
...
Don't read past the start of the string
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11009 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
c603d42b61
Followup fix for mantis 3049 (from Yarn)
...
Revert an Error back to a Warning
Prevent an out-of-bounds read of the Lcl_ext_str array
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11008 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-23 13:05:05 +10:00
niffiwan
179c2ceb82
Fix mantis 3065 (clear RA data)
...
Clear red alert data when resetting campaign progress, changing
campaigns and switching pilots
In CSG read, move RA data clear from the read RA section to the data
reset function (i.e. clear if CSG is valid, not if section contains
data)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11007 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
21cee81a2a
Fix Coverity 1093622 Array compared against 0 in process_new_player_packet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11006 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
0f77e0aa34
Fix Coverity 1093621 Array compared against 0 in send_accept_packet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11005 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
f3a1589d42
Fix Coverity 1093619 Array compared against 0 in delete_player()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11004 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:12 +10:00
Echelon9
01df45e37e
Fix Coverity 1093613 Negative array index read in stuff_loadout_list()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11003 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
Echelon9
1484f93590
Fix Coverity 1093599 Negative array index read in hud_query_order_issued()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11002 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
niffiwan
b29868aea7
Followup fix for mantis 3016 (FRED Briefing window FOV)
...
Make FRED icons & labels respect the Briefing_window_FOV
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11001 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-17 18:50:11 +10:00
niffiwan
2427c9cfe3
Fix mantis 3092 (from Yarn)
...
Fix certain key string parsing in German & French
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10995 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
bfa3397dbd
Fix mantis 2985 (from Yarn)
...
Fix float-to-int rounding errors in gr_[re|un]size_screen_pos
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10990 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
3d8554b41f
Followup fix to mantis 2887 (from MageKing17)
...
no-collide ship classes would collide unless the no-collide flag was set
in the mission file
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10989 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:57 +10:00
niffiwan
3c81c02829
oops - recommit r10986
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10988 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-16 12:31:56 +10:00
niffiwan
167739ed95
Fix gcc warning
...
declaration of ‘brief_line’ shadows a global declaration [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10987 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
5bcbad1e3a
Fix mantis 3091 (from Yarn)
...
Treat non-ASCII chars above unsigned index 127 as word separators when
ending retail style colorisation
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10986 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
Zacam
060bc97360
From Axem: adds isInCampaign() lua function to tell when a mission is being played in a campaign (as opposed to via Techroom)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10985 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
a2fd4aa519
Fix mantis 3088 (from Yarn)
...
Fix two German keys not displaying in controls config
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10984 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
4b7a69f34e
Fix mantis 3089 (From MageKing17)
...
Move 3D ship select model drawing earlier so that the help overlay is
drawn over the top, not underneath
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10983 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
ce8ed29326
From Coverity ID 1230636 Improper use of negative value
...
false positive; but add comment explaining why
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10982 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
43f3b6ade9
Fix Coverity ID 1230635 Unchecked return value
...
Check return code from lua EvalString on mainhall doors
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10981 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
Echelon9
0ed6dee427
Fix Mantis 3090: Valgrind: Conditional jump or move depends on uninitialised value(s) in webserverApiRequest()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10980 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
niffiwan
335b05c82a
Fix input lag with some ATI cards on Linux
...
From electrojustin; adds cmdline option to force a gl_finish call
prior to swapping buffers.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10979 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:05 +10:00
m_m
f8ff3be1fe
From MageKing17: Fix for Mantis 3085: Unhelpful error reporting in hud_gauges.tbl if an invalid gauge type is specified.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10978 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
7defc6aeeb
Fix mantis 3086 (from Yarn)
...
Add special case to avoid crash from mismatched quotes in
tstrings.tbl German text
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10977 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
b725ec527a
Fix mantis 3087 (from Yarn)
...
Readd translation support for default escort gauge header text
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10976 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
Goober5000
5cbb9d991b
Additional tweak for Mantis #2887 and follow-up to r10181: when modifying OF_COLLIDE, need to call obj_set_flags for collision code support
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10974 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
m_m
27e824c215
Revert accidentally committed project file changes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10973 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-11 18:54:04 +10:00
niffiwan
8e7a936c08
Fix line-endings in fred2/fred.rc
...
(somehow these got messed up in the git repo)
2014-08-06 19:41:46 +10:00
Goober5000
439b2c8cad
add additional lookup for GTSC Faustus for next version of FSPort
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10972 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
3db76adf40
From karajorma: Adds the multi-eval SEXP WARNING: This SEXP is subject to change and will likely be removed or changed in a future version, use with caution. Also fixes Mantis 3079: Add multi-eval to list of available SEXPs (.patch included)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10971 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
8e4235a86e
From ngld and Parias: Fix for Mantis 3084: Bitmaps loaded with gr.loadTexture() are never released.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10970 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:35 +10:00
m_m
9689711149
From FUBAR-BDHR, chief1983, m!m and MageKing17: Fix for Mantis 2887: Additional workaround for mantis 2693
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10969 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-06 19:39:34 +10:00
Zacam
b562ebe1f5
From Axem: adds getFrametimeOverall() lua function for timing purposes outside of gameplay
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10967 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
Zacam
c03fad72cd
Since we updated libpng, might as well update zlib as well. Now v1.2.8.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10966 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
niffiwan
1a813db618
Fix mantis 3078 (From Yarn)
...
Don't set / reset unscaled screen area when rendering to texture
Also fix a pre-10844 bug where scaling down a cockpit gauge would
cause the gauge to be improperly clipped if it was close enough to the
right or bottom edge of the texture.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10965 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
niffiwan
b39b23c3f6
"Fix" gcc warnings in Control_config[]
...
warning: missing initializer for member 'config_item::BLAH'
[-Wmissing-field-initializers]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10964 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
Zacam
e6f92ddcd9
Fix Mantis 3075 : Upgrades libpng from 1.5.7 to 1.6.12
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10963 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:23 +10:00
The_E
04f2c365f8
Fix for Mantis 3080 from MjnMixael: Fix for inadvertently changed parsing order for mainhall tables.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10962 387891d4-d844-0410-90c0-e4c51a9137d3
2014-08-05 18:47:22 +10:00
niffiwan
1291e0ad82
Fix mantis 3073: Additional Mainhall capabilities (from ngld)
...
Adds two new mainhall.tbl options:
1) "+Misc anim over doors:" (misc anim rendered after doors)
2) "+Cheat String:" (exchanges misc anim when cheat is entered)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10961 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
zookeeper
774ec066a4
Fix a render target bug by disabling environment mapping when doing full-scene RTT.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10959 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
9f768b8cff
Doh! Assign, not equality!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10958 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
f730df6c1a
Fix Coverity ID 1093805 Uninitialized scalar variable
...
1st use of fbfire_info.bfi_flags so assign instead of |=
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10957 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:21 +10:00
niffiwan
5daa8d87d2
Fix Coverity 1093822 Uninitialized scalar variable
...
Set sensible looking defaults for the elems added to the beam_collision
struct since retail
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10956 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-30 20:41:20 +10:00
niffiwan
9314dc89da
Fix gcc warnings in hud/hudtarget.cpp
...
declaration of ‘gauge_object’ shadows a member of 'this'
declaration of ‘esct’ shadows a global declaration [-Wshadow]
variable ‘srange’ set but not used [-Wunused-but-set-variable]
variable ‘ship_is_ballistic’ set but not used
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10955 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
3cccc7cb13
Fix gcc warnings in hud/hud.cpp
...
declaration of ‘render’ shadows a member of 'this'
declaration of ‘font’ shadows a global declaration [-Wshadow]
variable ‘flags’ set but not used [-Wunused-but-set-variable]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10954 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
71faaf3137
From MageKing17: tweak team colors
...
While we're looking at the Team Color code, let's have a warning if
someone tries to name a team 'none', and avoid pushing duplicate teams
to the Team_Names vector.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10953 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:18 +10:00
niffiwan
1a0ef281ed
Fix gcc warning in io/keycontrol.cpp
...
suggest parentheses around ‘+’ in operand of ‘&’ [-Wparentheses]
This code previously worked only by fluke!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10952 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 20:39:17 +10:00
z64555
021a0bd3a7
From MageKing17: Followup to r10914. Makes the name check ignore case.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10951 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
e2eddea231
Fix gcc warnings in globalincs/alphacolors.cpp
...
warning: declaration of ‘i’ shadows a previous local [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10950 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
2b191eef2d
Fix Coverity 1228854 Copy-paste error
...
Check pof_file_hud for "$POF target file:" not pof_file ("$POF file:")
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10949 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
e93c1e94b6
Fix Coverity ID 1228858 Missing varargs init or cleanup
...
In required_string_one_of(int arg_count, ...)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10948 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
751861c397
Fixed bits missing from r10946.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10947 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
ae1c4435cf
Turned the required SEXP variable arguments for add-background-bitmap and add-sun-bitmap into optional arguments.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10946 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
a23438f590
Fixed inverted normals in RTT if post-processing is on.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10945 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
zookeeper
6b404f1daa
Fixed RTT bugs: 1) inverted geometry, 2) the output being mirrored both ways and a quarter of the output missing if post-processing is off.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10944 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
niffiwan
2838afdd60
Fix several gcc warnings in code/graphics/gropengldraw.cpp
...
variable ‘clipped’ set but not used [-Wunused-but-set-variable]
variable ‘swapped’ set but not used [-Wunused-but-set-variable]
the address of ‘Distortion_texture’ will always evaluate as ‘true’
[-Waddress]
declaration of ‘vertex’ shadows a global declaration [-Wshadow]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10943 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
Goober5000
0bd67304c4
a tweaked version of ngld's patch for additional main hall capabilities (see Mantis #3071 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10941 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:04 +10:00
Goober5000
6249638c5a
use static casts to make our intentions clear and prevent compiler warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10940 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
5eeb6dd219
some const-correctness in preparation for the Mantis #3071 patch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10939 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
d04ae65f8b
for Mantis #2064 : remove ship template feature which never worked without crashing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10938 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
Goober5000
a30269bd3c
for Mantis #2651 : revert r10933, per forum discussion: http://www.hard-light.net/forums/index.php?topic=88047.0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10937 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
niffiwan
60bad89060
Fix gcc warning: ordered comparison of pointer with integer zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10935 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-27 13:03:03 +10:00
niffiwan
ca31f9a402
Fix mantis 2651: from ZekeSulastin
...
Add support for up to 98 joystick buttons
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10933 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
469e566b20
another localization patch by Yarn: disable character remapping when the game is running in Polish
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10932 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
e13e37245e
MageKing17's tweaks, with a couple of my own
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10931 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:29 +10:00
Goober5000
038ccffdaa
Mantis #2999 - add docking log entries for support ships
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10930 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
niffiwan
b19622cf96
Fix gcc warning in hud/hud.cpp
...
the address of ‘Hud_text_flash’ will always evaluate as ‘true’ [-Waddress]
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10929 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
96e8e77f4e
Fix for Mantis 3064 from MageKing17: Followup fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10928 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
b178fd0cbc
Fix for Mantis 3076 from MageKing17: Fixes behaviour of animated textures on skyboxes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10927 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
d3ef69848c
Fix for Mantis 3064 from MageKing17: Adds more functionality to colors.tbl. * "#Start Colors" is now optional; no more need for a blank section at the start of a colors.tbl just to define some team colors. * "#Interface Colors" section added for redefining various colors used by the interface. * "#Color Tags" section added for redefining or adding your own text color tags. * "#Default Text Color" section for choosing what color tag is the baseline default for various different screens. * And the big one, support for *-clr.tbm modular table files.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10926 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
The_E
a5a1a0ff3b
Patch for Mantis 3069 by MageKing17: Fixes help.tbl error reporting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10925 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:28 +10:00
Goober5000
6f80088695
for Mantis #2153 : MageKing17's FRED support for error messages when wingmen have illegal weapons
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10924 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
Goober5000
905f0999c2
Yarn's patch which allows FreeSpace fonts to support all characters that exist in both Code Page 437 and Windows-1252
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10923 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
3eaf02c022
Fixes an unintended linebreak removal in previous commit
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10922 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
5bff2754c2
From MageKing17: Fixes for a couple of clang warnings.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10921 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
The_E
5e6746af43
From MageKing17: Improves sexp help text to clear up possible confusion about indexes that are zero-based.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10920 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
niffiwan
d2cbf65e1e
Fix mantis3054 (from ngld)
...
In weapon select screen check weapon model index is != -1 before drawing it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10918 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-24 19:45:27 +10:00
m_m
fca002ada8
From Axem: Add ba.getGameDifficulty() scripting function to get the current difficulty level.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10916 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
d3089bb406
Fix for Mantis 2882 by Mageking17 (change-team-color with None color results in error)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10914 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
b96b0e87d8
Removes nonfunctional debug code left over from the :V: days
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10911 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
3d3fa6a749
Moving an assignment out of an if statement for better readability
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10910 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
The_E
514a8c3557
PVS Studio fix: Make the logic responsible for sending the builtin rearm messages behave as intended.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10909 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:32 +10:00
Goober5000
fe4b949c06
fix Mantis #3072 (crashes when using different languages)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10908 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
chief1983
ae351d2924
Fix Mantis 2886 - Option to render External weapon models, besides Tech models, in Weapon lab, from FUBAR.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10907 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
chief1983
4854087a18
Fix Mantis 2885 - SEXP flag to enable/disable primitive sensors, from FUBAR.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10906 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
831e0f3be7
Address clang warning: parameter 'x,' not found in the function declaration [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10904 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
307923e8dd
Address clang warning: unknown command tag name 'brieft'; did you mean 'brief'? [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10903 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
eacf4d4e6e
Address clang warning: parameter [x] not found in the function declaration [-Wdocumentation]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10902 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
2859e74ac9
Address clang warning: extra ';' after member function definition [-Wextra-semi]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10901 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
98a6166956
follow-up to r7163: this makes the text display properly in-game, no Unicode support needed (thanks to Yarn for the patch)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10900 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
07cad23aed
Address clang warning: commas at the end of enumerator lists are a C++11 extension
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10899 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
255fef6e47
Address clang warning: unused variable
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10898 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Echelon9
fc1b587cb6
Address clang warning: declaration shadows a field of 'HudGaugeRadarDradis' [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10897 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
8cdfb029d3
add mod_table option for red-alert for delayed ships (Mantis #3055 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10895 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
Goober5000
2fe0ec8ef0
Yarn's patch for Mantis #3049 (character remapping in tstrings.tbl)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10894 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:31 +10:00
The_E
75f533a6fe
Fix for Mantis 2960: Actually make sure that we're not performing invalid operations on a vector.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10887 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
d6e0a731db
From MageKing17: Patch for Mantis 3074: Correct mismatch between mission write and mission parse
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10886 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
327c67ff1d
Address clang warnings - hud/hud.cpp:1310:3: warning: delete called on 'HudGauge' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10885 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
80e1ecee69
Address clang warning - hud/hudtarget.cpp:7224:12: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10884 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
02aa18c260
Address clang warning - io/keycontrol.cpp:2504:7: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10883 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
53e78033c6
Fix unintended linebreak removal from 10880
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10882 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
bc568a9149
Address clang warning - lab/lab.cpp:912:8: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10881 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
The_E
0d9cc00ba8
From MageKing17: Removes redundant function call
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10880 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:30 +10:00
Echelon9
46288483c9
Address clang warning - menuui/mainhallmenu.cpp:2141:9: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10879 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
The_E
580330c224
From MageKing17: Patch for a small issue in briefing text color spans
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10878 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
3f645215ad
Address clang warning - object/collideshipweapon.cpp:258:17: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10877 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
d3f914a404
Address clang warning - ./ui/ui.h:291:7: warning: private field 'ignore_escape' is not used [-Wunused-private-field]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10876 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
7f9d879d7b
Address clang warning - ./ship/shipfx.h:202:6: warning: private field 'stage' is not used [-Wunused-private-field]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10875 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
54de592835
Address clang warning - debugconsole/console.cpp:169:13: warning: declaration shadows a local variable [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10874 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
03c32c1648
Further tweak fix for Coverity 1093783 Uninitialized scalar variable, and remove redundant variable in opengl_light structure
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10873 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
Echelon9
713e291bdc
Partially re-add the secure coding aspects of 10806 (which was rolled back in 10857). Fundamentally, the code in theora_open is written in a non-secure manner prior to this fix. That the callers currently appear per Goober to use it correctly is not the issue. There is no way of enforcing that contract as to length of the string unless it is internally handled in the function. Also Goober's comment that all callers use string lengths of MAX_FILENAME_LEN is incorrect. Examples trivially found that use the separate define NAME_LENGTH, which could be changed in future.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10872 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-14 19:02:29 +10:00
chief1983
137eb7e4d4
Fix Mantis #2790 , Easy options should be just that again.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10869 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
chief1983
f89d864756
Fix Mantis #3070 , courtesy of Yarn.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10868 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
7a56e7ff4a
Fix Clang warnings about incorrect type given different pointer sizes for the architecture. Use the standard compliant ptrdiff_t
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10867 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
a0ed86d6bc
Remove a tautological Assert(), which cannot be triggered due to the type
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10866 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
475e4d5d35
Yarn's fix for Mantis #2362 (scale images properly with show-subtitle-image)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10865 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
3743449a42
from MageKing17: choose alt_names and callsigns by array index instead of substring; fixes Mantis #2934
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10864 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Goober5000
79b73f241b
MageKing17's patch for callsigns not resetting when the mission is cleared (Mantis #2934 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10863 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
2da2527207
Quieten a number of warnings related to UI_USERBOX without a declaration yet. Added TODO.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10862 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
f8ef768bbf
Address Clang warnings are overloaded virtual functions in UI_GADET. Also opportunity to simplify code by making the most of inherited polymorphism. Docs cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10861 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:09 +10:00
Echelon9
522eb962ff
Fix a range of issue identified via clang warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10860 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
ad761f980f
fix a bug introduced by r10852: MAX_OBJECTS is not a valid object index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10859 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
41d7f2408c
fix a bug introduced by r10837: 0 is a valid path index
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10858 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
7c07151e26
roll back r10806 because 1) all callers to this function have names which are MAX_FILENAME_LEN in size; and 2) the memset already sets all characters to 0, so there's no need to add a null terminator
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10857 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Goober5000
05e0af6ebd
the minimum macro is defined as MIN in FSO to avoid conflicts; no need to #undef (since rev 10796 uses MIN anyway)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10856 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
d37e4c567d
Fix Coverity #1093706 Negative array index read in scoring_eval_kill_on_weapon()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10855 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
130ed7c7e3
Fix Coverity #1093707 Negative array index read in start_ship_animation()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10854 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
8d6e82c3bc
Fix Coverity #1093711 Negative array index read in event_music_enemy_arrival()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10853 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
823c144ecc
Fix Coverity #1093715 Negative array index read in maybe_weapon_detonate()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10852 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
abc0fd11b5
Fix Coverity #1093720 Negative array index read in ai_big_maybe_follow_subsys_path()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10851 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:08 +10:00
Echelon9
c3494516bd
Fix Coverity #1093544 Negative array index read in multi_ts_handle_mouse()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10850 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
9cbd23d2e9
Fix Coverity #1093783 Uninitialized scalar variable in gr_opengl_set_center_alpha()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10849 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
8cbb46f40c
Fix Coverity #1224006 Uninitialized scalar variable in nebl_generate_section()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10848 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
Echelon9
c85caef631
Fix Coverity #1224005 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10847 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
The_E
3545cacda0
From MageKing17: Patch for Mantis 761(!): Text color tags do not work in debriefings. Also allows color spans in text to cover line breaks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10846 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
The_E
7be5b03c62
From MageKing17: Patch form Mantis 3067 (Nebula flashing not following player view point)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10845 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
niffiwan
027f218f7f
Allow any resolution for mainhalls (From Yarn)
...
Also includes support for more than two mainhall resolutions, zooming
so one mainhall can adapt to multiple resolutions, setting new mainhall
fonts, help overlays for all resolutions and adjustable tooltip padding.
Also allows preload screens to be any resolution & aspect ratio.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10844 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:07 +10:00
z64555
cdb954f333
Fixes mantis 2877: $Type and $Category entries in controlconfigdefaults.tbl would not properly parse. #defines and enumerated names in the controls code (Such as TAB_SHIP and the various CC_TYPE's) may now be used in the .tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10843 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
The_E
8c1bef0415
From FUBAR: Patch for Mantis 2842 (Adds new section to game_settings.tbl called "#FRED SETTINGS". Also adds a parameter for it, "$Disable Hard Coded Message Head Ani Files:", a boolean value that controls whether FRED fills the head ani selection in the Event Editor with the retail head ani names)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10842 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
The_E
c07d792e4e
From FUBAR: Patch for Mantis 2872 (Make FRED emit a warning for invalid ship classes in a mission file)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10841 387891d4-d844-0410-90c0-e4c51a9137d3
2014-07-05 10:38:06 +10:00
niffiwan
545fd5e6ac
Fix mantis 3056
...
In redalert loadout, only store the current number of banks in use by
ships, not all banks where the weapon idx is -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10840 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 18:54:31 +10:00
Echelon9
c837a21f0d
Now that standalone server is support on more than Windows, ensure its features are applied as consistently as possible
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10839 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
666f53e44b
Fix Coverity #1093598 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10838 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
edad644595
Fix Coverity #1093597 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10837 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
82058a8c99
Fix Coverity #1093552 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10836 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
ae6365bc35
Fix Coverity #1093545 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10835 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
Echelon9
c2122f9767
Fix Coverity #1093544 Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10834 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
zookeeper
8e0304a58f
Fixed a bug in normal maps caused by a redundant and float-inaccurate calculation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10833 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
niffiwan
2740cf5ea2
Allow missions to exit to mainhall on successful completion
...
Activate with either a mission flag, or the 3rd parameter to the
end-mission sexp. Covers ending via the debrief, skipped from dying
5x times or skipped training mission
Does NOT work for redalert missions or multi (yet)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10832 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-26 16:54:17 +10:00
niffiwan
322d1f39e0
Fix mantis 2945 (From MageKing17)
...
Don't set PF_PROJECTED in g3_transfer_vertex() as it's not projecting
the vertex
Note: displaying nebula emp/lightning used to depend on unitialised data!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10828 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
Zacam
cc36ac9faf
Follow-up to r10793, missed a spot of [more]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10827 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
m_m
a45e930047
Fix for Mantis 3063: Animation code-related sound entries doesn't use new sound format
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10826 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
The_E
83ffa764b5
Fix for Mantis 3016 part 2 (Make FRED respect the Briefing Window FOV setting in game_settings.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10825 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:54 +10:00
The_E
54787e8402
Fix for Mantis 3016 (Briefing window FOV different from retail). Also adds a new setting to game_settings.tbl, "$Briefing Window FOV:" under Graphics, which takes a single float argument to set the FOV of the briefing window.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10824 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
8da0ac791e
From MageKing17: Patch for Mantis 3060 (Beam particles not generated correctly in certain cases)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10823 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
971192ab30
From MageKing17: Patch for Mantis 3061 (Turrets can't have an initial rotation defined)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10822 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
505e1e77f5
From MageKing17: Patch for Mantis 3012 (Various issues with ships in nebula)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10821 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
The_E
cba1eb07db
Fix for Mantis 2982: Removes superfluous Assert.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10820 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
CommanderDJ
358e2ab4fc
Fix Mantis 2773: Models turn black when full nebula enabled in FRED.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10819 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
niffiwan
f5199ea122
Fix mantis 2929
...
Save shortcut rank to the csg flags & bump csg version
Add function to read the csg rank during pilotfile::verify()
Reorder 'find pilots' call so that Game_mode is valid for verify
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10818 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-19 20:12:53 +10:00
niffiwan
603a4086f5
Fix mantis 2920: prevent pilots switching languages
...
In other words, a pilot can only be used in the same language it was
created with. Checks both the initial selection screen and in the
barracks.
Also fixes issue with PLR version being ignored in pilotfile::verify()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10817 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
niffiwan
05adea0e25
Fix mantis 2923
...
Backout all_time and multi_stats from the pilotfile stats as
required
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10816 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
3f752b9a40
Address Coverity 1093687 Resource leak in os_init_cmdline() that would occur when the -parse_cmdline_only flag was set. Refactored to improve readability at the same time. Order of precedence remains data/cmdline_fso.cfg, per-user cmdline_fso.cfg (on Linux and Mac), then actual commandline. The presence of -parse_cmdline_only will ignore all settings in on-disk cmdline_fso.cfg files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10815 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
55f34b1b58
Address Coverity 1093378 and 1093379 Resource leaks in object ChttpGet::ChttpGet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10814 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
a0f31e6dc5
Address Coverity 1093380 Resource leak in object CFtpGet::CFtpGet()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10813 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
f5a9d32d14
Address Coverity 1093781 and 1093782 Uninitialized scalar variables in cftp.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10812 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
d0b786fe87
Address Coverity 1093635 Out-of-bounds read in multi_team_report()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10811 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
d8e26c8e02
Address Coverity 1212011 Unchecked return value in DCF(multi oo)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10810 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
05991a9fbf
Address Coverity 1107318 Logically dead code in outwnd_print(), check for NULL id has already occurred
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10809 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
55af81050d
Fix Mantis 3059: Coverity 1204289 String not null terminated in cf_search_root_pack()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10808 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
27495abda6
Address Coverity 1093373 Copy-paste error in vm_find_bounding_sphere()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10807 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:36 +10:00
Echelon9
129a2d0d85
Address Coverity 1204290 Copy into fixed size buffer - strncpy() should be restricted by length to that of the target string, and does not guarantee null termination if the source string overran
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10806 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
Echelon9
1883fcb8ae
Address Coverity 1093663: Out-of-bounds access with memcpy() in multi_oo_pack_data() for clients only
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10805 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
niffiwan
2ea048ee51
Fix mantis 3005: add arg so end-campaign sexp can ignore the death screen
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10804 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 20:29:35 +10:00
niffiwan
c4978d3661
Fix r10801 (thanks to MageKing17 for noticing this)
...
Really avoid using -1 as an array index
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10803 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
chief1983
d2ffd40d67
Fix an assertion logic reversal in r10797, spotted by MageKing17.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10802 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
e86d0c573d
Fix pilot conversion issue (followup to r9630)
...
-1 is a valid weapon index, but avoid indexing the array with it
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10801 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
1d6e173023
Fix for Mantis 3058: On warp out, glowpoints still stay "on" and in mission space without a ship; from MageKing17
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10799 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
2db5a3b991
Fix for Mantis 2725: Beam sounds not panning correctly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10798 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Zacam
3e22cc0d54
Fix for Mantis 3057: Loadout (Ship/Weapon Select effect) rendering black models or no effect. Also corrects wireframe color for FS2 effect from black to blue. Committed on behalf of MageKing17.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10797 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
m_m
3390ba23a0
Fix for Mantis issue 2891: gr.drawString text box height irregular
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10796 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
1f246b7de1
Coverity ID 1093586 Negative array index read
...
Shouldn't be able to occur since when artillery_objnum is set to -1,
artillery_lock_time is also set to 0.0f. BUT, protect the array
access anyway in case the surrounding code changes in future.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10794 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
Goober5000
35096fd957
use the [more] color, per MageKing17's previous changes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10793 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:20 +10:00
niffiwan
1bd98325bd
Coverity ID 1093722 Negative array index read
...
Move -1 check to before the convinience ptr is created & used
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10788 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-14 13:07:19 +10:00
niffiwan
06b0eb8d35
Fix mantis 3051 (From MageKing17)
...
Only store CPVs on accepting mission results
Add copy of CPVs to missioncampaign and pilot .csg so redalert missions
can rollback the CPVs if required
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10786 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
5801bd47ea
Coverity ID 1093538 Negative array index read
...
Change unknown +Default Ship index (-1) to 1st ship index (0)
Fix loop iteration
Change Assert to Assertion
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10774 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
a545580a5a
Coverity ID 1093533 Negative array index read
...
This negative read occurs regularly, but it'd be very very rare for that
random read value to evaluate to OBJ_WEAPON and cause further issues.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10773 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:53 +10:00
niffiwan
3b77e65f5f
Raise MAX_PATH_LEN to 256 so FSO can run in long paths
...
Specifically avoid one issue with running FSO in the default Steam dir
Converted some magic 128/127 numbers to MAX_PATH_LEN
Convert some Int3() into more friendly errors
Stopgap measure until proper fix added with compressed VP support
Fix mantis 3028
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10772 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
zookeeper
3a3e8599df
Removed an assert checking for a condition which can rarely be false (presumably due to inaccuracy in vector normalization) but which doesn't actually need to be true.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10766 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
9da72db80e
Coverity 1221482: Dereference after null check
...
Stop Ctrl-PgUp/PgDown crashing when a briefing icon is not in closeup mode
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10764 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
e3ebdd3ce9
Coverity ID 1221483: Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10763 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-09 13:48:52 +10:00
niffiwan
8baa713ef8
Fix a few gcc compile errors introduced by r10756
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10760 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
The_E
147bf23067
Catch a lua error that apparently can happen
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10759 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
niffiwan
fdd8666524
Fix mantis 3048 (From MageKing17)
...
Fix "more" & offsets in [cmd|de|]briefings
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10758 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-07 12:37:26 +10:00
m_m
d84d9d31aa
Added multiple scripting features related to messaging as requested by Axem.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10756 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:18 +10:00
m_m
6d5b5ddde1
Add support for voice acting in fiction viewer.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10755 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:18 +10:00
niffiwan
f54429d49f
Fix mantis 3041
...
Allow set-skybox-model to set skybox flags (with FRED support - thanks
m!m)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10754 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
8e1c4be1b6
quotes can span multiple lines as well, so let's keep track of that flag (fixes Mantis #3001 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10753 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
e10550cdbd
fix a bug in the when-argument sexp that managed to escape detection from its original design! spotted by MageKing17, fixes Mantis #3052
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10748 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
a1e5d76c02
roll back r10741 pending further code review; see Mantis #3052
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10743 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
Goober5000
cf8c06f850
follow-up to r10734: in the event of any SND_F flags being added in the future, this is more future-proof
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10742 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
The_E
c562e34516
From MageKing17: Fix for Mantis 3502 (Flush the sexp result tree after argument evaluation to avert accidental short-circuit results)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10741 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-06 16:51:17 +10:00
niffiwan
28c31c9ba2
Fix mantis 3053 (From MageKing17)
...
Check KEY_DEBUGGED1 to allow event.log snapshot to trigger when using
release+cheats
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10740 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:30:00 +10:00
niffiwan
e926d6bad0
Fix mantis 2812 (From Yarn)
...
Add modular help tables and allow more than 2 help overlays
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10739 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:30:00 +10:00
The_E
52331f89a2
Stopgap fix to avert a crash in get_subsystem_world_pos later on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10738 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
f995298abf
Fix Coverity 1093663: Out-of-bounds access in multi_oo_pack_data()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10737 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
62b9833bf0
Fix Coverity 1093638, 1093640 and 1093667: Out-of-bounds access in tcp_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10736 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
0279040e80
Fix Coverity 1093799 Uninitialized scalar variable -- initialise array contents to zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10735 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
ff38404cac
Fix Coverity 1093788 Uninitialized scalar variable - no need for bitwise AND when value is so far unset
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10734 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
a779ee3ed4
Fix Coverity 1093783 Uninitialized scalar variable with opengl_light structure in gr_opengl_set_center_alpha()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10733 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
Echelon9
4033465143
Fix Coverity reports of Uninitialized scalar variable with the vertex struct. Should vertex ever be converted to a class from a struct, these memsets as well as the pre-existing ones will need to be removed in favour of a proper constructor of the then vertex class.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10732 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:59 +10:00
niffiwan
e7d041c332
Fix mantis 2940
...
Only reset pilotfile stats when the local Player is reset
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10722 387891d4-d844-0410-90c0-e4c51a9137d3
2014-06-02 18:29:58 +10:00
m_m
c1b2d7c1ee
Fix for Mantis 3045: gr.drawImage()'s UV arguments aren't working properly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10721 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
Goober5000
53e5ba5913
remove Import Weapon Loadouts feature, which was mainly used for versions of FSPort prior to 3.0 and was broken from r2768 to r10718 anyway
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10720 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
The_E
154a1a6c76
Removing dead and potentially confusing code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10719 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
Goober5000
9fdfde9ae6
restore a strcpy that was accidentally removed in r2768 (fixes Mantis #3046 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10718 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
The_E
d5388ad4bf
Fixes crash in the texture replacement editor: Erasing the end element of a size 0 vector is probably not a safe thing to do
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10717 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-25 19:03:50 +10:00
niffiwan
c27079fb7a
Fix Coverity ID 1215457 Out-of-bounds write
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10716 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-24 09:35:04 +10:00
niffiwan
e037571170
Fix Coverity ID 1215458 Uninitialized pointer field
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10715 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-24 09:35:04 +10:00
z64555
d5e81f4561
Fixes 3039: C++ STL was having data race issues with instantiating the debug_commands and the vector that was supposed to reference them. Seems like ✌️ ran into this issue a few times before...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10712 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-23 22:04:59 +10:00
The_E
003d5e5a2a
Amendment to 10706: INT, FLOAT and STRING are already defined symbols on Windows, I've changed them to AT_INT etc so that compilation can happen.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10710 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-22 20:49:29 +10:00
niffiwan
e31a8be138
Fix mantis 3026
...
Update Linux --help option to show all cmdline options
Added data/checks for expected args to cmdline options
Add extra const-ness per m!m review
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10706 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
m_m
a6a41efa84
Add support for countermeasures that will pull aspect seekers away from their previous targets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10705 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
3344f554f9
More ship flag/ship info flag confusion cleared up
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10704 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
2c59a39bf6
See 10701, same issue here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10702 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
The_E
3e1d0082c4
Checking a ship_info flag against a ship flag isn't going to work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10701 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
chief1983
b4785ea039
Add some lib locations for Solaris for software installed from OpenCSW.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10695 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-20 19:12:37 +10:00
asarium
6c16d0a890
Revert "Add support for countermeasures that will pull aspect seekers away from their previous targets."
...
This reverts commit 263ed7f05d .
2014-05-17 22:17:57 +02:00
asarium
263ed7f05d
Add support for countermeasures that will pull aspect seekers away from their previous targets.
2014-05-17 22:12:37 +02:00
niffiwan
8da9a68d31
Fix assertion when entering barracks in debug
...
Assert that there's one more line free, not number-of-ships lines
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10689 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
The_E
c22fd46f18
Change the "Report Bug" button's URL to scp.indiegames.us
...
In other news, did you know that FRED has a "Report Bug" button in its About dialog?
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10666 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
bd64590ec1
Fix mantis 2981
...
Read & write pilot loop data in the same order
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10665 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
ec90cae8d9
Fix Coverity ID 1212016 Copy into fixed size buffer
...
replace strcpy with strcpy_s
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10662 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
e199a928c4
Fix Coverity ID 1212017 Copy into fixed size buffer
...
replace strcpy with strcpy_s
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10661 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
3890ca6928
Fix Coverity ID 1212013 Macro compares unsigned to 0
...
Use MAX instead of CLAMP
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10660 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:12 +10:00
niffiwan
6b955bb7b8
Fix Coverity ID 1212014. Unsigned compared against 0
...
Removed the >= 0 check
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10659 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
niffiwan
cc21af0d08
Fix Coverity ID 1212015.
...
Check the pointers value vs '\0', not the pointer
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10658 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
z64555
153cb7dc79
Debug console. Now with more intuitive pagination from the help list!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10654 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-15 18:24:11 +10:00
niffiwan
5ccfbe1119
Remove GCC Warning (unused-variable)
...
Since token_str is only used in 1x .cpp, move the declaration from
the .h to the .cpp
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10653 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
z64555
2903bbee1f
Resolves complaints from VC6 about several instances of find_if that were not scoped properly. None of the other compilers seemed to have noticed...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10647 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
z64555
c6e9736c18
Resolves some warnings concerning signed/unsigned comparisons. Fixes a typo with a DCF_BOOL output message. Fixes compiling on MSVS 6.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10646 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:38 +10:00
zookeeper
9b822a3fa7
Fixed gr.drawOffscreenIndicator() returning wrongly scaled coordinates.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10645 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
The_E
cc8f3d2b21
Fixes another C4800: Conversion from int to bool warning
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10632 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
The_E
e3421897b9
fixes a bunch of C4800 warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10631 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
zookeeper
90c0e77250
Fixed missing closing tags.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10629 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
5e21ff72b9
Revert some accidental solution file changes from the debug console commit.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10627 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
f11188246b
Fix debug console compiling error on Linux.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10626 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
5b8728411f
Add debugconsole files to makefile. Also, remove lingering reference to dbugfile.h which was deleted in r7857.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10625 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
4dcf6a62ee
Add debugconsole to Xcode 3 project.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10624 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
chief1983
92d9b8b308
Redo the LastUpgradeVersion part of r10558.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10623 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
z64555
8d5fbab768
z64555's debug console. Take 2. Includes changes to most (not Xcode) project files to include the added files of r10621
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10622 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:37 +10:00
z64555
f18f8a9ea7
debug console amendment, these files got ignored, somehow.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10621 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
The_E
98355da7d5
Revert 10619: Missing files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10620 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
z64555
2b2ba832f8
z64555's debug console.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10619 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:36 +10:00
zookeeper
edc515e681
Fixed Mantis #3037 ; surface shields will again check for a shield mesh collision before hull collision.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10618 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:35 +10:00
zookeeper
c80484f890
Clarified documentation of gr.drawPolygon and gr.drawSphere.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10616 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-08 19:18:35 +10:00
niffiwan
b42f468552
Fix issues added in r10587
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10611 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
niffiwan
a861372efc
Add lua campaign lib & functions to retrieve mission filenames
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10602 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
niffiwan
7c3631002b
From Yarn: Fix mantis 3031
...
Use PF_USE_AFFIRMATIVE_ICON where necessary
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10601 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:23 +10:00
Echelon9
67ccdfb6d3
Fix Mantis Issue #2976 : AddressSanitizer: global-buffer-overflow in firing_aspect_seeking_bomb()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10596 387891d4-d844-0410-90c0-e4c51a9137d3
2014-05-04 20:52:22 +10:00
karajorma
bb7e894107
Output how much of the player's score comes from the currently displayed list of kills by ship type in the barracks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10595 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
8267319073
Resolve build errors reported on MSVC in beam_ok_to_fire()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10594 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
c1fdd9a58c
Correct the cast to size_t in buffer_data constructors
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10593 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
a7e1390397
Fix Mantis Issue 3035: AddressSanitizer: double-free in interp_configure_vertex_buffers() of memory contained in buffer_data object. Add a copy-constructor and copy-assignment operator which are required as we manage our own memory in buffer_data
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10592 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:45 +10:00
Echelon9
ceeabbf805
Reverse commit in r10558. Given we regularly have users provide Debug logs, this will prevent that small subset with only 32bit Mac's from running a Debug build
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10588 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-25 16:04:44 +10:00
niffiwan
b1ca9a33da
Fix mantis 2950: make shields-on/shields-off multi compatible
...
Fix multi player for alter-ship-flag
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10587 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
974bf06237
Fix Coverity 1093381: Resource leak in object due to absence of destructor. Provided that release() has already been called, which would mean memory has been cleaned up on most paths, this destructor will be in essence a NOP (or close to it). If memory has typically not been cleaned up already, this addition will improve memory usage over time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10581 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
b36f1c1709
Fix Coverity 1093306: Whilst the return value was not checked in beam.cpp, the correct fix is to convert the function to void given no location actually checks the return value.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10580 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
bdd192a17d
Fix Coverity 1093302: Unchecked return value. This is the only occasion where the return value of ship_get_by_signature() is not checked. Likely oversight.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10579 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
5268ef1916
Related to Coverity 1093623: The self-assignment at present has no effect
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10578 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
26ee96a012
Fix Coverity 1093493: Missing break in switch statement. No logical reason why LE_ORDER_EVADE should fall through to LE_ORDER_STAY_NEAR. Only switch statement in block without a break statement further indicates an oversight.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10577 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
389f4b3dfb
Fix Coverity 1093376: Copy-paste error in ade_table_entry::OutputMeta()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10576 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:26 +10:00
Echelon9
1205336fee
Fix Coverity 1194949: Copy-paste error in gr_opengl_bitmap_ex()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10575 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
0bb037bb85
Removes the DS_Store hidden files from the Xcode4 Frameworks archive.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10572 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
46c61fcbcf
Unify all the revision placeholders out to 6 digits for increased regex replacement reliablity.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10570 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
chief1983
f903da75e3
Increase Xcode and Xcode4 version and filename consistency with other platforms.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10569 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
Echelon9
3c155fd888
Fix Mantis Issue #3033 : AddressSanitizer: global-buffer-overflow in shockwave_move()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10568 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
Echelon9
308179256a
Fix Mantis Issue 3032: AddressSanitizer: SEGV on unknown address 0x00000000f000 in texture_info::LoadTexture()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10567 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:25 +10:00
zookeeper
a20f54957c
Ported r10282 from zookeeper branch: added a new #SOUND SETTINGS section to game_settings.tbl and in it overrides for the default sound, music and voice volume.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10563 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
zookeeper
1f2f6d8d8e
Ported r10395 from zookeeper branch: made the Shields handle support non-quadrant shields.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10562 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
zookeeper
636f903f72
Ported r10442 from zookeeper branch: increased the arrival/departure paths restriction dialog's width by 100px so even longer path names will be fully visible.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10561 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-22 19:22:24 +10:00
Echelon9
01d718f8e9
Project files in Xcode4 folder adopt latest suggested project file settings from Xcode 5.1.1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10558 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
Echelon9
7e47598eb9
Fix issue 3030: Clang warning: semantic issue, '&&' within '||' in gr_[re|un]size_screen_pos() and gr_[re|un]size_screen_posf()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10557 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
Echelon9
7aaa5fa4a1
Fix Mantis 3029: Clang warning: expression result unused in multi_pinfo_blit_squadron_logo()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10556 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
m_m
77d7871266
Fix for Mantis 3027: Crash if ship AI is forced to change target
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10552 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
m_m
d3dde35341
Fix for an invalid index crash.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10550 387891d4-d844-0410-90c0-e4c51a9137d3
2014-04-14 19:40:17 +10:00
niffiwan
3a113e6176
Remove gcc warnings (unused)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10548 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-31 17:28:25 +10:00
The_E
6e91857745
From Yarn: Fixes interface graphics scaling issues. If, for some reason, you want to have the interface graphics stretched, use the -stretch_menu commandline flag.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10544 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
c5417c1909
Fix mantis 3025: pass lua HookVar integer data as an integer, not a struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10543 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
d195c97056
Yarn's fix for Mantis #3024
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10531 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
c5a7223943
this will likely fix Mantis #3013
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10530 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
The_E
4f39ef2e07
Fix for Mantis 3023 by Yarn: Make sure the vasudan mainhall fun cheat works again
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10519 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
The_E
07980be92e
Fix for Mantis 3015: Makes sure rotation values are always in the 0-359 degree range
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10518 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
08280e3d9e
Remove gcc warnings (unused & shadow)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10517 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
ca17188572
Fix mantis 2921: start mainhall music when leaving the credits state
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10507 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Goober5000
d7b6a1ac6f
add briefing icons for ship-with-cargo and wing-with-cargo
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10506 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
zookeeper
7099170497
Changed the label of the "Broadcast Locally" multiplayer option from "/multidata" to "Broadcast Locally".
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10498 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
7f1a2c734f
From Axem: fix newly added hud gauge sexps
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10497 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
karajorma
2356f04f04
Yarn's fix for Mantis 3017 (Certain HUD elements don't work after the changes to strings.tbl). Not very happy with the way it fixes thing (it only solves problems for French, German and Polish, which kinda makes the changes to strings.tbl in r9761 somewhat pointless) but it makes sense to wait for SDL and truetype support and then fix everything properly then.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10496 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
niffiwan
55bec33861
From Axem & niffiwan: stop briefing/credits/mainhall music with scripting
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10495 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
m_m
626269d4a4
Fix for Mantis 3018: Setting a weapon's Target/HomingObject/HomingPosition etc doesn't work
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10494 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-30 12:39:54 +10:00
Fabian Woltermann
083905b4f8
Merge pull request #16 from asarium/fix/hudmessage
...
Fix a crash with invalid iterators
2014-03-16 22:57:45 +01:00
asarium
31d6ca5a0e
Fix a crash with invalid iterators
2014-03-16 22:32:10 +01:00
niffiwan
3f349849d6
Fix mantis 3019: flush bitmap to prevent alpha-additive-blend shenanigans with lua drawRectangle
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10493 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:32 +10:00
Goober5000
ff675c3653
New method of handling quotes and comments that examines lines character by character like most languages do, instead of just searching for the start of a comment. If a comment character is inside a quoted string, it will not kick off a new comment. (This actually fixes the core design flaw that caused semicolons to truncate messages, so the $semicolon tag is technically no longer necessary. It will still be kept, of course.) Fixes Mantis #3001 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10492 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:32 +10:00
Goober5000
0eb5606527
the #define already has a (char)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10491 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
niffiwan
2f22873e35
From Axem: add hud-set-custom-gauge-active and hud-set-retail-gauge active
...
Deprecates hud-set-active-gauge and hud-activate-gauge-type in favor of hud-set-custom-gauge-active and hud-set-retail-gauge active, which are clearer to understand and now accept INT_MAX number of gauges, instead of just 1.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10489 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
Goober5000
03144d3846
going through old revisions, r8540 is wrong, since it was like that in trunk -- memsetting the whole struct to -1 sets all integers and floats to -1 (so let's go back to the old way in case some old retail code relied on model_instance_num, model_num, or submodel_num being set to -1)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10481 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
m_m
638ad77a21
Add a scripting hook variable that specifies the mouse buttons. This variable is named MouseButton and is a bit field which uses the MOUSE_* defines (index 0 for right, 1 for left, 2 for middle).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10477 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
niffiwan
4e98285d2a
Followup to mantis 3009; missed the Lead Sight gauge in the 1st fix
...
Rechecked all other gauges that set slew=true in their contructors
(vs 1st pass which checked gauges that set slew=true in hudparse.cpp)
I think I got them all now...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10476 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-14 19:50:31 +10:00
Zacam
5e67acf5fe
Adds cursor.h/.cpp to 2011 Project for building.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10488 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-10 20:52:22 +10:00
m_m
088f0c2c4f
Fix a few mouse related issues. This adds the CursorManager class which handles loading cursors and showing/hiding the cursor.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10487 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-10 20:52:22 +10:00
niffiwan
6c3ae961ab
Copy in m4/sdl2.m4 from SDL2.0.1 for autotools
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10485 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-07 20:17:43 +10:00
Zacam
d617e85008
Adds SDL2main.lib to linking for SSE2 Debug/Release builds.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10479 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
Zacam
a8dfb820a1
Trunk Sync r10476
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10478 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
m_m
b7bea462ee
Merge changes of trunk r10463.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10468 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
Zacam
18648cbc37
Trunk Sync: r10464 This is sans Trunk Commit 10463 due to osapi changes.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10465 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
b4172fa379
Fix for some crashes, by Flaming_Sword
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10276 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
edeb8768af
Trunk sync r10257
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10259 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
ebf8fd19d3
From m!m: Proper use of SDL2Main
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10258 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
956d98de1d
The fuck is wrong with you, svn, I told you to sync
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10248 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
3748206525
Correctly initialize haptic support.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10234 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
013db60499
Replace call to vwglSwapIntervalEXT with SDL_GL_SetSwapInterval
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10231 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
753e82f5c6
Removes the CRITICAL_SECTION macros, as these were just obscuring calls to SDL functions
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10230 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
09df160371
Change std::map SDL2FS2 to SCP_map
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10229 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
09d039fd42
sync to trunk 10223
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
The_E
31db49d6fd
Sync to trunk revision 10223
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10227 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
chief1983
bd68173a4f
Closer to working compile with Xcode 5.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10173 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
m_m
66c37c8fda
Fix a problem with the mouse where the controls were stuck.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10172 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
m_m
3fa9b5275e
Also delete the old unix-osapi file, it isn't needed anymore.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10167 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
m_m
44d9279fa8
Merge both osapi files into one file.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10163 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
karajorma
a7428c5a72
Bigger (and better?) Briefing and Debriefing editors courtesy of Axem.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10475 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-26 21:37:14 +10:00
zookeeper
6f906561bb
Fixed oversight in r10430: the $Weapon class hook condition didn't work on $Weapon Collision hooks if the other object was an asteroid.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10474 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:02 +10:00
Zacam
3ef41e164c
I think we can allow for 32bit Color Depth to be the default option now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10473 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:02 +10:00
karajorma
159d8e7107
Fix a bug where you couldn't press g to start a mission in debug builds.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10471 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
b4dad30c77
Add a SEXP for checking the current state of ship flags.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10470 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
64efaddaab
Make the Mission Objectives editor a little larger. Cause why not?
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10469 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
ebfdf4e901
Fix a bug with the event.log where SEXPs which weren't in events would also write data to the log.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10467 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
karajorma
5dc4bfea97
Fix a bug with the multiplayer SEXP code. The callback functions write to the packet and thus can also make it go out of bounds.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10466 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
m_m
05702504c4
Fix for Coverity 1107332: Negative array index read
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10464 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
m_m
08dad5b3af
Add -no_unfocused_pause option.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10463 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-23 13:41:01 +10:00
niffiwan
a2b42bf5f1
Fix mantis 3009: set slew correctly for hud gauges
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10462 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:35 +10:00
m_m
3490ac3a9c
Add lua function to get a handle of the current player
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10446 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
The_E
37ded5589d
Adds set-motion-debris-override sexp. This can be used to control the presence of motion debris, and overrides any user choice made through the -nomotiondebris commandline flag.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10445 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
zookeeper
cef02e7b9f
Clarified which time units are expected by camera.setOrientation() and camera.setPosition().
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10431 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
zookeeper
a72f0f9d62
Allowed the $Weapon class hook condition to work on $Weapon Collision hooks.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10430 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
6d5e026a3e
Mantis #3004 : don't remove subspace drives from support ships
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10429 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
df73bacb9e
Mantis #3004 : standardize checks for whether ships can depart to docking bays, and whether departure goals are achievable, and whether a ship can be commanded to depart; also fix the default behavior if a ship attempts to warp out but is unable to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10428 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
m_m
d97f31d034
Fix for Coverity Issue 1166829: Dereference before null check
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10411 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
a880bcb9c2
Mantis #3004 : ship_get_ship_with_dock_bay was written in such a way that it allowed a negative array index to create all sorts of havoc
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10407 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
dbe5f61dd6
following up from r10000 and r10004, fix the hud squad message display for support ship aborts (and in the process optimize things slightly)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10406 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
0a9063a525
wing names with the hash at the beginning aren't subject to the name bashing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10405 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:34 +10:00
Goober5000
827286ec95
only warn once, because old missions tended to have a *lot* of these broken +Team values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10404 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
karajorma
aeb089b216
If we've already written the content of CTEXT(n) to a variable, we should use that, rather than calling CTEXT(n) 500+ times.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10403 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
m_m
5fa9a5c946
Fix for Coverity 1147623: Out-of-bounds access
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10393 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
m_m
0d54630e83
Fix for Coverity 1107329: Improper use of negative value
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10392 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-20 18:27:33 +10:00
Echelon9
f97e478c6d
Fix Coverity 1093576 Improper use of negative value: In model_collide_flatpoly(unsigned char *): Negative value can be returned from function is not being checked before being used improperly (CWE-394). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10391 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
3b19fab1c1
Fix Coverity 1093446 Dereference after null check: In obj_snd_stop_all(): Pointer is checked against null but then dereferenced anyway (CWE-476). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10390 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
6d52a7c2b2
Fix Coverity 1093407 Logically dead code: In model_interp_sub(void *, polymodel *, bsp_info *, int): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10389 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
0288075eb0
Fix Coverity 1093392 Logically dead code: In obj_snd_assign(int, int, vec3d *, int, int, ship_subsys *): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10388 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
cf0928ab8c
Fix Coverity 1129278 Uninitialized scalar field: In object::object(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10387 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
b2231f28d1
Fix Coverity 1102734 Uninitialized scalar field: In collider_pair::collider_pair(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10386 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
846cdad098
Fix Coverity 1107319 Copy-paste error: In collide_weapon_weapon(obj_pair *): A copied piece of code is inconsistent with the original (CWE-398). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10385 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:50 +10:00
Echelon9
64dad52741
Fix Coverity 1093455 Dereference after null check: In read_model_file(polymodel *, char *, int, model_subsystem *, int): Pointer is checked against null but then dereferenced anyway (CWE-476). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10384 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
2936dde64f
Fix Coverity 1093728 Allocation size mismatch: In model_allocate_interp_data(int, int, int): Allocation size is not a multiple of the target pointer's pointed-to type (CWE-131). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10383 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
f02cba4090
Fix Coverity 1093413 Logically dead code: In model_collide_sub(void *): Code can never be reached because of a logical contradiction (CWE-561). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10382 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
7241a6b686
Fix Coverity 1093669 Out-of-bounds access: In triggered_rotation::add_queue(queued_animation *, int): Out-of-bounds access to a buffer (CWE-119). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10381 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
0572c25aa1
Fix Coverity 1093859: Uninitialized scalar field In mst_info::mst_info(): A scalar field is not initialized by the constructor (CWE-457). From Flaming_Sword.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10380 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
d503d1d42e
Expand the .gitignore exclusions to cover modern Xcode project local files. Based off StackOverflow suggestions as documented.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10379 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
Echelon9
0b494959e1
Fix Mantis 2997: Make +Bitmap a required table item if a weapon trail has been set
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10378 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
karajorma
f9f2b1e8d7
There was some confusion about the old help text.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10377 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
The_E
e4009799c6
Remove a pointless, ✌️ original assert (All ships should be able to send messages regardless of whether they're flyable; checking whether they are accomplishes literally nothing)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10376 387891d4-d844-0410-90c0-e4c51a9137d3
2014-02-02 10:52:49 +10:00
The_E
d36fc2a88e
Remove per-campaign detail settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10351 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
The_E
6b39db6b12
Remove a superfluous $ sign from gauge_load_common, which was messing up hud_gauges tables that defined differing fonts for hud gauges.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10350 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
6e8a90fbbc
Fixed targethit1 -> targhit1 in an error message.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10349 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
0794dcded3
Another little Lua documentation fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10348 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
zookeeper
dc37d2e5de
Two small Lua documentation fixes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10347 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:26:00 +10:00
m_m
5050494c45
Fix for Coverity 1135848
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10311 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
niffiwan
c08aaf1ec2
Coverity ID 1093440: Evaluation order violation in weapon_create()
...
Related to weapon substitution code
Also a gcc warning (sequence point)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10301 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
m_m
8fb2a7ffad
Add -profile_write_file options to write frame times to a file. See Wiki for more information.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10299 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
zookeeper
0cac254b04
Fixed Mantis #3000 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10298 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-31 17:25:59 +10:00
niffiwan
9f67d2e337
From Admiral MS: add scripting function to get the waypoint-list of a waypoint
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10297 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
niffiwan
2605583be6
From Admiral MS: add scripting function to get the wing of a ship
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10296 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
niffiwan
e1711a326e
From Admiral MS: scripting access to ship orders; also allows modifying some order values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10295 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
270d3d9248
Fixed breakage from r10254: key tokens in messages weren't getting translated right.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10293 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
7f74ce48a6
Fixed +Spread From LOD not working.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10290 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
31ab1cff2c
Ported "no homing speed ramp" weapon flag from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10289 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
dbded13fa4
Ported $Acceleration Time weapons table option from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10288 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
zookeeper
ef94f4bb04
Ported $Velocity Inherit weapons table option from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10287 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:46 +10:00
karajorma
1adabef7bd
X3N0-Life-Form's Call-SSM-Strike SEXP.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10286 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
c27f75cd5a
Add support for replaying briefing and command briefing cutscenes. The go back a stage and go to first stage buttons will now count these as a briefing stage.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10280 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
7ef94f084b
Allow training missions to also show mission goals.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10279 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
karajorma
cd9c2f851b
Make it easier to distinguish the events in the mission log
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10278 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
2c34ca0218
fix Mantis #2994 : a model can have initial animation states even if it doesn't have animations
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10277 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
cecc445e8b
Move $Scale Gauges: token before $Reticle Style: to avoid breaking parsing when both are specified
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10275 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
7f05cca670
Ensure Offset & Origin are used together (hud gauges)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10274 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
4d7c218d59
Tweak HUD so that retail gauge scale/no-scale can be set in a minimalistic hud gauges table
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10273 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
770cd66755
Add scaling option to Yarns hud gauges
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10272 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
0b4f71c84d
Mantis #2951 : fix memory corruption issues by changing weapon substitution patterns to use C-style arrays rather than SCP_vectors
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10270 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
b090ea1f68
revert r10082 temporarily while substitute pattern feature is modified
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10269 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
niffiwan
84728de587
Add cmdline flag to disable use of pixel buffer objects
...
Workaround a bug/deficiency in recent linux intel video drivers
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10268 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
a04e83ab01
red-alert will now work with ships that appear at some point subsequent to mission start
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10267 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:45 +10:00
Goober5000
180115feba
correct ammo for red-alerted ballistic primaries
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10257 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
zookeeper
e93e27fc0d
Improved the calculation for how many segments to use for drawing circles and arcs.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10255 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
zookeeper
61d9ce895b
Ported the $On Action and $On Action Stopped scripting hooks from zookeeper branch. Also bumps the char limit for conditions from 32 to 64.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10254 387891d4-d844-0410-90c0-e4c51a9137d3
2014-01-14 20:24:44 +10:00
niffiwan
e3715cc420
change var names to avoid warnings re shadowing
2014-01-01 19:58:36 +10:00
niffiwan
366f4d5642
set HAVE_CXX11 for clang
2014-01-01 19:30:05 +10:00
niffiwan
547d615552
set HAVE_CXX11 for MSVC
2014-01-01 18:56:32 +10:00
niffiwan
4f074d94d1
Add compile time catch for memmove used on non-trivial objects
2013-12-22 20:09:44 +10:00
niffiwan
a4ac843d5b
Add compile time catch for memcpy used on non-trivial objects
2013-12-22 19:53:52 +10:00
niffiwan
0115235de7
Add lua on-collision hooks for beams: from Axem & Wanderer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10253 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
z64555
63ab561e59
Mantis 2977 - Fixes some scripting hooks and references broken by r9549
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10252 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
The_E
9ff8f21b1f
Adds a check to see if the model actually has a defined viewpoint; We can't generate the firepoint display if it doesn't
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10251 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
karajorma
69749cdaee
Add the was-destroyed-delay SEXP by the WCS team. Add support to alter-ship-flag for hiding ship names.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10250 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
m_m
9cd218a595
Fix Mantis 2978: Off by 1 error with getShipClassIndex()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10249 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
5875b4f3a3
Fix Coverity CID 1093619: Array compared against 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10247 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
08f36eb32c
Fix Coverity CID 1109072: Copy into fixed size buffer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10246 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
f834aa80a9
Fix Coverity CID 1093375: Copy-paste error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10245 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
b35ba0e419
Fix Coverity CID 1093368 - Copy-paste error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10244 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:16 +10:00
Echelon9
d753954bcb
Fix Coverity CIDs 1107320, 1107321, 1107322, 1107323 - Copy paste coding corrected
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10243 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
5664773a29
Allow game_settings.tbl to define the FS2NetD port, so TCs can work out of the box on *nix, etc.
...
http://www.hard-light.net/forums/index.php?topic=86317.0
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10242 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
8105d2a372
Fix Coverity ID 1093819: Uninitialized scalar variable in (template) class ade_obj::GetPtr()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10241 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
34b1f276f3
Fix Coverity ID 1093784Y: Uninitialized scalar variable in struct order_h
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10240 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
975f94f207
USHRT_MAX is in limits.h on Linux.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10239 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
Goober5000
d9b45b0eb2
just minor tweaks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10237 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
Goober5000
1ff223687d
when new subsystem entries are inserted, make sure the blank subsystem gets saved and inserted at the proper spot so that we don't use stale data (fixes Mantis #2979 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10236 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
a45af2f019
Found the constant USHRT_MAX I was looking for just a little too late.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10235 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
da4b191160
Saner parsing all around for webapi port number.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10233 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
chief1983
459e2bd469
Fix a warning when copying the webapi port token int into its destination ushort.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10232 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-22 19:05:15 +10:00
niffiwan
359a98410a
Add compile time catch for memset used on non-trivial objects
...
Fix one instance of this problem in osapi/outwnd_unix.cpp
2013-12-16 19:44:23 +10:00
niffiwan
1acfc1c326
Allow gcc on Linux to compile with -std=c++11
...
Tested with 4.6.3, 4.7.2 & 4.8.0
2013-12-16 19:37:02 +10:00
niffiwan
9e73870862
add wxfred2 execs to .gitignore
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10225 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
c5c7e58507
autotools: use autoreconf & m4 dir to make it easier to add/manage macros
...
add m4/wxwin.m4 macro file from wxWidgets 2.9.5 (previously pasted into acinclude.m4)
remove obsolete WX* macros from acinclude.m4
move acinclude to m4/fso.m4
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10224 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
zookeeper
6d3b183373
Ported parts of r9727 from zookeeper branch: Added support for multiple control presets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10223 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
d904a4d516
Fix Coverity ID 1093569: Negative array index read in create_wings()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10222 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
def53398bc
Fix Coverity ID 1093574: Negative array index read in sexp_change_player_score()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10221 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
620f6aaf3d
Fix Coverity ID 1093581: Negative array index read in sexp_clear_ship_goals()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10220 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
3ffe479cca
Fix Coverity ID 1093579: Negative array index write in sexp_damage_escort_list()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10219 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
7d846defa5
Coverity 110733[01]: Negative array index read in get_string_or_variable()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10218 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
aa60c5acec
Coverity ID 109381[456]: Uninitialized scalar variable in load_gauge_target_monitor()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10217 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
336db15246
Coverity ID 1093808: Uninitialized scalar variable in init_ai_target_priorities()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10216 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:02 +10:00
niffiwan
6d402f43aa
Coverity ID 1093550: Negative array index write in multi_voice_release_token()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10215 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
niffiwan
9480b079ca
Coverity ID 1093508: Negative array index write in observer_create()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10214 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
niffiwan
7b9f485a34
Coverity ID 1135850: Out-of-bounds read in hud_target_change_check()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10213 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-15 12:23:01 +10:00
zookeeper
d13236e0e4
Ported r9704 from zookeeper branch: Added scripting function for drawing filled and unfilled arcs and made drawCircle able to draw unfilled circles.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10211 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
a3256bbf88
Fix two issues found by Yarn
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10210 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
0402e46f89
Merge Yarn adaptable hud with m!m common hud parse
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10209 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
706152c7d5
Add common parsing function for hud tables (originally from m!m with updates from me)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10208 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:14 +10:00
niffiwan
e6d4b83907
update .gitignore to ignore codeblocks layout files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10207 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-11 18:52:13 +10:00
Echelon9
45d6f9be21
Fix Mantis 2975: AddressSanitizer: global-buffer-overflow in HudGaugeLeadSight::render()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10205 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Echelon9
ce41e56f46
Fix Mantis 2896: AddressSanitizer: global-buffer-overflow in hud_lock_reset() hudlock.cpp (v2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10204 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
3eedfc7853
don't freak out if we don't have a beam texture
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10203 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
645ee9a2ba
make warning messages friendlier
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10202 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Echelon9
be08468a81
Fix Mantis 2974: WebUI interface: Chat tab does not print messages sent from WebUI
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10201 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:58 +10:00
Goober5000
ab1b8912b7
Sushi (or maybe LPine) broke Shield_Hit_Ani for modular tables when coding a Diaspora feature
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10200 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Echelon9
e75a09d203
Update Jansson library to upstream v2.5 -- http://www.digip.org/blog/2013/09/jansson-2.5-released.html
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10199 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
f3c902c39b
add wing_bash_ship_name, which handles the hash symbol thing, accommodates Blue Planet's capship trick, and works in FRED and while we're at it, do a little bit of const'ing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10198 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
6804e5ae7d
a spelling fix, and also clarify a sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10197 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
niffiwan
6443005f5c
Tweak insignia limits again per Oddgrim's recommendations
...
http://www.hard-light.net/forums/index.php?topic=86195.msg1722757#msg1722757
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10196 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
niffiwan
07dbfed088
Fix compile issue on Linux re: INT_MAX / <limits.h>
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10195 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
7ff59d0559
Enabled fighterbay door animations to better define which bay path must be used or not used for the animation to trigger using +sub_type. Fixes the (undocumented) current numbering of fighterbay +sub_types to be 1-based instead of 0-based. Turns the SUBTYPE_CHECK macro to a proper function.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10194 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
9f65775702
Made +delay and +acceleration in animation code optional and default to 0.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10192 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Goober5000
1e78f8c6e1
fix hidden divide-by-zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10190 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
zookeeper
1c74472423
Added an $On Ship Arrive scripting hook.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10188 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:57 +10:00
Echelon9
49c56eea91
Fix Mantis 2970: AddressSanitizer: global-buffer-overflow in show_ship_subsys_count()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10187 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
Echelon9
9d6fdb07ba
Fix Mantis 2969: AddressSanitizer: global-buffer-overflow in ai_do_objects_repairing_stuff()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10186 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
zookeeper
54a4f26146
Replaced shield_hit_info in escort_info with its own simple set of timer variables. Fixes Mantis #2966 and makes the code simpler and safer.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10185 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
niffiwan
41fee37f3f
Bump model insignia faces/vertexes limits
...
(so that newer more detailed ships can have proper insignia)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10184 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-08 19:52:56 +10:00
niffiwan
4c93092045
Add warning for model insignia specifying an invalid LOD
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10183 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Echelon9
14fc0cfd88
Fix Mantis 2800: Particles not removed on standalone
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10182 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
c19ac5df9d
when changing ship types, make sure the collision flags propagate
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10181 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
1467b0ef16
for wing names with hash symbols, put the ship number before the hash
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10180 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
3bc14442c5
just make this block similar to the other one
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10179 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
niffiwan
668e67c52d
Fix Coverity 1093549: Negative array index write
...
(practically impossible to occur, but lets be safe in case multi_voice_get_stream() changes in future)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10178 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
zookeeper
4b7543361b
Added initialization of render box and sphere offsets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10177 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
niffiwan
e58cbc159b
Fix mantis 2967: use Medals array instead of Ranks (from Yarn)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10176 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Echelon9
da6c95b8c4
Fix Mantis 2968: AddressSanitizer: global-buffer-overflow in shield_info_reset() - relates to hud_target_change_check()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10175 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:50 +10:00
Goober5000
69c7ee68f5
don't Int3() because this can happen when a ship is missing from a mod (i.e. when it turns into the GTF Ulysses)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10174 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
af9b12e448
Resolve compilation failure introduced by r10170
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10171 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
zookeeper
b7a7bb968e
Fixed some improper initialization of escort list hit_infos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10170 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
zookeeper
85e39497cd
More fixes to potentially uninitialized shield_hit_infos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10168 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
b6b3a24e05
General clean up of commented out #ifndef NDEBUG blocks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10166 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
cb446460e4
General cleanup of commented out code in beam.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10165 387891d4-d844-0410-90c0-e4c51a9137d3
2013-12-03 21:12:49 +10:00
Echelon9
396afcacf8
Ensure compliance with the usual form of test in the FS2_Open codebase for running in Debug mode
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10164 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 20:12:54 +10:00
niffiwan
7f20857796
Honour ships' "no lighting" flag in the techroom (from Axem)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10162 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:38 +10:00
zookeeper
a59be2e7c7
Allowed shield_info_reset() to initialize shield_hit_info to empty values if it's not associated with a ship, as required by hudescort.cpp. Might fix Mantis #2961 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10161 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
niffiwan
1a3fc26bfe
Move set-ets-values sexp to the correct category (thanks to Axem for finding this)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10160 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
ad1bef5344
some things don't need to be re-inited every time you pause the game
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10159 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
0fb563b241
set ballistic HUD gauge any time HUD is changed -- fixes Mantis #2962
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10158 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
9ec027641d
add quotes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10157 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
92435f7217
fix some things that FreeBSD complained about
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10156 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Wanderer
141f6bc121
fix issue with burst firing secondaries - thanks to Goober for finding it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10150 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Wanderer
96cc3c017d
feature commit: excluding weapons from linked fire penalty (per request)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10147 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
chief1983
4e54350dcc
Fix #2959 . Framebuffer explosions need framebuffer objects, or it seems we assert later in the code.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10145 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
chief1983
04e7b4c288
Recommit the ship.h part of 10082 as the OBO fixes seem to have fixed #2958 .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10144 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Echelon9
3bbd389420
LLVM/Clang warns that a dangling else can occur without one level of braces
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10143 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
4611a77dbd
re-commit r10082, except for ship.h, because it's the size of the ship_weapon struct that's causing the mysterious crashes (Mantis #2958 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10141 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
9ca44d8ce4
fix an off-by-one error
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10140 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
40c4583792
fix Echelon9's fix >:( also add a judicious Assert for Mantis #2958
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10139 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
Goober5000
724e7816e4
Fix an actual Volition bug. This has AI balance implications, but it's already in the "pick a random weapon" section, so it will probably be all right.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10138 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:37 +10:00
zookeeper
204ebfca63
Remember to initialize shield_point_augment_ctrls.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10137 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
70d05d3815
scramble messages on a per-ship basis
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10136 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
zookeeper
8cd19aa588
Merged model point shields from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10135 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
1cb031c190
Fix #2959 by reverting r10082. I can probably talk zookeeper into converting the troublesome SCP_vectors into static variables so this isn't causing memset issues.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10132 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
f6a92e0972
allow modder to specify countermeasure type on a per-species basis
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10131 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
karajorma
bad6af8a3a
Yarn's fix for Mantis 2941 (Strings.tbms without the current language crash the game).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10130 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
b2167c61a3
Fix #2957 - FreeBSD RAND_MAX is 0x7ffffffd, not 0x7fffffff, so we can't always assume that it's the latter. Also move the check earlier in the code, if it's going to break at all, break immediately on any non-conforming platform so we can fine tune this some more.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10129 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
e8a7c8cf57
medal_stuff passes the duck test, so make it an official class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10128 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
6470f9043f
make init_ship_entry actually init all the fields in ship_info make draw_weapon_models a ship flag instead of a boolean remove the MAX_SHIP_FLAGS #define because it didn't mean what everybody thought it meant
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10127 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
da21b44d07
fix gcc warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10125 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
4581ed9aa2
Persona-specific promotion debriefings (from Yarn)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10124 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
5ceabf1e8b
Add support for the framecap menu option.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10121 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
chief1983
5ebd06bb29
Fix WebUI server name changes updating in clients and FS2NetD.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10120 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
858afb0cef
turns out gcc doesn't like the two angled brackets adjacent to one another
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10119 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
13c8f95046
let's not make expensive copies of all these SCP_strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10118 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
8179453ffa
fix Mantis #2955 : crash when trying to join multiplayer server, caused by trying to memcpy an integer into a ushort (also add some sanity asserts)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10117 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Goober5000
389a2c6955
fix Mantis #2933 : don't output alt ship class information using fout_version
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10116 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
Echelon9
9cdd329f11
Webui: Resolve bug that was causing standalone game name to not appear
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10115 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:36 +10:00
niffiwan
da92a1a709
Add stub for std_init_os() so that *nix can compile
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10114 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
niffiwan
f01eefe832
According to the medal_stuff class, some of these should be MAX_FILENAME_LEN, not NAME_LENGTH
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10113 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
karajorma
f4a7a117e4
Fix Mantis 2954 (Standalone can't find default language)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10112 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Goober5000
7585aed83b
clarify help... OP_AND will actually evaluate all arguments
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10111 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Goober5000
f8dcbffab8
rather than piggy-back the perform-actions sexp on top of the when sexp, it works better to make it its own operator (fixes Mantis #2956 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10110 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Echelon9
e5115993bf
AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) in hud_close()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10109 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
Echelon9
ea93153446
Remove this memory event, as clear() is called after loop, which will call the destructor of each item. Picked up by AddressSanitizer as this was attempting to free() memory allocated with new()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10108 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 19:29:35 +10:00
m_m
a8b201beb7
Changed most MessageBox calls to use SCP_Messagebox, also fixed some of the event processing.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10155 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
The_E
47e6c09e1f
Revert 10149. Needs more review
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10154 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
Echelon9
cd689b60e2
Remove extraneous WIN32 #ifdef's
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10153 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
m_m
4dbf2a4830
Derp, forgot to remove testing stuff.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10152 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
The_E
983214e3e5
From m!m: Enables FRED building. IMPORTANT NOTE: This requires a patched libsdl, the patch is included in the libsdl directory. Binaries were provided by m!m.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10151 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
The_E
2c5af51316
Removes a bunch of win32 ifdefs
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10149 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
m_m
20fb8f7196
Fixed crash in joy_ff_stop_effects caused by uninitialized function pointers.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10146 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
m_m
db7b16feda
MSVC 2011 Project Updates for SDL2/joy-sdl
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10106 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
Echelon9
a9c2fd7794
Cleanup some stray comments in cftp and chttpget
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10105 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
Echelon9
b397f376d8
SDL2 code changes to bring more common platform code into play
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10104 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
Echelon9
3dd0ddd95d
Ensure the SDL2.framework is copied into the final application bundle
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10103 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:18 +10:00
Echelon9
90853677c4
Support SDL2 bindings and SDL2.framework on Xcode4/5. Please remember to delete your projects/Xcode4/Frameworks/ folder and recreate from the modified projects/Xcode4/Frameworks.tgz
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10102 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
Echelon9
0fccedc811
For now, we need to duplicate this code in osapi.cpp and osapi_unix.cpp, so that Mac and Unix can compile
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10101 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
chief1983
21cd06389b
MSVC 2008 Project Updates for SDL2/joy-sdl.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10100 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
bfa7beb62d
Adds include and linker directories to the FRED project (Does not resolve building errors though!)
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10099 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
9294acc319
Adds an SCP_Warning function that acts as frontend to SDL_ShowSimpleMessagebox
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10098 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
93ed384775
Removes redundant code
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10097 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
e15599d4cf
Adds SDL force feedback support (Thanks, taylor!)
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10096 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
bcc6a3bdfb
Allow borderless window mode on non-Windows platforms
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10073 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
dd0de23b3b
Oops, deleted the wrong entry
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10072 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
1831931c91
Comment cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10071 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
0682ab8a05
We're not going to need the no-di-mouse cmdline argument anymore
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10070 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
97f1c547a0
Actually initializing the keyboard input map is probably a good idea
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10069 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
abd5af41b4
Fix OpenGL context creation
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10068 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
a3ec953400
Updated project files for VS2012
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10067 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
e039693c13
Small snafu while merging
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10066 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
02d44009ce
...
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10065 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
81f623fb01
More missing things
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10064 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:17 +10:00
The_E
119fbbe38d
Big commit part 2: Stuff the svn missed
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10063 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
The_E
25915f6de0
IIt begins!
...
SDL2 Everywhere, from me and Flaming_Sword. Outstanding issues: FRED integration, project file updates, cleanup.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10062 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
The_E
0a85a86c65
Sync to trunk 10060
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10061 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
The_E
2f46cbe8a3
sync to trunk 10046
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10047 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
chief1983
4996303b5a
Sync over r9194 from trunk.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9580 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
219c9b2c72
from trunk, committed with the pilot code.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9579 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
722ccb0299
Sync line endings on freespace.rc with trunk.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9578 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
1d39c15693
This wasn't supposed to be in 9574.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9577 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
69c9f459ce
Trunk sync over r8579 that was missed apparently.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9576 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
0110f662dc
Trunk sync commit r9565.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9575 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
b75e9ce1f8
Demo/standalone removal code from trunk to antipodes.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9574 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
14641d8136
Mainhall comment sync.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9573 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
93d4d11350
Remnant differences from Inferno removal.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9572 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:15 +10:00
chief1983
9a4f3f3fa0
More misc project differences.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9571 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
db12f67c4a
More misc project file changes, properties on Xcode4 files.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9570 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
d9f7661bcb
Sync some misc project file differences against trunk.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9569 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
47f3829aa4
Sync whitespace/formatting/comment purge differences from trunk to Antipodes.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9568 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
32957c999c
Trunk sync r9564, for easier differencing.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9566 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
Zacam
684908b239
Trunk Sync: r9544
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9548 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
The_E
499c62b181
Trunk sync r9530
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9531 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
niffiwan
3675a990ab
Fix mantis 2781: use LastPlayer consistently in .ini files/registry
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9521 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
2a5429ea1d
Trunk sync r9516.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9519 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
chief1983
e1650f1255
Trunk sync r9508.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9509 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
Goober5000
70f84212df
we can just use the STL methods here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10095 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:44 +10:00
Goober5000
a739c172f4
add an important note
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10094 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:44 +10:00
niffiwan
b4ab0f3a44
fix gcc warning: declaration of ‘shipp’ shadows a previous local [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10092 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
7a1b8d5be1
Coverity 1129269: Dereference after null check
...
add checks to deal with parent_objp == NULL
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10091 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
ed49e0786b
Coverity 1129274: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10090 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
e5260a381a
Coverity 1129270: Negative array index read
...
weapon_create can return -1
(& oops, r10087 was 1129271, not 1129270)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10089 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
95ab88de98
remove gcc warning: [-Wunused-but-set-variable]
...
(ret_val earmarked for future use)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10088 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
ae429e756e
Coverity 1129270: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10087 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
442f3fb846
Coverity 1129272: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10086 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
1dad7f799e
Coverity 1129273: Negative array index read
...
weapon_create can return -1
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10085 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
niffiwan
b2958b5e4a
Remove a magic number
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10084 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
fa7cf7a910
"new" shouldn't really ever fail
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10083 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
33b871d29d
remove non-working and non-supported $substitute feature for weapons (Mantis #2951 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10082 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
6bc71834ec
this exited_ship constructor is redundant and interferes with the POD-ness of the struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10081 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
35347262d4
make man_thruster a POD struct, and initialize maneuvering thrusters in ship_info initialization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10080 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
de792bc0ca
memset initialized the wrong level of pointer :-/
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10079 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
ed04c7788b
these memsets aren't needed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10078 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:43 +10:00
Goober5000
e9fc00df0c
now that we have queued_animation_init, we can rewrite this properly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10077 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
551ba6ba1a
ugh, neither the constructor nor the memsets are actually needed here
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10076 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
fcb31d94c1
change p_dock_function_info to a class as well
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10075 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
b7db596f12
change dock_function_info to a class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10074 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
13513588df
turn p_object into a class ensure that p_object dock instances are cleared between missions, not just when the game exits handle Player_start_pobject in a saner way the p_object Reset method is nice, but it turns out we don't need it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10060 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
6b97f368e8
sync functions for freeing dock instances
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10059 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
d310647bfe
clear dock lists when objects are deleted, and redundantly clear them between missions and when object instances are destroyed (Mantis #2952 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10058 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
ed06a01897
restore r10051, this time allocating triggered_rotation instances when we need them
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10057 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
Goober5000
7413a7a7d2
don't unnecessarily retime collision checks
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10056 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
niffiwan
0299c7e42b
fix gcc warning: [-Wreorder]
...
‘game_snd::flags’ will be initialised after ‘uint game_snd::signature’
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10055 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:42 +10:00
The_E
c0a3d69ed2
Revert revision 10051: If we're going to use a global vector to store animation info, we need to fill it (and the references to it) too.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10054 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
niffiwan
3b89290cd8
fix gcc warning: [-Wreorder]
...
‘campaign::variables’ will be initialised after ‘int campaign::num_missions’
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10052 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
d11c7ccc2f
ship subsystems should reference an index in a global Triggered_rotations vector rather than maintaining their own class object, which wastes space
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10051 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
afe08580c0
make cmission and campaign into full-fledged classes since they contain non-POD types remove a memset which hoses the multi campaign class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10050 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
3aeee91f14
better assignment of vec3d and matrix (matrix should be set to identity, not all-0)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10049 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Goober5000
e0fa46a185
more memset refactoring... turn texture_replace back into a POD struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10048 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-17 20:24:41 +10:00
Echelon9
cc8310a491
Webui: Clarify the use of branching if statements, to be consistent with existing code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10046 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
0e34a25207
Webui: Support setting an alternative port than 8080 to host the webui on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10045 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
d9ac71740a
Webui: Support the setting of a non-default username and password in multi.cfg. These settings are +webapi_username and +webapi_password
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10044 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
8009d34928
Webui: support writing to fs2_standalone.log on Unix or Mac OS X when running a standalone server
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10043 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
07e35d7bd1
LLVM warning: Initialization of pointer of type 'bool *' to null from a constant boolean expression
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10042 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
2d9dfebae3
Re-enable -Wno-shorten-64-to-32 for Xcode. There remains code in the project, including third party, that assumes implicit 64->32 casts are permitted, which the expectation of overflow. We'll need to re-enable this warning later and revisit specific cases in question, either adding an explicit cast, or handling any cases where overflow is theoretically possible and undersired.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10041 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
93e3461748
Xcode 4/5 project file cleanup. These are redundant settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10040 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
5c8d8f6ded
Xcode 4/5 project file cleanup. Further deprecated settings related to cfilearchiver
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10039 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
fa1403f9a9
Further Xcode 4/5 project file cleanup. Install setting not required as we build an .app bundle
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10038 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
af81604303
Further cleanup Xcode 4/5 project file. Promote settings to top level where possible, remove redundant GCC settings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10037 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
Echelon9
eefa00cb19
Clean up Xcode4/5 project file. Remove blank overrides at the lower level of specific projects
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10036 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
niffiwan
196bfa25d3
Revert "oops - using the right pointer helps (from r10032)" (too hasty)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10035 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
niffiwan
a2fe09fe6c
oops - using the right pointer helps (from r10032)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10034 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:59 +10:00
The_E
184df2fb9e
Make sure is-facing does not blow up id OSWPT_TYPE_NONE is encountered
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10033 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
niffiwan
1f2005ab02
Fix mantis 2946 part C: when enabling sheields, only rebalance ETS if the shields were previously off
...
Also fix same issue in alter-ship-flag ( "no-shields" ... )
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10032 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
6f3e773359
Fix for Mantis #2807 - not particularly elegant fix but enough to prevent the reported null vec issue
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10031 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
e4f63a227c
Solution to issues mentioned in Mantis #2949
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10030 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
25d5cf17f0
Small performance improvement: Only call opengl_shader_t::uniforms::end() once, not every iteration.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10029 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
db183e021c
Continued on Mantis #2806
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10028 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
521e31d766
...aaand cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10027 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
ec56e7771a
Ooops, small buffer collision. Need to load the depth buffer to texture unit 2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10026 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
The_E
551a539fe8
Adds depth buffer access to post processing shaders (via use of the depth_tex uniform)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10025 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
0d4cc04cd6
Fix for Mantis #2352 - Turret reset when idle woes and other limited rotation turret woes.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10024 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
niffiwan
9525d19b89
Fix mantis 2946 part B: set defaults ets when calling shields-on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10023 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Wanderer
ca0bcd5dbf
Fix for Mantis #2806 - added option to rotate the turrets according to 'initial' state animation code in the lab - option enabled by default but can be toggled via render options
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10022 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Goober5000
6836199eeb
ship_subsys is now a class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10021 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:58 +10:00
Goober5000
f883a4bc09
make script_hook behave as a POD object, and fix some parameter passing
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10020 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
90e7709da5
fix warning and mismatched line endings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10019 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
8a8c338409
Fix for Mantis #2784
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10018 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
f571d2336f
Assert to trap lua getSignature access to objects with invalid signature.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10017 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Wanderer
6cbc4f78c4
Fix to prevent invalid weapon bitmap references from being created in the lab.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10016 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
The_E
e6a77d8a34
Moves game_settings.tbl parsing up a few lines so that it takes place before graphics are initialized (Necessary due to the table deciding whether to load external shaders or not)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10015 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
niffiwan
6e265e7e96
Fix mantis 2946: set ets shield index to zero when sexp shields-off is called
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10014 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
39024965b8
promptly change the icon type when the wing checkbox is checked load icons.tbl earlier in FRED so that briefing icons work correctly
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10013 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
5d73931b6d
this should now allow wing icons to be specified too
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10012 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:57 +10:00
Goober5000
686088fa90
store briefing icons in a master list rather than in species_def allow ship classes to specify their own briefing icon to override normal icon
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10011 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
7e6cb331bf
game_snd has a STL field, so it is properly a class and consequently species_info needs to be a class as well
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10010 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
45791f371d
Make sure we only write to the event log if the buffer to do this actually exists
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10009 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
b5e0647d54
Adds a check to the mn.Debris table in lua to check for invalid debris pieces
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10008 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
7b0f6b310b
Make sure entries in the Debris[] array get cleared properly upon deletion
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10007 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
The_E
d20df5b4c9
Adds a safety check to model_render_glow_points to stop it from blowing up when a glowpoint texture is for some reason not available
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10006 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
1ab4286a25
some calculations will be above 999999, so just do it this way; the end result doesn't matter anyway as we just need the minimum
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10005 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
80320485c1
fix some more loose ends in the revised support ship code
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10004 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
f8b3d75fa4
fail
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10003 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
4bf48943d4
oh come on
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10002 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:56 +10:00
Goober5000
c17fd1af7d
fix somebody's spelling
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10001 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
6a8bc0a5ed
make support ship deployment more robust, and prevent an edge case where too many support ships could be in the mission at one time
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10000 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
f3318caef7
some updates to r9885 per discussion with Goober5000
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9999 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
fa04b7c412
Fix mantis 2905: lead sight for secondaries uses subsys distance when targeting a subsys
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9998 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
941fcf34ef
and that shouldn't have been committed in r9995
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9997 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
522299eadf
the game doesn't like it when you do an Assertion while it's shutting down
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9996 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
Goober5000
5aa3bddf70
change object from a struct to a class, since it contains the objsnd_num field :-/
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9995 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-10 18:28:55 +10:00
niffiwan
f301cefe2c
redo r9978 with BUF-1 instead of x[BUF+1]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9994 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
zookeeper
3df8818635
Fixed subtle breakage I caused to surface shields in r9794.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9993 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
Goober5000
758bf662e7
valid timestamps are actually > 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9992 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
629ca0cdc0
Fix mantis 2938: ship.time_first_tagged should be initialised to 0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9989 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
aa3f9080d9
From X3N0-Life-Form: add custom sound for SSM strikes
...
(I updated the patch to use parse_sound instead of the missing stuff_sound)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9988 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
617e4472a2
Remove stuff_sound declaration - was never implemented
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9987 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
2c03139f97
Fix mantis 2889: add sexps's ets-get-value & ets-set-values
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9986 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
niffiwan
797ffdf0f4
Fix mantis 2883
...
update hud_num_make_mono (& callers) to handle the font number
add partial support for specifying special char indexes for individual fonts
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9985 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
Goober5000
7b3a2ddeb5
Mantis #2944 : add a hack to remember the color we faded out to
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9984 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:03 +10:00
The_E
575bc3bcce
From Axem: Allow secondaries to cause shudder effects through use of the Shudder flag
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9983 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-31 19:25:02 +10:00
niffiwan
7f7f857559
Add the Polish font01.vf checksum
...
Sourced from https://svn.icculus.org/freespace2/trunk
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9982 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
e39c972f3d
Coverity 1112867: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9981 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
24e7810b24
Coverity fixes from Flaming_Sword
...
Uninitialized scalar field 1093859 1093917 1093810
Out-of-bounds read/access 1093669 1093670
Logically dead code 1093413 1093396 1093407 1093408 1093409 1093410 1093423 1093427 1093390
Allocation size mismatch 1093729 1093728
Unused pointer value 1093921 1093922
Wrong sizeof argument 1093732 1093731
Operands don't affect result 1093365
Dereference after null check/return value 1093475 1093455 1093627
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9979 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:50 +10:00
niffiwan
f5757f8591
Coverity 1093664: Out-of-bounds write
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9978 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
0e561c822a
Coverity 1093500: Missing break in switch
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9977 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
The_E
a43062a426
Makes the following changes to the FRED project for MSVC2013: -Set WINVER and _WIN32_WINNT to 0x501
...
In combination with this download: http://go.microsoft.com/?linkid=9832071 this will enable FRED building on that compiler.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9976 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
aaab9f2f00
Fix FreeBSD since it doesn't have libdl and doesn't need to include it to build currently. May break Solaris but it doesn't work yet anyway.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9973 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
eb1cfc9ef7
Fix Unix building on several platforms breaking from the new WebUI standalone code. See http://www.hard-light.net/forums/index.php?topic=85859
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9972 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
5f5d13f2b6
Remove 2 unused hudbrackets functions (only with "#if 0" for now)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9971 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
93992f55ff
Coverity 1093668: Out-of-bounds access in fs2netd/tcp_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9970 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
zookeeper
5586cd14b0
Port r9959 from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9968 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
The_E
4a422d3398
Updated for released version of VS2013. Note that FRED building is currently not supported on this platform due to MS deprecating Multibyte Charset for MFC, and haven't provided a workaround at this time.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9967 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
2615ca9ab0
Coverity 1107315: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9966 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
6002874610
Coverity 1107314: Buffer not null terminated
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9965 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
b790092b50
This will actually fix the webui code to support jansson 2.2.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9964 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
63de4932f8
Ubuntu LTS still uses jansson 2.2.1 in their repo and the code does in fact support 2.2. The libs change was definitely my fault though, I forgot all about r7939.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9963 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
df6f8b5292
And tweak it again, for some reason 2.4 != 2.4.0 :rolleyes:
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9962 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
niffiwan
9df9586ef0
Fix new standalone builds
...
Bumped jansson required version to 2.4.0 since that's the version included with our source
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9960 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:49 +10:00
chief1983
8d371f9e94
From Eli2: WebUI-based standalone/dedicated server code for all supported non-Windows platforms. See WIP documentation at http://www.hard-light.net/wiki/index.php/FS2_WebUI_Standalone .
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9957 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:48 +10:00
chief1983
22cfa72250
One more Solaris tweak. No malloc_size or malloc_usable_size on Sun kit. Still can't get it to link though.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9949 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-27 13:51:48 +10:00
Goober5000
c1aaefea08
patch for Mantis #2937
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9946 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
Goober5000
bce047db1e
fix handling of multi-line comments, and add !* and *! as a possible option
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9945 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
92712f5579
Port 9940-9941 from zookeeper branch: Made the targeting box render the target relative to player's eyepoint orientation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9942 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
9ed68b129d
Port r9936 from zookeeper branch: Fixed possible crashes related to the eyepoint orientation features.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9939 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
5312b47983
Typo fix.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9938 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
Goober5000
a81491161e
allow setting of background and mask bitmaps for the medal case
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9935 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
zookeeper
81a40458c2
Fixed -misc maps being dependent on LOD and lighting levels.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9929 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
The_E
ea6edd3f8c
Catch a rare error condition where shield_hit_tri was -1 for some reason
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9927 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:02 +10:00
niffiwan
6b3c7bd83e
more fixes for wxfred all-lowercase filenames
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9926 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
7343c92c23
spelling
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9925 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
7298f50b7a
From Admiral MS: Add a scripting function to check if a ship is in the field of view of a turret.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9924 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
m_m
6021fb4bea
Some new scripting functions as requested by Axem: Access to the CargoSize of a weapon class Access to the AltName of a ship class Access to the actual capacity of a weapon bank Access to the callsign of a ship Access to the alternate ship type of a ship Access to the maximum velocity of a ship with respect to its engine energy level
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9923 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
184cda8e58
remove gcc warnings [-Wunused-but-set-variable] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9922 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
e725bfc7a1
remove gcc warnings [-Wshadow] in ship/shiphit.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9921 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
niffiwan
af56b43beb
Coverity 1093367: logical vs bitwise operator in stars_draw_background()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9920 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
762045168a
merp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9918 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
73ebcda173
additional memory management improvements
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9917 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
Goober5000
2359bd5c7a
more clarification of structs vs. classes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9916 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:01 +10:00
chief1983
75148a3f76
Upgrade Xcode4 project file to...Xcode 5, turning on recommend compiler warnings. Feel free to disable them if they were off for a reason.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9915 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
a0c510e1c6
fix Mantis #2931 : don't prematurely exit the model_interp_tmappoly method if we're drawing outlines
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9913 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
595a4c44c5
initialize this just to prevent loose ends
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9912 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
8dc043ae23
WMC has a screwy way of destroying his jumpnode class, so we need a screwy workaround to avoid hitting an Assert...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9911 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
22d491e50b
add copy-variable-from-index and copy-variable-between-indexes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9910 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
0a7409c7a8
better ranges are also good
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9909 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
Goober5000
f77dd3c219
change sexp operator names for clarity, make sure mprintfs have newlines, and fix typo
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9908 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
chief1983
ae169ebb39
Add .svn folders to .gitignore.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9907 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:46:00 +10:00
niffiwan
92e5d5bee3
Coverity 1093637: "fix" out of bounds read of Weapon_info[Weapons[other_obj->instance].weapon_info_index].subtype
...
(fix for release, at least, Assert probably handles this in debug)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9906 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-16 19:45:59 +10:00
niffiwan
01629bd946
Redo 9903 - this is a more robust solution
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9905 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:32 +10:00
niffiwan
7348b9b08d
remove gcc warnings [-Wunused-but-set-variable] in network/psnet2.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9904 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:32 +10:00
niffiwan
2fe56e6780
Coverity 1093639: fix out of bounds access (ip_addr.sin_addr with proto TCP)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9903 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
e991f7b3ac
remove gcc warnings [-Wshadow] in mission/missionlog.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9902 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
14058b834d
Coverity 1093641: fix out of bounds write (Log_line_timestamps[Num_log_lines])
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9901 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
a7c074e5c3
Coverity 1093645 (out of bounds read): fix 2nd case & correct previous "fix"
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9900 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Echelon9
d0d932fb43
Fix Coverity 1093773: Uninitialized scalar variable - hostaddr.sin_zero
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9899 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
a2b7935a15
remove gcc warnings [-Wunused-but-set-variable] in fs2netd/fs2netd_client.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9898 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
02afed1d78
Coverity: more out-of-bounds fixes
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9897 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
2f573aeb29
fix ship sounds when in observer mode (bug was introduced in revision 7923)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9896 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
26f8b5fed1
make collider_pair an actual class since its constructor is called by hash_map
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9891 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
9e8356b72c
setting to 0 is better because -1 triggers an Int3() on the first swarm entry
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9890 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
e68d8097cd
Fix waaay too short char * var for hostname
...
(this was a buffer overrun for every fs2netd game until coverity complained)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9889 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
5531c0d6b4
resolve issues with ship-templates and memcpy by deprecating ship-copy
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9888 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
niffiwan
0c4c9ec9c9
Fix mantis 2906
...
reset stats in Pilot (i.e. .plr) on new pilot create/clone
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9887 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
3e3714fb8d
fix declaration
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9886 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
0f1971c5aa
change the ship struct to a class, and remove use of memcpy and memset for setting/copying the entire ship class
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9885 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:31 +10:00
Goober5000
bdc0767bb0
change strcpy to strcpy_s (left over from r9832)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9884 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Goober5000
d3e0a2b904
improved error messaging for icons.tbl
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9883 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Echelon9
96e2f96f1a
Fix Coverity 1093931 and 1093932: Missing varargs init or cleanup
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9882 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
Echelon9
4d63d6ea05
Fix Coverity 1093734: Copy into fixed size buffer
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9881 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
z64555
ee1711ed0b
Fixed spelling error with 2 filenames. Updated MSVC project and filters to reflect previous changes with filenames.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9880 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
b26ec341bd
Coverity: more out-of-bounds errors (& fix mistakes in previous "fixes")
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9879 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
1861195702
add .gitignore file :D
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9878 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
576baed1d3
add Coverity modeling file
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9877 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
019c18fab4
Coverity: fix some out-of-bounds access/read/write issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9876 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
d7cc54b324
Change Assert -> Assertion (plus removed some trailing whitespace)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9875 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
910d4bd293
Coverity: fix some out-of-bounds access issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9874 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:30 +10:00
niffiwan
5f0351c72b
Coverity: buffer not null terminated issues
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9873 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
niffiwan
7e1ad3dd5b
Coverity: potential array out of bounds read in ade_set_object_with_breed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9872 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
niffiwan
a02b97b25a
remove GCC warnings in lua.cpp [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9871 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
z64555
f44356a4c5
Looks like I missed 2 files for renaming.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9870 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
z64555
63df481478
Compliance modifications. EOL to Unix style (LF only), files renamed to only lowercase
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9869 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
f1d0d36647
Port r9734 from zookeeper branch: Added scripting function to enable/disable tips of the day in mainhall.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9868 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
40af858593
Port r9823 from zookeeper branch: Added an option to make pitch and yaw axes be determined by eyepoint orientation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9867 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:29 +10:00
zookeeper
ad1c2f0ecd
Port r9738 from zookeeper branch: Forgot this from r9728; makes changing eyepoint orientation affect chase view as well.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9866 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
zookeeper
e8a15e7b22
Port r9728 from zookeeper branch: Made eyepoints match the orientation of their parent submodel.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9865 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
zookeeper
f164e30b0b
Port r9725 from zookeeper branch: Added a Lua function for drawing offscreen indicators. Includes refactoring of some of HudGaugeOffscreen gauge code to separate the position finding and drawing logic.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9864 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
a2ac3497b8
(redo 9781) remove GCC warnings in sexp.cpp [-Wunused-but-set-variable]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9863 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
5135771062
Update ChangeLog, 1st time since 2002...
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9862 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
CommanderDJ
5022356faa
Fix a couple of typos.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9861 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
Goober5000
55c2f4b156
well crap, looks like I broke XSTR in r9809
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9859 387891d4-d844-0410-90c0-e4c51a9137d3
2013-10-07 20:02:28 +10:00
niffiwan
7adf66330d
Coverity CID 1093820: read of uninitialised var in beam_render_muzzle_glow(beam *b)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9858 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
niffiwan
8b78abd7a6
Coverity CID 1093930: read from pointer after free in GUIScreen::Add(GUIObject* new_gauge)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9857 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
niffiwan
5ec75bdd06
Coverity CID 1093821: use of an uninitialised variable in ship_select_blit_ship_info()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9856 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
z64555
79415c262a
Fixes mantis 2925 and 2926. Errors with declaring wxFlexGridSizer item sizes in wxFormBuilder.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9855 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
Goober5000
3e4eca4104
reintegrate Goober5000 branch into trunk: adds STLport support and fixes MSVC6 compatibility with SCP_hash_map (part 2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9854 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:23 +10:00
Goober5000
82fbd9a7c1
reintegrate Goober5000 branch into trunk: adds STLport support and fixes MSVC6 compatibility with SCP_hash_map (part 1)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9853 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
Goober5000
67b171612d
proper class/struct distinction and use of vector over list are A-1 SUPAR
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9851 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
Goober5000
69e1d4e36b
the adjustment should be fixed this way, since most people don't count from 0 to n-1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9846 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
The_E
52381d05db
Small adjustment to the error message here to minimize confusion
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9844 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
The_E
16e60920cf
Changes an Assert to an Assertion in order to provide better feedback in case stuff_int_list fails due to too many entries in the passed list of integers
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9843 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
niffiwan
62d06cfcd9
Coverity multiple CID: fix potential not null terminated strings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9842 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:22 +10:00
niffiwan
ece9b2034b
Coverity CID 1093804: init member raw8 of color struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9841 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-29 22:12:21 +10:00
niffiwan
05a298c68d
Coverity CID 1099443: fix out of bounds access
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9840 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:24 +10:00
Goober5000
8a72823839
turn hud_anim back into an actual struct
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9834 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
c7f6394d6c
polymodel code now has basic class management in place and no longer uses memset
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9833 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
8e096f5c15
remove bad use of memcpy by assigning player class using an actual assign() method (part 2)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9832 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
52edd5b112
remove bad use of memcpy by assigning player class using an actual assign() method
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9831 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
Goober5000
52e9c4a8e0
allow fade-in and fade-out with any color, not just black, white, and red
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9830 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
z64555
5c0a97db80
Allows compiling of wxFred2 on *Nix machines. Includes niffiwan's autocools, fixes some referencing issues with button graphics, and includes graphics for the program and application icons.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9829 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-28 11:47:23 +10:00
niffiwan
cebded3acb
Tweak autotools compilation
...
Add -pipe to potentially speed up compiles
Change -mtune to generic to clarify intent
(people compiling executables for their own use (i.e. not for distribution)
should set CXXFLAGS="-march=native" before running autogen.sh)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9824 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:36 +10:00
Goober5000
7e5b2aee52
turn mc_info into a plain data struct, part 2
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9822 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:36 +10:00
Goober5000
4a9d457154
turn mc_info back into a plain data struct, part 1
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9821 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
c46c0d1412
derp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9820 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
444d4b801a
make engine_wash_info a struct again
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9819 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
2ee1b24b65
queued_animation uses a mess of memcpy and memset, so make sure it's a plain struct!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9818 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
fe934190ac
clarify that some structs should now be treated as classes change shockwave_create_info back to being a struct fix some missing shockwave_create_info initialization
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9817 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
b4cc5d72f4
use an index rather than an iterator into the waypoint list so that ai_info is again a plain old data object
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9816 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Echelon9
e7cbe63a08
Resovle a few const char build errors for non-Windows platforms
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9815 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
f0830b6d64
scoring_level_init is only supposed to initialize a subset of the stats
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9814 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Goober5000
7248acc004
use a copy method rather than memcpy to clone stats (Mantis #2922 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9813 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:35 +10:00
Swifty
4a1e2cb4c5
From Kobrar: Make sure we normalize when normal mapping is off.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9812 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
fc191a40f2
whoops
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9811 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
97e18cd758
various fixes for pilotfile stats
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9810 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
Goober5000
4bd10888ff
make localization more robust with additional checks on string length, more consting, and stronger typing and make XSTR const, since we don't want to modify the strings it translates and then CONST ALL THE THINGS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9809 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
chief1983
d8e4b8de55
Add profiling.cpp to the Makefile.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9808 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
chief1983
d1ac95963f
Add profiling file to Xcode projects, and remove the wxfred2 files from their code.lib targets.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9807 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:34 +10:00
The_E
e2281c39cb
Adds Swifty's frame profiling code. In order to activate it, use the -profile_frame_time commandline parameter. ATTENTION PLATFORM MAINTAINERS:
...
This adds a new file to the source tree named profiling.cpp, add this to the respective project files (I've already done it for the various MSVS projects)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9806 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
2e779e8bef
MOAR const!
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9805 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
38ae06e97d
derp... apply consting to FRED
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9804 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
The_E
3f6f498340
Fix a function call that got broken in all the consting.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9803 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-26 18:51:33 +10:00
Goober5000
8cf10e86f8
remove Bobboau's "better error messages" which were never fully implemented and are more distracting than helpful
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9802 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:46:41 +10:00
Goober5000
886018d28f
here a const, there a const, everywhere a const const
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9801 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:46:41 +10:00
Goober5000
0dfcea3b22
make MAX_MEDALS dynamic (missed a file)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9800 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:27:08 +10:00
Goober5000
7f90f5c674
make MAX_MEDALS dynamic
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9799 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:27:03 +10:00
Goober5000
fcf6d56774
fix tech-add-intel-xstr to actually localize from tstrings.tbl (Mantis #2919 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9798 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
Goober5000
ebe1043a13
add tech-add-intel-xstr, and modify intel_info_lookup to properly translate intel entries (fixes Mantis #2919 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9797 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
chief1983
cc0caf5e55
The last remaining code change (I think) blocking Solaris compatibility.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9796 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
The_E
c0919e0777
Admiral MS' AI flag to enable the AI to be smarter when using afterburners. flag name is "free-afterburner-use". See http://www.hard-light.net/forums/index.php?topic=83818.0 for reference
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9795 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
zookeeper
d993c3e1f5
Merge auto spread shields from zookeeper branch.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9794 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
zookeeper
46ad62f831
Clarified a warning about missing glowpoint textures.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9791 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:19 +10:00
Goober5000
b3798527a0
allow medals.tbl to specify images for debriefing views of medals, not just medal case views
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9789 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:18 +10:00
The_E
81c5c06218
Experimental Configurations to make AVX builds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9788 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-20 19:23:18 +10:00
Goober5000
6d6c82c652
make localization names consistent, and move medal localization into localize.cpp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9787 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:33 +10:00
niffiwan
e19e9d1afd
Allow the use of __attribute__ (GCC specific syntax) In particular, __attribute__((__unused__)) to shush compiler warning -Wunused-but-set-variable
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9786 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:33 +10:00
z64555
32bd62bc18
wxFred2: whoops, forgot some resource files
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9785 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
z64555
ec02c3c972
wxFred progress: GUI elements designed, organized code/wxfred2, work begun on main fred viewport.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9784 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
Goober5000
138e6b853f
yeesh... a veritable cascade of const-correctness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9783 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
chief1983
0a1379159d
Revert r9781 until it can be implemented without breaking MSVC.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9782 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
niffiwan
809ee2483d
remove GCC warnings in sexp.cpp [-Wunused-but-set-variable]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9781 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:32 +10:00
niffiwan
9a602777bd
Fix mantis 2911: stop (de)activate-glow-point-bank sexp from processing the 1st arg twice
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9780 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
The_E
41af7e5ec0
Project files vor MSVS 2013. Please note that in order to build FRED, you need to install the Multibyte MFC library from http://www.microsoft.com/en-us/download/confirmation.aspx?id=39309
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9779 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
niffiwan
5a6493fa62
remove GCC warnings in sexp.cpp [-Wshadow]
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9778 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
143463b478
Port r9723 from zookeeper branch to trunk: Made is-facing able to check for target objects other than ships.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9777 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
f98030b122
Port r9705 from zookeeper branch to trunk: Exposed a ship's autoaim FOV to Lua and allowed $Autoaim FOV to take floats rather than just ints.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9776 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
zookeeper
fd21b9054b
Port r9701 from zookeeper branch to trunk: Added a Lua function to check whether a ship is warp-capable.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9775 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
d5f03daa6b
spelling, hehe
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9774 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
96587dd2ab
allow specification of medal, callsign, and label coordinates
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9773 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
0debee3c51
pretty sure this needs to be 0, per line 325
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9772 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
3550b720cb
remove requirement that game_settings.tbl should specify a campaign filename with an extension
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9771 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
42d096a3c2
allow a user-specified number of credit images
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9770 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
a921665872
add missing newline
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9769 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:31 +10:00
Goober5000
52413c944f
what's this? a Volition bug?
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9768 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:30 +10:00
karajorma
602e608065
Fix Mantis 2883 (All the 1's have vanished since r9761)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9767 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-13 20:18:30 +10:00
The_E
06900df8df
As requested by Axem, adds "player-is-cheating" sexp
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9766 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
chief1983
6c88f96cc0
Bump version to 3.7.1 for nightlies.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9765 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
niffiwan
7fad36e90c
Fix for mantis 2907: In red alert missions that skip briefings, use the red alert "continue" button, not the ship/weapon select "commit" button.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9764 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
niffiwan
3d1edee29a
Fix for mantis 2878: LUA playMusic uses players music volume, not the requested volume
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9763 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
0b0b3fdf70
Allow event.log to snapshot all events that are checked this frame. Allow event.log to record the status of the event the previous time it was checked in addition to its status this frame.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9762 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
2691085f9f
Add support for other languages beyond French, German and Polish. Any non-unicode language should work now.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9761 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
800602701a
Add alter-ship-flag support for several more flags
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9760 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
karajorma
18ca1c08db
Add the toggle-subsystem-scanning option to the alter-ship-flag SEXP
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9759 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:26 +10:00
Goober5000
8f7320119e
show-subtitle-text will now display subtitles from a message
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9758 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
Goober5000
d7fc8372aa
Number 3 from Axem's "A triplet of small patches", http://www.hard-light.net/forums/index.php?topic=82749.0
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9757 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
f38b90f431
Fix Mantis Mantis 2913 (Time Compression SEXPs do not work in multiplayer)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9756 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
c251c031f0
Fix Mantis 2903 (Spinners in the Object Editor point in the wrong direction).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9753 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
7b53a46e88
From m|m: Fix for Mantis 2914 (AmmoLeft and AmmoMax return strange things in scripting)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9752 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
chief1983
5b7c056cb1
Revert 9749 until after 3.7.0.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9751 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
karajorma
53d0129e8f
Fix Mantis 2912 (Hud-set-max-targeting-range doesn't work on multiplayer clients).
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9750 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
6524a2140f
As requested by Aesaar, raise the per-model debris limit to 48 (previously 32). Also increases the per-frame debris limit to 96 (previously 64)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9749 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
z64555
134b0dd757
fix for mantis 2874: Pilot conversion not preserving axis mappings. Also adds a warning that is activated whenever the pilot loading process has to skip bytes of "extra/unknown data" in a section.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9748 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
315373e952
Fix mantis 2908: finally get "richer" pilot conversion exceptions data working correctly THANK YOU Tony D @stackoverflow! http://stackoverflow.com/questions/6248404/c-exceptions-is-throwing-c-string-as-an-exception-bad
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9747 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
99ef01ff6d
Fix 3 for 2901: remove long/short read warning by making mainhall(csg flags), cutscenes(csg flags) & is_multi(plr flags) consistent between pilot conversion and normal save/loads
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9746 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
d619d86976
Fix 2 for mantis 2901: 7 weapon slots (not 12) for pilot conversions
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9745 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
d60a930dc2
2808 accidentally clobbered 2810: change 3.6.18 last played pilot name before loading the pilot for the 1st time
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9744 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
The_E
4eb1787e4e
Fix for Mantis 2898: Reverting r8627 to reinstate -img2dds
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9742 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
Echelon9
0f7d8ec579
Fix Mantis 2847: Assert: (team != -1) -- due to aicode issues tracking destroyed weapons
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9741 387891d4-d844-0410-90c0-e4c51a9137d3
2013-09-03 21:01:25 +10:00
niffiwan
878a7a1921
Fix for mantis 2904: redalert wingmen without RA data are treated as destroyed
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9740 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:15 +10:00
niffiwan
12de1de128
Fix MSVC warning (int to char conversion): thanks to zookeeper for noticing this
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9739 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:15 +10:00
zookeeper
cf4fa30f0f
Fixed bug in RotationalVelocityDesired documentation.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9737 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:14 +10:00
Echelon9
fb33fe020b
Resolve a series of Xcode (LLVM compiler) warnings
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9735 387891d4-d844-0410-90c0-e4c51a9137d3
2013-08-06 22:55:14 +10:00
niffiwan
59762a4db7
add some red alert doco
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9733 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:31 +10:00
niffiwan
d4d10dedd9
add more data to pilot (csg) conversion error messages
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9732 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:31 +10:00
Echelon9
e776f8e5dd
Fix issue where switch statement would fall through for TS_MOVE_PLAYER, which would then not get pushed to other hosts
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9731 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
niffiwan
f8a74ae5c9
Partial fix for 2901: pilot conversion needs to read the ubyte mainhall from <= 3.6.18
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9730 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
m_m
f410440604
Fix for Mantis 2884: Team colors not displayed on player ship.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9720 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
The_E
bccd0533bd
Removes a console command that basically amounted to being a more elaborate way of causing an Int3()
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9719 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
The_E
c6397750e0
Fix for Mantis 2861: Make sure we switch off shader-based effect rendering if the GPU can't handle it
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9718 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
f5f42f65fa
this is required for strict const-correctness
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9715 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
ce118c232c
add a missing #include
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9714 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
509f509347
MSVC6 compatibility
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9710 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
bda6c72d31
remove an unused function, per Echelon9's detective work (Mantis #2900 )
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9709 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Goober5000
b5f278c91c
a modified version of Echelon9's fix for Mantis #2897 (heap corruption due to object indexes being too large for the object dock bitstring)
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9708 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
Echelon9
17c7d0be26
Documentation cleanup of object.cpp pursuant to Mantis 2897 bug-hunting.
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9706 387891d4-d844-0410-90c0-e4c51a9137d3
2013-07-26 08:14:30 +10:00
niffiwan
aa22aca144
Fix for mantis 2503: clear red alert wingman data before loading new wingman data
2013-01-20 10:01:51 +00:00
The_E
e0bb90040f
change build output names to "fs2_open_3_6_17" instead of "*_17r"
2013-01-15 19:31:41 +00:00
niffiwan
cae43dce4f
related to mantis 2503: added assertion to detect crazy amounts of red alert wingman when writing .csg
...
player may lose one mission worth of progress, but shouldn't lose their campaign
2013-01-12 09:52:10 +00:00
chief1983
165eef24e2
Trunk sync r9495.
2013-01-10 05:28:17 +00:00
Zacam
b999937222
Trunk Sync: r9480
2013-01-04 21:44:14 +00:00
niffiwan
216759ab3a
autotools: exclude lua5.2 because it's not (yet) compatible with FSO
...
(backported from trunk so current BP AoA release has less issues on Linux)
2012-12-31 09:39:47 +00:00
chief1983
6954e5f615
Someone goofed a build output filename.
2012-12-30 21:30:55 +00:00
The_E
896c9eef86
Gaaah, forgot syntax
2012-12-30 09:27:55 +00:00
The_E
43857b0032
From Eli2: Lower the value of MAX_SHIPS_PER_PACKET to 64 in order to keep packet size down
2012-12-30 09:27:17 +00:00
Zacam
0437b5f229
Trunk Sync: r9464
...
Fixes Mantis 2432: Changing Sound in as a MULTI pilot does NOT save; from Eli2
2012-12-26 19:49:19 +00:00
chief1983
31f014ed5c
Trunk sync r9456
2012-12-21 21:02:47 +00:00
Valathil
501d62db8b
From Eli2: Replaced memset of player struct with reset(). Fixes random multi crashes.
2012-12-15 18:31:58 +00:00
The_E
6b07c37a63
Trunk sync r9435
2012-12-15 15:40:58 +00:00
Zacam
ef048c5af2
Trunk Sync: r9425
2012-12-13 08:54:32 +00:00
Zacam
d0e450cfd1
Trunk Sync: r9418
2012-12-09 23:16:22 +00:00
Zacam
55bf45393e
Trunk Sync: r9408
2012-12-09 00:48:01 +00:00
Zacam
ee28362f42
Trunk Sync: r9389
2012-12-03 01:06:58 +00:00
Zacam
3fdae2e3c1
Trunk Sync: r9386
2012-12-02 02:24:53 +00:00
The_E
0c222afeb0
Trunk sync r9353
2012-11-18 12:34:24 +00:00
Zacam
dc82a0c7f8
Trunk Sync: r9351
...
You may see other sync's, but none have taken place during a live Feed Dump on Desert Bus!
2012-11-17 23:47:11 +00:00
Zacam
0d518330df
Correct and update all MSVC build output names.
2012-11-11 01:45:55 +00:00
Zacam
ba68ceca3f
Trunk Sync: r9326 and set revision properties to this commit, tagged as 3.6.17 to eliminate any later fiddling or missing it for merge to Trunk.
2012-11-11 00:50:47 +00:00
chief1983
bd96b1a71f
Somehow these lines got added in by accident.
2012-11-05 01:43:16 +00:00
Zacam
808fc0f8e7
Add XCode 4 Project for Antipodes
2012-11-04 10:06:00 +00:00
chief1983
73ab64e3da
Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).
2012-11-02 20:28:04 +00:00
The_E
e2fb98b862
Trunk sync r9275
2012-10-27 14:25:44 +00:00
The_E
ce05f3a88a
Trunk sync r9274
2012-10-21 07:58:11 +00:00
The_E
3ed94d11f9
Trunk sync r9230
2012-09-29 11:46:20 +00:00
The_E
1d75b96d5c
Trunk sync r9215
2012-09-20 16:34:15 +00:00
Zacam
c9a1d1869c
Trunk Sync: r9195-9199
2012-09-13 17:21:17 +00:00
chief1983
ac44f7c59d
Trunk Sync: r9193
2012-09-13 15:14:56 +00:00
chief1983
9091cb6531
Fix antipodes compiling on Linux.
2012-08-31 19:03:55 +00:00
chief1983
10eb2def8a
Trunk Sync: r9149
2012-08-29 18:00:11 +00:00
Zacam
2b4479d853
XCode clean up for ltests.c
2012-08-23 15:36:42 +00:00
Zacam
362c8e4169
Trunk Sync: r9134
2012-08-22 21:44:43 +00:00
The_E
05d5744477
TRunk sync r9104
2012-08-12 07:44:05 +00:00
The_E
79b714ea12
Trunk sync r9092
2012-08-04 06:27:35 +00:00
The_E
1a4fd2f7dd
Backport of trunk 9091
2012-08-04 06:21:36 +00:00
The_E
b6bdffd23a
Trunk sync r9082
2012-08-01 16:43:44 +00:00
The_E
49ba4f86ff
Oops, the mainhall is inited differently now
2012-07-29 12:24:41 +00:00
The_E
1640d066a1
Trunk sync r9064
2012-07-29 11:40:49 +00:00
The_E
2c729eee15
Trunk sync r9057
2012-07-28 21:09:28 +00:00
The_E
68be57e92b
Trunk sync r9031
2012-07-22 11:41:28 +00:00
The_E
8c8302a064
Trunk sync r9006
2012-07-11 17:25:38 +00:00
Zacam
2eb9357312
Trunk Sync r8980
2012-07-04 05:13:33 +00:00
CommanderDJ
edcdfacdc9
Trunk sync r8915
2012-06-27 05:34:53 +00:00
The_E
43c83bf2fd
Trunk sync r8906
2012-06-24 14:43:38 +00:00
The_E
444fccf77a
Make sure we actually have a valid campaign file before trying to do stuff with invalid pointers
2012-06-24 14:36:04 +00:00
Zacam
5dc5f82e43
Trunk Sync r8897
2012-06-18 00:44:03 +00:00
CommanderDJ
35da255b8d
Trunk sync r8874.
2012-06-12 07:57:20 +00:00
Zacam
592ad34c4e
Trunk Sync r8845
2012-06-06 13:59:44 +00:00
CommanderDJ
8a430d927a
Trunk sync r8830.
2012-05-28 12:23:16 +00:00
The_E
2d60cabe4a
Trunk sync r8813
2012-05-22 10:39:23 +00:00
Zacam
58afb0a3da
Trunk Sync: r8807
2012-05-20 22:48:54 +00:00
CommanderDJ
9abcb1e43c
Trunk sync r8799
2012-05-20 03:13:27 +00:00
The_E
a60c8f52db
trunk sync r8786
2012-05-15 11:34:21 +00:00
CommanderDJ
3da8762458
Trunk rev 8773: supernova-stop sexp.
2012-05-11 17:16:19 +00:00
CommanderDJ
1d30cfd0bb
Trunk rev 8768: Patch for Mantis 2650 (Allow 0 door animations in mainhall.tbls/tbms)
2012-05-11 17:06:33 +00:00
CommanderDJ
69d7a29820
Trunk sync 8775
2012-05-11 17:02:01 +00:00
The_E
cc7a648fac
Trunk sync r8766
2012-05-10 10:03:39 +00:00
The_E
4bd9093125
Trunk sync r8753
2012-05-05 14:09:52 +00:00
The_E
05283a3cfa
Trunk sync r8742
2012-05-03 08:26:41 +00:00
The_E
eee0c96fc1
Trunk sync r8696
2012-04-30 14:57:21 +00:00
The_E
45bd1d1d99
Trunk sync r8679
2012-04-15 11:41:31 +00:00
The_E
3f364d8718
trunk sync r8644
2012-04-01 16:21:23 +00:00
The_E
49819d2f4f
Remove two unused function stubs
2012-03-31 14:29:38 +00:00
Zacam
866d4b7efb
Trunk Sync r8631
2012-03-31 03:23:53 +00:00
Zacam
81973b528c
Trunk Sync r8625
2012-03-25 19:44:25 +00:00
The_E
fcbc4362b9
TRunk sync r8615
2012-03-15 12:11:58 +00:00
The_E
8891ccb74f
Update to include mod_table stuff
2012-03-15 10:09:45 +00:00
chief1983
50c090b724
Trunk sync: r8603 (skip 8606, already handled by hand)
2012-03-09 18:34:29 +00:00
chief1983
1a52d39763
Keep that from happening again.
2012-03-09 18:29:43 +00:00
chief1983
4f6972468e
How did these line endings get so jacked up?
2012-03-09 18:25:48 +00:00
The_E
b44c33abc5
Trunk sync r8587
2012-03-06 12:30:49 +00:00
chief1983
c505fed7c0
Trunk sync: r8577
2012-03-05 20:36:27 +00:00
The_E
af9261af10
Trunk sync r8575
2012-03-05 11:53:22 +00:00
The_E
f3e4e78f02
oops, missed this one
2012-03-02 18:12:37 +00:00
The_E
02d8bd64c4
Trunk sync r8545
2012-03-02 16:05:44 +00:00
chief1983
b7716621a8
Trunk sync: r8523-8526
2012-02-23 19:01:29 +00:00
Zacam
c7b77c2974
Fix for Mantis 2609: Resolves segmentation fault under linux caused by memsets clobbering the pointer that SCP_string used to check its length before assignment.
2012-02-21 15:20:15 +00:00
The_E
f02c973621
From eli2: Patch for Mantis 2608 (Adds "$Always Viewable:" setting to cutscenes.tbl)
2012-02-20 14:53:30 +00:00
Zacam
37f0cf8b0d
Trunk Sync: r8519
2012-02-19 19:16:06 +00:00
Zacam
a068ae82f2
From Eli2: Corrects some issues with the last changes to the Main Hall code to allow compilation under linux.
2012-02-19 05:23:23 +00:00
The_E
4b013ac6ab
Trunk sync r8515
2012-02-18 11:56:09 +00:00
Zacam
4e03a83484
Trunk Sync: r8512
2012-02-16 13:04:37 +00:00
Zacam
7506ed7941
Trunk Sync r8506. 8505 skipped as it is only Pilot Specific to Trunk, not needed for AP or would need factoring specifically to AP.
2012-02-15 08:03:56 +00:00
Zacam
db52add4f8
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
Zacam
b27faceb28
Trunk Sync: r8465
2012-02-12 23:10:38 +00:00
Zacam
3b30274a75
Not only did rev 8439 not do what it was supposed to, it also broke subsystem scanning
2012-02-11 13:40:45 +00:00
Zacam
35e8ea59b0
Anomalous whitespace/tab and alignment cleanup.
2012-02-11 01:42:28 +00:00
Zacam
0f5843860b
From CommanderDJ: The Pièce de résistance, MainHall.tbl is now modular.
2012-02-11 01:36:21 +00:00
Zacam
55996169ff
Trunk Sync: r8456-8459
2012-02-10 19:05:36 +00:00
Zacam
a74531eed3
Trunk Sync: r8452, r8454
2012-02-09 14:48:18 +00:00
Zacam
3a62c1bb23
From CommanderDJ:
...
Introduces +Name identifiers for mainhall.tbl entries:
- +Name identifiers only need to be added to the lo-res (640x480) entry of the mainhall. If you really must add a +Name to both res versions, the two resolutions must have the exact same name.
- +Name identifiers are added immediately under the $Main Hall string
Vectorises Main_hall_defines, thus removing the MAIN_HALLS_MAX limit.
Main halls are now loaded based purely on campaign files. Hall indexes are no longer stored in the player struct, and thus this patch changes the pilot file version.
2012-02-09 12:56:10 +00:00
Zacam
971c69a06e
Trunk Sync: r8449-8450
2012-02-09 03:53:54 +00:00
chief1983
2aa9001450
Trunk Sync: r8446, r8447
2012-02-07 22:12:48 +00:00
The_E
ebfeb106e9
Trunk sync r8441-8444
2012-02-06 12:57:58 +00:00
Zacam
1021553630
Trunk Sync: r8436-8439
2012-02-04 23:02:23 +00:00
Zacam
6ce90694c7
Trunk Sync: r8434
2012-02-04 19:37:38 +00:00
Zacam
e2ea4f01e1
Trunk Sync: r8428-8432
...
r8427 not needed in Antipodes due to changes in Pilot data.
2012-02-04 17:36:23 +00:00
Zacam
2b0c9c20b7
Trunk Sync: r8423, r8424
2012-02-03 15:41:02 +00:00
Zacam
dc01c779b3
Trunk Sync: r8417-8420
2012-02-02 00:44:02 +00:00
Zacam
46214abe92
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
016e024844
Trunk Sync: r8412-8414
2012-02-01 14:14:40 +00:00
Zacam
feba1296d8
Trunk Sync: r8406-8410
2012-01-30 18:27:55 +00:00
Zacam
5c9e256e23
Slight touch up to Trunk Commit 8401: (! switch to !( to resolve a C4806 warning in MSVC.
2012-01-29 17:38:50 +00:00
Zacam
2191b124fe
Trunk Sync: r8387-8403
2012-01-29 17:20:25 +00:00
The_E
cb243c3f5c
trunk sync r8382 - 8385
2012-01-28 17:45:57 +00:00
Zacam
bd27ee5e81
Fix to Trunk r8379, for want of a ; a compile was lost.
2012-01-28 07:07:07 +00:00
Zacam
ca926da3f3
Trunk Sync: r8373, r8376-8379
2012-01-28 06:53:43 +00:00
chief1983
b6e8dc552b
Trunk Sync: 8368-8369
2012-01-24 18:40:54 +00:00
Zacam
b925d70617
Trunk Sync: 8341. 8344. 8350. 8361-8363
2012-01-24 03:58:22 +00:00
chief1983
4cff0a9b3c
Trunk Sync: r8239
2012-01-23 03:19:09 +00:00
chief1983
05792b8029
Trunk Sync: r8326-8327
2012-01-23 01:36:02 +00:00
chief1983
09d1ae2e56
Trunk sync: r8310
2012-01-22 21:42:14 +00:00
Zacam
2a641ffff7
Trunk Sync: r8304-8308
2012-01-22 12:15:42 +00:00
Zacam
45d55d5c75
Trunk Sync: r8297-8302
2012-01-22 07:52:20 +00:00
Zacam
4236636365
Trunk Sync: r8287, r8291-8295
2012-01-22 02:09:35 +00:00
The_E
b7db6702dc
TRunk sync r8270-8286, 8289
2012-01-21 12:12:25 +00:00
Zacam
0ff43753cf
Trunk Sync: r8265-8267
2012-01-20 02:26:25 +00:00
The_E
d02a86a86b
Trunk sync revisions 8258, 8260-8263
2012-01-19 14:45:47 +00:00
Zacam
be8e7478a7
Copy of Trunk 8256
2012-01-17 00:19:45 +00:00
chief1983
a57c66bdf3
Trunk sync: r8234-8254
2012-01-16 01:54:01 +00:00
Zacam
e8da8b037c
Trunk Sync: r8230-8233
2012-01-15 19:28:50 +00:00
Zacam
1af3bc902b
Trunk Sync: r8227, r8228
2012-01-15 11:23:20 +00:00
Zacam
cb2e53c6c0
Trunk Sync: r8222-8225
2012-01-15 08:31:47 +00:00
Zacam
c33bf8d031
Trunk Sync: r8218-8220
2012-01-15 06:05:06 +00:00
Zacam
cba78496b6
Trunk Sync: r8214-8216
2012-01-14 19:45:44 +00:00
Zacam
e75c12920b
Trunk Sync: r8207-8212
2012-01-14 02:35:17 +00:00
Zacam
3cbdb1d799
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
16e4c568fe
Meh. Let's do this right. svn:eol-type set to LF for all of these as well. *sighs*
2012-01-13 18:35:09 +00:00
Zacam
064fcd6b04
Set svn:eol-type to LF for these as well.
2012-01-13 18:29:34 +00:00
Zacam
368004ca20
Set svn:eol-style to LF for files.
2012-01-13 18:26:33 +00:00
Zacam
aacaf1944b
Trunk 8199: 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:53:56 +00:00
Zacam
1cd25cc0fb
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
Zacam
e157e27045
Wrong EOLs.
2012-01-13 17:46:33 +00:00
Zacam
7aa0e3732a
Wrong EOL
2012-01-13 17:21:46 +00:00
chief1983
688ed8833a
Trunk sync r8195
2012-01-13 16:49:15 +00:00
chief1983
ed2d5e0f76
Trunk sync r8164
2012-01-11 18:03:01 +00:00
The_E
5aa47d9169
Fix compilation for MacOS
2012-01-11 17:39:03 +00:00
The_E
f95b58ec26
Backport trunk r8152
2012-01-06 01:04:37 +00:00
The_E
a0a2efba63
And 8114 to 8116
2012-01-05 23:15:10 +00:00
The_E
4da4d0f682
Trun 8117 - 8120 need to be here as well
2012-01-05 22:57:00 +00:00
The_E
9f209d5d5d
Trunk sync r8131
2012-01-05 22:49:11 +00:00
karajorma
6f2b86d7f2
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:39:35 +00:00
karajorma
da1a3bcb7a
Training weapons shouldn't cause smoke to come off of ships which haven't really taken any damage.
2011-12-31 06:24:36 +00:00
karajorma
cf2cac5796
Switch from the directive-is-variable SEXP to the more powerful directive-value one.
2011-12-31 06:20:10 +00:00
The_E
8e06b279f9
Trunk sync r8112
2011-12-24 16:22:50 +00:00
Zacam
832999fbbd
Trunk Sync r8104
2011-12-21 08:52:59 +00:00
The_E
fddb57820e
And this too?
2011-12-13 17:27:21 +00:00
The_E
340c28f3b0
Hmm, how did this get missed?
2011-12-13 17:18:25 +00:00
The_E
ffc14f5d9e
Trunk sync r8082
2011-12-13 16:23:01 +00:00
The_E
3c38ce4737
Trunk sync r 8066
2011-12-04 17:42:52 +00:00
Goober5000
06d3ba08be
assigning an empty string is functionally equivalent to clearing the string, and is also compatible with MSVC6
2011-11-23 05:30:00 +00:00
Zacam
165c451719
Fix to Trunk Sync of 7971, when adding more lines to an if, braces are your friend.
2011-11-23 05:16:24 +00:00
Zacam
3966ab46d0
Trunk Sync r8044 (some fixes for MSVC 6 from Goober)
2011-11-23 04:50:57 +00:00
Zacam
7eb3b95751
Trunk Sync r8028
2011-11-23 01:23:54 +00:00
Zacam
6e648f5205
Trunk Sync r8013
2011-11-19 16:32:50 +00:00
niffiwan
dee12f104f
Fix for pilotfile conversion - convert non INF campaign files correctly
2011-11-17 01:52:33 +00:00
niffiwan
2a3b3cc958
PLR conversion: read two more values from .pl2 files
2011-11-17 01:52:26 +00:00
niffiwan
ccaaff35c6
Fix incorrect string sizes used with cfread_string_len
2011-11-17 01:52:19 +00:00
The_E
465b3296ae
Trunk sync r7997
2011-11-16 18:16:55 +00:00
Zacam
9f8c2061c8
Trunk Sync r7986
2011-11-13 10:15:32 +00:00
Zacam
9b8a667728
Trunk Sync r7974
2011-11-12 06:47:54 +00:00
Zacam
64acadfbb9
Trunk Sync r7969
2011-11-10 12:01:34 +00:00
Zacam
aba7c37634
Trunk Sync r7960
2011-11-08 04:53:02 +00:00
Zacam
46ff890305
Trunk Sync r7952
2011-11-06 04:33:41 +00:00
Zacam
f64c5ea811
Trunk Sync r7946
2011-11-05 09:36:17 +00:00
niffiwan
30c7a9971b
Backport of Trunk r7939: : Fix our linking order to work with --as-needed
2011-11-05 02:35:00 +00:00
The_E
4afaa1449d
Trunk sync r7942
2011-11-03 15:21:08 +00:00
Zacam
657182c001
Trunk Sync r7936
2011-11-01 04:16:18 +00:00
The_E
8cf61ad24b
Fixes possible null pointer issues when not using FS2
2011-10-28 13:41:22 +00:00
Zacam
d495ef5ca9
Trunk Sync r7926
2011-10-23 19:04:29 +00:00
Zacam
81255e2299
From ni1s: -Wreorder warnings clean up for GCC output.
2011-10-19 07:36:59 +00:00
Zacam
255c377047
Trunk Sync r7916
2011-10-17 17:58:47 +00:00
Zacam
897eea19d2
Trunk Sync r7909
2011-10-16 18:03:37 +00:00
Zacam
18970717c7
Match Trunk r7902: correct EOL type for these two.
2011-10-12 20:18:33 +00:00
Zacam
eb0060e130
Trunk r7898: Improve performance of jpeg byte swap operation
2011-10-12 16:12:10 +00:00
Zacam
d380153ed9
Trunk Sync r7895
2011-10-11 20:33:05 +00:00
Zacam
6c6849405d
Trunk Sync r7891
2011-10-11 09:04:55 +00:00
Zacam
a2c6d3cb47
Trunk r7885: 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:43:50 +00:00
Zacam
56f5a4c726
Trunk Sync r7882
2011-10-09 10:39:19 +00:00
Zacam
754d89da84
Copy of: Trunk 7874; Fix for medal room crash reported by QuantumDelta
2011-10-08 07:40:12 +00:00
Zacam
3839228867
Trunk Sync r7871
2011-10-08 05:41:06 +00:00
Zacam
23d0c5bb01
Trunk Sync r7862
2011-10-06 04:53:51 +00:00
Zacam
3993b21e6d
Trunk Sync r7859
2011-10-05 04:08:51 +00:00
Zacam
ac5e5cdc6f
Trunk Sync r7856
2011-10-03 13:40:33 +00:00
Zacam
31ccffef1c
Trunk Sync r7853
2011-10-03 11:28:19 +00:00
Zacam
a6041628e7
Finish removing dbugfile.cpp/.h from the rest of the projects.
2011-10-02 08:11:10 +00:00
The_E
f77910e72e
Trunk sync r7842
2011-10-02 07:54:02 +00:00
The_E
b4fec4791a
From Eli2: Dead/unused code removal
2011-10-01 11:55:18 +00:00
Echelon9
116f14d1c3
PVS-Studio fix: V568 It's odd that the argument of sizeof() operator is the '(ushort) sc->m_okKills [idx]' expression.
...
Please note that this will break multiplayer compatibility with prior versions of Antipodes 8. See further http://www.hard-light.net/forums/index.php?topic=73257.msg1550632#msg1550632
2011-10-01 07:53:04 +00:00
The_E
475f364c22
From Eli2: Eclipse project files
2011-09-30 13:38:55 +00:00
Zacam
ed827a5605
Fixes error on cmdline_nohtl in neblighting.cpp, restores sound index in gamesnd.h.
2011-09-30 05:04:02 +00:00
Zacam
8552e85396
Trunk Sync r7825
2011-09-28 17:27:15 +00:00
Zacam
0a6390abfb
Corrections to the MSVC2005 workspace.
2011-09-27 08:06:29 +00:00
Zacam
f429eec1e8
libpng Project had an extra Debug SSE in it.
2011-09-27 08:05:36 +00:00
Zacam
f20499a45a
Copy of Trunk 7815: Add set-docked SEXP.
2011-09-27 05:53:27 +00:00
Zacam
33e49eb177
De-commit the beta version of the sound code patch (it was accidentally merged anyway) as it currently only belongs in the RC branch.
2011-09-27 05:52:02 +00:00
Zacam
6258fb77f1
From niffiwan: Fix for Mantis 2501. (Copy from Trunk)
2011-09-26 21:15:51 +00:00
Zacam
1508051685
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:50:47 +00:00
Zacam
640133f963
Trunk Sync r7807
2011-09-26 03:01:28 +00:00
Zacam
6de603683f
Trunk Sync: Copy of 7801, From CommanderDJ: Patch for Mantis 2307, set-object-position weirdness when in nebula
2011-09-25 08:33:41 +00:00
Zacam
e6a4e6114a
And another Sync Drift check for AP to tidy things up.
2011-09-25 08:27:17 +00:00
Zacam
176f307316
Trunk Sync r7799
2011-09-25 04:10:42 +00:00
Zacam
7bcb3907db
copy of Trunk r7795
2011-09-24 22:40:35 +00:00
Zacam
2c6a924a82
Copy's Trunk revert in r7794.
2011-09-24 19:55:31 +00:00
The_E
15afdd864a
Trunk sync r7792
2011-09-24 17:44:49 +00:00
Zacam
b3ff543742
Thanks to Backslash for noticing this: afterburner_reverse_accel wasn't set in sip-> to init as 0.0, this has been corrected (along with aligned to their entry order)
2011-09-23 02:05:58 +00:00
Zacam
f882175397
From Eli2: Some copy/paste function clean-up
2011-09-21 22:02:58 +00:00
Zacam
9efca699d5
Copy of Trunk 7770: Documentation: Code cleanup of grbatch.cpp and work to prepare for 64bit with size_t
2011-09-21 19:06:43 +00:00
Echelon9
d1db372561
PVS-Studio fix: V512 A call of the 'memset' function will lead to underflow of the buffer '&stackFrame' (mspdb_callstack.cpp).
2011-09-21 14:18:09 +00:00
Zacam
cfc2302eeb
Adds Trunk 7766.
...
(Previous Commit message should have said 7764, not 7763.)
2011-09-20 04:48:10 +00:00
Zacam
dabd1b9405
Trunk Sync r7763
2011-09-20 01:26:10 +00:00
The_E
f22a692c22
MSVC 2011 projects
2011-09-18 09:50:17 +00:00
Echelon9
6ad11d2431
PVS-Studio false alarm: 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 (plr_convert.cpp).
2011-09-18 07:24:18 +00:00
Echelon9
048a0ee140
From niffiwan: A means of catching a non-sensical value to help track down Mantis 2503. See http://www.hard-light.net/forums/index.php?topic=73257.msg1548721
2011-09-18 05:21:36 +00:00
Zacam
08fbeb2e01
Project cleanup for the removals of cryptstring, scramble, and crypt.cpp/.h.
2011-09-18 00:46:43 +00:00
Zacam
c0c96db795
Trunk Sync r7753
2011-09-18 00:08:52 +00:00
The_E
3f60c8a228
Trunk sync r7747
2011-09-17 20:32:54 +00:00
Zacam
e5c2b03610
Fix from Valathil for the pan-and-paint that occurs from shaders on non-SM2.0 cards from weapon lighting not culling out properly.
2011-09-17 15:15:54 +00:00
Zacam
a4c59963ef
Trunk Sync (r7732, r7736, r7737)
2011-09-17 15:11:02 +00:00
Valathil
c4797aede3
Don't do a boolean check on Floats could be -0.0 which is boolean true
2011-09-17 14:38:54 +00:00
Zacam
6d7c608b91
Enable Text-to-Speech (SVN Include) and Voice Recognition. (MSVC 2010)
2011-09-15 03:29:20 +00:00
Zacam
1d637cf6ae
Enable Text-to-Speech (SVN Include) and Voice Recognition.
2011-09-14 22:49:05 +00:00
Zacam
1ca545c89b
EOL inconsistencies corrected to match the rest of the files.
2011-09-14 19:25:38 +00:00
Zacam
662938705e
Trunk Sync r7724
2011-09-14 19:12:08 +00:00
Zacam
9b4bd56b18
Trunk Sync r7721
2011-09-14 08:34:17 +00:00
Zacam
1ef95444f2
Trunk Sync r7716
2011-09-13 08:05:43 +00:00
Zacam
1356613dcd
Trunk Sync r7711
2011-09-12 12:42:59 +00:00
Zacam
8a587f1a50
Trunk r7703: Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl
2011-09-12 04:02:17 +00:00
Zacam
1b3cef40f6
Trunk Sync r7701
2011-09-12 03:44:56 +00:00
Zacam
a667215670
Fix for Trunk r7677 causing map corruption on model cache rebuild.
2011-09-10 21:12:30 +00:00
The_E
b654d36399
Changing this uint32_t (what's that supposed to be?) to a regular int to allow compilation on VS
2011-09-10 09:26:28 +00:00
chief1983
c5f16fd6df
Richard's fix for firepoint cycling predictability.
2011-09-09 22:54:46 +00:00
Zacam
c9e53a41bc
Copy of: Trunk 7693
2011-09-09 15:23:34 +00:00
Zacam
98bbc8bee3
These PVS-Studio checks were fixed by IssMneur in Trunk r7676 and don't need flagging.
2011-09-09 13:46:12 +00:00
The_E
f7e75c32b1
A few PVS Studio things (fixes, false alarm marks)
2011-09-09 11:47:55 +00:00
Zacam
c62f04749c
This file was inadvertently changed during a Trunk Sync that had some test data applied to it, now matches Trunk.
2011-09-09 10:55:34 +00:00
Zacam
cc0d1b563e
Part Three: Synchronization pass of Antipodes and Trunk Differences.
...
Catching on anything missed in the first two passes.
2011-09-09 10:38:47 +00:00
Zacam
3b085e8b83
Part Two: Synchronization pass of Antipodes and Trunk Differences.
...
Trunk Sync r7685
2011-09-09 10:25:08 +00:00
Zacam
c607d9844e
Part One: Synchronization pass of Antipodes and Trunk Differences.
...
Whitespace/tab mostly and to catch any drift.
2011-09-09 09:38:52 +00:00
Zacam
da8f806a10
Trunk Sync r7680
2011-09-08 11:33:58 +00:00
Zacam
17b3c8be17
Trunk Sync r7677
2011-09-08 05:47:44 +00:00
Zacam
e9e29e3ae6
Trunk Sync r7674
2011-09-08 05:05:01 +00:00
Zacam
6e6aa1975c
Trunk Sync r7665
2011-09-07 10:20:10 +00:00
Zacam
a4635437ec
"zbuffer_save" in 'void model_render_children_buffers' is declared but not used.
2011-09-07 08:05:23 +00:00
Zacam
ce708461e6
Fix merge issue that was causing a compiler error.
2011-09-07 07:58:07 +00:00
Zacam
02412812e2
Trunk Sync r7660
2011-09-07 07:41:50 +00:00
The_E
60758c5e82
And a few things that went wrong while merging
2011-09-06 21:44:54 +00:00
The_E
b725ff7e21
trunk sync r7657
2011-09-06 21:22:39 +00:00
The_E
86e99817a4
Ooops, messed up the merge here
2011-08-31 19:44:14 +00:00
The_E
75f66ee174
Trunk sync r7607
2011-08-31 19:36:54 +00:00
Zacam
37735762bc
From Trunk 7595: Shipp can be NULL, which would lead to a crash. This resolves that crash from happening.
2011-08-30 23:00:56 +00:00
The_E
d8a728d5f1
Trunk sync r7593
2011-08-30 18:17:09 +00:00
Zacam
ad3b01c2f2
Trunk Sync r7563
2011-08-29 00:21:43 +00:00
Zacam
61c81e2a99
Trunk Sync r7542
2011-08-27 23:17:45 +00:00
Zacam
1ba4ce550f
Trunk Sync r7537
2011-08-26 19:51:06 +00:00
Zacam
b12b33b151
Trunk Sync r7534
2011-08-25 03:02:20 +00:00
Zacam
2f6d659147
Trunk Sync r7529
2011-08-24 20:41:13 +00:00
Zacam
971ae63ea3
Trunk Sync r7521
2011-08-24 05:35:30 +00:00
Zacam
61ae987752
Trunk Sync r7513
2011-08-22 18:22:17 +00:00
Zacam
bce73f18e0
Hmm. No idea how this one got missed. FRED controls for Nebula Fog Distance.
2011-08-21 12:15:57 +00:00
Zacam
ecd6db1169
Derp. No version for u.
2011-08-21 05:34:02 +00:00
Zacam
029e2a1c5b
Somehow missed these in the Trunk Sync. MSVC 2005 updated.
2011-08-21 04:26:44 +00:00
Zacam
1452c349ee
Trunk Sync r7502
2011-08-21 04:10:52 +00:00
Zacam
844bd02cbf
Trunk Sync r7496 More Justice
2011-08-20 23:40:54 +00:00
Zacam
4b6bfbc980
Trunk Sync r7496 for GREAT JUSTICE!
2011-08-20 22:25:04 +00:00
Zacam
33d3a759e3
Trunk Sync r7494
2011-08-20 19:15:54 +00:00
Zacam
e3dcfbe59a
Trunk Sync r7490
2011-08-19 22:11:28 +00:00
Zacam
0ba0aa44e3
Resolves MSVC Errors from the sync of Hallecks Bomb code. "&& !(Game_mode & GM_DEMO_PLAYBACK)", error being that "GM_DEMO_PLAYBACK" is not available in Antipodes.
2011-08-19 02:57:40 +00:00
Zacam
037a418a62
Trunk Sync r7483
2011-08-18 20:22:52 +00:00
Zacam
de70737203
Trunk Sync r7474
2011-08-15 22:16:25 +00:00
Zacam
d9ab31b4ff
Trunk 7469: PVS-Studio fix: Expression 'b->type < 0' is always false. Unsigned type value is never < 0.
2011-08-14 15:53:02 +00:00
Zacam
78e2500d9e
Some additional PVS-Studio fixes as placed in the thread on Aug 10th:
...
http://www.hard-light.net/forums/index.php?topic=77590.msg1538811#msg1538811
2011-08-14 14:08:09 +00:00
Zacam
db5f86892c
Trunk 7465: change warnings to mprintfs
2011-08-14 14:00:43 +00:00
Echelon9
45b0a125bc
PVS-Studio fix: A few outstanding issues with r7466
2011-08-14 13:59:32 +00:00
Echelon9
67eb406443
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
2011-08-14 13:14:35 +00:00
Zacam
0504a180d3
Shader Update: main-f updated with latest cloaking code. small amount of cleanup done as well.
2011-08-14 02:39:31 +00:00
Zacam
2cda91d1a9
Trunk Sync r7461
2011-08-13 19:09:09 +00:00
Zacam
61d7289888
Trunk Sync r7458
2011-08-12 12:48:38 +00:00
Zacam
10a648755e
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:22:34 +00:00
Zacam
f51b68afc3
Trunk Sync r7447
2011-08-10 14:14:07 +00:00
Zacam
d3bb5578e3
From Echelon9: For testing, PVS-Studio output corrections.
2011-08-09 07:45:09 +00:00
Zacam
9df0ac03b6
Trunk Sync r7436
2011-08-09 07:41:01 +00:00
Zacam
3eb7d1699a
Trunk Sync r7434
2011-08-08 01:53:57 +00:00
Zacam
9ea5438622
Trunk Sync r7428
2011-08-05 03:44:27 +00:00
The_E
fb5c0d8b9e
Trunk sync r7246
2011-08-04 16:27:02 +00:00
Zacam
4b9c69d9f6
Trunk Sync r7423
2011-08-04 13:47:38 +00:00
Zacam
dcde3e4270
Trunk Sync r7420
2011-08-04 13:27:14 +00:00
The_E
a5cde74b9e
Reverting 7412
2011-08-02 13:03:42 +00:00
The_E
beda0ef100
Trunk sync r7411
2011-08-02 11:28:10 +00:00
Zacam
3d27bc8b88
Trunk Sync - r7409 (from r7398, sans 7402 & 7408)
2011-08-02 03:57:38 +00:00
The_E
5a072e0319
Moving ai_profiles parsing up a few lines to get them parsed before weapons and ships, to fix issue with $Default Weapon Selection
2011-07-31 20:16:17 +00:00
The_E
13ec8c9ce4
Trunk sync r7396
2011-07-30 22:46:16 +00:00
The_E
1159c2111c
Trunk sync r7391
2011-07-30 21:49:42 +00:00
Zacam
d4c2990f45
Trunk Sync r7386
2011-07-29 21:11:23 +00:00
Zacam
24325508ae
Trunk Sync r7384
2011-07-29 12:17:25 +00:00
The_E
b5a1b4c263
Trunk sync r7282
2011-07-26 22:16:22 +00:00
The_E
35dc693427
Trunk sync r7379
2011-07-23 10:20:17 +00:00
Zacam
dab3c6d3c9
Trunk Sync r7376
2011-07-23 02:09:07 +00:00
Zacam
4d5e94bf35
Trunk Sync r7372
2011-07-22 17:07:42 +00:00
The_E
727b77a8c0
Trunk sync r7366
2011-07-21 12:22:00 +00:00
The_E
08063525c7
trunk sync r7363
2011-07-20 18:07:56 +00:00
Zacam
a115bdf287
Trunk Sync -r7359
2011-07-19 22:10:23 +00:00
Zacam
8cd8490d15
Trunk Sync -r7356
2011-07-19 19:27:13 +00:00
Zacam
2601fbeb53
Trunk Syn - r7350
2011-07-17 04:44:46 +00:00
The_E
e274c1b218
Trunk sync r7246
2011-07-13 09:04:47 +00:00
Zacam
899abfe413
Trunk Sync - r7342
2011-07-11 08:22:54 +00:00
Zacam
872a5dd838
One should remember to revert testing code out before doing a Sync. *sighs*
2011-07-09 17:37:39 +00:00
Zacam
de2c9aa442
Trunk Sync -r7336
2011-07-09 17:11:53 +00:00
Zacam
5e4f401371
From Valathil: Correction to commit 7292. Light sorting now takes place in the proper order.
2011-07-06 20:55:22 +00:00
The_E
d12cc44de2
Trunk sync r7230
2011-07-06 10:51:40 +00:00
Zacam
5f0c4ad2a7
Trunk Sync - r7328
2011-07-06 05:23:54 +00:00
The_E
662dae1305
Trunk sync r7223
2011-07-05 12:40:08 +00:00
The_E
95f7c0d83b
Reverting changes due to unforeseen consequences.
2011-07-04 14:56:27 +00:00
Zacam
4ff9c7914d
Whoops. My bad.
2011-07-04 14:25:26 +00:00
The_E
b98d27a892
Small update to the FXAA shaders. Also adds a function for shader uniform access that was previously missing.
2011-07-04 13:08:40 +00:00
Zacam
eca9a5380b
Trunk Sync - r7315
2011-07-04 06:41:27 +00:00
Zacam
0fc25700b2
Copy of Trunk 7307.
2011-07-02 01:03:24 +00:00
Zacam
b654033b44
Trunk 7304 Copy
2011-07-01 23:40:13 +00:00
Zacam
6d377a87aa
Typo found by Valathil.
2011-07-01 19:00:56 +00:00
Zacam
8d700fa600
From Trunk 7295: Swifty's collision detection improvements.
2011-07-01 18:08:54 +00:00
Zacam
4834b112b8
And now XCode can join the party too.
2011-07-01 17:41:27 +00:00
Zacam
d87ccf8a48
Narf.
2011-07-01 17:29:21 +00:00
The_E
d37114415f
Adds missing header for libpng
2011-07-01 17:24:38 +00:00
Zacam
a836a27fe0
Update:
...
libpng now at 1.5.2 (small update to pngutils)
zlib now at 1.2.5
Files are in "LF" instead of "CRLF" this time around.
2011-07-01 17:06:16 +00:00
The_E
f000375fef
Trunk sync r7293
2011-07-01 14:15:06 +00:00
Zacam
efa75b4a22
Trunk Sync - r7289
2011-06-28 22:43:33 +00:00
The_E
a9a8cfbfc5
A few operator constants were colliding for some reason
2011-06-28 09:36:56 +00:00
The_E
a6a3e1900c
Trunk sync r7280
2011-06-28 08:38:40 +00:00
Zacam
a8f9b2a15e
Trunk Sync - r7277
2011-06-28 04:04:47 +00:00
Zacam
f8883ce805
Trunk Sync - r7274
2011-06-27 20:36:05 +00:00
Zacam
d96982e6ce
Catches one of the signed/unsigned conversions not covered under r7258.
2011-06-22 23:05:23 +00:00
Zacam
6d2d34b421
From Trunk: Standalone now makes it's own log file.
2011-06-21 23:09:41 +00:00
Zacam
12c5007f9c
Update to r7260 from pyro3d
2011-06-20 13:18:16 +00:00
The_E
1de6dfa605
Trunk sync r7259
2011-06-19 17:24:40 +00:00
The_E
1f5d3fd63a
Patch for buggy red alert data saving from Pyro3D
2011-06-19 13:22:03 +00:00
Zacam
8d587f1c75
Trunk 7257: "Fix compiler warnings re: signed/unsigned mismatch" by The E
2011-06-18 21:48:12 +00:00
Zacam
53b5dd43bd
Trunk Sync - r7255
2011-06-18 19:40:53 +00:00
The_E
6546d07d90
Trunk sync r7253
2011-06-16 17:18:13 +00:00
Zacam
6698f622c3
Oops.
2011-06-16 15:50:20 +00:00
Zacam
d4d47ab54c
Update to some Additional Options under MSVC 2008 for Release Builds to enable "/MP" that are present in the rest of the vcproj files.
2011-06-16 15:18:01 +00:00
Zacam
27ae715cbe
Trunk Sync - r7248
2011-06-16 15:07:09 +00:00
Zacam
e9a6ceb9a3
Trunk Sync - r7245
2011-06-15 15:13:20 +00:00
The_E
aa6bcda337
TRunk sync r7242
2011-06-14 16:42:03 +00:00
Zacam
baa1b95549
Trunk Sync - r7240
2011-06-13 21:52:07 +00:00
The_E
b0fd971cd8
Adding a few bits of sanity checking here. This doesn't address the underlying problem, which is somewhere in the red-alert storage code.
2011-06-12 12:53:55 +00:00
Zacam
80e9420172
Trunk Sync - r7235
2011-06-07 02:33:03 +00:00
chief1983
70598a3abd
Trunk sync - r7230
2011-06-03 18:11:17 +00:00
Zacam
e628e45e44
Trunk Sync - r7224
2011-06-01 21:24:46 +00:00
Zacam
5b3f98fa07
Trunk Sync - r7222
2011-05-31 02:41:44 +00:00
The_E
e57b4f26bf
Trunk sync r7219
2011-05-30 18:51:00 +00:00
Zacam
7bd7dfd24f
Trunk Sync - r7213
2011-05-27 23:45:52 +00:00
Zacam
519c80477b
Quick check for pyro3d's Mantis 2425 Patch.
2011-05-24 15:26:25 +00:00
Zacam
81e6dc277e
Removing some unreachable returns.
2011-05-24 15:14:58 +00:00
Zacam
4557dc1e0b
Trunk Sync - r7204
2011-05-24 15:12:06 +00:00
Zacam
db4a193eba
Trunk Sync - r7201
2011-05-23 16:49:43 +00:00
Zacam
80ba7361a8
Trunk Sync - r7197
2011-05-19 21:34:28 +00:00
Zacam
905ecf5f6f
Let's try "GS_EVENT_END_CAMPAIGN (59)" instead of "GS_EVENT_EMD_CAMPAIGN (59)"
2011-05-19 11:34:48 +00:00
The_E
2975402985
Comment out a few warnings that are unnecessarily alarming.
2011-05-19 11:27:13 +00:00
Zacam
00741a4206
Trunk 7190 - Fix BSG warp effect shockwave
2011-05-19 10:49:41 +00:00
Zacam
b886f25cd3
AP Red-Alert bug patch from Pyro3d
...
http://www.hard-light.net/forums/index.php?topic=73257.msg1511794#msg1511794
2011-05-19 10:48:32 +00:00
Zacam
ca9126e8b2
Copy of Trunk 7188
2011-05-18 13:27:35 +00:00
Zacam
94f980b921
Copy of Trunk Commit r7186:
...
Adding an error message in case FXAA shader compilation fails.
2011-05-18 04:07:34 +00:00
The_E
ad1f1ff97b
Trunk sync r7184
2011-05-17 14:59:47 +00:00
Zacam
6e0f95ee0f
Trunk Sync - r7182
2011-05-16 09:16:44 +00:00
Zacam
a62b7c6d9b
Trunk Sync - r7176
2011-05-11 00:32:21 +00:00
Zacam
51dbc52d4a
Trunk Sync -r7171
2011-05-01 15:13:24 +00:00
Zacam
8467ad4a01
Trunk Sync -r7153
2011-04-28 22:57:45 +00:00
Zacam
40a9444f13
The E's fix for Mantis 2428 from Trunk.
2011-04-26 12:06:37 +00:00
Zacam
9cc432aeb0
Trunk Sync -r7146
2011-04-25 02:10:50 +00:00
Zacam
ce2b01f20c
Trunk Sync -r7141
2011-04-20 18:07:38 +00:00
Zacam
7b1908c4f8
Trunk Sync - r7136
2011-04-18 09:10:42 +00:00
The_E
2f3f8abb4b
Trunk sync r7133
2011-04-17 18:18:36 +00:00
The_E
8da39cd0f8
This assertion is bogus.
2011-04-17 18:12:28 +00:00
The_E
793222a182
Actually, let's make it an Assertion.
2011-04-16 09:46:56 +00:00
The_E
6eadd3ec87
Adding some braces that were missing for some reason.
2011-04-16 09:45:43 +00:00
The_E
5e82657bf8
Fix issue with the tips popup popping up _every goddamn time, EVEN THOUGH I TOLD YOU NOT TO!_
2011-04-16 09:19:51 +00:00
The_E
ba09ace833
Okay, this one needs to be done properly at some point. For now, let us just assume that using Single-player mode by default is the right thing to do.
2011-04-13 14:51:40 +00:00
The_E
4fadf2c205
Trunk sync r7113
2011-04-11 15:46:20 +00:00
The_E
d226931506
Trunk sync r7107
2011-04-05 12:07:21 +00:00
The_E
116c1945f5
Trunk sync r7104
2011-04-04 20:25:24 +00:00
Zacam
cb85530ac8
Trunk Sync - r7099
2011-03-30 13:40:30 +00:00
Zacam
8bcd7b416b
Removing platform #ifdef from the limits.h include as un-necessary.
2011-03-29 19:49:05 +00:00
Zacam
335bf6cd83
Reported by rsaxvc:
...
<limits.h> in bmpman (Probably due to MAX_INT being used)
Pull the "demo" dir out of the makefile
http://www.hard-light.net/forums/index.php?topic=75332.0
2011-03-29 13:54:07 +00:00
The_E
ac1b4951f2
Minor patch to address issue with custom mainhalls not loading for fresh pilots. I hate this one.
2011-03-26 13:29:35 +00:00
The_E
58464ff04c
Trunk sync r7080
2011-03-20 18:15:11 +00:00
The_E
2b52a08c55
More guarding against reading invalid values.
2011-03-20 18:00:18 +00:00
The_E
18d0c77e8e
Fix for bug noted by Zacam. Note to self: read the code before toying with forces you don't understand.
2011-03-18 20:24:07 +00:00
The_E
5134c9abdd
A few changes to bm_get_next_handle().
2011-03-13 09:07:43 +00:00
Zacam
732de3d7b3
Trunk Sync - r7051
2011-03-11 09:57:38 +00:00
Zacam
c60578f338
Trunk Sync - r7036
2011-03-03 03:49:54 +00:00
The_E
257520a27c
Adding a few CLAMPs and log warnings to ensure validity
2011-02-27 20:06:44 +00:00
The_E
3325b4b804
This will allow for longer sexps.
2011-02-26 08:53:09 +00:00
Zacam
307ad4b32f
Test commit of Doxygen MSVC Addin configuration file
...
http://doxygenbrowseraddin.codeplex.com/
Install and Configure/Run Doxygen first per:
http://www.hard-light.net/wiki/index.php/Doxygen_Documentation
2011-02-26 02:48:58 +00:00
Zacam
d5542b9a31
Trunk Sync - r7030
2011-02-26 01:50:36 +00:00
Zacam
04c76be830
Trunk Sync - r7025
2011-02-25 04:30:55 +00:00
Zacam
ff47346489
Removal of the /code/demo directory references from the remaining projects.
2011-02-24 15:58:19 +00:00
The_E
c323582583
Fix for bug encountered in BP, From now on "0" is no longer a valid handle for bmpman slots
2011-02-18 15:22:28 +00:00
Zacam
4ab313e1b6
Trunk Sync - r7014
2011-02-14 17:03:01 +00:00
The_E
400383f901
Removing the nonfunctional demo code, part 2
2011-02-13 20:42:20 +00:00
The_E
5d22efe392
Removing the nonfunctional demo code.
2011-02-13 20:41:43 +00:00
Zacam
b2535b181b
Fixes Dialogue alignment in the Misc Ships Flags portion of the Ships Editor.
2011-02-07 19:02:15 +00:00
Zacam
a79c2d8390
Trunk Sync - r7005
...
Some modification to list "no-ets" above "immobile"
2011-02-07 09:45:15 +00:00
Zacam
5abaa37b7f
Trunk Sync -r7002
2011-02-06 03:26:41 +00:00
Zacam
d340e3e1cd
Nukes Particle Code.
2011-02-04 15:15:27 +00:00
Zacam
8afa55a716
Trunk Sync - r6993
2011-02-04 03:50:54 +00:00
Zacam
0349ed6db6
Trunk Sync - r6988
2011-01-30 17:56:40 +00:00
Zacam
a5400e8e86
Trunk Sync - r6975
2011-01-25 16:49:43 +00:00
Zacam
7b472ce10a
Trunk Sync - r6967
2011-01-23 18:23:47 +00:00
The_E
f028c7a5f1
Trunk sync r6964
2011-01-23 16:25:29 +00:00
The_E
419592d706
Trunk sync r6959
2011-01-22 18:34:12 +00:00
Zacam
6eccb00b38
Trunk Sync - r6952
2011-01-19 10:33:07 +00:00
The_E
4cba1ccb03
Trunk sync r6949
2011-01-18 16:26:37 +00:00
Zacam
ff073dfb4d
Trunk Sync - r6945
2011-01-15 09:27:20 +00:00
The_E
41d452e689
Trunk sync r6934
2011-01-10 15:50:50 +00:00
Zacam
6fd659607f
Trunk Sync - r2930
2011-01-08 08:02:04 +00:00
Zacam
fa908e72a8
Trunk 6921 - "Add flag that applies damage to subsystem as if it were the hull."
2011-01-05 17:36:39 +00:00
chief1983
21040622bd
Trunk r6924: Support for PNG/JPG/TGA based EFFs for the HUD and other graphics that previously required ANI/PCX.
2011-01-05 16:10:30 +00:00
Zacam
4d78024d0c
GLSL version Detection fix.
...
http://www.hard-light.net/forums/index.php?topic=73712.0
2011-01-05 07:13:10 +00:00
Zacam
9b8d978e81
Trunk 6919, "resolve a conversion warning pointed out by FUBAR"
2011-01-02 20:46:42 +00:00
The_E
f8674a1515
Trunk sync r6917
2011-01-01 13:41:57 +00:00
Zacam
5078462321
Dynamic Primary Linking, from chief1983.
2010-12-30 19:28:52 +00:00
Zacam
866f7f86f8
Trunk Sync - r6910
2010-12-29 18:39:43 +00:00
Zacam
2549635181
Thanks to Goober5000, this is the correct way to be doing this.
2010-12-28 04:49:27 +00:00
Zacam
35c7cf3514
Fixes the index for Player Main Hall. Still not saving (or being read) by CSG properly despite tripping breakpoints set on the cfread/cfwrite on the flags for main_hall.
2010-12-27 22:54:50 +00:00
Zacam
59e562a587
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:28:04 +00:00
Zacam
1aab2c261e
Trunk Sync - r6898
2010-12-27 13:01:43 +00:00
Zacam
65143c8a26
Revert 6885. Not a good thing to do apparently.
2010-12-26 19:46:49 +00:00
Zacam
727c65d095
From Trunk: Fix for Mantis 2350 (Sound assignments get lost/become bogus when changing ship class)
2010-12-25 15:18:47 +00:00
Zacam
142eda661c
Fix: MSVC signed/unsigned mismatch.
2010-12-25 13:16:37 +00:00
Zacam
4df9e6f78c
Just noticed that I sorta messed up the Prev/Next Squad Logo buttons locations trying to disable the "Convert" button.
...
Thanks to The_E, this has now been fixed, and a "Disabled!" message will now show.
2010-12-25 12:10:32 +00:00
Zacam
716be042d5
Trunk 6880 - Fix for Mantis 2356.
2010-12-24 09:37:58 +00:00
Zacam
2c5f54c319
MSVC LNK4221 Resolution.
...
multi_oo.cpp/.h and psnet.cpp/.h are not being used and have been removed.
Headers updated to point to multi_obj or psnet2 as appropriate.
Multi.cpp #ifdef PSNET2 made default. vecmat.h added to multi_obj.h.
2010-12-24 09:35:09 +00:00
The_E
f05fcfade1
Trunk synk r6876
2010-12-22 14:48:44 +00:00
The_E
cc088c897a
Fixes erroneous assert on valid last_ship_flown data.
2010-12-22 13:47:30 +00:00
Zacam
8c2e8ca45a
Trunk Sync - r6875
2010-12-21 06:51:15 +00:00
karajorma
e17d7206d5
Fix a bug in persistent variable handing which was corrupting pilots.
2010-12-20 16:01:19 +00:00
karajorma
bc0b03683d
Fix a bug where persistent variables were copied on top non-persistent variables that happened to have the same name.
2010-12-20 15:59:16 +00:00
Zacam
34e02ce943
Trunk Sync - r6865
2010-12-19 06:05:54 +00:00
Zacam
0edd54cf19
Potential fix for reported mainhall issues. Caused by my own commit 6677 and only partly corrected for in 6692. (note: I'm unable to reproduce the reported issues, so it's anybodies guess)
2010-12-16 23:52:39 +00:00
Zacam
8561bf8b4b
From Karajorma: Fix for Mantis 1708 "Training messages do not take into account multiple binds for controls"
2010-12-16 07:15:30 +00:00
Zacam
de3846675f
Trunk Sync - r6855
2010-12-16 07:01:53 +00:00
Zacam
1a7298e0d5
Mantis 2354: Barracks can now be used to switch between Single/Multi Gameplay.
2010-12-16 05:58:50 +00:00
Zacam
805f948882
Mantis 2353: Doesn't resolve Importing/Converting older players, but now Cloning a pilot will retain Axis/Invert as well as sensitivity and dead zone.
2010-12-16 05:57:22 +00:00
Zacam
6083c4e8a1
I honestly have no idea what I have done here, but this should resolve Mantis 2353. (Tested on New pilot and converted)
2010-12-15 12:39:52 +00:00
karajorma
ce8b569132
Might want to check that index is in bounds.
2010-12-15 12:24:20 +00:00
Zacam
76a427daae
Not changing anything here, but it is making this mess a whole lot easier to read. (feel free to disagree if you want)
2010-12-15 11:36:45 +00:00
Zacam
24ff53937d
Trunk Sync - r6847
2010-12-13 20:44:27 +00:00
Zacam
b44703cc09
Copy of Trunk 6844.
2010-12-13 05:52:25 +00:00
The_E
27e6a17b97
Set type for pilotfile.h and pilotfile_convert.h correctly.
2010-12-13 04:02:02 +00:00
Zacam
6e41f25a6f
MSVC_2008 Compiler warnings, fixed.
2010-12-13 03:54:08 +00:00
The_E
768e7df94b
Save the savefile when leaving the options menu
2010-12-13 02:53:22 +00:00
Zacam
a50f6a7a10
The E cleaned house on a slew of unused #IFDEFs, such as FS2_DEMO, MULTIPLAYER_BETA, OEM_BUILD, commented out code, etc.
2010-12-13 02:44:27 +00:00
Zacam
ea971a95a1
INF_BUILD #ifdef/#ifndef's and Inferno Build Configurations go away.
2010-12-13 02:33:41 +00:00
The_E
9ca59918b2
Slight changes to fix linker warning
2010-12-13 01:42:11 +00:00
Zacam
cbd55626f4
Quick fix. (Would have helped if I had saved the file prior to commit)
2010-12-12 23:55:29 +00:00
Zacam
d86f450c55
Antipodes 8: New Pilot code, from taylor.
2010-12-12 23:53:05 +00:00
Zacam
e635d7af70
Prep for Antipodes 8. EXE output filenames now match Trunk to make Merge easier once AP8 is done.
2010-12-12 23:44:13 +00:00
Zacam
d4503bdece
Adds radardradis.cpp/.h to codeblocks and MSVC_2005.
2010-12-12 04:51:05 +00:00
Zacam
6d9dedb2f8
Trunk Sync - r6830
2010-12-12 01:29:12 +00:00
Zacam
958191f75b
Trunk 6822 - Goober5000: use standard font to output the "more" indicator
2010-12-10 19:08:56 +00:00
The_E
4c22ceda41
Fix for Mantis 2254. This adds the option "$Speed Unit Multiplier:" after "Length Unit Multiplier". This value, if left alone, is set to the same value as the length unit multiplier for compatibility. See Mantis for more notes.
2010-12-10 18:21:15 +00:00
The_E
0e64e47bfe
Trunk sync r6820
2010-12-09 23:49:32 +00:00
The_E
ca9d09cc39
Trunk sync - r6818
2010-12-09 23:25:11 +00:00
Zacam
065878be49
Trunk Sync - r6804
2010-12-06 20:11:49 +00:00
The_E
0ae81a217f
Bah. getObjectType() != getConfigType()
2010-12-01 13:07:18 +00:00
The_E
6816a45506
Adding the hud-activate-gauge-type sexp, which can be used to switch a gauge category on or off.
2010-11-29 14:35:42 +00:00
Zacam
e824b8b86e
Trunk Sync -r6795
2010-11-29 12:45:07 +00:00
Swifty
464e3a7270
Lead sight now displays for secondary dumbfires and does not display until an armed weapon is in range.
2010-11-27 22:06:13 +00:00
Zacam
1e6030d5a1
Trunk 6789 - Goober5000 - bump number of misc anims to 32
2010-11-27 00:14:23 +00:00
The_E
f1dd9cf410
Small logic changes here. Changes bug with hud gauges not getting turned off properly in options menu
2010-11-26 19:39:55 +00:00
Zacam
44ba6b9306
Trunk Sync - r6787
2010-11-26 01:52:39 +00:00
The_E
d4424ed8b6
Bumping XSTR_SIZE to allow for "Artillery firing" message replacement
2010-11-24 20:47:54 +00:00
Zacam
5357113acd
Trunk Sync - r6774
2010-11-24 02:59:12 +00:00
The_E
8d7a70b471
eval_sexp -> is_sexp_true
2010-11-23 08:06:10 +00:00
Zacam
423c16c380
Trunk Sync - r6768
2010-11-23 07:41:34 +00:00
Zacam
a4bffc0c76
Trunk Sync - r6766
2010-11-22 21:14:27 +00:00
The_E
7b019a4005
Trunk sync r6762
2010-11-22 06:24:06 +00:00
Zacam
fc0d8b53c8
Trunk Sync - r6760
2010-11-21 20:29:01 +00:00
The_E
5de50c2e3c
More fixes for the "initial off" thing.
2010-11-20 23:38:53 +00:00
The_E
f890e627c6
Logic is a good thing. If you don't reverse it.
2010-11-19 21:22:12 +00:00
The_E
e62c853715
Various bugfixes related to the "off by default" setting
2010-11-19 21:21:47 +00:00
The_E
9d2fc56831
Fixes issue noticed by Axem, where messages without head anis would reuse the last head ani in use.
2010-11-19 17:18:56 +00:00
Swifty
de5a72917d
Rectified the behavior of View From Target from rendering the inverse of HUD elements it originally displayed. Targetbox returned to its original behavior of not displaying in external cam.
2010-11-17 21:52:08 +00:00
The_E
21976de611
Changes the firepoiunt display to be a tiny bit more efficient. Also, working as planned now.
2010-11-16 13:57:26 +00:00
The_E
28a87521a9
Fix for code analysis warning
2010-11-16 12:29:13 +00:00
The_E
38085dc5a8
Adding option to designate a custom HUD gauge as off by default, as well as a sexp to activate/deactivate custom gauges
2010-11-15 15:36:27 +00:00
Zacam
b28a2754cb
Trunk Sync - r6738
2010-11-14 19:41:45 +00:00
Swifty
6a95628a8f
Rewrite of the HUD messages rewrite.
2010-11-14 19:28:11 +00:00
The_E
f7c2c24f82
This wasn't supposed to be committed as well, sorry
2010-11-13 16:01:21 +00:00
The_E
00c67a65b5
Ooops, small oversight
2010-11-13 15:55:29 +00:00
The_E
f7b3bbae18
Adding the "Fixed Message" gauge. This is used to display status messages, like the "Killed by..." and "Viewing from:..." messages. Usage is the same as the standard message gauge.
2010-11-13 11:16:29 +00:00
The_E
d45e390fd0
Fixing bug where the coordinates for the subsystem reticle in the targetview window got manipulated wrongly if no hud_gauges.tbl was present.
2010-11-13 02:09:01 +00:00
The_E
52a7c5be81
The real fix for hud-set-directive
2010-11-12 03:01:30 +00:00
The_E
e142759be4
Ooops, forgot to change this to a renderString()
2010-11-11 16:38:34 +00:00
The_E
94cc5ceaeb
Adds an XWA-style firepoint display to the standard reticle. To use it, add "Firepoint display: YES" to the center reticle gauge (after "Filename:"). Additional options are "Firepoint size:" (size in pixels, default value is 5), "Firepoint X coordinate multiplier:" (Default is 15) and "Firepoint Y coordinate multiplier:" (Default value 10)
...
Also adds HudGauge::renderCircle().
2010-11-11 03:33:06 +00:00
The_E
91dedca11c
Fix for faulty check
2010-11-11 03:17:37 +00:00
The_E
88f5848c12
But this is how you do it right
2010-11-09 18:36:00 +00:00
Zacam
3b42dd1f51
Hmm. There's a game-breaker, hopefully now fixed appropriately. (At least now it compiles)
2010-11-09 12:38:17 +00:00
The_E
949106b963
Adding the hud-set-directive sexp, to complete the set.
2010-11-09 09:48:23 +00:00
The_E
56c1859579
Trunk sync r6715
2010-11-09 04:10:53 +00:00
The_E
bf7e1cc536
Fix issue with alternate weapon energy/ballistic ammo gauges not drawn correctly
2010-11-09 04:05:18 +00:00
The_E
8c12647629
Changes render permissions for the messages, head ani, and target view gauges.
2010-11-09 01:30:22 +00:00
The_E
cb2a15ad1a
Trunk sync r6711
2010-11-05 00:47:58 +00:00
chief1983
8755806397
Trunk sync - r6704
2010-10-29 19:10:21 +00:00
chief1983
2723cc7e99
Whoops, still testing this part
2010-10-29 17:08:38 +00:00
chief1983
3f0f10d3a6
Trunk sync - r6701
2010-10-29 17:05:36 +00:00
Zacam
5d506d2341
copy of Trunk Commit r6697 - Patch for minor snafu, from FUBAR
2010-10-29 01:20:57 +00:00
The_E
4e118acd49
Fixes issue with the head ani not being unloaded correctly
2010-10-28 19:03:07 +00:00
Zacam
89a8c659d1
Trunk Sync -r6694
2010-10-27 18:33:32 +00:00
The_E
8769780354
Fix for Mantis 2331 (hud-set-message not working properly)
2010-10-26 10:20:48 +00:00
chief1983
06c6a8a70f
Trunk sync - r6689
2010-10-25 15:58:47 +00:00
The_E
fa2da96059
Removing lua.c from the VS2010 project
2010-10-25 15:07:41 +00:00
Zacam
1e4b61547c
Trunk Sync - r6684
2010-10-25 04:09:33 +00:00
Zacam
b33234ab29
Trunk Sync - r6677
2010-10-25 00:25:52 +00:00
Zacam
3662c33157
Trunk Sync - r6675
2010-10-24 20:50:24 +00:00
The_E
d9c0a50141
Adding "Message Source: None". Fixes oversight regarding hud-set-message
2010-10-23 14:51:24 +00:00
Zacam
a246fa3a30
Trunk Sync - r6669
2010-10-22 20:47:28 +00:00
chief1983
84930ce188
Trunk sync - r6662
2010-10-22 20:34:37 +00:00
The_E
ef61f16857
Fixes for build warnings
2010-10-22 20:33:35 +00:00
The_E
f78fc33742
Removing unused variables and unused code
2010-10-22 20:13:58 +00:00
The_E
7572008d94
Basic lua integration of the new HUD gauges.
2010-10-22 20:09:11 +00:00
The_E
35d9c02231
Adding a getter function for the custom HUD gauge text
2010-10-22 19:33:14 +00:00
The_E
f295358b00
Adding an option to specify a text offset for custom gauges
2010-10-22 18:33:39 +00:00
Zacam
4595b64430
Resolves for conversion type warnings.
2010-10-22 05:44:06 +00:00
Swifty
5e40c0ddb4
Fixed warnings when retrieving HUD config data.
2010-10-22 00:32:54 +00:00
chief1983
3b222fe39c
Add radardradis files to code/Makefile.am
2010-10-21 22:44:48 +00:00
chief1983
089fd2fafe
Trunk sync - r6655
2010-10-21 18:16:58 +00:00
Zacam
8bd65baa06
Resolves float-to-int conversion warning.
2010-10-20 20:43:16 +00:00
Zacam
63e36377da
Removes unreferenced variable, some whitespace/formatting cleanup.
2010-10-20 20:42:29 +00:00
chief1983
19e491c4fc
Fix compiling errors on VC6
2010-10-20 19:24:59 +00:00
Zacam
3322191676
Update 2005 and 2008 Project file output names from 6 to 7.
2010-10-20 18:19:15 +00:00
chief1983
f6683e6f41
VC6 rename output build to ant-7 from ant-6
2010-10-20 16:36:00 +00:00
chief1983
780eafe42e
Add radar files to VC6 code project file.
2010-10-20 16:13:15 +00:00
chief1983
090965e952
Trunk sync - r6646
2010-10-20 15:15:07 +00:00
The_E
a9cf01b21d
Addng the hud-set-message sexp (Changes the text of a HUD gauge to a message from the messages list)
2010-10-20 09:11:52 +00:00
The_E
04158e45f1
Added radardradis files to the VS2010 project
2010-10-20 09:08:11 +00:00
chief1983
7995e438a4
Properly add radardradis files for Xcode
2010-10-19 23:41:26 +00:00
chief1983
48d5472738
Initial commit of HUD/Dradis code from Swifty's branch for Antipodes 7
2010-10-19 23:17:26 +00:00
chief1983
e9454476d0
More whitespace fixage
2010-10-19 22:19:15 +00:00
chief1983
d78d31a021
Somehow this line was left out of antipodes
2010-10-19 22:17:12 +00:00
chief1983
da31ed9fa2
Trunk sync - r6635
2010-10-19 14:57:03 +00:00
Zacam
1c11fee7e6
Trunk sync - r6632
2010-10-18 21:01:59 +00:00
Zacam
1c65117a01
Trunk sync - r6630.
2010-10-18 20:20:59 +00:00
chief1983
a1e1978565
Trunk sync - r6623
2010-10-18 17:12:35 +00:00
taylor
8e307b0353
this just seems to cause problems
2010-10-17 00:56:24 +00:00
chief1983
a5e31bb187
Add fsmemory.cpp to Xcode too, and some region stuff apparently
2010-10-16 17:49:45 +00:00
Zacam
74288b25ad
Set fsmemory.cpp in the 2010 .filters file as well.
2010-10-16 08:12:31 +00:00
Zacam
c60c5c354f
Trunk Sync r6613
2010-10-16 06:46:33 +00:00
taylor
da639658bf
new/delete fixage for FRED
2010-10-16 06:07:50 +00:00
Goober5000
a865a61999
add fsmemory.cpp to VC6 project
...
add /FORCE:MULTIPLE to FRED
2010-10-16 05:34:23 +00:00
The_E
d469ce0ebe
These should be set as well.
2010-10-15 21:16:03 +00:00
The_E
a47fc29330
--Added "-disable_glsl_model" commandline option to switch off shader-based model rendering but leave the option open to use post processing
...
--Changed shader compilation behaviour so that it stops to compile shaders if one of the lighting shaders fails, similar to the behaviour for normal and height map shaders
2010-10-15 21:11:36 +00:00
taylor
dd0f58dffa
better fix for warnings and messed up texture replacement
2010-10-14 04:15:34 +00:00
taylor
3f1263f39a
fix standalone problems with new gr_*_buffer() setup
2010-10-14 04:15:30 +00:00
chief1983
92ef57241c
Missed some VS2010 renames too
2010-10-13 18:42:36 +00:00
Zacam
4eaccb5149
Missed some.
2010-10-13 18:25:44 +00:00
chief1983
f338b6f373
Trunk sync - r6601.
2010-10-13 15:43:10 +00:00
Zacam
c6a3ffca69
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.
Set Output Filenames to Antipodes instead of Trunk.
2008: Set PDB and Map Exports to explicitly FALSE on Release builds.
2010-10-12 22:38:26 +00:00
chief1983
85a0d81dc6
Let's get all the places it says trunk instead of ant-6, instead of just a few of them.
2010-10-12 00:30:26 +00:00
Zacam
849f1487c7
Swifty's FBO changes.
...
Read: http://www.hard-light.net/forums/index.php?topic=71692.msg1422165#msg1422165
2010-10-11 23:17:39 +00:00
chief1983
0848930abb
Damn VC6 and its urges to use absolute paths for everything
2010-10-11 17:51:50 +00:00
Zacam
a507e1eb2e
And add fsmemory.h to MSVC_2005.
2010-10-09 00:16:12 +00:00
Zacam
75c3b91218
No idea who uses this, but added fsmemory.h to codeblocks.
2010-10-09 00:12:54 +00:00
Zacam
3a18295fb8
Trunk Sync - r6586.
2010-10-08 23:37:32 +00:00
Zacam
19171baf7d
Warning Fix: void model_render_buffers
...
MSVC complains of "C4238: nonstandard extension used : class rvalue used as lvalue".
2010-10-08 23:15:01 +00:00
Zacam
a40d0abf52
Trunk Sync - r6581.
2010-10-08 23:10:53 +00:00
Zacam
3b9443d380
Trunk Sync - r6575.
2010-10-06 20:22:00 +00:00
Zacam
2360d36072
Trunk Sync - r6571.
2010-10-06 09:56:50 +00:00
Zacam
ab8a83e271
Trunk Sync - r6558.
2010-10-02 07:18:59 +00:00
Zacam
2edf65dfe0
Trunk Sync - r6556.
2010-10-02 00:51:18 +00:00
taylor
a2cafff9ee
fix bloom issue when clipping is enabled (death scene, cutscene, etc.)
2010-10-01 18:53:50 +00:00
Zacam
dabd73e5e1
Trunk Sync - r6545.
2010-10-01 04:25:38 +00:00
Zacam
2a6e9c8662
Trunk Sync - r6543.
2010-10-01 04:13:00 +00:00
Zacam
1752bcaee8
Trunk Sync - r6537.
2010-09-30 06:10:56 +00:00
chief1983
053539e0ca
Should help VC6 out a little bit but I'm still having problems.
2010-09-28 16:05:35 +00:00
Zacam
a4f09bf1b5
Trunk Sync - r6532.
2010-09-27 19:04:53 +00:00
taylor
4da431b000
texture_target isn't completely valid until after opengl_create_texture() has been called
2010-09-26 21:16:09 +00:00
taylor
d387a4644e
re-comment debug message
2010-09-26 21:16:07 +00:00
Zacam
d259ba852b
Trunk Sync - r6524.
2010-09-26 18:17:08 +00:00
Echelon9
36e983b786
Code cleanup: Remove redundant Num_observer_obs ahead of converting Observers array to an STL container
2010-09-26 10:39:03 +00:00
Echelon9
0b8234bbb9
Code cleanup: No need to track separately the Num_files variable when Cutscene_list is an STL container
2010-09-26 10:33:51 +00:00
The_E
15c456250b
Ooops, minor typo
2010-09-26 03:25:45 +00:00
Zacam
f9a5615c64
Trunk Sync - r6515 (6506, 6507, 6508, 6511, 6512, 5614 actually committed, 5613/6515 ignored)
2010-09-26 01:44:56 +00:00
Zacam
457434d3eb
Fix to add :AdditionalOptions="/FORCE:MULTIPLE" to MSVC 2008 to allow Fred compilation.
2010-09-26 01:26:06 +00:00
The_E
d1a1bf068d
Normalized line endings
2010-09-26 01:24:10 +00:00
The_E
84e64dcfa8
Bringing back the old-style shader compilation report
2010-09-26 01:23:06 +00:00
The_E
73c500259c
Ooops, those are unneeded
2010-09-24 16:48:22 +00:00
The_E
32c46b8ac4
Fix FRED building. Note that this is partially an ugly hack through using the linkers' FORCE:MULTIPLE option. See also: http://msdn.microsoft.com/en-us/library/70abkas3.aspx
2010-09-24 16:34:33 +00:00
The_E
aace5f90c7
Hopefully fix Xcode compilation issue reported by chief1983
2010-09-23 20:53:39 +00:00
chief1983
0c9fbb6b22
Add fsmemory.h to Xcode project
2010-09-23 17:06:07 +00:00
The_E
485d014b6d
taylor's fix for the loading issues. Please regenerate your cache files.
2010-09-23 06:09:18 +00:00
The_E
335a9d80ec
Only free what actually needs freeing
2010-09-23 05:17:01 +00:00
chief1983
06b703df07
Add fsmemory.h to the Linux build stuff.
2010-09-23 03:53:19 +00:00
chief1983
bdc6defdd0
Add fsmemory.h to VS2008
2010-09-23 03:31:33 +00:00
The_E
998fa46e57
Let's format this properly, shall we?
2010-09-23 03:25:23 +00:00
Zacam
753dfaeb3b
Quick fix noted by The E, keeps really huge models (Like BP's UED Solaris) from crashing the exec.
2010-09-23 03:22:16 +00:00
The_E
21400d3688
Changed VS2010 project files to include fsmemory.h and to change the output name for the binaries
2010-09-23 02:32:54 +00:00
The_E
bb6eea5f21
taylor's diff to make movies work again. See http://www.hard-light.net/forums/index.php?topic=71692.msg1417039#msg1417039
2010-09-23 02:31:31 +00:00
Zacam
9dac4b2bc4
From taylor: go_faster
2010-09-23 02:19:27 +00:00
Zacam
88377709f3
This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.
2010-09-23 02:14:26 +00:00
The_E
6d1909e823
Adding the explanation for disabling the 4290 warning
2010-09-23 02:01:39 +00:00
Zacam
585281635d
Trunk Sync - r4290
2010-09-22 22:39:29 +00:00
Zacam
3bebbbbcd0
Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.
2010-06-29 22:09:34 +00:00
Zacam
cfc49b7680
taylor's changes3.diff
...
(see: http://www.hard-light.net/forums/index.php?topic=68146.msg1353724#msg1353724 )
Some slight changes for alignment and whitespace (space vs tab), otherwise unchanged.
2010-03-21 21:00:26 +00:00
Zacam
139049947b
Yet another fix on the broken commit for the Trunk update.
2010-03-02 22:28:39 +00:00
Zacam
d340940da9
Oh ffs. No more Trunk syncs while at work anymore. Somewhere, a } got lost.
2010-03-02 22:11:53 +00:00
Zacam
83d895fce2
taylors 2nd sound code diff from Reply #99 on 03-01-2010, 00:08:44 on Testing forum. Sans Project file edits, as they have already been done.
2010-03-01 18:28:21 +00:00
Zacam
d283dfd832
Trunk Sync - r5961
2010-03-01 18:22:26 +00:00
Zacam
287bc0294a
Applied Goober5000's Trunk Commit r5943 to the MSVC 2005 Project Files and the cleaned them up.
2010-02-24 05:53:15 +00:00
chief1983
7ba1ec1738
Taylor's recent updates to the code
2010-02-24 00:21:41 +00:00
chief1983
fa9a637819
Add some missing files to build with the code target in Xcode
2010-02-23 21:47:41 +00:00
Zacam
15a2c3b584
Set SVN EOL Types on he new files.
...
From chief1983: OS X XCode project update for the new Sound Code.
2010-02-23 18:10:14 +00:00
Zacam
c430677499
New Sound code addendum: For some STUPID reason, when I applied the patch at work, one file did not delete, one did not create.
2010-02-23 02:43:26 +00:00
Zacam
98b0e40445
The_E's fix for FRED compiling with taylors sound code.
2010-02-23 00:20:06 +00:00
Zacam
f969eb52a2
taylors Sound Code. Linux, MSVC 6, 2005 & 2008 compiling.
...
(Mac OS-X Compiling still needs setup for the file changes)
2010-02-23 00:15:32 +00:00
Zacam
7a399e1db3
Trunk Sync - r5931. Updated build output filenames to 6, MSVC 6 project also outputs _ant (instead of _trunk) so as not to over-write Trunk build compiles.
2010-02-22 21:37:43 +00:00
Zacam
c6c23bbd00
Trunk Sync - r5888
...
Special notes: MSVC_6_Release was corrected by hand, but none of the changes made to MSVC_6 were carried over.
2010-02-06 02:27:21 +00:00
Zacam
2a154a3a97
Updates libpng to 1.2.42. This is currently the highest and newest supportable MAX_VERSION, as 1.4.0 will break things.
...
No other changes for this lib upgrade needed.
2010-02-05 04:36:52 +00:00
Zacam
97790afcf1
Apparently, I mis-understood and left the cfclose in. Let's try this again.
2010-02-04 23:34:13 +00:00
Zacam
8c456a1e75
Let's see if this fixes things, or causes a snowball. If it does, everybody say thank you to ni1s. If it doesn't, then it's still my fault somehow.
2010-02-04 22:31:58 +00:00
Zacam
ba404d8686
chief1983's fixes for Antipodes VC_6_Release distribution for PNG.
...
Additionally, corrected output names for Antipodes from *_trunk_*.exe to *_ant_5_*.exe.
2010-01-30 23:48:23 +00:00
Zacam
0692473238
Check on Speech for VC_6_Release
2010-01-29 23:43:29 +00:00
Flaming_Sword
29752c6ec1
PNG support - fixed MSVC6 workspace file
2010-01-26 04:57:18 +00:00
Zacam
fc13daba42
Deleted and set to ignore.
2010-01-19 21:31:10 +00:00
Zacam
ba66cee720
Trunk Sync - r5825
2010-01-17 23:13:55 +00:00
Zacam
456b98a468
Add's PNG compilation support for XCode, by Echelon9.
2010-01-15 22:00:49 +00:00
Zacam
cd4c79dfa9
Fixes ExternalDLL in MSVC_6_Release.
...
Adds Makefile data for PNG for Linux Platforms.
Patches SPHelper.h for compiling speech under 2008 with less warnings.
2010-01-15 21:57:30 +00:00
Zacam
c65b259ddd
Potential start for adding PNG to MSVC_6_Release from Flaming Sword originally.
2010-01-12 05:07:23 +00:00
Zacam
cd13843cbe
Checked a whitespace difference out of 2008.
...
Removed "trackir.lib" and "../../trackir/lib" from MSVC 6 Release files.
2010-01-12 04:33:31 +00:00
Flaming_Sword
4943d9aafb
Fixed possible calling cfclose() on NULL
2010-01-11 10:42:26 +00:00
Zacam
b0cd916edb
Trunk Sync - r5792
2010-01-08 02:50:10 +00:00
Flaming_Sword
a3c2998f4f
PNG support - added missing files
2010-01-06 09:17:23 +00:00
Flaming_Sword
2198d020ce
PNG support
2010-01-06 08:42:32 +00:00
Flaming_Sword
ce4c32b6d7
Exe names change for msvc2008
2010-01-06 08:29:23 +00:00
Flaming_Sword
2c47356550
trackir cleanup in msvc2008
2010-01-06 08:27:50 +00:00
Flaming_Sword
06ce9f76f6
Trunk sync to 5779
2010-01-06 08:24:54 +00:00
Flaming_Sword
c07b803065
$Alt name:
...
For ships and weapon tbms - renaming existing tbl entries in mods
2010-01-05 12:25:14 +00:00
Flaming_Sword
849506485f
Trunk sync to 5771
2010-01-05 10:13:32 +00:00
Flaming_Sword
258c434207
VC6 project file update for trackir changes
2010-01-05 10:00:01 +00:00
Flaming_Sword
d227e102f7
Trunk sync to 5769
2010-01-05 09:19:55 +00:00
portej05
31e620931e
Trunk Sync
2009-12-14 13:34:13 +00:00
Hery
7ec9f92db1
Post-processing
...
* the main post-processing code
* shaders manager (support for the main and post-processing shaders)
* simple post-processing effects
* bloom
* depth of field (inactive)
* wrappers for OpenGL textures, render buffers and FBO
2009-11-24 15:57:49 +00:00
Hery
b725a5e8bb
Trunk sync (pending PostProcessing patch)
2009-11-24 15:31:34 +00:00
Flaming_Sword
2ccdcbc0fe
Trunk sync
2009-11-19 12:14:17 +00:00
portej05
0ca19eb893
Trunk sync
2009-11-13 09:38:30 +00:00
portej05
391bcbfc64
Icons Patch + Trunk Sync (argh! on the two at once!)
2009-11-12 15:44:33 +00:00
portej05
d1a1f39974
Trunk Sync
2009-11-03 08:21:16 +00:00
portej05
6be1003994
Shouldn't have committed .aps or .cpp.bak
2009-10-28 16:30:45 +00:00
portej05
811755475d
Zacams Icon Update for FSO
2009-10-28 16:28:38 +00:00
portej05
963d965699
Trunk Sync pending Zacams changes
2009-10-26 09:16:42 +00:00
portej05
763dc6f25c
Trunk sync after Antipodes #3
2009-09-26 05:54:19 +00:00
portej05
0974d547a4
PDB_DEBUGGING for antipodes
2009-09-18 13:50:13 +00:00
portej05
d8b132d846
Antipodes3 from Flaming_Sword
2009-09-12 16:03:52 +00:00
portej05
b981f4147f
Trunk Sync
2009-09-12 15:18:09 +00:00
portej05
d32784123b
Sync to include Sushi's 5581 patch
2009-09-09 04:51:12 +00:00
portej05
bc99d2520f
Trunk sync
2009-09-09 04:07:40 +00:00
portej05
8eb87b45b9
Trunk Sync for FS' EFF code
2009-09-03 14:20:46 +00:00
portej05
c1ef2b9f61
Trunk Sync
2009-08-28 11:58:32 +00:00
portej05
3d32f78038
Hery's shaders patch
2009-08-09 14:38:14 +00:00
portej05
d45b249561
Trunk sync (pending Hery's shaders patch)
2009-08-09 13:47:51 +00:00
portej05
302f615cff
Trunk sync
2009-08-03 16:15:44 +00:00
portej05
eb9f23d6fd
Trunk Sync
2009-07-31 09:27:55 +00:00
portej05
aaf3a9bf09
safe_strings changes
2009-07-26 05:15:24 +00:00
portej05
ffd33dd5fe
Trunk Sync (Rodos overlong word fix)
2009-07-22 06:02:16 +00:00
Goober5000
b08d35d1d0
2009-07-22 04:21:53 +00:00