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
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
5206220f5a
simplify the random number seeding; don't seed the RNG for every mission in single player
2016-02-27 13:25:48 -05:00
asarium
108d60330f
Clean up the renderer interface
2016-02-21 23:24:01 +01:00
Goober5000
746fe56b32
Merge pull request #525 from asarium/cleanup/timer
...
Remove some unused code from timer.h/.cpp
2016-01-31 16:12:04 -05:00
asarium
fc6bc3a1c6
Remove some unused code from timer.h/.cpp
...
The removed code has been replaced by the profiling subsystem.
2016-01-29 22:00:58 +01:00
asarium
54b2eddc14
Change timestamp integer handling again
2016-01-28 16:39:10 +01:00
asarium
64c4e4d7b4
Use integer math instead of floats for timestamps
2016-01-27 15:34:37 +01:00
asarium
95c88cd62d
Fix compilation errors in FRED
2016-01-24 23:17:19 +01:00
asarium
deade82a19
Merge branch 'master' into antipodes_/sync
...
Conflicts:
configure.ac
2015-12-12 18:36:32 +01:00
asarium
94ca29735c
Quit when the end of the mission is reached
2015-12-02 17:03:54 +01:00
DahBlount
3fa03fcda0
Fix ENVMAP vertex shader to use the inverse of gl_ModelViewMatrix
2015-11-30 09:36:29 -07: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
Peter Mitsis
57c16bd58a
toolchain: Replace __attribute__((__unused__)) with __UNUSED
...
Abstracting this allows for the possibility of other compilers to have their
own implementation of marking a variable as potentially unused without using
the __attribute__ keyword (which is not supported on all compilers).
Signed-off-by: Peter Mitsis <[email protected]
2015-11-22 11:32:07 -05:00
Goober5000
564f31aeab
properly close the fiction viewer when returning to the main menu
2015-11-04 00:54:02 -05: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
niffiwan
253d8a7eb1
Fix memory leak from Control_config_presets
2015-10-31 14:06:56 +10:00
Goober5000
eaa09dd862
small optimization of shadow checks
2015-10-24 15:42:06 -04: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
Yarn366
932a5230e9
Fixed language autodetection
2015-09-02 17:13:33 -04: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
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
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
Cliff Gordon
0a2b97c3bc
Merge pull request #41 from MageKing17/ship_info
...
Ship_info vectorization, ship templates.
2015-08-20 21:51:18 -05:00
Cliff Gordon
f0c4bf2e3a
[fix/292_warnings_part_b] Cast Frametime (of type fix) to int for printf specifier to avoid a warning.
2015-08-19 17:01:07 -05:00
MageKing17
64c9b272e7
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/pilotfile/pilotfile.cpp
2015-08-19 11:53:25 -07:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
MageKing17
ce3755b333
Further hook variables cleanup.
...
Consolidated a few sequential calls, corrected a few instances of "ObjectB" being removed when "Object" was set, and removed a couple instances of hook variables that weren't set being removed.
2015-08-18 08:11:11 -07:00
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
MageKing17
dc80ae0c9a
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-06 00:25:42 -07:00
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
Echelon9
8e018c5338
Clean up load_animating_pointer().
2015-07-01 23:07:17 +10:00
Echelon9
90bb4e3a7b
Simplify duplicative freespace2/ includes, which are in freespace2/freespace.h
2015-06-22 20:24:30 +10:00
Echelon9
c5493bb480
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
2015-06-22 20:24:30 +10:00
MageKing17
ab9d2e20fb
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-06-18 14:40:53 -07:00
Cliff Gordon
2d662075c3
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
2015-06-17 10:11:57 -05:00
asarium
2d47bcd9ad
Replace Sleep with os_sleep
2015-06-03 16:20:39 +02:00
MageKing17
7e696a55d2
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Also added model_icon_angles to the ship_info() constructor, and model_icon_angles, thruster_glow_noise_mult, and min_engine_vol to ship_info::clone() and and ship_info::move().
Conflicts:
code/ship/ship.cpp
code/ship/ship.h
2015-05-28 23:49:33 -07:00
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
asarium
d6460398e6
Update externalcode to use SDL to do DLL loading
2015-05-27 15:01:40 +02:00
asarium
a7e8ecfe07
Use the desktop size to initialize a default video card config
2015-05-25 22:09:34 +02:00
Cliff Gordon
a4c1f89720
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
...
Conflicts:
code/freespace2/freespace.cpp
2015-05-20 17:15:15 -05:00
The E
ef9ae017b5
Make sure we use the same calling convention both times
2015-05-19 21:21:54 +02:00
The E
2c626b4eec
According to AMD and NV, these _should_ force their drivers into high-performance mode
2015-05-19 20:48:01 +02:00
MageKing17
274a32e1ac
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/model/modelread.cpp
code/ship/ship.h
2015-05-12 19:22:58 -07:00
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
asarium