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
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
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
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
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
asarium
6b093f2ee9
Fix set but unused variable warning in multiutil.cpp
2015-08-19 11:26:29 +02:00
asarium
280ceabb45
Fix format warning in multi_options.cpp
2015-08-19 11:26:28 +02:00
asarium
ff51e79531
Fix set but unused variable warning in chat_api.cpp
2015-08-19 11:26:28 +02:00
asarium
40c81134ac
Fix "format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long int’" warning
2015-08-19 11:26:26 +02:00
MageKing17
6985b198ec
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-12 13:25:34 -07:00
Echelon9
930f386064
Generalise warning string if we can't provide callback operator information.
2015-08-08 18:10:26 +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
Echelon9
8f9fd97902
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:29:41 +10:00
Echelon9
4f4449958b
Fix: warning: format ‘%s’ expects a matching ‘char*’ argument [-Wformat=]
2015-08-05 20:14:48 +10:00
Echelon9
cffdbe932f
Fix: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2015-08-05 20:12:41 +10:00
Echelon9
9db610ef2c
Fix: network/multiutil.cpp:692:76: warning: declaration of ‘net_player’ shadows a global declaration [-Wshadow]
2015-07-06 21:30:27 +10:00
Echelon9
444f830fdc
Fix: network/multi_voice.cpp: warning: parameter set but not used [-Wunused-but-set-parameter]
2015-07-05 16:51:16 +10:00
Echelon9
e98d84314a
Fix: network/multimsgs.cpp:8473:70: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:44:48 +10:00
Echelon9
5e9fd26028
Fix: network/multimsgs.cpp:8493:7: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]
2015-07-05 16:42:24 +10:00
Echelon9
3a3e901249
Fix: network/multiteamselect.cpp:1720:7: warning: declaration of ‘wing’ shadows a global declaration [-Wshadow]
2015-07-05 16:40:04 +10:00
Cliff Gordon
6e0f9c1cd2
[fix/nat_multiplayer] Simplify the new psnet check.
2015-06-29 16:51:49 -05:00
Cliff Gordon
5311ea4f7a
[fix/nat_multiplayer] Vestigare's submitted patch for allowing multiple users behind a NAT to connect to a remote standalone.
2015-06-29 16:50:06 -05:00
Fabian Woltermann
feb6d188f7
Merge pull request #188 from chief1983/fix/standalone_name_hang
...
[fix/standalone_name_hang] Prevent the standalone from hanging
2015-06-19 21:24:47 +02:00
MageKing17
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
3e8b62999b
[fix/standalone_name_hang] Prevent the standalone from hanging when attempting to set a name that is too long.
2015-06-17 14:14:06 -05:00
Cliff Gordon
2d662075c3
Merge remote-tracking branch 'origin/master' into fix/triplemon_hud
2015-06-17 10:11:57 -05:00
FSCyborg
6393189c19
Resolve CID 1093431 & 1093432
...
Should resolve issues 1093431 and 1093432. These issues cannot cause crashes because the denominator is indirectly checked, but it's good to change to get coverity and other future diagnosing programs to stop yelling at us.
2015-06-13 13:26:25 -04:00
Axem
e396686570
Adding customizable pain flash and shield pain flash settings
2015-05-24 09:00:30 -05:00
Cliff Gordon
0ce31bf471
[fix/triplemon_hud] Yarn's triple-monitor fix, see http://www.hard-light.net/forums/index.php?topic=89262.0 . Patch tweaked to work around changes in 9aed627.
2015-05-06 10:40:45 -05:00
MageKing17
202bd3a5dc
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-05 14:39:01 -07:00
Cliff Gordon
6b080df736
Fix for Mantis #3158 (take 2): change the size of the token used for released but active streams to fit into an int without narrowing.
2015-05-04 20:33:02 -05:00
Fabian Woltermann
4a14e26256
Merge pull request #64 from asarium/coverity/1093515
...
Fix for Coverity 1093515: Negative array index read
2015-05-03 21:55:50 +02:00
asarium
fe49ef63aa
Fix for Coverity 1093515: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_options_process_packet(unsigned char *, header *): Negative value used to index an array in a read operation
2015-05-03 14:44:26 +02:00
asarium
ca16b4710d
Fix for Coverity 1093555: Negative array index read
...
A memory location at a negative offset from the beginning of the array will be read, resulting in incorrect values.
In multi_create_standalone_object(): Negative value used to index an array in a read operation
observer_create() will only fail in exceptional circumstances so a showing an error dialog should be acceptable
2015-05-03 13:12:23 +02:00
niffiwan
25079f5ed2
Fix Coverity 1093484
...
time_t is 64bit on 64bit systems; casting a pointer to a larger type is
dangerous, but assigning to a larger type should be fine
2015-05-03 15:42:25 +10:00
MageKing17
bc0c7cf4c5
Vectorization of Ship_info.
...
Converts Ship_info from a ship_info[] to an SCP_vector<ship_info>. ship_info now has proper constructors, assignment operators, and a destructor. Num_ship_classes removed; various references to Num_ship_classes and/or MAX_SHIP_CLASSES (which remains for various other structures which need it) changed to Ship_info.size() instead.
This doesn't make the ship class limit dynamic, but it is a preparatory step to get there.
2015-04-27 00:01:22 -07:00
Goober5000
709f483617
PAUSE ALL THE STREAMS
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11197 387891d4-d844-0410-90c0-e4c51a9137d3
2014-12-12 16:12:16 +10:00
Goober5000
4f06fd2435
additional string safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11140 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-15 18:22:57 +10:00
Goober5000
ff38449a46
string printing safety
...
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11136 387891d4-d844-0410-90c0-e4c51a9137d3
2014-10-13 18:23:39 +10:00
MageKing17