Author
Committer
Branch
Timestamp
Parent
Ported
unknownplayer
trunk
2003-03-18 05:07
Pending
Changeset
The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can.
mod - /trunk/fs2_open/Freespace2.dsp
Diff
File
mod - /trunk/fs2_open/code/anim/animplay.cpp
Diff
File
mod - /trunk/fs2_open/code/anim/packunpack.cpp
Diff
File
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp
Diff
File
mod - /trunk/fs2_open/code/bmpman/bmpman.h
Diff
File
mod - /trunk/fs2_open/code/cfile/cfile.cpp
Diff
File
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp
Diff
File
mod - /trunk/fs2_open/code/cmdline/cmdline.h
Diff
File
mod - /trunk/fs2_open/code/cmeasure/cmeasure.cpp
Diff
File
mod - /trunk/fs2_open/code/code.dsp
Diff
File
mod - /trunk/fs2_open/code/controlconfig/controlsconfig.cpp
Diff
File
mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp
Diff
File
mod - /trunk/fs2_open/code/cutscene/movie.cpp
Diff
File
mod - /trunk/fs2_open/code/debugconsole/console.cpp
Diff
File
mod - /trunk/fs2_open/code/debugconsole/dbugfile.cpp
Diff
File
mod - /trunk/fs2_open/code/debugconsole/dbugfile.h
Diff
File
mod - /trunk/fs2_open/code/directx/ddraw.lib
Diff
File
mod - /trunk/fs2_open/code/directx/dxguid.lib
Diff
File
mod - /trunk/fs2_open/code/directx/strmiids.lib
Diff
File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp
Diff
File
mod - /trunk/fs2_open/code/freespace2/freespace.rc
Diff
File
mod - /trunk/fs2_open/code/freespace2/freespaceresource.h
Diff
File
mod - /trunk/fs2_open/code/gamehelp/gameplayhelp.cpp
Diff
File
mod - /trunk/fs2_open/code/globalincs/pstypes.h
Diff
File
mod - /trunk/fs2_open/code/graphics/2d.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/2d.h
Diff
File
mod - /trunk/fs2_open/code/graphics/bitblt.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/directx8/GrD3D81.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/directx8/GrD3D81.h
Diff
File
add - /trunk/fs2_open/code/graphics/directx8/GrD3d81Stubs.cpp
File
mod - /trunk/fs2_open/code/graphics/directx8/grd3d81internal.h
Diff
File
mod - /trunk/fs2_open/code/graphics/grd3d.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grd3d.h
Diff
File
add - /trunk/fs2_open/code/graphics/grd3dbmpman.cpp
File
add - /trunk/fs2_open/code/graphics/grd3dbmpman.h
File
add - /trunk/fs2_open/code/graphics/grd3dcalls.cpp
File
mod - /trunk/fs2_open/code/graphics/grd3dinternal.h
Diff
File
mod - /trunk/fs2_open/code/graphics/grd3drender.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grd3dtexture.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grdirectdraw.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grglide.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grglidetexture.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/gropengl.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/grsoft.cpp
Diff
File
mod - /trunk/fs2_open/code/graphics/tmapper.h
Diff
File
mod - /trunk/fs2_open/code/hud/hud.cpp
Diff
File
mod - /trunk/fs2_open/code/hud/hudconfig.cpp
Diff
File
mod - /trunk/fs2_open/code/hud/hudmessage.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/barracks.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/credits.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/mainhalltemp.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/optionsmenu.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/playermenu.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/readyroom.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/techmenu.cpp
Diff
File
mod - /trunk/fs2_open/code/menuui/trainingmenu.cpp
Diff
File
mod - /trunk/fs2_open/code/mission/missioncampaign.cpp
Diff
File
mod - /trunk/fs2_open/code/mission/missiongoals.cpp
Diff
File
mod - /trunk/fs2_open/code/mission/missionhotkey.cpp
Diff
File
mod - /trunk/fs2_open/code/mission/missionload.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missionbrief.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missioncmdbrief.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missiondebrief.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missionloopbrief.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missionpause.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp
Diff
File
mod - /trunk/fs2_open/code/missionui/redalert.cpp
Diff
File
mod - /trunk/fs2_open/code/model/modelinterp.cpp
Diff
File
mod - /trunk/fs2_open/code/nebula/neb.cpp
Diff
File
mod - /trunk/fs2_open/code/network/multi_dogfight.cpp
Diff
File
mod - /trunk/fs2_open/code/network/multi_ingame.cpp
Diff
File
mod - /trunk/fs2_open/code/network/multi_pinfo.cpp
Diff
File
mod - /trunk/fs2_open/code/network/multiteamselect.cpp
Diff
File
mod - /trunk/fs2_open/code/network/multiui.cpp
Diff
File
mod - /trunk/fs2_open/code/osapi/osapi.cpp
Diff
File
mod - /trunk/fs2_open/code/osapi/osapi.h
Diff
File
mod - /trunk/fs2_open/code/osapi/outwnd.cpp
Diff
File
mod - /trunk/fs2_open/code/osapi/outwnd_unix.cpp
Diff
File
mod - /trunk/fs2_open/code/palman/palman.cpp
Diff
File
mod - /trunk/fs2_open/code/pcxutils/pcxutils.cpp
Diff
File
mod - /trunk/fs2_open/code/popup/popup.cpp
Diff
File
mod - /trunk/fs2_open/code/render/3ddraw.cpp
Diff
File
mod - /trunk/fs2_open/code/ship/ship.cpp
Diff
File
mod - /trunk/fs2_open/code/stats/medals.cpp
Diff
File
mod - /trunk/fs2_open/code/tgautils/tgautils.cpp
Diff
File
mod - /trunk/fs2_open/code/ui/gadget.cpp
Diff
File
mod - /trunk/fs2_open/code/weapon/muzzleflash.cpp
Diff
File
mod - /trunk/fs2_open/code/weapon/weapons.cpp
Diff
File