z64555
8b517ddda9
Adds outwindow init and the SCP_mspdbcs init and cleanup.
2016-08-15 17:45:22 -05:00
z64555
6bc5a395e0
Pointless style flag is pointless
2016-08-15 17:28:52 -05:00
z64555
318496992e
Fix bug where scene would not repaint when window was resized to something smaller.
2016-08-15 17:24:55 -05:00
z64555
1e28d526ae
Prevent excessive calls to wxfred::render_resize if the viewport size didn't change.
2016-08-15 16:10:48 -05:00
z64555
26a746d612
Some work on the viewport:
...
* Viewport now resizes. There's some kinks with re-draw to work out, though
* Viewport now displays starfield
* Viewport now displays mission grid
2016-08-15 07:24:39 -05:00
z64555
5b41dce69c
Update wxfred2.cpp to use flagsets. Also a bit of whitespace maintenance (yawn).
2016-08-15 05:38:04 -05:00
z64555
ea9b611782
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into wxfred2
2016-08-15 04:37:40 -05:00
m!m
ddd64146d9
Merge pull request #820 from z64555/fix/filelength
...
Adds macro to replace instances of the deprecated filelength with...
2016-08-15 11:12:50 +02:00
MageKing17
43ca34cb4c
Merge pull request #821 from SamuelCho/lightshafts_reorder
...
Reorder lightshafts in the post process pipeline.
2016-08-14 20:16:50 -07:00
SamuelCho
60bee02f92
Reorder lightshafts in the post process pipeline. Fixes the glare effect from being too bright.
2016-08-14 19:09:29 -07:00
z64555
2b4117256a
Adds macro to replace instances of the deprecated filelength with _filelength if using MSVC.
2016-08-14 20:11:40 -05:00
z64555
9474f58820
Setup OS and FSO backend initialization.
...
* Currently only works on Windows due to the OpenGL loader (wxFredRender) being rather basic.
2016-08-14 19:36:16 -05:00
Fabian Woltermann
d5ac9a33c1
Merge pull request #815 from asarium/feature/flagsetInitializer
...
Add initializer_list support for flagset
2016-08-14 17:07:33 +02:00
asarium
d1baf8edca
Add initializer_list support for flagset
...
This allows to initialize a flagset instance from a {...} expression
without having to create an intermediary instance.
2016-08-14 16:39:29 +02:00
m!m
af9cc94470
Merge pull request #807 from The-E/ship_subsys_flags
...
Changes the subsystem flags to the new flag system.
2016-08-14 16:24:28 +02:00
z64555
6f7039ed01
Merge pull request #809 from asarium/fix/joystickGUIDs
...
Fix wrong joystick event assignment
2016-08-14 02:11:58 -05:00
z64555
006853ae44
Forgot to set canvas target in context creation.
2016-08-13 20:33:50 -05:00
z64555
22f56a12d9
* Implements wxFredRender's render_init() and render_frame() functions.
...
* Implements glcViewport's construction
2016-08-13 20:09:52 -05:00
Fabian Woltermann
8a85b5abe8
Merge pull request #811 from Echelon9/fix/legacy-mode-warning-wrapping
...
Improve legacy mode warning console message
2016-08-14 00:48:00 +02:00
Echelon9
69a88cf58f
Improve legacy mode warning console message
...
Without the new line, this important warning line can get lost within
the console messages e.g. on Linux.
2016-08-13 17:44:03 -04:00
asarium
a4d70c78cb
Fix wrong joystick event assignment
...
Kobrar reported that joystick events were not properly assigned to the
right Joystick instances because the GUIDs of the joysticks was the same
(that's another problem since the code assumes that they actually are
Globally Unique like the name says).
The fix was to simply use the instance ID for checking if two sticks are
the same which seems to work more reliably.
2016-08-13 23:14:47 +02:00
m!m
ecc878586c
Merge pull request #808 from The-E/flagset_emergency_fix
...
Bugfix for flagsets
2016-08-13 21:54:15 +02:00
Fabian Woltermann
d7e6e5e152
Fixes an issue in flagsets where the sanity check for flagset::set was inverted.
2016-08-13 18:26:17 +02:00
Fabian Woltermann
b352a4c13a
Merge pull request #770 from asarium/cmake_/ninjaColor
...
Enable color diagnostics for Ninja generator
2016-08-13 15:17:42 +02:00
Fabian Woltermann
dc11b13edd
Merge pull request #783 from MageKing17/feature/more-target-flags
...
Greatly expand available flags for creating target priority groups.
2016-08-13 15:17:15 +02:00
Fabian Woltermann
e1ba2256ed
Changes the subsystem flags to the new flag system.
2016-08-13 13:52:51 +02:00
Fabian Woltermann
0117ba446c
Merge pull request #794 from z64555/fix/joystick_hats1
...
More compatibility code for joystick hats.
2016-08-13 11:50:24 +02:00
Fabian Woltermann
71acc296f0
Merge pull request #804 from z64555/feature/freelook
...
Feature/freelook
2016-08-13 11:50:06 +02:00
z64555
d24aa9f478
Remove 4-pos hat to 8-pos hat conversion code. Revert this commit if needed in the future!
2016-08-13 01:03:50 -05:00
z64555
431dd7067e
More joystick hat compatibility code.
...
* There's now registers for both 4 position and 8 position hats for both timestamps and downcounts
* There's conversion code to allow an 8-position hat to act like a 4-position hat, which is needed by the FSO codebase which only uses 4-pos hats
* There's also conversion code to allow a 4-pos hat to act like an 8-position hat to some degree.
2016-08-13 01:03:49 -05:00
MageKing17
c17c58265a
Merge pull request #805 from Echelon9/feature/readme-badges
...
Add badges to Readme
2016-08-12 22:17:17 -07:00
Echelon9
229a578b61
Add badges to Readme
...
Re-add visual badges that provide overview of build and code quality
status via Travis and Coverity.
2016-08-13 00:40:54 -04:00
z64555
994f8f7ec4
Fix bug introduced by freelook code that disabled target padlock view mode.
2016-08-12 21:47:04 -05:00
MageKing17
78de88adcf
Greatly expand available flags for creating target priority groups.
...
Target priorities could previous only select based on very few flags, for the simple reason that very few were defined in the ai_tgt_*_flags[] arrays. This simply adds additional flags (even some that seem a little silly; I can't actually think of a reason to especially target "objects that are being rendered", but hey, maybe somebody will find a use for it in the future).
2016-08-12 19:24:07 -07:00
Fabian Woltermann
770fce8de5
Bitset flags -- take 2 ( #775 )
...
This introduces a new mechanism for handling bit flags. Instead of using an int (or two, or three) to write bits into, this uses the std::bitset in a wrapper class that accepts an enum class as input. This means that certain classes of errors we've had a few of in the engine, where a coder used the wrong set of flags or checked them against the wrong variable (SF_STEALTH vs SIF_STEALTH, for example) can now be detected at a compiler level rather than not at all.
2016-08-12 16:13:50 -07:00
z64555
b60f8742e2
Re-Re-enables the freelook mode. Somehow got lost during the Antipodes merge.
2016-08-12 18:09:24 -05:00
Fabian Woltermann
1ea71d2ba6
Merge pull request #803 from asarium/fix/fredFastDebug
...
Fix FRED configuration
2016-08-12 21:15:13 +02:00
asarium
e8d74a833b
Fix FRED configuration
2016-08-12 20:28:29 +02:00
Fabian Woltermann
97153b80a1
Merge pull request #801 from asarium/warnings/more64bit
...
And another batch of 64-bit fixes
2016-08-12 14:55:06 +02:00
asarium
a685642554
And another batch of 64-bit fixes
2016-08-12 09:42:55 +02:00
MageKing17
96c7ea9247
Merge pull request #798 from asarium/cleanup/windebug
...
Remove unused code in windebug.cpp
2016-08-11 18:40:19 -07:00
MageKing17
a1c82455e4
Merge pull request #797 from asarium/warnings/evenmore64bit
...
Another batch of 64-bit warning fixes.
2016-08-11 18:40:09 -07:00
z64555
80f6f31f15
Merge pull request #799 from The-E/math_include_cleanup
...
A bit of include cleanup
2016-08-11 20:39:04 -05:00
z64555
682b279553
Merge pull request #800 from The-E/only_old_stars
...
Dead code cleanup in starfield.cpp
2016-08-11 20:39:01 -05:00
Fabian Woltermann
2d85ced533
Merge pull request #788 from asarium/build/sdlmain
...
Use the provided sdlmain library again
2016-08-11 23:04:00 +02:00
Fabian Woltermann
ab315f2064
Merge pull request #792 from asarium/cleanup/disableFredDeprecation
...
Disable MBCS deprecation warnings in FRED
2016-08-11 23:03:40 +02:00
Fabian Woltermann
b5e837a040
Merge pull request #796 from asarium/fix/memoryStats
...
Fix Windows memory statistics
2016-08-11 23:03:26 +02:00
Fabian Woltermann
444a9ba614
Merge pull request #789 from asarium/cmake_/msvcWarningSpecifications
...
Clean up CMake MSVC warning handling
2016-08-11 23:02:52 +02:00
Fabian Woltermann
e103bcdf69
Removes a bit of dead code that we probably aren't going to develop any further.
2016-08-11 23:01:28 +02:00
Fabian Woltermann
44c64d79f1
Removes old int type includes we carried around from when we supported old compilers
2016-08-11 22:57:49 +02:00
asarium
c40ede030a
Another batch of 64-bit warning fixes.
2016-08-11 22:19:50 +02:00
asarium
76c220251b
Remove unused code in windebug.cpp
2016-08-11 22:10:43 +02:00
MageKing17
affecc9285
Merge pull request #791 from asarium/warnings/more64bit
...
Fix even more 64-bit warnings
2016-08-11 12:54:51 -07:00
asarium
c6a74c2f04
Fix Windows memory statistics
2016-08-11 21:48:11 +02:00
asarium
9a46e9b55e
Fix negative shift warning
...
This converts the fix conversion macros to constexpr functions which
should have the same runtime effects with the added type safety.
2016-08-11 10:42:40 +02:00
asarium
6c3da4b455
Fix even more 64-bit warnings
2016-08-11 10:08:11 +02:00
z64555
83724c0d8a
Merge pull request #793 from MageKing17/bugfix/invalid-joystick-buttons
...
Fix a couple button-related joystick issues.
2016-08-10 23:24:39 -05:00
MageKing17
9f12e1f749
Fix hat position comparison in joy_down()
...
getHatPosition() returns a value from the HatPosition enum, so the conversion to a 0-based index is incorrect (and causes the hat switch to basically not work with continuous controls).
2016-08-10 20:42:00 -07:00
MageKing17
7906f0b9b3
Fix allowing invalid joystick buttons through to the joystick API.
...
When the hat switch code was fixed to restrict joysticks to 32 buttons again, it forgot to invalidate buttons between numButtons() and 32. This could lead to some assertions being failed when the joystick got asked for the status of a nonexistent button.
2016-08-10 18:55:57 -07:00
z64555
20990416a9
Implement wxFredRender components.
2016-08-10 17:56:51 -05:00
asarium
d7707053c3
Disable MBCS deprecation warnings in FRED
2016-08-10 23:44:20 +02:00
z64555
627ef75af0
Fix (undocumented) issue with hat presses not registering. ( #777 )
...
* Fix (undocumented) issue with hat presses not registering.
* Use array instead of a vector for _hat::DownCount
* No, no die-nam-ick numbor of boot-ons to-day. Und no, ve only haff vone hat. Sad Heavy is Sad.
* Fixes an out-of-bounds error caused by incorrect indexing in Joystick::handleHatEvent.
Also fixes a bug where the hatGetDownTime would return a nonzero value if the hat was active but in a different position than the input parameter.
2016-08-10 23:31:09 +02:00
MageKing17
9cef8ed64b
Merge pull request #782 from asarium/fix/luaFixes
...
Fix a few lua related issues
2016-08-10 12:19:35 -07:00
MageKing17
8f32c6100e
Merge pull request #786 from asarium/fix/grbatch
...
Fix wrong return type in grbatch
2016-08-10 11:26:27 -07:00
asarium
2b52c7888e
Remove _cdecl usages
2016-08-10 18:03:29 +02:00
asarium
74b0702577
Specify ignored warnings in CMake toolchain file
...
This means that it's no longer necessary to include pstypes.h just for
ignoring the standard warnings.
2016-08-10 17:24:04 +02:00
asarium
b26a70d96a
Use the provided sdlmain library again
2016-08-10 16:45:04 +02:00
asarium
5b28824f62
Fix wrong return type in grbatch
2016-08-10 15:18:55 +02:00
Fabian Woltermann
9953fd924e
Merge pull request #779 from asarium/warnings/more64bit
...
More 64-bit MSVC warning fixes
2016-08-10 14:32:21 +02:00
Fabian Woltermann
14f80e6a07
Merge pull request #784 from asarium/fix/fontHeightHack
...
Improve font top and bottom offset handling
2016-08-10 14:30:50 +02:00
Fabian Woltermann
e805cc15fc
Merge pull request #785 from asarium/fix/modelrenderVars
...
Fix uninitialized values in modelrender
2016-08-10 14:30:22 +02:00
asarium
0cabe71fdd
More 64-bit MSVC warning fixes
2016-08-10 13:33:12 +02:00
asarium
f5c0234d3b
Fix uninitialized values in modelrender
2016-08-10 13:28:36 +02:00
asarium
19de867f31
Improve font top and bottom offset handling
2016-08-10 12:59:19 +02:00
niffiwan
c3b4380351
Merge pull request #781 from asarium/fix/mainhallDistance
...
Fix wrong parameter order
2016-08-10 09:50:29 +10:00
asarium
72a956e0ed
Fix wrong handle pointer validation
2016-08-10 00:06:33 +02:00
asarium
5e12ec392c
Fix wrong parameter order
2016-08-10 00:03:17 +02:00
asarium
188bf2bb1e
Fix wrong initial value
2016-08-09 23:55:38 +02:00
MageKing17
5f38b7fbce
Merge pull request #780 from asarium/fix/shaderCrash
...
Fix Assert caused by invalid comparision
2016-08-09 13:58:29 -07:00
asarium
b982c04a00
Fix Assert caused by invalid comparision
2016-08-09 22:24:00 +02:00
m!m
079c6ae86e
Fix FRED executable version information ( #778 )
2016-08-09 11:15:46 -07:00
m!m
22c0255277
Fix a bunch of 64-bit MSVC warnings ( #709 )
...
* Fix a bunch of 64-bit warnings
* Fix Linux compilation error
* Fix Mac error
* Fix some issues
* Fix more GCC warnings
* Remote unwanted change
* Remove accidentally readded file
* Fix wrong limit check
* Use BEAM_INDEX macro for getting beam object index
* Fix 32-bit warning
* Use BEAM_INDEX instead of pointer arithmetic
2016-08-09 11:08:54 -07:00
asarium
526962fb60
Fix Clang warning
2016-08-09 10:44:27 +02:00
Fabian Woltermann
7265711551
Merge pull request #776 from scp-fs2open/revert-720-cleanup/update-sdl2-to-custom-libsdl
...
Revert "Update included SDL2.dll files to ones compiled from our custom libsdl."
2016-08-09 09:01:54 +02:00
Fabian Woltermann
5ffc569eed
Merge pull request #759 from asarium/fix/hudParseErrors
...
Detect HUD gauges parse error and print a warning
2016-08-09 08:30:34 +02:00
Fabian Woltermann
6703007ee2
Merge pull request #761 from MageKing17/feature/allow-ai-slowdown
...
Add an AI flag to enable old, unused behavior when attacking big ships.
2016-08-09 08:29:58 +02:00
MageKing17
cdef2ee86a
Revert "Update included SDL2.dll files to ones compiled from our custom libsdl."
2016-08-08 21:10:04 -07:00
MageKing17
552a575232
Merge pull request #773 from asarium/fix/772
...
Fix logic error in controlsconfig.cpp
2016-08-08 12:27:56 -07:00
asarium
bfdcad1848
Fix logic error in controlsconfig.cpp
...
This fixes #772 .
2016-08-08 19:54:12 +02:00
MageKing17
76b7c0a3d2
Merge pull request #771 from asarium/feature/noninteractive
...
Add noninteractive mode
2016-08-08 08:39:13 -07:00
asarium
8dbfb3a334
Fix CI failure with outdated GCC version
2016-08-08 16:49:22 +02:00
asarium
84973dd56f
Use CMake variable for determining library with dlsym
2016-08-08 16:47:29 +02:00
asarium
1086e330fb
Fix warnings by updating external includes
2016-08-08 16:22:39 +02:00
asarium
775d404bf1
Enable color diagnostics for Ninja generator
...
Also improves flags handling a bit. Previously only the C++ flags were
set, now the C flags are set as well.
2016-08-08 15:59:33 +02:00
asarium
ab6c3f4ac8
Add noninteractive mode
...
If the -noninteractive command line option is set then dialogs won't be
shown and the default action is taken. This should be useful for
the standalone server.
2016-08-08 15:46:08 +02:00
Fabian Woltermann
302b0297b5
Merge pull request #767 from asarium/fix/64-bitFRED
...
Fix 64-bit compilation of FRED
2016-08-08 13:21:37 +02:00
z64555
92fc16372f
Create wxFredRender files, this'll be for the graphics of wxFred and used by the glcViewport class(es).
2016-08-08 05:50:41 -05:00
z64555
cd25f907ac
Merge pull request #2 from asarium/wxfred2_dev
...
Fix MSVC compilation issues
2016-08-08 04:33:11 -05:00
asarium
c2363989e4
Fix MSVC compilation issues
2016-08-08 11:27:45 +02:00
z64555
7b13d5c1f2
Merge pull request #1 from asarium/wxfred2_dev
...
Fix wxFRED CMake and compliation errors
2016-08-08 04:18:56 -05:00
asarium
25f6be7867
Use the version string in the project headers
2016-08-08 11:17:05 +02:00
asarium
9756b52845
Fix wxFRED CMake and compliation errors
2016-08-08 11:17:05 +02:00
z64555
93101aa8ce
Remove glrcMissionFrame.
2016-08-08 04:07:48 -05:00
z64555
10a37e6ddb
Add link targets to core codebase.
2016-08-08 02:46:08 -05:00
z64555
469a31602e
Fix access violation. Can't append items to wxChoice elements for the moment.
2016-08-07 23:15:43 -05:00
z64555
3521740a60
Update XRC and generated files to use wxWidgets 3.0.2 (or later. wxFormBuilder doesn't say which version it uses)
2016-08-07 23:15:42 -05:00
z64555
beaee70a82
Fix building after rebase with master.
2016-08-07 23:15:42 -05:00
z64555
eb3b65e051
Implement Copy functions, settle on using OIN_t's for object selection queues.
2016-08-07 23:15:41 -05:00
z64555
4bb547ce09
(FRED) Fix bug where AIF_NO_DYNAMIC flags weren't set with copied objects
2016-08-07 23:15:40 -05:00
z64555
5294db25b3
Implement port of core mission management functions
2016-08-07 23:15:40 -05:00
z64555
5983ddeea4
Some FRED cleanup and debugging
2016-08-07 23:15:39 -05:00
z64555
37d16a65c4
Updating README with info on wxWidget's Release packages.
2016-08-07 23:15:39 -05:00
z64555
8c54c63908
Update the README a bit.
2016-08-07 23:15:38 -05:00
z64555
ae7bf0667e
Fix linking due to an unknown, removed, or renamed ailocal.h
2016-08-07 23:15:38 -05:00
z64555
c018329a4c
Adds new define to disable FSO's mem* function overrides
2016-08-07 23:15:38 -05:00
z64555
f188960f91
Fixes compiling by de-tangling a #include chain that was exposed by commit 798a8922879f7af8ebd2bb07a6cdaa655a2e038b
2016-08-07 23:15:37 -05:00
niffiwan
7255d5e8e4
Update Linux to link successfully with libcode.a
2016-08-07 23:15:36 -05:00
z64555
198c6cace9
End of linkage work. (This commit is probably temporary)
...
* Includes wxfredstubs.cpp to prevent linkage to certain data members and functions defined in freespace.cpp.
* "_SECURE_SCL" and "_HAS_ITERATOR_DEBUGGING" defines removed from the project files
* C runtime library (CRT) switched to use DLL so as to integrate with wxWidgets default settings.
2016-08-07 23:15:34 -05:00
z64555
5efe85b4db
Beginning setup to link into code.lib, defined some variables needed for linkage and link tests.
2016-08-07 23:15:01 -05:00
z64555
fb8fe9bb75
Started work on docFRED2, and mission load/save methods. More work done on glcViewport.
2016-08-07 23:14:59 -05:00
z64555
790f8b9d8c
Some header name wrangling, a Big O snuck in somehow.
2016-08-07 23:14:03 -05:00
z64555
0bcc9f27d4
glcViewport and glrcMissionFrame classes added. README updated.
2016-08-07 23:13:59 -05:00
MageKing17
4b900bb84c
Merge pull request #764 from asarium/wxFRED/graphicsInterface
...
Add interface for creating an OpenGL context
2016-08-07 15:42:30 -07:00
MageKing17
820d4b88be
Merge pull request #769 from asarium/fix/768
...
Fix for #768
2016-08-07 15:38:24 -07:00
asarium
5ba393ce5d
Fix for #768
...
Apparently MSVC 2013 allocates memory when locking a mutex which calls
our allocation hook when the tries to call our memory tracking function
which leads to a deadlock. Since there is no way of providing a memory
allocation function for std::mutex the best solution is to simply
disable the lock_guard for everything before MSVC 2015. That will
probably corrupt the memory tracking values at some point but it's
better than not being able to run FSO at all.
2016-08-07 23:45:38 +02:00
MageKing17
c76c1cb4ff
Add an AI flag to enable old, unused behavior when attacking big ships.
...
Coverity defects 1320483, 1320484, 1320485, and 1320486 noted that several values were being set and then immediately overwritten before they could do anything. These appear to be related to behavior that Volition disabled before release that would allow the AI to slow down while attacking capital ships. It seemed a shame to waste this code, so I've added a flag to enable the behavior.
2016-08-07 14:27:59 -07:00
asarium
1fb0a57fd8
Fix 64-bit compilation of FRED
2016-08-07 23:00:17 +02:00
Fabian Woltermann
8543e99352
Merge pull request #755 from asarium/fix/gladVersion
...
Use the OpenGL version provided by GLAD
2016-08-07 22:28:09 +02:00
Fabian Woltermann
17e5918eeb
Merge pull request #756 from asarium/cleanup/gladLoader
...
Improve GLAD config a bit
2016-08-07 22:27:53 +02:00
Fabian Woltermann
d0ea08ed6c
Merge pull request #766 from asarium/fix/linewidth
...
Fix for #765
2016-08-07 22:27:17 +02:00
asarium
0bf5ba092b
Add interface for creating an OpenGL context
...
This allows to use a different method of creating and managing the
OpenGL context. This is needed of wxFRED where the OpenGL context is
created by wxWidgets. This will probably also fix #753 since it uses the
old wgl based method of creating an OpenGL context in FRED.
2016-08-07 21:38:36 +02:00
MageKing17
195b0b1d53
Merge pull request #763 from The-E/radarsetup_flag_fix
...
SIF_STEALTH and SF2_STEALTH are different things, I'm afraid
2016-08-07 11:41:22 -07:00
asarium
4f5ae67020
Fix for #765
...
glLineWidth is no longer an effective way of setting the line width of
2D operations.
2016-08-07 19:49:48 +02:00
Fabian Woltermann
580892243f
SIF_STEALTH and SF2_STEALTH are different things, I'm afraid
2016-08-07 16:46:14 +02:00
niffiwan
9b537434fc
Merge pull request #760 from MageKing17/coverity/1360950
...
Make sure va_end() gets called in ade_get_args() (fix Coverity 1360950)
2016-08-07 10:46:34 +10:00
MageKing17
5cdcd2beac
Make sure va_end() gets called in ade_get_args() (fix Coverity 1360950)
...
If a required argument is invalid, ade_get_args() returns 0, but it wasn't making sure va_end(vl) got called first, leading to potential memory corruption (probably not a huge issue in actual usage because most people try not to release scripts that throw errors).
2016-08-06 12:57:03 -07:00
asarium
7baefbcd45
Detect HUD gauges parse error and print a warning
...
Previously the code simply skipped the invalid tokens and silently
ignored them. This is frustrating for modders and also let #758 slip
into the code base which would not have happened otherwise.
2016-08-06 21:40:52 +02:00
MageKing17
02aad7e5a7
Merge pull request #758 from asarium/fix/hudparse
...
Fix parsing code error introduced by TTF merge
2016-08-06 11:56:03 -07:00
asarium
0d165f159e
Fix parsing code error introduced by TTF merge
2016-08-06 19:15:47 +02:00
asarium
e6f00e37ae
Improve GLAD config a bit
...
This removes the built-in OpenGL function pointer because we don't need
it since we are using the SDL function for that. Also explicitly uses a
compatibility loader although that has no effect on the generated code.
2016-08-06 15:24:19 +02:00
asarium
877fae7d5f
Use the OpenGL version provided by GLAD
2016-08-06 15:15:23 +02:00
MageKing17
82ac53a693
Merge pull request #750 from PhantomHoover/master
...
Fixed actual_main to correctly return 0 on success and made
2016-08-06 00:04:54 -07:00
MageKing17
a4c6437104
Merge pull request #749 from The-E/parse_object_flag_fix
...
Fixes a mismatched flag type error in multiteamselect.
2016-08-06 00:04:31 -07:00
MageKing17
858df67078
Merge pull request #754 from niffiwan/fix/coverity_and_travis
...
Fix coverity scan triggered from travis
2016-08-06 00:04:09 -07:00
niffiwan
41b0b53b85
Fix coverity scan triggered from travis
...
Update modeling file to deal with SDL2.0 changes
2016-08-06 16:42:56 +10:00
Fabian Woltermann
d60b756b4b
Merge pull request #748 from asarium/fix/cfileArchiver
...
Fix compilation of cfile(archiver|extractor)
2016-08-06 08:29:13 +02:00
MageKing17
9ee98d45a2
Merge pull request #752 from asarium/fix/multiSort
...
Fix sorting function multi_create_sort_func
2016-08-05 15:13:41 -07:00
Fabian Woltermann
fb9f3bc322
Merge pull request #751 from asarium/fix/fredOpenGL
...
Make sure that SDL OpenGL is initialized
2016-08-05 23:40:54 +02:00
asarium
81e3cf6fac
Fix sorting function multi_create_sort_func
...
The function returned the wrong value for same string which caused the
MSVC debug runtime to throw an error. This fixes that.
2016-08-05 23:38:17 +02:00
asarium
0473ead31f
Make sure that SDL OpenGL is initialized
...
The documentation says that the SDL OpenGL attributes need to be
initialized before a window is created. These changes implement that by
moving the actual SD_Window creation inside the OpenGL setup. FRED only
sets the native window handle to the correct HWND and gropengl uses
that.
2016-08-05 21:51:29 +02:00
Phantom Hoover
9ef81071fe
doxygenate game_main()
2016-08-05 19:57:51 +01:00
Phantom Hoover
7b094e6966
good point mageking
2016-08-05 19:46:36 +01:00
Fabian Woltermann
88df37c6d6
Merge pull request #747 from asarium/coverity/1360947
...
Fix for Coverity 1360947
2016-08-05 19:19:24 +02:00
Phantom Hoover
ef147c7284
Fixed actual_main to correctly return 0 on success and made
...
-shadow_quality imply -enable_shadows.
2016-08-05 18:10:16 +01:00
Fabian Woltermann
e470d2959e
Fixes a mismatched flag type error in multiteamselect.
2016-08-05 19:08:31 +02:00
asarium
bc304bddfc
Fix compilation of cfile(archiver|extractor)
2016-08-05 18:40:52 +02:00
Fabian Woltermann
0a0a1db421
Merge pull request #742 from asarium/fix/beamPiercingEffect
...
Fix variable for piercing beam particle effect
2016-08-05 18:32:48 +02:00
Fabian Woltermann
dffb0c7c1d
Merge pull request #746 from asarium/coverity/1320536
...
Fix wrong argument order in multiple functions
2016-08-05 18:32:30 +02:00
Fabian Woltermann
6dacfd8ffb
Merge pull request #745 from asarium/coverity/1093292
...
Fix for Coverity 1093292
2016-08-05 18:32:16 +02:00
Fabian Woltermann
ab17ccd424
Merge pull request #743 from asarium/fix/fredSDLMain
...
Call SDL_SetMainReady() in fred_init
2016-08-05 18:31:56 +02:00
asarium
b408ca72f3
Fix for Coverity 1360947
2016-08-05 18:25:59 +02:00
asarium
7435d7a703
Fix for Coverity 1320538
2016-08-05 17:53:47 +02:00
asarium
fa60c666bc
Fix for Coverity 1320537
2016-08-05 17:50:49 +02:00
asarium
04d494e1a4
Fix for Coverity 1320536
...
Apparently someone mixed up left and right...
2016-08-05 17:49:01 +02:00
asarium
7e3b30f5bf
Fix for Coverity 1093296
2016-08-05 17:38:57 +02:00
asarium
e4783b3d34
Fix for Coverity 1093295
2016-08-05 17:37:52 +02:00
asarium
8ee84a05c0
Fix for Coverity 1093294
2016-08-05 17:35:35 +02:00
asarium
6899b1680d
Fix for Coverity 1093293
2016-08-05 17:33:16 +02:00
asarium
1cfbc8859e
Fix for Coverity 1093292
...
"Unchecked return value from library". The function can't return an
error value so I added a ml_printf (which is used at another place for
error logging as well) to log the error.
2016-08-05 17:28:44 +02:00
asarium
9a10a78ed3
Fix variable for piercing beam particle effect
2016-08-05 10:54:00 +02:00
Fabian Woltermann
bd7a691b8e
Merge pull request #722 from z64555/cleanup/fred
...
Cleanup/fred
2016-08-05 10:30:47 +02:00
asarium
6e9ce021cc
Call SDL_SetMainReady() in fred_init
2016-08-05 09:58:30 +02:00
z64555
17a6896e1d
Merge branch 'master' into cleanup/fred
...
Conflicts:
fred2/fred.cpp
fred2/fredrender.cpp
2016-08-04 19:18:16 -05:00
z64555
d46b17606d
Fix linking with the Freespace project
2016-08-04 13:54:38 -05:00
Fabian Woltermann
a570eca073
Merge pull request #739 from asarium/cmakeMerge/particlesystems
...
Add a new particle effect system
2016-08-04 12:46:33 +02:00
Fabian Woltermann
c7f3097f7d
Merge pull request #731 from asarium/fix/standaloneAssert
...
Fix Assertion when running in standalone mode
2016-08-04 11:28:30 +02:00
Fabian Woltermann
e8954c4297
Merge pull request #733 from asarium/fix/openglVersion
...
Actually enforce the OpenGL 2.0 requirement
2016-08-04 11:28:07 +02:00
asarium
bbeaaa1565
Add a new particle effect system
...
This is similar to the script I wrote a few years ago but unlike that
one, this solution doesn't kill the performance.
2016-08-04 11:08:39 +02:00
m!m
91b1d294ec
Merge pull request #738 from MageKing17/coverity/1360951
...
Remove duplicate fclose() call (fix Coverity defect 1360951)
2016-08-03 23:26:32 +02:00
Fabian Woltermann
eb164b3ff8
Merge pull request #737 from X3N0-Life-Form/lua_iff
...
Expose IFF to lua
2016-08-03 22:36:55 +02:00
MageKing17
4b634327e1
Remove duplicate fclose() call (fix Coverity defect 1360951)
...
It looks like this was added to trunk (a0f31e6 ), synced with antipodes (4952b70 ), and then one of the antipodes merges (7e77b5a ) wound up combining both additions.
2016-08-03 13:28:29 -07:00
X3N0-Life-Form
625ea48d9e
Expose IFF to lua
...
Adds the 'attacks' function to the 'team' lua type, which exposes the iff_x_attacks_y function to the lua engine.
2016-08-03 21:27:19 +02:00
Fabian Woltermann
0afe5ba8bd
Merge pull request #730 from asarium/feature/openGLDebug
...
Use an OpenGL debug context and debug extensions
2016-08-03 11:47:49 +02:00
Fabian Woltermann
1783df6b5f
Merge pull request #728 from asarium/fix/reallocCrash
...
Fix segfault when calling realloc
2016-08-03 11:47:30 +02:00
Fabian Woltermann
34d88d9d99
Merge pull request #735 from asarium/fix/axemFonts
...
Fix some font scripting bugs reported by Axem
2016-08-03 11:44:55 +02:00
Fabian Woltermann
8a9c9fb999
Merge pull request #734 from asarium/fix/luaConst
...
Fix const correctness in lua.cpp/.h
2016-08-03 11:28:27 +02:00
asarium
5d14899808
Fix const correctness in lua.cpp/.h
2016-08-03 10:53:23 +02:00
asarium
acab2d2c46
Fix campaign list spacing
2016-08-03 10:41:09 +02:00
asarium
63f7f04502
Add error message for wrong font index
2016-08-03 10:27:22 +02:00
asarium
026564b973
Actually enforce the OpenGL 2.0 requirement
2016-08-03 09:53:51 +02:00
z64555
33ae17f00b
Merge pull request #671 from asarium/feature/joystickAPI
...
Add improved joystick API
2016-08-03 02:21:43 -05:00
Fabian Woltermann
d9a45d8dc0
Merge pull request #729 from asarium/fix/luaFontIndex
...
Fix off-by-one error in Lua font API
2016-08-02 23:27:38 +02:00
asarium
1679d81efa
Fix Assertion when running in standalone mode
...
The Assertion which was triggered was carried over from the OpenGL code
but the stub code was using pretty much the same code so removing the
Assertion seems like the correct way to solve this.
2016-08-02 23:04:35 +02:00
asarium
0b5aed3e11
Use an OpenGL debug context and debug extensions
...
This instructs SDL to create an OpenGL debug context when a debug build
is used. Additionally it uses GL_ARB_debug_output if it's available to
provide OpenGL debug output.
2016-08-02 20:24:50 +02:00
asarium
f91c681ee1
Add improved joystick API
...
This API allows to handle events from multiple joysticks but currently
only the events from the configured joystick are used.
2016-08-02 20:08:21 +02:00
asarium
3a63dc3800
Fix segfault when calling realloc
2016-08-02 20:00:35 +02:00
asarium
2e90049eba
Fix off-by-one error in Lua font API
2016-08-02 19:39:13 +02:00
Cliff Gordon
b92be0b5da
Merge pull request #727 from asarium/fix/freebsd
...
LGTM, shouldn't even affect any other build platforms.
2016-08-02 12:38:05 -05:00
Cliff Gordon
dae5c58b98
Merge pull request #723 from asarium/fix/configCase
...
Well, running dos2unix on it didn't create any local changes, so it looks to be entirely unix line endings now, as it should be. LGTM.
2016-08-02 12:28:00 -05:00
asarium
1f4e40757d
Fix build on FreeBSD
2016-08-02 19:10:51 +02:00
Fabian Woltermann
dfc10ad8db
Merge pull request #725 from asarium/fix/fontOptions
...
Fix code that was overwritten by TTF merge
2016-08-02 14:54:58 +02:00
asarium
bb503de698
Fix code that was overwritten by TTF merge
2016-08-02 12:34:55 +02:00
Fabian Woltermann
f3f4560824
Merge pull request #724 from asarium/cleanup/directx
...
Remove last remains of DirectX
2016-08-02 12:18:14 +02:00
Fabian Woltermann
9bfc0be819
Merge pull request #696 from asarium/cmakeMerge/memory
...
Add new memory tracking subsystem
2016-08-02 12:17:56 +02:00
Fabian Woltermann
36f08ca62b
Merge pull request #715 from asarium/fix/fredCwd
...
Use the current working directory for FRED
2016-08-02 12:16:45 +02:00
Fabian Woltermann
b4db345e5e
Merge pull request #692 from asarium/test/ttf-3
...
TrueType support
2016-08-02 12:16:23 +02:00
Fabian Woltermann
2cfd82b182
Merge pull request #720 from MageKing17/cleanup/update-sdl2-to-custom-libsdl
...
Update included SDL2.dll files to ones compiled from our custom libsdl.
2016-08-02 12:15:51 +02:00
z64555
0c90a75900
Cleanup missionsave.h and .cpp
2016-08-02 04:24:18 -05:00
z64555
060c090827
Doxy and organize wing.h and .cpp. Probably needs a bit more cleanup.
2016-08-02 04:23:04 -05:00
z64555
a57483ffad
Cleanup of mainfrm.h and .cpp
2016-08-02 04:23:02 -05:00
z64555
581e6320e1
Cleanup grid.h and .cpp
2016-08-02 04:21:56 -05:00
z64555
35dc235599
Cleanup of fredrender.h and .cpp.
2016-08-02 04:21:54 -05:00
z64555
fddbbf47bd
Remove unused Preferences dialog and related variables.
2016-08-02 04:21:52 -05:00
z64555
1c4eb25e84
Cleanup freddoc.h and .cpp
2016-08-02 04:21:24 -05:00
z64555
ed3c9f1621
Cleanup of fred.h and fred.cpp
2016-08-02 04:21:22 -05:00
z64555
f836d5e002
Some header wrangling
2016-08-02 04:21:20 -05:00
z64555
2829eb5e35
Remove editor.h
2016-08-02 04:21:18 -05:00
z64555
c062a071fb
Cleanup and doxy a few dialogs
2016-08-02 04:19:39 -05:00
asarium
a4302fde2f
Remove last remains of DirectX
2016-08-02 11:10:24 +02:00
asarium
16be3b7cc5
Add support for TrueType fonts
...
This allows to use standard TrueType Fonts for text rendering in FSO. It uses the NanoVG library which provides the ability of drawing 2D shapes. This library is used for most 2D operations now and can also be used directly by using the PathRenderer class.
2016-08-02 10:57:28 +02:00
asarium
9630b595e0
Make config key check case-insensitive
...
Fix for #719 .
2016-08-02 10:39:04 +02:00
MageKing17
0d8e09f136
Merge pull request #716 from asarium/fix/fredErrorPrinting
...
Clean up FRED init a bit
2016-08-02 01:32:51 -07:00
m!m
44c7155f34
Merge pull request #718 from chief1983/speech_debugging
...
Speech Debugging
2016-08-02 10:31:00 +02:00
m!m
6a12b90df5
Merge pull request #721 from MageKing17/cleanup/remove-old-def_files
...
Remove old def_files.cpp file and clean up some redundant imports.
2016-08-02 10:29:16 +02:00
Cliff
8f58fa88c1
Add some debugging to the speech code for troubleshooting future issues, under the Speech filter.
2016-08-01 22:12:45 -05:00
MageKing17
dd4af145bf
Remove old def_files.cpp file and clean up some redundant imports.
...
The CMake merge changed the default files system to include individual files instead of use a bunch of hardcoded strings, but the old file got left behind for some reason. Also, the same merge added some spurious extra imports of def_files.h which I removed at the same time (although if somebody wanted to go through and clean up all of our imports again, it'd probably be a good time for it).
2016-08-01 14:20:24 -07:00
MageKing17
253987dfb3
Update included SDL2.dll files to ones compiled from our custom libsdl.
2016-08-01 14:11:20 -07:00
SamuelCho
9a91e6041c
Merge pull request #714 from The-E/fxaa-fix2
...
Moves the FXAA pass to after the tonemapping step
2016-08-01 10:23:01 -07:00
asarium
18154bfa60
Clean up FRED init a bit
...
Maybe this will help tracking down that FRED OpenGL issue
2016-08-01 19:10:51 +02:00
asarium
28f9fafa84
Use the current working directory for FRED
...
This allows to run the executable in a different directory. This is very
useful for debugging from within Visual Studio.
2016-08-01 18:38:21 +02:00
Fabian Woltermann
e3d4cc1bc7
_actually_ move the fxaa pass
2016-08-01 11:54:00 +02:00
Fabian Woltermann
2b333fc299
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com into fxaa-fix2
...
Conflicts:
code/graphics/gropenglpostprocessing.cpp
2016-08-01 11:48:58 +02:00
Fabian Woltermann
97c7ad43ce
Moves the FXAA pass to after the tonemapping step, as recommended in the FXAA documentation
2016-08-01 11:46:45 +02:00
Fabian Woltermann
6a76b99083
Merge pull request #713 from SamuelCho/fxaa_fix
...
Make sure we can write to the alpha channel before doing the FXAA luminance prepass
2016-08-01 11:43:55 +02:00
SamuelCho
c049c64c00
Make sure we can write to the alpha channel before doing the FXAA luminance prepass.
2016-07-31 21:04:04 -07:00
MageKing17
feb49eae9f
Merge pull request #710 from asarium/fix/nestedModFolder
...
Fix directory creation for nested mod folders.
2016-07-30 16:05:48 -07:00
asarium
7cf42b6811
Fix directory creation for nested mod folders.
...
The launcher passes the mod folders as relative paths using / as the
directory separator. That path is copied into the cf_root path and when
cf_create_directory tries to create the directory, mkdir_recursive can't
handle the / in the path and tries to create two path elements at once
which is not supported by mkdir.
These changes fix that by converting mod paths to the native format
(from the / format, so it's a No-op on Unix) before using it in
cf_create_root().
2016-07-30 21:53:15 +02:00
Fabian Woltermann
42a217d48a
Merge pull request #706 from asarium/cmake_/gcc-leak-check
...
Add option for -fsanitize=leak on GCC
2016-07-30 08:41:54 +02:00
MageKing17
24ccb7c8ff
Merge pull request #707 from asarium/fix/memleak_modelinterp
...
Fix memory leak in modelinterp.cpp
2016-07-29 10:40:51 -07:00
m!m
e3e0eae93e
Merge pull request #702 from The-E/fb_thruster_adjustments
...
Adds a commandline switch analoguous to framebuffer shockwaves to enable the distortion effect for thrusters
2016-07-29 14:39:32 +02:00
asarium
d0bfc47e59
Fix memory leak in modelinterp.cpp
...
bsp_info.outline_buffer was allocated but not freed when unloading the
model.
2016-07-29 12:30:21 +02:00
asarium
31712e0c48
Add option for -fsanitize=leak on GCC
2016-07-29 12:00:33 +02:00
asarium
7b352e511c
Add new memory tracking subsystem
...
This expands the existing system which only worked on Windows to all
supported platforms.
If the MSVC debug runtime is not present then its behavior is emulated
by adding a header to each allocated memory block.
2016-07-29 11:02:45 +02:00
m!m
0819d57fd5
Merge pull request #705 from rtoijala/fix-lua51-search
...
Add lua51 as a possible pkg-config name
2016-07-29 10:28:00 +02:00
Fabian Woltermann
d709ac3732
Merge pull request #697 from asarium/cmake_/platformChecks
...
Use CMake for determining if a specific header is available
2016-07-29 10:04:29 +02:00
Fabian Woltermann
f30e8a3141
Merge pull request #704 from asarium/fix/cmakeConfig
...
Fix default CMake configuration
2016-07-29 10:04:07 +02:00
Risto Toijala
baa2f9f5d7
Add lua51 as a possible pkg-config name
...
Basically the same as PR #628 but for CMake this time.
2016-07-29 11:00:00 +03:00
asarium
3b4e258f32
Fix default CMake configuration
2016-07-28 23:10:02 +02:00
Fabian Woltermann
624c5842c0
Merge pull request #703 from asarium/fix/submodules
...
Add CMake error if external modules could not be found
2016-07-28 22:36:28 +02:00
asarium
465d95dd7f
Add CMake error if external modules could not be found
2016-07-28 21:16:35 +02:00
MageKing17
850824cd3c
Merge pull request #701 from scp-fs2open/lab_weapon_thruster_fix
...
Fixes issue when rendering thrusters on weapon models
2016-07-28 12:01:51 -07:00
Fabian Woltermann
53222e66e3
Adds a commandline switch analoguous to framebuffer shockwaves to enable the distortion effect for thrusters
2016-07-28 20:22:49 +02:00
Fabian Woltermann
9f0897d916
Fixes issue when rendering thrusters on weapon models
2016-07-28 20:04:40 +02:00
Fabian Woltermann
c0e67c44e8
Merge pull request #699 from asarium/ci/vsversionUpdate
...
Update tested visual studio versions
2016-07-28 11:36:24 +02:00
MageKing17
b40631e268
Merge pull request #698 from asarium/fix/portableMode
...
Expose portable mode in launcher
2016-07-28 02:17:03 -07:00
asarium
4edd6fd5a9
Update tested visual studio versions
2016-07-28 11:09:39 +02:00
asarium
690d293d9a
Expose portable mode in launcher
2016-07-28 10:17:20 +02:00
Fabian Woltermann
4c53d46aec
Merge pull request #695 from asarium/cmake_/appimage
...
Add AppImage support for nightly builds
2016-07-27 23:21:05 +02:00
asarium
06768e72d4
Use Platform checks for determining if a header is available
2016-07-27 22:24:28 +02:00
asarium
5826b880fb
Add AppImage support
2016-07-27 20:53:40 +02:00
Fabian Woltermann
6646bf3002
Merge pull request #694 from asarium/fix/nightly
...
Fix AppVeyor Bintray config
2016-07-27 19:26:56 +02:00
asarium
ea77b6fc7e
Fix AppVeyor Bintray config
2016-07-27 19:24:35 +02:00
Fabian Woltermann
aec35e4aba
Merge pull request #693 from asarium/fix/nightly
...
Fix nightly BinTray user
2016-07-27 18:49:20 +02:00
asarium
676bc68beb
Fix nightly BinTray user
2016-07-27 18:47:02 +02:00
Fabian Woltermann
fc2a3e2869
Merge pull request #691 from asarium/fix/secureVars
...
Update secure variables for the main repo
2016-07-27 18:15:49 +02:00
asarium
983f1f386d
Update AppVeyor variables
2016-07-27 16:12:09 +02:00
Fabian Woltermann
a1582c7619
Merge pull request #690 from asarium/fix/Readme
...
Update readme
2016-07-27 16:03:28 +02:00
Fabian Woltermann
4a1c7ad37b
Merge pull request #689 from asarium/cmake_/binarySourceDir
...
Don't allow binary and source directory to be the same
2016-07-27 16:03:01 +02:00
asarium
b02270a6eb
Update secure variables for the main repo
2016-07-27 15:57:36 +02:00
asarium
65bc829ffc
Update readme
2016-07-27 15:46:04 +02:00
asarium
c51d7e5676
Don't allow binary and source directory to be the same
2016-07-27 15:43:51 +02:00
Fabian Woltermann
a3c674b1f1
Merge pull request #680 from asarium/cmake_/pr
...
Move build system to CMake
2016-07-27 15:23:16 +02:00
asarium
0af3a04140
Don't link the speech lib
...
It's not needed, we just need the header.
2016-07-26 22:30:57 +02:00
asarium
8a883eb3a0
Disable speech building on MSVC2010
2016-07-26 22:24:06 +02:00
asarium
3e0f1a8501
Turn FRED warning into status message
2016-07-26 22:18:18 +02:00
asarium
4d25eabcf6
Enable FRED2 by default
...
If MFC could not be found then it's disabled without causing an error.
2016-07-26 22:16:13 +02:00
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
asarium
33141220c0
If supported set the Freespace2 as the default project
2016-07-23 22:24:50 +02: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
asarium
29d180d3a7
Fix build naming
2016-07-22 22:22:11 +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
asarium
26ed09d5b3
Fix revision in version
2016-07-22 12:10:05 +02:00
asarium
1bcd5400d3
Move build system to CMake
2016-07-22 12:07:19 +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
niffiwan
1d28184ce6
Merge pull request #442 from asarium/antipodes_/luaMouse
...
Improve CursorManager
2016-06-18 12:53:16 +10:00
asarium
44b44bb249
Fix compilation with SDL 2.0.4
2016-06-03 19:58:50 +02: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
asarium
57f015a764
Remove unused graphics functions
2016-04-18 22:36:25 +02: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
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
MageKing17
40d49eb17a
Merge pull request #552 from asarium/antipodes_/sync
...
Sync Antipodes
2016-03-11 13:55:01 -08: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
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
asarium
75625270c9
Use the correct type for high resolution timers
2016-01-27 14:27:46 +01: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
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
asarium
4a869b8ec3
Merge branch 'master' into antipodes_/sync
2016-01-24 21:20:18 +01: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
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
niffiwan
94130f8a9e
Merge pull request #477 from asarium/antipodes_/sync
...
Sync Antipodes
2015-11-30 14:10:31 +10: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
niffiwan
26d97ce5d7
Merge pull request #446 from asarium/antipodes_/deleteOldFiles
...
Remove some now unused files
2015-11-18 09:40:11 +10:00
asarium
f2cbb687b7
Remove some now unused files
2015-11-17 16:05:21 +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
niffiwan
1b9892f363
Remove obsolete comment
2015-11-11 22:16:35 +10:00
niffiwan
c7866a774a
Fix issue with backslash on UK keyboards
2015-11-10 17:45:35 +10:00
MageKing17
f48a31c610
Merge pull request #409 from asarium/antipodes_/sync
...
Sync Antipodes
2015-10-31 15:10:25 -07: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
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
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
asarium
28c40ae888
Add support for specifying the used display
2015-09-06 22:34:09 +02: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
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
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
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
66c9b7584c
Merge pull request #330 from asarium/antipodes_/messageBoxCleanup
...
Replace Win32 MessageBox with os::dialogs version
2015-08-31 08:58:54 +02:00
asarium
d57eefde7f
Undefine MessageBox if it is defined
2015-08-29 23:01:38 +02: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
z64555
f8d8c32d4e
Use correct C library for limits.h this time
2015-08-27 05:58:31 -05: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
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
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
Fabian Woltermann
0ce1f10fee
Merge pull request #279 from asarium/antipodes
...
Sync Antipodes
2015-08-16 22:08:51 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
asarium
4a3da56ffd
Merge branch 'master' into antipodes
2015-05-18 22:29:27 +02:00
MageKing17
41df065706
Merge pull request #101 from asarium/antipodes
...
Sync Antipodes
2015-05-15 14:31:18 -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
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
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
m!m
2223db66d2
Merge pull request #81 from asarium/antipodes
...
Sync Antipodes
2015-05-08 08:08:29 +02:00
asarium
2453161a54
Merge branch 'master' into antipodes
2015-05-07 22:38:11 +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
niffiwan
caf2876d50
Merge pull request #40 from asarium/antipodes
...
Add proper usage of SDLMain again
2015-04-29 20:58:58 +10:00
asarium
62cfccb325
Remove the rest of no-grab
2015-04-29 12:51:47 +02: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
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
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
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
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
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