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

..

chat_api.cpp

Use cross-platform compatible struct

2015-08-28 11:46:10 +02:00

chat_api.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_campaign.cpp

Vectorization of Ship_info.

2015-04-27 00:01:22 -07:00

multi_campaign.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_data.cpp

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_data.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_dogfight.cpp

Yarn's patch for Mantis #3107 (Parts of the interface code assume a font size of 10)

2014-09-25 16:40:34 +10:00

multi_dogfight.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_endgame.cpp

Trunk Sync r8897

2012-06-18 00:44:03 +00:00

multi_endgame.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_ingame.cpp

Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info

2015-08-12 13:25:34 -07:00

multi_ingame.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_kick.cpp

Trunk Sync - r10911

2014-09-11 19:22:13 +10:00

multi_kick.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_log.cpp

string printing safety

2014-10-13 18:23:39 +10:00

multi_log.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_obj.cpp

that was just dumb

2015-10-25 21:14:08 -04:00

multi_obj.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_observer.cpp

Sync to trunk 10060

2013-11-25 18:40:16 +10:00

multi_observer.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_options.cpp

Fix format warning in multi_options.cpp

2015-08-19 11:26:28 +02:00

multi_options.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_pause.cpp

Replace Sleep with os_sleep

2015-06-03 16:20:39 +02:00

multi_pause.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_pinfo.cpp

Trunk Sync - r10911

2014-09-11 19:22:13 +10:00

multi_pinfo.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_ping.cpp

Trunk Sync - r6993

2011-02-04 03:50:54 +00:00

multi_ping.h

Trunk Sync - r6993

2011-02-04 03:50:54 +00:00

multi_pmsg.cpp

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_pmsg.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_pxo.cpp

Merge branch 'master' into antipodes

2015-07-03 19:15:43 +02:00

multi_pxo.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_rate.cpp

Yarn's patch for Mantis #3107 (Parts of the interface code assume a font size of 10)

2014-09-25 16:40:34 +10:00

multi_rate.h

Sync Drift: Apparently still some lingering ifdefs for OEM/Multiplayer_Beta and non-AP specific things not having made it to trunk for some reason.

2011-09-25 08:26:45 +00:00

multi_respawn.cpp

Trunk sync r9508.

2013-11-25 18:40:14 +10:00

multi_respawn.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_sexp.cpp

Generalise warning string if we can't provide callback operator information.

2015-08-08 18:10:26 +10:00

multi_sexp.h

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

multi_team.cpp

Trunk Sync - r10911

2014-09-11 19:22:13 +10:00

multi_team.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

multi_update.cpp

Trunk Sync - r6684

2010-10-25 04:09:33 +00:00

multi_update.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_voice.cpp

Fix: network/multi_voice.cpp: warning: parameter set but not used [-Wunused-but-set-parameter]

2015-07-05 16:51:16 +10:00

multi_voice.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multi_xfer.cpp

Trunk Sync r8013

2011-11-19 16:32:50 +00:00

multi_xfer.h

trunk sync r7657

2011-09-06 21:22:39 +00:00

multi.cpp

Undefine MessageBox if it is defined

2015-08-29 23:01:38 +02:00

multi.h

Sync to trunk 10060

2013-11-25 18:40:16 +10:00

multilag.cpp

we don't need to cast because mod is a float

2014-10-13 12:24:17 +10:00

multilag.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

multimsgs.cpp

Stop comparing/setting homing_object to NULL.

2015-10-12 16:10:05 -07:00

multimsgs.h

Fix: network/multimsgs.cpp:8473:70: warning: declaration of ‘bolt_type’ shadows a global declaration [-Wshadow]

2015-07-05 16:44:48 +10:00

multiteamselect.cpp

Added unified functions for loading and saving custom UI backgrounds

2015-09-19 04:47:11 -04:00

multiteamselect.h

Trunk Sync: r9464

2012-12-26 19:49:19 +00:00

multiui.cpp

[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

multiui.h

Trunk Sync - r10911

2014-09-11 19:22:13 +10:00

multiutil.cpp

Re-enable two warnings

2015-09-03 15:38:33 +02:00

multiutil.h

Fix: network/multiutil.cpp:692:76: warning: declaration of ‘net_player’ shadows a global declaration [-Wshadow]

2015-07-06 21:30:27 +10:00

psnet2.cpp

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

psnet2.h

Part One: Synchronization pass of Trunk and Antipodes Differences.

2011-09-09 09:37:45 +00:00

stand_gui-unix.cpp

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

stand_gui.cpp

Replace Sleep with os_sleep

2015-06-03 16:20:39 +02:00

stand_gui.h

sync to trunk 10223

2014-03-06 19:24:13 +10:00