All Projects FSSCP  wxFRED

fs2open: antipodes r10912

Diff Back to Repository
Author Committer Branch Timestamp Parent
Zacam antipodes 2014-07-12 02:35 Pending
Changeset Trunk Sync - r10911

There are a lot of changes here that should probably be examined, namely the Debug Console (which had conflicts) and Yarn's "any resolution" mainhalls code (Which also had conflicts) but for the most part this should be fairly clean.
mod - /branches/antipodes/code/fred2/eventeditor.cpp Diff File
mod - /branches/antipodes/code/mission/missionhotkey.h Diff File
mod - /branches/antipodes/code/missionui/fictionviewer.cpp Diff File
mod - /branches/antipodes/code/lab/lab.cpp Diff File
mod - /branches/antipodes/code/globalincs/def_files.cpp Diff File
mod - /branches/antipodes/code/globalincs/systemvars.cpp Diff File
mod - /branches/antipodes/code/io/keycontrol.cpp Diff File
mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /branches/antipodes/code/missionui/missioncmdbrief.h Diff File
mod - /branches/antipodes/code/ai/aibig.cpp Diff File
mod - /branches/antipodes/code/cutscene/cutscenes.cpp Diff File
mod - /branches/antipodes/code/graphics/font.cpp Diff File
mod - /branches/antipodes/code/mission/missioncampaign.h Diff File
mod - /branches/antipodes/code/hud/hudtarget.cpp Diff File
mod - /branches/antipodes/code/missionui/missionscreencommon.cpp Diff File
mod - /branches/antipodes/code/model/modelanim.h Diff File
mod - /branches/antipodes/code/object/object.cpp Diff File
mod - /branches/antipodes/code/missionui/missionbrief.h Diff File
mod - /branches/antipodes/code/palman/palman.cpp Diff File
mod - /branches/antipodes/code/missionui/missiondebrief.cpp Diff File
mod - /branches/antipodes/code/gamehelp/contexthelp.h Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/cfileextractor.xcscheme Diff File
mod - /branches/antipodes/projects/MSVC_2013/code.vcxproj.filters Diff File
mod - /branches/antipodes/code/playerman/managepilot.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.cpp Diff File
mod - /branches/antipodes/code/localization/localize.cpp Diff File
mod - /branches/antipodes/code/hud/hudparse.cpp Diff File
mod - /branches/antipodes/code/parse/lua.cpp Diff File
mod - /branches/antipodes/code/network/multi_options.cpp Diff File
mod - /branches/antipodes/code/osapi/outwnd_unix.cpp Diff File
mod - /branches/antipodes/code/ui/slider.cpp Diff File
mod - /branches/antipodes/code/hud/hud.cpp Diff File
mod - /branches/antipodes/code/autopilot/autopilot.cpp Diff File
mod - /branches/antipodes/code/fred2/shiptexturesdlg.cpp Diff File
mod - /branches/antipodes/code/mission/missionload.cpp Diff File
mod - /branches/antipodes/code/graphics/gropengllight.cpp Diff File
mod - /branches/antipodes/code/fred2/sexp_tree.h Diff File
mod - /branches/antipodes/code/ship/ship.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/zlib.xcscheme Diff File
mod - /branches/antipodes/code/fred2/freddoc.cpp Diff File
mod - /branches/antipodes/code/menuui/fishtank.cpp Diff File
mod - /branches/antipodes/code/ship/shipfx.h Diff File
mod - /branches/antipodes/code/graphics/grbatch.cpp Diff File
mod - /branches/antipodes/code/weapon/emp.cpp Diff File
mod - /branches/antipodes/code/render/3dlaser.cpp Diff File
mod - /branches/antipodes/code/network/multi_obj.cpp Diff File
mod - /branches/antipodes/code/network/multimsgs.cpp Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile.cpp Diff File
mod - /branches/antipodes/code/gamehelp/contexthelp.cpp Diff File
mod - /branches/antipodes/code/missionui/redalert.cpp Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile_convert.h Diff File
mod - /branches/antipodes/projects/MSVC_2010/code.vcxproj.filters Diff File
mod - /branches/antipodes/code/ui/inputbox.cpp Diff File
mod - /branches/antipodes/code/mission/missionbriefcommon.h Diff File
mod - /branches/antipodes/code/species_defs/species_defs.cpp Diff File
mod - /branches/antipodes/code/starfield/nebula.h Diff File
mod - /branches/antipodes/projects/MSVC_2005/code.vcproj Diff File
mod - /branches/antipodes/code/object/collideshipship.cpp Diff File
mod - /branches/antipodes/code/network/multiteamselect.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/jpeg.xcscheme Diff File
mod - /branches/antipodes/code/lab/wmcgui.h Diff File
mod - /branches/antipodes/code/localization/localize.h Diff File
mod - /branches/antipodes/code/gamesnd/eventmusic.cpp Diff File
mod - /branches/antipodes/code/mission/missionparse.h Diff File
mod - /branches/antipodes/code/weapon/beam.h Diff File
mod - /branches/antipodes/code/radar/radarsetup.cpp Diff File
mod - /branches/antipodes/code/controlconfig/controlsconfig.h Diff File
mod - /branches/antipodes/code/fred2/FictionViewerDlg.cpp Diff File
add - /branches/antipodes/code/debugconsole/consoleparse.cpp File
mod - /branches/antipodes/code/network/multilag.cpp Diff File
mod - /branches/antipodes/code/network/multi_pxo.cpp Diff File
mod - /branches/antipodes/code/menuui/techmenu.cpp Diff File
mod - /branches/antipodes/code/graphics/2d.h Diff File
mod - /branches/antipodes/code/ship/ship.h Diff File
mod - /branches/antipodes/code/menuui/mainhallmenu.cpp Diff File
mod - /branches/antipodes/code/parse/scripting.cpp Diff File
mod - /branches/antipodes/projects/MSVC_2011/code.vcxproj Diff File
mod - /branches/antipodes/code/graphics/grbatch.h Diff File
add - /branches/antipodes/code/debugconsole/console.h File
mod - /branches/antipodes/code/mission/missionbriefcommon.cpp Diff File
mod - /branches/antipodes/code/pilotfile/pilotfile.h Diff File
mod - /branches/antipodes/code/starfield/nebula.cpp Diff File
mod - /branches/antipodes/code/weapon/shockwave.cpp Diff File
mod - /branches/antipodes/code/bmpman/bmpman.cpp Diff File
mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp Diff File
mod - /branches/antipodes/code/hud/hudtargetbox.h Diff File
mod - /branches/antipodes/code/ai/aiturret.cpp Diff File
mod - /branches/antipodes/code/network/multi_team.cpp Diff File
mod - /branches/antipodes/code/starfield/starfield.cpp Diff File
mod - /branches/antipodes/projects/MSVC_6/code.dsp Diff File
mod - /branches/antipodes/code/weapon/corkscrew.cpp Diff File
mod - /branches/antipodes/code/missionui/missioncmdbrief.cpp Diff File
mod - /branches/antipodes/code/fred2/resource.h Diff File
mod - /branches/antipodes/code/network/multi_dogfight.cpp Diff File
mod - /branches/antipodes/code/controlconfig/controlsconfig.cpp Diff File
mod - /branches/antipodes/code/ui/ui.h Diff File
mod - /branches/antipodes/code/cutscene/oggplayer.cpp Diff File
mod - /branches/antipodes/code/fred2/shipeditordlg.cpp Diff File
mod - /branches/antipodes/code/render/3ddraw.cpp Diff File
mod - /branches/antipodes/code/sound/rtvoice.cpp Diff File
mod - /branches/antipodes/code/weapon/weapons.cpp Diff File
mod - /branches/antipodes/code/globalincs/version.h Diff File
mod - /branches/antipodes/code/missionui/missionbrief.cpp Diff File
mod - /branches/antipodes/code/menuui/readyroom.h Diff File
mod - /branches/antipodes/code/ui/gadget.cpp Diff File
mod - /branches/antipodes/code/hud/hudlock.cpp Diff File
mod - /branches/antipodes/code/radar/radardradis.cpp Diff File
mod - /branches/antipodes/code/nebula/neb.cpp Diff File
mod - /branches/antipodes/code/fred2/FictionViewerDlg.h Diff File
add - /branches/antipodes/code/debugconsole/consoleparse.h File
mod - /branches/antipodes/code/debugconsole/console.cpp Diff File
mod - /branches/antipodes/code/freespace2/freespace.cpp Diff File
mod - /branches/antipodes/code/fred2/management.cpp Diff File
mod - /branches/antipodes/code/nebula/neblightning.cpp Diff File
mod - /branches/antipodes/code/menuui/techmenu.h Diff File
mod - /branches/antipodes/code/object/collideshipweapon.cpp Diff File
mod - /branches/antipodes/code/inetfile/chttpget.cpp Diff File
mod - /branches/antipodes/code/network/multiui.cpp Diff File
mod - /branches/antipodes/code/fred2/fred.cpp Diff File
add - /branches/antipodes/code/debugconsole/consolecmds.cpp File
mod - /branches/antipodes/code/object/objectsort.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /branches/antipodes/code/missionui/missiondebrief.h Diff File
mod - /branches/antipodes/code/fs2netd/tcp_client.cpp Diff File
mod - /branches/antipodes/code/globalincs/alphacolors.h Diff File
mod - /branches/antipodes/code/menuui/barracks.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/png.xcscheme Diff File
mod - /branches/antipodes/code/graphics/gropengldraw.cpp Diff File
mod - /branches/antipodes/code/osapi/outwnd.cpp Diff File
mod - /branches/antipodes/code/anim/animplay.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.h Diff File
mod - /branches/antipodes/code/sound/ds.cpp Diff File
mod - /branches/antipodes/code/fred2/sexp_tree.cpp Diff File
mod - /branches/antipodes/code/menuui/readyroom.cpp Diff File
mod - /branches/antipodes/code/ship/shipfx.cpp Diff File
mod - /branches/antipodes/code/popup/popup.cpp Diff File
mod - /branches/antipodes/code/network/multi_voice.cpp Diff File
mod - /branches/antipodes/code/cfile/cfile.h Diff File
mod - /branches/antipodes/code/hud/hudsquadmsg.h Diff File
mod - /branches/antipodes/code/graphics/gropengllight.h Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/cfilearchiver.xcscheme Diff File
mod - /branches/antipodes/code/ai/aicode.cpp Diff File
mod - /branches/antipodes/projects/MSVC_2013/code.vcxproj Diff File
mod - /branches/antipodes/code/mod_table/mod_table.h Diff File
mod - /branches/antipodes/code/parse/parselo.h Diff File
mod - /branches/antipodes/code/pilotfile/plr_convert.cpp Diff File
mod - /branches/antipodes/code/ai/ai_profiles.cpp Diff File
mod - /branches/antipodes/code/sound/sound.h Diff File
mod - /branches/antipodes/code/windows_stub/stubs.cpp Diff File
mod - /branches/antipodes/code/Makefile.am Diff File
mod - /branches/antipodes/code/playerman/player.h Diff File
mod - /branches/antipodes/code/gamesnd/gamesnd.cpp Diff File
mod - /branches/antipodes/projects/codeblocks/code/code.cbp Diff File
mod - /branches/antipodes/code/freespace2/freespace.rc Diff File
mod - /branches/antipodes/code/menuui/barracks.h Diff File
mod - /branches/antipodes/code/starfield/supernova.cpp Diff File
mod - /branches/antipodes/code/missionui/fictionviewer.h Diff File
mod - /branches/antipodes/code/fred2/missionsave.cpp Diff File
mod - /branches/antipodes/code/stats/scoring.cpp Diff File
mod - /branches/antipodes/code/pilotfile/csg_convert.cpp Diff File
mod - /branches/antipodes/code/model/modelanim.cpp Diff File
mod - /branches/antipodes/code/particle/particle.cpp Diff File
mod - /branches/antipodes/code/graphics/gropenglextension.cpp Diff File
mod - /branches/antipodes/code/ui/scroll.cpp Diff File
mod - /branches/antipodes/code/mission/missionmessage.h Diff File
mod - /branches/antipodes/projects/MSVC_2010/code.vcxproj Diff File
mod - /branches/antipodes/code/graphics/gropengl.cpp Diff File
mod - /branches/antipodes/code/parse/parselo.cpp Diff File
mod - /branches/antipodes/code/camera/camera.cpp Diff File
mod - /branches/antipodes/code/network/multiutil.cpp Diff File
mod - /branches/antipodes/code/object/object.h Diff File
mod - /branches/antipodes/code/object/objectsnd.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/FS2_Open.xcscheme Diff File
mod - /branches/antipodes/code/network/multi_kick.cpp Diff File
mod - /branches/antipodes/code/pilotfile/plr.cpp Diff File
mod - /branches/antipodes/code/sound/ds3d.cpp Diff File
mod - /branches/antipodes/code/weapon/weapon.h Diff File
mod - /branches/antipodes/code/menuui/playermenu.h Diff File
mod - /branches/antipodes/code/fred2/missionnotesdlg.h Diff File
mod - /branches/antipodes/code/missionui/missionweaponchoice.h Diff File
mod - /branches/antipodes/projects/MSVC_2008/code.vcproj Diff File
mod - /branches/antipodes/code/pilotfile/csg.cpp Diff File
mod - /branches/antipodes/code/missionui/missionshipchoice.h Diff File
mod - /branches/antipodes/code/hud/hud.h Diff File
mod - /branches/antipodes/code/mission/missionmessage.cpp Diff File
mod - /branches/antipodes/code/math/vecmat.cpp Diff File
mod - /branches/antipodes/code/controlconfig/controlsconfigcommon.cpp Diff File
mod - /branches/antipodes/code/fred2/freddoc.h Diff File
mod - /branches/antipodes/code/hud/hudnavigation.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/code.xcscheme Diff File
mod - /branches/antipodes/code/ui/slider2.cpp Diff File
mod - /branches/antipodes/code/fred2/fredrender.cpp Diff File
mod - /branches/antipodes/code/menuui/playermenu.cpp Diff File
mod - /branches/antipodes/code/fred2/missionnotesdlg.cpp Diff File
mod - /branches/antipodes/code/asteroid/asteroid.cpp Diff File
mod - /branches/antipodes/projects/MSVC_2011/code.vcxproj.filters Diff File
mod - /branches/antipodes/code/playerman/playercontrol.cpp Diff File
mod - /branches/antipodes/code/mission/missionhotkey.cpp Diff File
mod - /branches/antipodes/code/cmdline/cmdline.cpp Diff File
mod - /branches/antipodes/code/network/multiui.h Diff File
mod - /branches/antipodes/code/lab/wmcgui.cpp Diff File
mod - /branches/antipodes/code/hud/hudshield.cpp Diff File
mod - /branches/antipodes/code/inetfile/cftp.cpp Diff File
mod - /branches/antipodes/code/mission/missionparse.cpp Diff File
mod - /branches/antipodes/code/fireball/warpineffect.cpp Diff File
mod - /branches/antipodes/code/weapon/beam.cpp Diff File
mod - /branches/antipodes/code/menuui/snazzyui.cpp Diff File
mod - /branches/antipodes/code/missionui/missionshipchoice.cpp Diff File
mod - /branches/antipodes/code/menuui/credits.cpp Diff File
mod - /branches/antipodes/code/render/3dmath.cpp Diff File
mod - /branches/antipodes/code/mission/missioncampaign.cpp Diff File
mod - /branches/antipodes/code/stats/medals.cpp Diff File
mod - /branches/antipodes/code/fred2/fred.rc Diff File
mod - /branches/antipodes/code/physics/physics.cpp Diff File
mod - /branches/antipodes/code/globalincs/vmallocator.h Diff File
mod - /branches/antipodes/code/graphics/2d.cpp Diff File
mod - /branches/antipodes/configure.ac Diff File
mod - /branches/antipodes/code/cfile/cfilesystem.cpp Diff File
mod - /branches/antipodes/code/lighting/lighting.cpp Diff File
mod - /branches/antipodes/code/ship/shield.cpp Diff File
mod - /branches/antipodes/code/mod_table/mod_table.cpp Diff File
mod - /branches/antipodes/code/graphics/tmapper.h Diff File
mod - /branches/antipodes/code/network/multi_pinfo.cpp Diff File
mod - /branches/antipodes/code/sound/sound.cpp Diff File
mod - /branches/antipodes/code/menuui/mainhallmenu.h Diff File
mod - /branches/antipodes/code/globalincs/windebug.cpp Diff File
mod - /branches/antipodes/code/parse/scripting.h Diff File
mod - /branches/antipodes/code/model/modelinterp.cpp Diff File
mod - /branches/antipodes/code/fireball/fireballs.cpp Diff File
mod - /branches/antipodes/code/network/multi.cpp Diff File
mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/lua.xcscheme Diff File
mod - /branches/antipodes/code/mission/missiongoals.cpp Diff File
mod - /branches/antipodes/code/globalincs/pstypes.h Diff File