[SirKnightly]

Here is the nightly for Windows on 09 Sep 2011 - Revision 7690

Group: Inferno
fso-WIN-Inferno-20110909_r7690.7z
MD5Sum

Group: Inferno_SSE
fso-WIN-Inferno_SSE-20110909_r7690.7z
MD5Sum

Group: Inferno_SSE2
fso-WIN-Inferno_SSE2-20110909_r7690.7z
MD5Sum

Code: [Select]

------------------------------------------------------------------------
r7682 | Zacam | 2011-09-08 12:12:25 -0500 (Thu, 08 Sep 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/model/modelinterp.cpp

From Valathil: Fixes thrusters with -trans textures
------------------------------------------------------------------------
r7683 | Zacam | 2011-09-09 04:37:45 -0500 (Fri, 09 Sep 2011) | 4 lines
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/bmpman/bmpman.cpp
   M /trunk/fs2_open/code/controlconfig/controlsconfig.cpp
   M /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp
   M /trunk/fs2_open/code/fred2/campaigntreewnd.cpp
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/fredview.cpp
   M /trunk/fs2_open/code/fred2/messageeditordlg.cpp
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/graphics/gropengllight.cpp
   M /trunk/fs2_open/code/graphics/gropengltexture.cpp
   M /trunk/fs2_open/code/io/keycontrol.cpp
   M /trunk/fs2_open/code/menuui/barracks.cpp
   M /trunk/fs2_open/code/missionui/missioncmdbrief.cpp
   M /trunk/fs2_open/code/model/modelinterp.cpp
   M /trunk/fs2_open/code/network/chat_api.cpp
   M /trunk/fs2_open/code/network/multi_pxo.cpp
   M /trunk/fs2_open/code/network/psnet2.h
   M /trunk/fs2_open/code/physics/physics.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

Part One: Synchronization pass of Trunk and Antipodes Differences.
Whitespace/tab mostly.
aicode does have a change of an Int3 to an Assertion.
bmpman has an update to bm_next_handle.
------------------------------------------------------------------------
r7685 | Zacam | 2011-09-09 05:23:53 -0500 (Fri, 09 Sep 2011) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/Makefile.am
   M /trunk/fs2_open/code/asteroid/asteroid.cpp
   M /trunk/fs2_open/code/cutscene/cutscenes.cpp
   D /trunk/fs2_open/code/demo
   M /trunk/fs2_open/code/fred2/fredstubs.cpp
   M /trunk/fs2_open/code/freespace2/freespace.cpp
   M /trunk/fs2_open/code/freespace2/freespace.h
   M /trunk/fs2_open/code/gamehelp/contexthelp.cpp
   M /trunk/fs2_open/code/gamehelp/gameplayhelp.cpp
   M /trunk/fs2_open/code/globalincs/globals.h
   M /trunk/fs2_open/code/globalincs/pstypes.h
   M /trunk/fs2_open/code/globalincs/systemvars.h
   M /trunk/fs2_open/code/globalincs/version.h
   M /trunk/fs2_open/code/globalincs/windebug.cpp
   M /trunk/fs2_open/code/io/joy.cpp
   M /trunk/fs2_open/code/io/keycontrol.cpp
   M /trunk/fs2_open/code/io/mouse.cpp
   M /trunk/fs2_open/code/menuui/barracks.cpp
   M /trunk/fs2_open/code/menuui/mainhallmenu.cpp
   M /trunk/fs2_open/code/menuui/optionsmenu.cpp
   M /trunk/fs2_open/code/menuui/optionsmenumulti.cpp
   M /trunk/fs2_open/code/menuui/playermenu.cpp
   M /trunk/fs2_open/code/menuui/readyroom.cpp
   M /trunk/fs2_open/code/menuui/techmenu.cpp
   M /trunk/fs2_open/code/missionui/missionbrief.cpp
   M /trunk/fs2_open/code/missionui/missioncmdbrief.cpp
   M /trunk/fs2_open/code/missionui/missiondebrief.cpp
   M /trunk/fs2_open/code/missionui/missionloopbrief.cpp
   M /trunk/fs2_open/code/missionui/missionscreencommon.cpp
   M /trunk/fs2_open/code/missionui/missionshipchoice.cpp
   M /trunk/fs2_open/code/missionui/missionweaponchoice.cpp
   M /trunk/fs2_open/code/missionui/redalert.cpp
   M /trunk/fs2_open/code/object/collidedebrisship.cpp
   M /trunk/fs2_open/code/object/collidedebrisweapon.cpp
   M /trunk/fs2_open/code/object/collideshipship.cpp
   M /trunk/fs2_open/code/object/collideweaponweapon.cpp
   M /trunk/fs2_open/code/object/object.cpp
   M /trunk/fs2_open/code/osapi/osregistry.cpp
   M /trunk/fs2_open/code/osapi/osregistry_unix.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/physics/physics.cpp
   M /trunk/fs2_open/code/ship/shield.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/shipcontrails.cpp
   M /trunk/fs2_open/code/ship/shipfx.cpp
   M /trunk/fs2_open/code/ship/shiphit.cpp
   M /trunk/fs2_open/code/stats/medals.cpp
   M /trunk/fs2_open/code/weapon/weapons.cpp
   M /trunk/fs2_open/configure.ac
   M /trunk/fs2_open/projects/MSVC_2005/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters
   M /trunk/fs2_open/projects/MSVC_6/code.dsp
   M /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj
   M /trunk/fs2_open/projects/codeblocks/code/code.cbp

Part Two: Synchronization pass of Trunk and Antipodes Differences.
Removes all extraneous ifdefs (Demo, E3, Multi Beta, etc).
Leaves Debug and Inferno.
------------------------------------------------------------------------
r7687 | Zacam | 2011-09-09 05:38:14 -0500 (Fri, 09 Sep 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/mission/missioncampaign.cpp
   M /trunk/fs2_open/code/mission/missioncampaign.h
   M /trunk/fs2_open/code/mission/missionload.cpp
   M /trunk/fs2_open/code/mission/missionmessage.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp

Part Three: Synchronization pass of Trunk and Antipodes Differences.
Catching on anything missed in the first two passes.
------------------------------------------------------------------------