fs2open: trunk r7685

Author Committer Branch Timestamp Parent
Zacam trunk 2011-09-09 06:23 Pending
Changeset Part Two: Synchronization pass of Trunk and Antipodes Differences.
Removes all extraneous ifdefs (Demo, E3, Multi Beta, etc).
Leaves Debug and Inferno.
mod - /trunk/fs2_open/code/Makefile.am Diff File
mod - /trunk/fs2_open/code/asteroid/asteroid.cpp Diff File
mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp Diff File
rm - /trunk/fs2_open/code/demo File
mod - /trunk/fs2_open/code/fred2/fredstubs.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.h Diff File
mod - /trunk/fs2_open/code/gamehelp/contexthelp.cpp Diff File
mod - /trunk/fs2_open/code/gamehelp/gameplayhelp.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/globals.h Diff File
mod - /trunk/fs2_open/code/globalincs/pstypes.h Diff File
mod - /trunk/fs2_open/code/globalincs/systemvars.h Diff File
mod - /trunk/fs2_open/code/globalincs/version.h Diff File
mod - /trunk/fs2_open/code/globalincs/windebug.cpp Diff File
mod - /trunk/fs2_open/code/io/joy.cpp Diff File
mod - /trunk/fs2_open/code/io/keycontrol.cpp Diff File
mod - /trunk/fs2_open/code/io/mouse.cpp Diff File
mod - /trunk/fs2_open/code/menuui/barracks.cpp Diff File
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp Diff File
mod - /trunk/fs2_open/code/menuui/optionsmenu.cpp Diff File
mod - /trunk/fs2_open/code/menuui/optionsmenumulti.cpp Diff File
mod - /trunk/fs2_open/code/menuui/playermenu.cpp Diff File
mod - /trunk/fs2_open/code/menuui/readyroom.cpp Diff File
mod - /trunk/fs2_open/code/menuui/techmenu.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missioncmdbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missiondebrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionloopbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionscreencommon.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp Diff File
mod - /trunk/fs2_open/code/missionui/redalert.cpp Diff File
mod - /trunk/fs2_open/code/object/collidedebrisship.cpp Diff File
mod - /trunk/fs2_open/code/object/collidedebrisweapon.cpp Diff File
mod - /trunk/fs2_open/code/object/collideshipship.cpp Diff File
mod - /trunk/fs2_open/code/object/collideweaponweapon.cpp Diff File
mod - /trunk/fs2_open/code/object/object.cpp Diff File
mod - /trunk/fs2_open/code/osapi/osregistry.cpp Diff File
mod - /trunk/fs2_open/code/osapi/osregistry_unix.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.h Diff File
mod - /trunk/fs2_open/code/physics/physics.cpp Diff File
mod - /trunk/fs2_open/code/ship/shield.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/shipcontrails.cpp Diff File
mod - /trunk/fs2_open/code/ship/shipfx.cpp Diff File
mod - /trunk/fs2_open/code/ship/shiphit.cpp Diff File
mod - /trunk/fs2_open/code/stats/medals.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters Diff File
mod - /trunk/fs2_open/projects/MSVC_6/code.dsp Diff File
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/codeblocks/code/code.cbp Diff File