scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 12:11:36 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
11,983 Commits 61 Branches 1,532 Tags
94412da2dec4bbe8db6be06b6855808ba37726b2
Commit Graph
706 Commits
Author SHA1 Message Date
MageKing17 384b4b9413 Merge pull request #834 from The-E/multi_server_version_bump 
Bumps multi server version due to changes in the multiplayer sexp code
 2016-08-15 23:39:48 -07:00
Fabian Woltermann 8248ac2516 Encapsulates the multi_sexp infrastructure in its own class (#833) 
While working on #824, I found out that cleaning up that particular piece of code would not be doable cleanly without a refactor of the multi_sexp infrastructure. This is that refactor; it encapsulates the code of multi_sexp inside a class, an instance of which is then used to manage all the network stuff that sexps need to do.
 2016-08-15 23:39:40 -07:00
MageKing17 8f4972aab9 Merge pull request #618 from Karajorma/RemoveOldSEXPPackets 
Remove several packets used in multiplayer that can now be handled by…
 2016-08-15 12:52:11 -07:00
Fabian Woltermann e0314eecd0 Bumps multi server version due to changes in the multiplayer sexp code 2016-08-15 21:42:38 +02:00
Fabian Woltermann 3160bdaa00 Changes ship exit flags to the new system 2016-08-14 16:48:11 +02:00
Fabian Woltermann e1ba2256ed Changes the subsystem flags to the new flag system. 2016-08-13 13:52:51 +02: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
asarium a685642554 And another batch of 64-bit fixes 2016-08-12 09:42:55 +02: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
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
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
Fabian Woltermann e470d2959e Fixes a mismatched flag type error in multiteamselect. 2016-08-05 19:08:31 +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 1bcd5400d3 Move build system to CMake 2016-07-22 12:07:19 +02:00
asarium 2b5fd5e7ec Merge branch 'master' into antipodes_/sync 2016-07-06 18:46:11 +02: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 cd2a692150 Merge branch 'master' into antipodes_/sync 2016-07-04 11:15:40 +02:00
Karajorma bcf007376d Remove several packets used in multiplayer that can now be handled by the SEXP packet system instead. 2016-06-02 12:20:07 +08:00
jg18 d06d6e6df0 Change f2fld() macro to f2d(). 2016-05-30 14:08:28 -07:00
jg18 e78327d879 Fix ping average calculation. 2016-05-30 13:59:51 -07:00
jg18 8f42977ee8 Fix ping calculations in server list. 
Fix calculations of server ping in in-game server list. Minimize floating
point calculations, using double instead of float, avoid calling timer
twice when receiving pong, and capture pong time more precisely.
 2016-05-30 13:59:51 -07:00
Peter Mitsis 180674154c trig: Use floating point versions of trig functions 
Replaces calls to double-precision floating point trig functions with
calls to single-precision floating point trig functions as follows:
    cos() -> cosf()
    sin() -> sinf()
    tan() -> tanf()
    acos() -> acosf()
    asin() -> asinf()
    atan() -> atanf()

This allows the compiler to avoid generating unnecessary instructions
that convert a float to a double and then a double back to a float.

Signed-off-by: Peter Mitsis <[email protected]>
 2016-04-24 21:56:06 -04:00
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
jg18 cb65ca8655 Revert changes to net_addr struct format. 
Revert changes that were made to net_addr struct format in commit 220fa18.
The net_addr struct is now the same as it was in retail.
 2016-02-25 10:28:49 -08:00
jg18 1adb64e39d Remove IPX support. 
Remove support for the IPX protocol. The IPX selector button in the multi
options menu is now hidden, and the TCP button is disabled since there is no other option.
 2016-02-25 10:28:49 -08:00
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
MageKing17 551d64192c Merge pull request #481 from The-E/vm_vec_cleanup2 
Cleanup in vecmat, aile 2
 2015-12-02 08:18:37 -08:00
Cliff Gordon 870ad9e3ae [fix/187_debugging] Enhance an Assert to help track down how issue 187 could happen. 2015-12-01 14:54:57 -06:00
The E a413255728 Renaming vm_vec_dotprod to vm_vec_dot 2015-12-01 20:35:47 +01: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
asarium 0bb6002f0a Fix compilation error 
Apparently multi_update.cpp isn't used anywhere in the code. That file
could be removed in the future.
 2015-11-20 12:24:10 +01:00
asarium 28c9512727 Fix compilation 
Now the static_asserts use the types from cstdint
 2015-11-13 11:52:52 +01:00
asarium 34a7f7d60f Check the size of data in multi packets 
This will make sure that compiler changes that affect the size of a
type are noticed early.
 2015-11-11 14:56:14 +01:00
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
Goober5000 ccc71a8e8b looks like we'll need them in these three other files too 2015-10-25 21:20:57 -04:00
Goober5000 7dde0a79a7 that was just dumb 2015-10-25 21:14:08 -04:00
Goober5000 e895f86e44 come on, Travis 2015-10-25 20:48:02 -04:00
Goober5000 b82d0c579d convert qsort to std::sort 2015-10-25 19:16:36 -04:00
asarium bcedaee793 Fix "uninitialized variable warning" 2015-10-14 18:54:14 +02:00
MageKing17 75ae511ae6 Stop comparing/setting homing_object to NULL. 
The rest of the codebase uses &obj_used_list to mean "no homing target", and the inconsistency could cause all kinds of issues.
 2015-10-12 16:10:05 -07:00
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 873694eae2 Added unified functions for loading and saving custom UI backgrounds 2015-09-19 04:47:11 -04:00
Yarn366 36cc228527 Added support for custom ship select backgrounds 2015-09-15 23:49:43 -04:00
asarium 032aa154de Re-enable two warnings 
The unknown pragmas have been fixed by wrapping them in a visual studio ifdef
 2015-09-03 15:38:33 +02:00
Fabian Woltermann e02adc2b8f Merge pull request #329 from asarium/antipodes_/stubsCleanup 
Remove usage of HMMIO
 2015-08-31 09:02:06 +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
asarium b500e072da Use cross-platform compatible struct 2015-08-28 11:46:10 +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