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

..

ai

Trunk sync r9456

2012-12-21 21:02:47 +00: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

Trunk Sync: r9386

2012-12-02 02:24:53 +00:00

autopilot

Trunk Sync: r9425

2012-12-13 08:54:32 +00:00

bmpman

Trunk sync r9274

2012-10-21 07:58:11 +00:00

camera

Trunk sync r9435

2012-12-15 15:40:58 +00:00

cfile

Trunk sync r9274

2012-10-21 07:58:11 +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: r9464

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

cmeasure

Trunk Sync r7926

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

controlconfig

Trunk Sync: r9193

2012-09-13 15:14:56 +00:00

cutscene

Trunk sync r9353

2012-11-18 12:34:24 +00:00

ddsutils

Trunk Sync - r6684

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

debris

Trunk Sync: r9418

2012-12-09 23:16:22 +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 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

Trunk Sync r8897

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

fred2

Trunk Sync: r9464

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

freespace2

Trunk Sync: r9464

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

fs2netd

Trunk sync r9456

2012-12-21 21:02:47 +00:00

gamehelp

Trunk sync r9274

2012-10-21 07:58:11 +00:00

gamesequence

Trunk Sync r7986

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

gamesnd

Trunk sync r9456

2012-12-21 21:02:47 +00:00

globalincs

Trunk Sync: r9464

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

graphics

Trunk sync r9456

2012-12-21 21:02:47 +00:00

hud

Trunk sync r9435

2012-12-15 15:40:58 +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: r9351

2012-11-17 23:47:11 +00:00

jpgutils

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

jumpnode

Trunk sync r9006

2012-07-11 17:25:38 +00:00

lab

Trunk sync r9456

2012-12-21 21:02:47 +00:00

lighting

Trunk sync r8742

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

localization

Trunk Sync r8897

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

math

Trunk Sync: r9389

2012-12-03 01:06:58 +00:00

menuui

Trunk Sync: r9464

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

mission

Trunk Sync: r9464

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

missionui

Trunk sync r9456

2012-12-21 21:02:47 +00:00

mm

remove PreProcDefine #includes in FS2

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

mod_table

Trunk Sync: r9351

2012-11-17 23:47:11 +00:00

model

Trunk Sync: r9464

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

nebula

Trunk sync r9064

2012-07-29 11:40:49 +00:00

network

Trunk Sync: r9464

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

object

Trunk Sync: r9464

2012-12-26 19:49: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

Trunk sync r8799

2012-05-20 03:13:27 +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 r9456

2012-12-21 21:02:47 +00:00

particle

Trunk sync r9456

2012-12-21 21:02:47 +00:00

pcxutils

Trunk sync r7593

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

physics

Trunk sync r8696

2012-04-30 14:57:21 +00:00

pilotfile

From eli2: Patch for Mantis 2608 (Adds "$Always Viewable:" setting to cutscenes.tbl)

2012-02-20 14:53:30 +00:00

playerman

Trunk Sync: r9351

2012-11-17 23:47:11 +00:00

pngutils

Trunk Sync: r9408

2012-12-09 00:48:01 +00:00

popup

Trunk Sync r8013

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

radar

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

render

Trunk sync r9031

2012-07-22 11:41:28 +00:00

ship

Trunk sync r9456

2012-12-21 21:02:47 +00:00

sound

Trunk Sync: r9195-9199

2012-09-13 17:21:17 +00:00

species_defs

Trunk sync r8799

2012-05-20 03:13:27 +00:00

starfield

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

stats

Trunk sync r8742

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

tgautils

Trunk Sync r8897

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

ui

Trunk Sync r8897

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

weapon

Trunk sync r9456

2012-12-21 21:02:47 +00:00

windows_stub

Trunk Sync: r9425

2012-12-13 08:54:32 +00:00

wxfred2

Trunk sync r9275

2012-10-27 14:25:44 +00:00

Makefile.am

Trunk sync r9275

2012-10-27 14:25:44 +00:00