Author
Committer
Branch
Timestamp
Parent
Ported
Zacam
antipodes
2010-06-29 18:09
Pending
Changeset
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.
mod - /branches/antipodes/Makefile.am
Diff
File
mod - /branches/antipodes/acinclude.m4
Diff
File
mod - /branches/antipodes/autogen.sh
Diff
File
mod - /branches/antipodes/code/Makefile.am
Diff
File
mod - /branches/antipodes/code/ai/ai.h
Diff
File
mod - /branches/antipodes/code/ai/ai_profiles.cpp
Diff
File
mod - /branches/antipodes/code/ai/ai_profiles.h
Diff
File
mod - /branches/antipodes/code/ai/aibig.cpp
Diff
File
mod - /branches/antipodes/code/ai/aicode.cpp
Diff
File
mod - /branches/antipodes/code/ai/aigoals.cpp
Diff
File
mod - /branches/antipodes/code/ai/aiturret.cpp
Diff
File
mod - /branches/antipodes/code/asteroid/asteroid.cpp
Diff
File
mod - /branches/antipodes/code/autopilot/autopilot.cpp
Diff
File
mod - /branches/antipodes/code/camera/camera.cpp
Diff
File
mod - /branches/antipodes/code/camera/camera.h
Diff
File
mod - /branches/antipodes/code/cfile/cfilesystem.cpp
Diff
File
mod - /branches/antipodes/code/cmdline/cmdline.cpp
Diff
File
mod - /branches/antipodes/code/cmdline/cmdline.h
Diff
File
mod - /branches/antipodes/code/cutscene/cutscenes.cpp
Diff
File
mod - /branches/antipodes/code/cutscene/cutscenes.h
Diff
File
mod - /branches/antipodes/code/fireball/fireballs.h
Diff
File
mod - /branches/antipodes/code/fred2/AltShipClassDlg.cpp
Diff
File
mod - /branches/antipodes/code/fred2/fred.cpp
Diff
File
mod - /branches/antipodes/code/fred2/fred.h
Diff
File
mod - /branches/antipodes/code/fred2/fred.rc
Diff
File
mod - /branches/antipodes/code/fred2/management.cpp
Diff
File
mod - /branches/antipodes/code/fred2/missionnotesdlg.cpp
Diff
File
mod - /branches/antipodes/code/fred2/missionnotesdlg.h
Diff
File
mod - /branches/antipodes/code/fred2/missionsave.cpp
Diff
File
mod - /branches/antipodes/code/fred2/resource.h
Diff
File
mod - /branches/antipodes/code/fred2/sexp_tree.cpp
Diff
File
mod - /branches/antipodes/code/fred2/sexp_tree.h
Diff
File
mod - /branches/antipodes/code/fred2/shipeditordlg.cpp
Diff
File
mod - /branches/antipodes/code/fred2/shipspecialdamage.cpp
Diff
File
mod - /branches/antipodes/code/fred2/shipspecialdamage.h
Diff
File
mod - /branches/antipodes/code/fred2/shipspecialhitpoints.cpp
Diff
File
mod - /branches/antipodes/code/fred2/shipspecialhitpoints.h
Diff
File
add - /branches/antipodes/code/fred2/soundenvironmentdlg.cpp
File
add - /branches/antipodes/code/fred2/soundenvironmentdlg.h
File
mod - /branches/antipodes/code/fred2/wing_editor.cpp
Diff
File
mod - /branches/antipodes/code/freespace2/freespace.cpp
Diff
File
mod - /branches/antipodes/code/gamesnd/eventmusic.cpp
Diff
File
mod - /branches/antipodes/code/gamesnd/gamesnd.cpp
Diff
File
mod - /branches/antipodes/code/globalincs/alphacolors.cpp
Diff
File
mod - /branches/antipodes/code/globalincs/def_files.cpp
Diff
File
mod - /branches/antipodes/code/globalincs/globals.h
Diff
File
mod - /branches/antipodes/code/globalincs/pstypes.h
Diff
File
mod - /branches/antipodes/code/globalincs/windebug.cpp
Diff
File
mod - /branches/antipodes/code/graphics/generic.cpp
Diff
File
mod - /branches/antipodes/code/graphics/generic.h
Diff
File
mod - /branches/antipodes/code/graphics/gropengl.cpp
Diff
File
mod - /branches/antipodes/code/graphics/gropenglpostprocessing.cpp
Diff
File
mod - /branches/antipodes/code/graphics/gropenglshader.cpp
Diff
File
mod - /branches/antipodes/code/graphics/gropenglshader.h
Diff
File
mod - /branches/antipodes/code/graphics/gropengltexture.cpp
Diff
File
mod - /branches/antipodes/code/graphics/gropengltexture.h
Diff
File
mod - /branches/antipodes/code/graphics/gropengltnl.cpp
Diff
File
mod - /branches/antipodes/code/hud/hud.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudescort.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudlock.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudparse.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudparse.h
Diff
File
mod - /branches/antipodes/code/hud/hudreticle.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudsquadmsg.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudtarget.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudtargetbox.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudtargetbox.h
Diff
File
mod - /branches/antipodes/code/io/joy_ff.cpp
Diff
File
mod - /branches/antipodes/code/io/keycontrol.cpp
Diff
File
mod - /branches/antipodes/code/lab/lab.cpp
Diff
File
add - /branches/antipodes/code/math/bitarray.h
File
mod - /branches/antipodes/code/math/vecmat.cpp
Diff
File
mod - /branches/antipodes/code/menuui/optionsmenumulti.cpp
Diff
File
mod - /branches/antipodes/code/menuui/optionsmenumulti.h
Diff
File
mod - /branches/antipodes/code/menuui/techmenu.cpp
Diff
File
mod - /branches/antipodes/code/menuui/techmenu.h
Diff
File
mod - /branches/antipodes/code/mission/missionbriefcommon.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionlog.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionmessage.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionparse.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionparse.h
Diff
File
mod - /branches/antipodes/code/mission/missiontraining.cpp
Diff
File
mod - /branches/antipodes/code/mission/missiontraining.h
Diff
File
mod - /branches/antipodes/code/missionui/fictionviewer.cpp
Diff
File
mod - /branches/antipodes/code/missionui/missionbrief.cpp
Diff
File
mod - /branches/antipodes/code/missionui/missioncmdbrief.cpp
Diff
File
mod - /branches/antipodes/code/missionui/missiondebrief.cpp
Diff
File
mod - /branches/antipodes/code/missionui/missionshipchoice.cpp
Diff
File
mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp
Diff
File
mod - /branches/antipodes/code/model/model.h
Diff
File
mod - /branches/antipodes/code/model/modelanim.cpp
Diff
File
mod - /branches/antipodes/code/model/modelread.cpp
Diff
File
mod - /branches/antipodes/code/nebula/neb.cpp
Diff
File
mod - /branches/antipodes/code/network/multi.h
Diff
File
mod - /branches/antipodes/code/network/multi_respawn.cpp
Diff
File
mod - /branches/antipodes/code/network/multi_sexp.cpp
Diff
File
mod - /branches/antipodes/code/network/multi_voice.cpp
Diff
File
mod - /branches/antipodes/code/network/multimsgs.cpp
Diff
File
mod - /branches/antipodes/code/object/objcollide.cpp
Diff
File
mod - /branches/antipodes/code/object/object.cpp
Diff
File
mod - /branches/antipodes/code/object/objectdock.cpp
Diff
File
mod - /branches/antipodes/code/object/objectshield.cpp
Diff
File
mod - /branches/antipodes/code/object/parseobjectdock.cpp
Diff
File
mod - /branches/antipodes/code/osapi/outwnd_unix.cpp
Diff
File
mod - /branches/antipodes/code/parse/lua.cpp
Diff
File
mod - /branches/antipodes/code/parse/scripting.cpp
Diff
File
mod - /branches/antipodes/code/parse/scripting.h
Diff
File
mod - /branches/antipodes/code/parse/sexp.cpp
Diff
File
mod - /branches/antipodes/code/parse/sexp.h
Diff
File
mod - /branches/antipodes/code/particle/particle.cpp
Diff
File
mod - /branches/antipodes/code/physics/physics.cpp
Diff
File
mod - /branches/antipodes/code/physics/physics.h
Diff
File
mod - /branches/antipodes/code/playerman/playercontrol.cpp
Diff
File
mod - /branches/antipodes/code/pngutils/pngutils.cpp
Diff
File
mod - /branches/antipodes/code/popup/popupdead.cpp
Diff
File
mod - /branches/antipodes/code/radar/radarorb.cpp
Diff
File
mod - /branches/antipodes/code/ship/afterburner.cpp
Diff
File
mod - /branches/antipodes/code/ship/ship.cpp
Diff
File
mod - /branches/antipodes/code/ship/ship.h
Diff
File
mod - /branches/antipodes/code/ship/shipfx.cpp
Diff
File
mod - /branches/antipodes/code/ship/shiphit.cpp
Diff
File
mod - /branches/antipodes/code/sound/acm.h
Diff
File
mod - /branches/antipodes/code/sound/audiostr.cpp
Diff
File
mod - /branches/antipodes/code/sound/ds.cpp
Diff
File
mod - /branches/antipodes/code/sound/ds.h
Diff
File
mod - /branches/antipodes/code/sound/ds3d.cpp
Diff
File
mod - /branches/antipodes/code/sound/rtvoice.cpp
Diff
File
mod - /branches/antipodes/code/sound/rtvoice.h
Diff
File
mod - /branches/antipodes/code/sound/sound.cpp
Diff
File
mod - /branches/antipodes/code/sound/sound.h
Diff
File
mod - /branches/antipodes/code/stats/scoring.cpp
Diff
File
rm - /branches/antipodes/code/vcodec/codec1.cpp
File
rm - /branches/antipodes/code/vcodec/codec1.h
File
mod - /branches/antipodes/code/weapon/beam.cpp
Diff
File
mod - /branches/antipodes/code/weapon/beam.h
Diff
File
mod - /branches/antipodes/code/weapon/muzzleflash.cpp
Diff
File
mod - /branches/antipodes/code/weapon/muzzleflash.h
Diff
File
mod - /branches/antipodes/code/weapon/swarm.cpp
Diff
File
mod - /branches/antipodes/code/weapon/swarm.h
Diff
File
mod - /branches/antipodes/code/weapon/weapon.h
Diff
File
mod - /branches/antipodes/code/weapon/weapons.cpp
Diff
File
mod - /branches/antipodes/code/windows_stub/config.h
Diff
File
mod - /branches/antipodes/code/windows_stub/stubs.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/aboutbox.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/campaigneditor.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/campaigneditor.h
Diff
File
mod - /branches/antipodes/code/wxfred2/commandbriefingeditor.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/debriefingeditor.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/fredframe.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/fredframe.h
Diff
File
add - /branches/antipodes/code/wxfred2/mission.h
File
mod - /branches/antipodes/code/wxfred2/missionspecseditor.cpp
Diff
File
mod - /branches/antipodes/code/wxfred2/missionspecseditor.h
Diff
File
add - /branches/antipodes/code/wxfred2/res/V_fred.ico
File
add - /branches/antipodes/code/wxfred2/res/V_fred.xpm
File
add - /branches/antipodes/code/wxfred2/res/bitmap1.xpm
File
add - /branches/antipodes/code/wxfred2/res/black_do.xpm
File
add - /branches/antipodes/code/wxfred2/res/bmp00001.xpm
File
add - /branches/antipodes/code/wxfred2/res/chained.xpm
File
add - /branches/antipodes/code/wxfred2/res/chained_directive.xpm
File
add - /branches/antipodes/code/wxfred2/res/data.xpm
File
add - /branches/antipodes/code/wxfred2/res/data00.xpm
File
add - /branches/antipodes/code/wxfred2/res/data05.xpm
File
add - /branches/antipodes/code/wxfred2/res/data10.xpm
File
add - /branches/antipodes/code/wxfred2/res/data15.xpm
File
add - /branches/antipodes/code/wxfred2/res/data20.xpm
File
add - /branches/antipodes/code/wxfred2/res/data25.xpm
File
add - /branches/antipodes/code/wxfred2/res/data30.xpm
File
add - /branches/antipodes/code/wxfred2/res/data35.xpm
File
add - /branches/antipodes/code/wxfred2/res/data40.xpm
File
add - /branches/antipodes/code/wxfred2/res/data45.xpm
File
add - /branches/antipodes/code/wxfred2/res/data50.xpm
File
add - /branches/antipodes/code/wxfred2/res/data55.xpm
File
add - /branches/antipodes/code/wxfred2/res/data60.xpm
File
add - /branches/antipodes/code/wxfred2/res/data65.xpm
File
add - /branches/antipodes/code/wxfred2/res/data70.xpm
File
add - /branches/antipodes/code/wxfred2/res/data75.xpm
File
add - /branches/antipodes/code/wxfred2/res/data80.xpm
File
add - /branches/antipodes/code/wxfred2/res/data85.xpm
File
add - /branches/antipodes/code/wxfred2/res/data90.xpm
File
add - /branches/antipodes/code/wxfred2/res/data95.xpm
File
add - /branches/antipodes/code/wxfred2/res/freddoc.ico
File
add - /branches/antipodes/code/wxfred2/res/green_do.xpm
File
add - /branches/antipodes/code/wxfred2/res/root.xpm
File
add - /branches/antipodes/code/wxfred2/res/root_directive.xpm
File
add - /branches/antipodes/code/wxfred2/res/toolbar.xpm
File
add - /branches/antipodes/code/wxfred2/res/toolbar1.xpm
File
add - /branches/antipodes/code/wxfred2/res/variable.xpm
File
add - /branches/antipodes/code/wxfred2/res/wxFREDIcon.xpm
File
mod - /branches/antipodes/code/wxfred2/voiceactingmanagereditor.cpp
Diff
File
rm - /branches/antipodes/code/wxfred2/voicefilemanager.cpp
File
rm - /branches/antipodes/code/wxfred2/voicefilemanager.h
File
add - /branches/antipodes/code/wxfred2/wxFRED.fbp
File
mod - /branches/antipodes/code/wxfred2/wxfred.xrc
Diff
File
mod - /branches/antipodes/code/wxfred2/wxfred2.cpp
Diff
File
mod - /branches/antipodes/configure.ac
Diff
File
rm - /branches/antipodes/libjpeg/Makefile.am
File
rm - /branches/antipodes/lua/Makefile.am
File
mod - /branches/antipodes/oggvorbis/lib/ogg_static.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/ogg_static_d.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/theora_static.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/theora_static_d.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/vorbis_static.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/vorbis_static_d.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/vorbisfile_static.lib
Diff
File
mod - /branches/antipodes/oggvorbis/lib/vorbisfile_static_d.lib
Diff
File
mod - /branches/antipodes/projects/MSVC_2005/Fred2.vcproj
Diff
File
mod - /branches/antipodes/projects/MSVC_2005/Freespace2.vcproj
Diff
File
mod - /branches/antipodes/projects/MSVC_2005/code.vcproj
Diff
File
mod - /branches/antipodes/projects/MSVC_2008/Fred2.vcproj
Diff
File
mod - /branches/antipodes/projects/MSVC_2008/code.vcproj
Diff
File
mod - /branches/antipodes/projects/MSVC_2008/zlib.vcproj
Diff
File
add - /branches/antipodes/projects/MSVC_2010
File
mod - /branches/antipodes/projects/MSVC_6
Diff
File
mod - /branches/antipodes/projects/MSVC_6/Fred2.dsp
Diff
File
mod - /branches/antipodes/projects/MSVC_6/Freespace2.dsp
Diff
File
mod - /branches/antipodes/projects/MSVC_6/code.dsp
Diff
File
mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj
Diff
File