Author
Committer
Branch
Timestamp
Parent
Ported
Zacam
antipodes
2010-09-22 22:14
Pending
Changeset
This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.
mod - /branches/antipodes/code/Makefile.am
Diff
File
mod - /branches/antipodes/code/asteroid/asteroid.cpp
Diff
File
mod - /branches/antipodes/code/bmpman/bm_internal.h
Diff
File
mod - /branches/antipodes/code/bmpman/bmpman.cpp
Diff
File
mod - /branches/antipodes/code/cfile/cfile.cpp
Diff
File
mod - /branches/antipodes/code/cmdline/cmdline.cpp
Diff
File
add - /branches/antipodes/code/directx/vdsound.lib
File
mod - /branches/antipodes/code/fireball/fireballs.cpp
Diff
File
mod - /branches/antipodes/code/fred2/res/fred.ico
Diff
File
mod - /branches/antipodes/code/fred2/resource.h
Diff
File
mod - /branches/antipodes/code/fred2/shipeditordlg.cpp
Diff
File
mod - /branches/antipodes/code/fred2/shiptexturesdlg.cpp
Diff
File
mod - /branches/antipodes/code/fred2/wing_editor.cpp
Diff
File
mod - /branches/antipodes/code/freespace2/app_icon.ico
Diff
File
mod - /branches/antipodes/code/freespace2/app_icon.png
Diff
File
mod - /branches/antipodes/code/globalincs/def_files.cpp
Diff
File
mod - /branches/antipodes/code/graphics/2d.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/hudparse.cpp
Diff
File
mod - /branches/antipodes/code/hud/hudparse.h
Diff
File
mod - /branches/antipodes/code/hud/hudshield.cpp
Diff
File
mod - /branches/antipodes/code/menuui/optionsmenu.cpp
Diff
File
mod - /branches/antipodes/code/menuui/optionsmenumulti.cpp
Diff
File
mod - /branches/antipodes/code/menuui/techmenu.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionbriefcommon.cpp
Diff
File
mod - /branches/antipodes/code/mission/missionparse.cpp
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.h
Diff
File
mod - /branches/antipodes/code/missionui/missionshipchoice.h
Diff
File
mod - /branches/antipodes/code/network/multiui.cpp
Diff
File
mod - /branches/antipodes/code/parse/sexp.cpp
Diff
File
mod - /branches/antipodes/code/particle/particle.cpp
Diff
File
mod - /branches/antipodes/code/ship/shield.cpp
Diff
File
mod - /branches/antipodes/code/ship/ship.cpp
Diff
File
mod - /branches/antipodes/code/sound/acm.cpp
Diff
File
mod - /branches/antipodes/code/sound/audiostr.cpp
Diff
File
mod - /branches/antipodes/code/sound/openal.cpp
Diff
File
mod - /branches/antipodes/code/sound/openal.h
Diff
File
mod - /branches/antipodes/code/sound/rtvoice.cpp
Diff
File
mod - /branches/antipodes/code/starfield/starfield.cpp
Diff
File
mod - /branches/antipodes/code/weapon/beam.cpp
Diff
File
mod - /branches/antipodes/code/weapon/flak.cpp
Diff
File
mod - /branches/antipodes/code/weapon/muzzleflash.cpp
Diff
File
mod - /branches/antipodes/code/weapon/shockwave.cpp
Diff
File