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

..

ai

sync to trunk 10223

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

anim

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

asteroid

sync to trunk 10046

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

autopilot

sync to trunk 10046

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

bmpman

sync to trunk 10046

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

camera

sync to trunk 10046

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

cfile

Changed most MessageBox calls to use SCP_Messagebox, also fixed some of the event processing.

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

cfilearchiver

Trunk Sync - r6875

2010-12-21 06:51:15 +00:00

cfileextractor

Trunk Sync r7946

2011-11-05 09:36:17 +00:00

cmdline

Changed most MessageBox calls to use SCP_Messagebox, also fixed some of the event processing.

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

cmeasure

sync to trunk 10046

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

controlconfig

sync to trunk 10223

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

cutscene

sync to trunk 10046

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

ddsutils

sync to trunk 10046

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

debris

sync to trunk 10046

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

debugconsole

sync to trunk 10046

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

directx

This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.

2010-09-23 02:14:26 +00:00

exceptionhandler

Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).

2012-11-02 20:28:04 +00:00

external_dll

Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).

2012-11-02 20:28:04 +00:00

fireball

sync to trunk 10046

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

fred2

sync to trunk 10223

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

freespace2

sync to trunk 10223

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

fs2netd

sync to trunk 10223

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

gamehelp

sync to trunk 10046

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

gamesequence

sync to trunk 10046

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

gamesnd

sync to trunk 10046

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

globalincs

sync to trunk 10223

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

graphics

sync to trunk 10223

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

hud

sync to trunk 10223

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

iff_defs

sync to trunk 10046

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

inetfile

Revert 10149. Needs more review

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

io

sync to trunk 10223

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

jpgutils

sync to trunk 10046

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

jumpnode

sync to trunk 10046

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

lab

sync to trunk 10046

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

lighting

Trunk sync r8742

2012-05-03 08:26:41 +00:00

localization

sync to trunk 10223

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

math

sync to trunk 10046

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

menuui

sync to trunk 10223

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

mission

sync to trunk 10223

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

missionui

sync to trunk 10223

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

mm

remove PreProcDefine #includes in FS2

2005-07-13 03:26:00 +00:00

mod_table

sync to trunk 10046

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

model

Sync to trunk revision 10223

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

nebula

sync to trunk 10046

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

network

sync to trunk 10223

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

object

sync to trunk 10223

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

observer

sync to trunk 10223

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

osapi

sync to trunk 10223

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

palman

sync to trunk 10046

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

parse

sync to trunk 10223

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

particle

sync to trunk 10046

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

pcxutils

sync to trunk 10046

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

physics

sync to trunk 10046

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

pilotfile

sync to trunk 10046

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

playerman

sync to trunk 10223

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

pngutils

sync to trunk 10046

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

popup

sync to trunk 10046

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

radar

sync to trunk 10046

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

render

sync to trunk 10046

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

ship

sync to trunk 10223

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

sound

sync to trunk 10223

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

species_defs

sync to trunk 10223

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

starfield

sync to trunk 10223

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

stats

sync to trunk 10223

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

tgautils

sync to trunk 10046

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

ui

IIt begins!

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

weapon

sync to trunk 10223

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

windows_stub

IIt begins!

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

wxfred2

Big commit part 2: Stuff the svn missed

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

Makefile.am

Merge both osapi files into one file.

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