fs2open.github.com

ai

Trunk Sync: r8373, r8376-8379

2012-01-28 06:53:43 +00:00

anim

Trunk Sync r7969

2011-11-10 12:01:34 +00:00

asteroid

Trunk sync r 8066

2011-12-04 17:42:52 +00:00

autopilot

Trunk Sync r7853

2011-10-03 11:28:19 +00:00

bmpman

Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.

2012-01-13 17:49:57 +00:00

camera

Trunk Sync r7853

2011-10-03 11:28:19 +00:00

cfile

Trunk sync r7997

2011-11-16 18:16:55 +00: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

trunk sync r8382 - 8385

2012-01-28 17:45:57 +00:00

cmeasure

Trunk Sync r7926

2011-10-23 19:04:29 +00:00

controlconfig

Trunk Sync: r8222-8225

2012-01-15 08:31:47 +00:00

cutscene

Trunk sync r8112

2011-12-24 16:22:50 +00:00

ddsutils

Trunk Sync - r6684

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

debris

Trunk sync r 8066

2011-12-04 17:42:52 +00:00

debugconsole

Trunk sync r7842

2011-10-02 07:54:02 +00: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

2009-09-12 15:18:09 +00:00

external_dll

Trunk Sync - r5792

2010-01-08 02:50:10 +00:00

fireball

Trunk Sync r7986

2011-11-13 10:15:32 +00:00

fred2

trunk sync r8382 - 8385

2012-01-28 17:45:57 +00:00

freespace2

trunk sync r8382 - 8385

2012-01-28 17:45:57 +00:00

fs2netd

Trunk Sync r7853

2011-10-03 11:28:19 +00:00

gamehelp

The E cleaned house on a slew of unused #IFDEFs, such as FS2_DEMO, MULTIPLAYER_BETA, OEM_BUILD, commented out code, etc.

2010-12-13 02:44:27 +00:00

gamesequence

Trunk Sync r7986

2011-11-13 10:15:32 +00:00

gamesnd

And 8114 to 8116

2012-01-05 23:15:10 +00:00

globalincs

Trunk Sync: 8368-8369

2012-01-24 18:40:54 +00:00

graphics

Trunk Sync: 8368-8369

2012-01-24 18:40:54 +00:00

hud

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

iff_defs

Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.

2012-01-13 17:49:57 +00:00

inetfile

Trunk Sync r7674

2011-09-08 05:05:01 +00:00

io

Trunk sync r 8066

2011-12-04 17:42:52 +00:00

jpgutils

Trunk r7898: Improve performance of jpeg byte swap operation

2011-10-12 16:12:10 +00:00

jumpnode

Trunk Sync: r8304-8308

2012-01-22 12:15:42 +00:00

lab

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

lighting

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

localization

TRunk sync r8270-8286, 8289

2012-01-21 12:12:25 +00:00

math

Trunk sync r 8066

2011-12-04 17:42:52 +00:00

menuui

Trunk Sync: r8287, r8291-8295

2012-01-22 02:09:35 +00:00

mission

Trunk Sync: r8304-8308

2012-01-22 12:15:42 +00:00

missionui

trunk sync r8382 - 8385

2012-01-28 17:45:57 +00:00

mm

remove PreProcDefine #includes in FS2

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

model

Fix to Trunk r8379, for want of a ; a compile was lost.

2012-01-28 07:07:07 +00:00

nebula

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

network

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

object

Trunk Sync: 8341. 8344. 8350. 8361-8363

2012-01-24 03:58:22 +00:00

observer

Code cleanup: Remove redundant Num_observer_obs ahead of converting Observers array to an STL container

2010-09-26 10:39:03 +00:00

osapi

Trunk Sync: r8222-8225

2012-01-15 08:31:47 +00:00

palman

Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.

2012-01-13 17:49:57 +00:00

parse

trunk sync r8382 - 8385

2012-01-28 17:45:57 +00:00

particle

Trunk Sync r7916

2011-10-17 17:58:47 +00:00

pcxutils

Trunk sync r7593

2011-08-30 18:17:09 +00:00

physics

TRunk sync r8270-8286, 8289

2012-01-21 12:12:25 +00:00

pilotfile

Wrong EOLs.

2012-01-13 17:46:33 +00:00

playerman

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

pngutils

Update:

2011-07-01 17:06:16 +00:00

popup

Trunk Sync r8013

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

radar

Trunk Sync: r8297-8302

2012-01-22 07:52:20 +00:00

render

Trunk Sync r7677

2011-09-08 05:47:44 +00:00

ship

Trunk Sync: r8239

2012-01-23 03:19:09 +00:00

sound

Trunk Sync: r8304-8308

2012-01-22 12:15:42 +00:00

species_defs

Trunk sync r 8066

2011-12-04 17:42:52 +00:00

starfield

Trunk Sync: r8265-8267

2012-01-20 02:26:25 +00:00

stats

Trunk Sync: r8222-8225

2012-01-15 08:31:47 +00:00

tgautils

Trunk sync r7792

2011-09-24 17:44:49 +00:00

ui

Trunk Sync: r8222-8225

2012-01-15 08:31:47 +00:00

weapon

TRunk sync r8270-8286, 8289

2012-01-21 12:12:25 +00:00

windows_stub

Copy of Trunk 6844.

2010-12-13 05:52:25 +00:00

wxfred2

Meh. Let's do this right. svn:eol-type set to LF for all of these as well. *sighs*

2012-01-13 18:35:09 +00:00

Makefile.am

Trunk Sync r7862

2011-10-06 04:53:51 +00:00