fs2open.github.com

ai

Trunk Sync r7853

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

anim

Trunk Sync r7674

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

asteroid

Trunk Sync r7701

2011-09-12 03:44:56 +00:00

autopilot

Trunk Sync r7853

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

bmpman

Trunk sync r7593

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

camera

Trunk Sync r7853

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

cfile

Trunk Sync r7853

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

cfilearchiver

Trunk Sync - r6875

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

cfileextractor

Trunk Sync r7853

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

cmdline

De-commit the beta version of the sound code patch (it was accidentally merged anyway) as it currently only belongs in the RC branch.

2011-09-27 05:52:02 +00:00

cmeasure

Trunk Sync - r7030

2011-02-26 01:50:36 +00:00

controlconfig

Trunk Sync r7853

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

cutscene

Part Two: Synchronization pass of Antipodes and Trunk Differences.

2011-09-09 10:25:08 +00:00

ddsutils

Trunk Sync - r6684

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

debris

Trunk Sync r7853

2011-10-03 11:28:19 +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 r7677

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

fred2

Trunk sync r7842

2011-10-02 07:54:02 +00:00

freespace2

Trunk Sync r7853

2011-10-03 11:28:19 +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

Let's try "GS_EVENT_END_CAMPAIGN (59)" instead of "GS_EVENT_EMD_CAMPAIGN (59)"

2011-05-19 11:34:48 +00:00

gamesnd

Fixes error on cmdline_nohtl in neblighting.cpp, restores sound index in gamesnd.h.

2011-09-30 05:04:02 +00:00

globalincs

Trunk Sync r7853

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

graphics

Trunk Sync r7853

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

hud

Trunk Sync r7853

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

iff_defs

Trunk Sync

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

inetfile

Trunk Sync r7674

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

io

From Eli2: Dead/unused code removal

2011-10-01 11:55:18 +00:00

jpgutils

safe_strings changes

2009-07-26 05:15:24 +00:00

jumpnode

Trunk Sync -r7171

2011-05-01 15:13:24 +00:00

lab

Trunk Sync r7853

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

lighting

Trunk Sync r7721

2011-09-14 08:34:17 +00:00

localization

Copy's Trunk revert in r7794.

2011-09-24 19:55:31 +00:00

math

Trunk Sync r7716

2011-09-13 08:05:43 +00:00

menuui

From Eli2: Dead/unused code removal

2011-10-01 11:55:18 +00:00

mission

And another Sync Drift check for AP to tidy things up.

2011-09-25 08:27:17 +00:00

missionui

From niffiwan: A means of catching a non-sensical value to help track down Mantis 2503. See http://www.hard-light.net/forums/index.php?topic=73257.msg1548721

2011-09-18 05:21:36 +00:00

mm

remove PreProcDefine #includes in FS2

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

model

Trunk Sync r7853

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

nebula

Fixes error on cmdline_nohtl in neblighting.cpp, restores sound index in gamesnd.h.

2011-09-30 05:04:02 +00:00

network

Trunk Sync r7853

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

object

Trunk Sync r7853

2011-10-03 11:28:19 +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

From Trunk: Standalone now makes it's own log file.

2011-06-21 23:09:41 +00:00

palman

safe_strings changes

2009-07-26 05:15:24 +00:00

parse

Trunk Sync r7853

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

particle

Trunk Sync r7496 for GREAT JUSTICE!

2011-08-20 22:25:04 +00:00

pcxutils

Trunk sync r7593

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

physics

Trunk Sync - r6865

2010-12-19 06:05:54 +00:00

pilotfile

PVS-Studio false alarm: V802 On 32-bit platform, structure size can be reduced from 28 to 24 bytes by rearranging the fields according to their sizes in decreasing order (plr_convert.cpp).

2011-09-18 07:24:18 +00:00

playerman

Trunk sync r7842

2011-10-02 07:54:02 +00:00

pngutils

Update:

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

popup

Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.

2010-06-29 22:09:34 +00:00

radar

Trunk Sync r7420

2011-08-04 13:27:14 +00:00

render

Trunk Sync r7677

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

ship

Trunk sync r7842

2011-10-02 07:54:02 +00:00

sound

Trunk Sync r7853

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

species_defs

Trunk r7703: Allow customization of the thruster distortion effect in species_defs.tbl and ships.tbl

2011-09-12 04:02:17 +00:00

starfield

Trunk Sync r7677

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

stats

Trunk Sync r7799

2011-09-25 04:10:42 +00:00

tgautils

Trunk sync r7792

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

ui

PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct

2011-08-14 13:14:35 +00:00

weapon

Trunk Sync r7825

2011-09-28 17:27:15 +00:00

windows_stub

Copy of Trunk 6844.

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

wxfred2

Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.

2010-06-29 22:09:34 +00:00

Makefile.am

Project cleanup for the removals of cryptstring, scramble, and crypt.cpp/.h.

2011-09-18 00:46:43 +00:00