| Author |
Committer |
Branch |
Timestamp |
Parent |
|
| Swifty |
|
swifty |
2010-06-10 00:08 |
|
Pending |
|
|
Changeset |
Merge with trunk r6199 |
| mod - /branches/swifty/autogen.sh |
Diff
File |
| mod - /branches/swifty/code/Makefile.am |
Diff
File |
| mod - /branches/swifty/code/ai/ai.h |
Diff
File |
| mod - /branches/swifty/code/ai/ai_profiles.cpp |
Diff
File |
| mod - /branches/swifty/code/ai/ai_profiles.h |
Diff
File |
| mod - /branches/swifty/code/ai/aibig.cpp |
Diff
File |
| mod - /branches/swifty/code/ai/aicode.cpp |
Diff
File |
| mod - /branches/swifty/code/ai/aiturret.cpp |
Diff
File |
| mod - /branches/swifty/code/asteroid/asteroid.cpp |
Diff
File |
| mod - /branches/swifty/code/cfile/cfilesystem.cpp |
Diff
File |
| mod - /branches/swifty/code/cmdline/cmdline.cpp |
Diff
File |
| mod - /branches/swifty/code/cmdline/cmdline.h |
Diff
File |
| mod - /branches/swifty/code/cutscene/cutscenes.cpp |
Diff
File |
| mod - /branches/swifty/code/cutscene/cutscenes.h |
Diff
File |
| mod - /branches/swifty/code/cutscene/mve_audio.cpp |
Diff
File |
| mod - /branches/swifty/code/cutscene/mveplayer.cpp |
Diff
File |
| mod - /branches/swifty/code/cutscene/oggplayer.cpp |
Diff
File |
| rm - /branches/swifty/code/directx/vdsound.h |
File |
| mod - /branches/swifty/code/fireball/fireballs.h |
Diff
File |
| mod - /branches/swifty/code/fred2/fred.cpp |
Diff
File |
| mod - /branches/swifty/code/fred2/fred.rc |
Diff
File |
| mod - /branches/swifty/code/fred2/management.cpp |
Diff
File |
| mod - /branches/swifty/code/fred2/missionnotesdlg.cpp |
Diff
File |
| mod - /branches/swifty/code/fred2/missionnotesdlg.h |
Diff
File |
| mod - /branches/swifty/code/fred2/missionsave.cpp |
Diff
File |
| mod - /branches/swifty/code/fred2/resource.h |
Diff
File |
| mod - /branches/swifty/code/fred2/sexp_tree.cpp |
Diff
File |
| mod - /branches/swifty/code/fred2/sexp_tree.h |
Diff
File |
| mod - /branches/swifty/code/fred2/shipeditordlg.cpp |
Diff
File |
| add - /branches/swifty/code/fred2/soundenvironmentdlg.cpp |
File |
| add - /branches/swifty/code/fred2/soundenvironmentdlg.h |
File |
| mod - /branches/swifty/code/fred2/wing_editor.cpp |
Diff
File |
| mod - /branches/swifty/code/freespace2/freespace.cpp |
Diff
File |
| mod - /branches/swifty/code/gamesnd/gamesnd.cpp |
Diff
File |
| mod - /branches/swifty/code/globalincs/def_files.cpp |
Diff
File |
| mod - /branches/swifty/code/globalincs/globals.h |
Diff
File |
| mod - /branches/swifty/code/globalincs/pstypes.h |
Diff
File |
| mod - /branches/swifty/code/globalincs/windebug.cpp |
Diff
File |
| mod - /branches/swifty/code/graphics/gropenglshader.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hud.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudescort.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudlock.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudparse.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudreticle.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudsquadmsg.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudtargetbox.cpp |
Diff
File |
| mod - /branches/swifty/code/hud/hudtargetbox.h |
Diff
File |
| mod - /branches/swifty/code/io/joy_ff.cpp |
Diff
File |
| mod - /branches/swifty/code/io/keycontrol.cpp |
Diff
File |
| mod - /branches/swifty/code/lab/lab.cpp |
Diff
File |
| mod - /branches/swifty/code/menuui/optionsmenumulti.cpp |
Diff
File |
| mod - /branches/swifty/code/menuui/optionsmenumulti.h |
Diff
File |
| mod - /branches/swifty/code/menuui/techmenu.cpp |
Diff
File |
| mod - /branches/swifty/code/mission/missionbriefcommon.cpp |
Diff
File |
| mod - /branches/swifty/code/mission/missionlog.cpp |
Diff
File |
| mod - /branches/swifty/code/mission/missionmessage.cpp |
Diff
File |
| mod - /branches/swifty/code/mission/missionparse.cpp |
Diff
File |
| mod - /branches/swifty/code/mission/missionparse.h |
Diff
File |
| mod - /branches/swifty/code/mission/missiontraining.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/fictionviewer.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/missionbrief.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/missioncmdbrief.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/missiondebrief.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/missionshipchoice.cpp |
Diff
File |
| mod - /branches/swifty/code/missionui/missionweaponchoice.cpp |
Diff
File |
| mod - /branches/swifty/code/model/model.h |
Diff
File |
| mod - /branches/swifty/code/model/modelanim.cpp |
Diff
File |
| mod - /branches/swifty/code/model/modelread.cpp |
Diff
File |
| mod - /branches/swifty/code/nebula/neb.cpp |
Diff
File |
| mod - /branches/swifty/code/network/multi.h |
Diff
File |
| mod - /branches/swifty/code/network/multi_respawn.cpp |
Diff
File |
| mod - /branches/swifty/code/network/multi_voice.cpp |
Diff
File |
| mod - /branches/swifty/code/network/multimsgs.cpp |
Diff
File |
| mod - /branches/swifty/code/object/objcollide.cpp |
Diff
File |
| mod - /branches/swifty/code/object/object.cpp |
Diff
File |
| mod - /branches/swifty/code/object/objectshield.cpp |
Diff
File |
| mod - /branches/swifty/code/object/objectsnd.cpp |
Diff
File |
| mod - /branches/swifty/code/parse/lua.cpp |
Diff
File |
| mod - /branches/swifty/code/parse/scripting.cpp |
Diff
File |
| mod - /branches/swifty/code/parse/scripting.h |
Diff
File |
| mod - /branches/swifty/code/parse/sexp.cpp |
Diff
File |
| mod - /branches/swifty/code/parse/sexp.h |
Diff
File |
| mod - /branches/swifty/code/physics/physics.cpp |
Diff
File |
| mod - /branches/swifty/code/physics/physics.h |
Diff
File |
| mod - /branches/swifty/code/playerman/playercontrol.cpp |
Diff
File |
| mod - /branches/swifty/code/popup/popupdead.cpp |
Diff
File |
| mod - /branches/swifty/code/ship/afterburner.cpp |
Diff
File |
| mod - /branches/swifty/code/ship/ship.cpp |
Diff
File |
| mod - /branches/swifty/code/ship/ship.h |
Diff
File |
| mod - /branches/swifty/code/ship/shiphit.cpp |
Diff
File |
| rm - /branches/swifty/code/sound/acm-openal.cpp |
File |
| add - /branches/swifty/code/sound/acm.cpp |
File |
| mod - /branches/swifty/code/sound/acm.h |
Diff
File |
| rm - /branches/swifty/code/sound/audiostr-openal.cpp |
File |
| mod - /branches/swifty/code/sound/audiostr.cpp |
Diff
File |
| mod - /branches/swifty/code/sound/channel.h |
Diff
File |
| mod - /branches/swifty/code/sound/ds.cpp |
Diff
File |
| mod - /branches/swifty/code/sound/ds.h |
Diff
File |
| mod - /branches/swifty/code/sound/ds3d.cpp |
Diff
File |
| mod - /branches/swifty/code/sound/ds3d.h |
Diff
File |
| mod - /branches/swifty/code/sound/dscap.cpp |
Diff
File |
| add - /branches/swifty/code/sound/openal.cpp |
File |
| add - /branches/swifty/code/sound/openal.h |
File |
| rm - /branches/swifty/code/sound/rbaudio.cpp |
File |
| rm - /branches/swifty/code/sound/rbaudio.h |
File |
| mod - /branches/swifty/code/sound/rtvoice.cpp |
Diff
File |
| mod - /branches/swifty/code/sound/rtvoice.h |
Diff
File |
| mod - /branches/swifty/code/sound/sound.cpp |
Diff
File |
| mod - /branches/swifty/code/sound/sound.h |
Diff
File |
| mod - /branches/swifty/code/stats/scoring.cpp |
Diff
File |
| rm - /branches/swifty/code/vcodec/codec1.cpp |
File |
| rm - /branches/swifty/code/vcodec/codec1.h |
File |
| mod - /branches/swifty/code/weapon/beam.cpp |
Diff
File |
| mod - /branches/swifty/code/weapon/beam.h |
Diff
File |
| mod - /branches/swifty/code/weapon/muzzleflash.cpp |
Diff
File |
| mod - /branches/swifty/code/weapon/muzzleflash.h |
Diff
File |
| mod - /branches/swifty/code/weapon/swarm.cpp |
Diff
File |
| mod - /branches/swifty/code/weapon/swarm.h |
Diff
File |
| mod - /branches/swifty/code/weapon/weapon.h |
Diff
File |
| mod - /branches/swifty/code/weapon/weapons.cpp |
Diff
File |
| mod - /branches/swifty/code/windows_stub/config.h |
Diff
File |
| mod - /branches/swifty/code/windows_stub/stubs.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/aboutbox.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/campaigneditor.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/campaigneditor.h |
Diff
File |
| mod - /branches/swifty/code/wxfred2/commandbriefingeditor.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/debriefingeditor.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/fredframe.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/fredframe.h |
Diff
File |
| add - /branches/swifty/code/wxfred2/mission.h |
File |
| mod - /branches/swifty/code/wxfred2/missionspecseditor.cpp |
Diff
File |
| mod - /branches/swifty/code/wxfred2/missionspecseditor.h |
Diff
File |
| add - /branches/swifty/code/wxfred2/res/V_fred.ico |
File |
| add - /branches/swifty/code/wxfred2/res/V_fred.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/bitmap1.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/black_do.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/bmp00001.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/chained.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/chained_directive.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data00.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data05.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data10.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data15.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data20.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data25.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data30.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data35.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data40.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data45.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data50.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data55.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data60.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data65.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data70.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data75.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data80.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data85.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data90.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/data95.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/freddoc.ico |
File |
| add - /branches/swifty/code/wxfred2/res/green_do.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/root.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/root_directive.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/toolbar.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/toolbar1.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/variable.xpm |
File |
| add - /branches/swifty/code/wxfred2/res/wxFREDIcon.xpm |
File |
| mod - /branches/swifty/code/wxfred2/voiceactingmanagereditor.cpp |
Diff
File |
| rm - /branches/swifty/code/wxfred2/voicefilemanager.cpp |
File |
| rm - /branches/swifty/code/wxfred2/voicefilemanager.h |
File |
| add - /branches/swifty/code/wxfred2/wxFRED.fbp |
File |
| mod - /branches/swifty/code/wxfred2/wxfred.xrc |
Diff
File |
| mod - /branches/swifty/code/wxfred2/wxfred2.cpp |
Diff
File |
| mod - /branches/swifty/configure.ac |
Diff
File |
| mod - /branches/swifty/projects/MSVC_2005/code.vcproj |
Diff
File |
| mod - /branches/swifty/projects/MSVC_2008/Fred2.vcproj |
Diff
File |
| mod - /branches/swifty/projects/MSVC_2008/Freespace2.vcproj |
Diff
File |
| mod - /branches/swifty/projects/MSVC_2008/code.vcproj |
Diff
File |
| mod - /branches/swifty/projects/MSVC_2008/zlib.vcproj |
Diff
File |
| add - /branches/swifty/projects/MSVC_2010 |
File |
| mod - /branches/swifty/projects/MSVC_6 |
Diff
File |
| mod - /branches/swifty/projects/MSVC_6/Fred2.dsp |
Diff
File |
| mod - /branches/swifty/projects/MSVC_6/Freespace2.dsp |
Diff
File |
| mod - /branches/swifty/projects/MSVC_6/code.dsp |
Diff
File |
| mod - /branches/swifty/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj |
Diff
File |
