Commit Graph
445 Commits
Author SHA1 Message Date
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
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 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 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 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 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 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 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 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
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
Zacam d0e450cfd1 Trunk Sync: r9418 2012-12-09 23:16:22 +00:00
The_E ce05f3a88a Trunk sync r9274 2012-10-21 07:58:11 +00:00
Zacam c9a1d1869c Trunk Sync: r9195-9199 2012-09-13 17:21:17 +00:00
chief1983 10eb2def8a Trunk Sync: r9149 2012-08-29 18:00:11 +00:00
The_E 05d5744477 TRunk sync r9104 2012-08-12 07:44:05 +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
Zacam 592ad34c4e Trunk Sync r8845 2012-06-06 13:59:44 +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
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 fcbc4362b9 TRunk sync r8615 2012-03-15 12:11:58 +00:00
chief1983 50c090b724 Trunk sync: r8603 (skip 8606, already handled by hand) 2012-03-09 18:34:29 +00:00
The_E 02d8bd64c4 Trunk sync r8545 2012-03-02 16:05:44 +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
Zacam 0f5843860b From CommanderDJ: The Pièce de résistance, MainHall.tbl is now modular. 2012-02-11 01:36:21 +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
The_E cb243c3f5c trunk sync r8382 - 8385 2012-01-28 17:45:57 +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 45d55d5c75 Trunk Sync: r8297-8302 2012-01-22 07:52:20 +00:00
The_E b7db6702dc TRunk sync r8270-8286, 8289 2012-01-21 12:12:25 +00:00
Zacam e8da8b037c Trunk Sync: r8230-8233 2012-01-15 19:28:50 +00:00
Zacam c33bf8d031 Trunk Sync: r8218-8220 2012-01-15 06:05:06 +00:00
Zacam 832999fbbd Trunk Sync r8104 2011-12-21 08:52:59 +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
Zacam 9f8c2061c8 Trunk Sync r7986 2011-11-13 10:15:32 +00:00
Zacam aba7c37634 Trunk Sync r7960 2011-11-08 04:53:02 +00:00
Zacam d495ef5ca9 Trunk Sync r7926 2011-10-23 19:04:29 +00:00
Zacam 897eea19d2 Trunk Sync r7909 2011-10-16 18:03:37 +00:00
Zacam 31ccffef1c Trunk Sync r7853 2011-10-03 11:28:19 +00:00
The_E f77910e72e Trunk sync r7842 2011-10-02 07:54:02 +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 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