All Projects FSSCP  wxFRED

Changesets: fs2open

Search Browse Back to Index

trunk r1474

2005-02-04 23:15

taylor


Ported: N/A

Details Diff		 more post merge happiness
mod - /trunk/fs2_open/code/jpgutils/jpgutils.cpp Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/sound/audiostr.cpp Diff File

trunk r1473

2005-02-04 19:52

taylor


Ported: N/A

Details Diff		 add libjpeg and ogg stuff
mod - /trunk/fs2_open/Freespace2.dsp Diff File
mod - /trunk/fs2_open/code/code.dsp Diff File

trunk r1472

2005-02-04 19:30

taylor


Ported: N/A

Details Diff		 fix a few things post merge
mod - /trunk/fs2_open/code/cutscene/movie.cpp Diff File
mod - /trunk/fs2_open/code/graphics/2d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dbmpman.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengl.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengllight.cpp Diff File
mod - /trunk/fs2_open/code/sound/audiostr-unix.cpp Diff File

trunk r1471

2005-02-04 18:29

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0204-3
mod - /trunk/fs2_open/FS2_Open.prj Diff File
mod - /trunk/fs2_open/Freespace2.dsp Diff File
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp Diff File
mod - /trunk/fs2_open/code/code.dsp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dbmpman.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dinternal.h Diff File
mod - /trunk/fs2_open/code/graphics/gropengl.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengllight.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudparse.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudparse.h Diff File
mod - /trunk/fs2_open/code/menuui/barracks.cpp Diff File
mod - /trunk/fs2_open/code/model/model.h Diff File
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File

trunk r1470

2005-02-04 15:06

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0204-2
mod - /trunk/fs2_open/code/freespace2/levelpaging.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/Client.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/Client.h Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/TCP_Client.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/TCP_Socket.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/TCP_Socket.h Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/protocol.h Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/udpsocket.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/udpsocket.h Diff File
mod - /trunk/fs2_open/code/graphics/2d.h Diff File
mod - /trunk/fs2_open/code/graphics/gropenglbmpman.cpp Diff File
mod - /trunk/fs2_open/code/irc/irc.cpp Diff File
mod - /trunk/fs2_open/code/irc/irc.h Diff File
mod - /trunk/fs2_open/code/missionui/missiondebrief.cpp Diff File
mod - /trunk/fs2_open/code/nebula/neb.cpp Diff File
mod - /trunk/fs2_open/code/nebula/neblightning.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.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/multi_rate.h Diff File
mod - /trunk/fs2_open/code/network/multimsgs.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/network/multiutil.cpp Diff File
mod - /trunk/fs2_open/code/network/psnet2.cpp Diff File
mod - /trunk/fs2_open/code/network/stand_gui.cpp Diff File
mod - /trunk/fs2_open/code/object/object.cpp Diff File
mod - /trunk/fs2_open/code/osapi/osapi.cpp Diff File
mod - /trunk/fs2_open/code/osapi/outwnd.h Diff File
mod - /trunk/fs2_open/code/parse/parselo.cpp Diff File
mod - /trunk/fs2_open/code/parse/parselo.h Diff File
mod - /trunk/fs2_open/code/particle/particle.cpp Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/radar/radar.cpp Diff File
mod - /trunk/fs2_open/code/radar/radarorb.cpp Diff File
mod - /trunk/fs2_open/code/radar/radarsetup.cpp Diff File
mod - /trunk/fs2_open/code/render/3ddraw.cpp Diff File
mod - /trunk/fs2_open/code/ship/aicode.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File
mod - /trunk/fs2_open/code/sound/audiostr.cpp Diff File
mod - /trunk/fs2_open/code/starfield/starfield.cpp Diff File
mod - /trunk/fs2_open/code/stats/scoring.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r1469

2005-02-04 05:12

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0204
mod - /trunk/fs2_open/code/PreProcDefines.h Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/pstypes.h Diff File
mod - /trunk/fs2_open/code/globalincs/systemvars.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/windebug.cpp Diff File
mod - /trunk/fs2_open/code/graphics/2d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropenglbmpman.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengllight.h Diff File
mod - /trunk/fs2_open/code/hud/hudescort.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudsquadmsg.cpp Diff File
mod - /trunk/fs2_open/code/io/joy-unix.cpp Diff File
mod - /trunk/fs2_open/code/io/key.cpp Diff File
mod - /trunk/fs2_open/code/io/keycontrol.cpp Diff File
mod - /trunk/fs2_open/code/io/mouse.cpp Diff File
mod - /trunk/fs2_open/code/io/timer.cpp Diff File
mod - /trunk/fs2_open/code/jpgutils/jpgutils.cpp Diff File
mod - /trunk/fs2_open/code/jpgutils/jpgutils.h Diff File
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp Diff File
mod - /trunk/fs2_open/code/menuui/optionsmenumulti.cpp Diff File
mod - /trunk/fs2_open/code/menuui/playermenu.h Diff File
mod - /trunk/fs2_open/code/mission/missionlog.cpp Diff File
mod - /trunk/fs2_open/code/missionui/chatbox.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp Diff File
mod - /trunk/fs2_open/code/model/modelsinc.h Diff File
mod - /trunk/fs2_open/code/network/multi.h Diff File
mod - /trunk/fs2_open/code/network/multi_campaign.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_data.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_dogfight.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_kick.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_obj.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_observer.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_oo.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_options.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_pause.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_pmsg.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_respawn.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_team.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_voice.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_xfer.cpp Diff File
mod - /trunk/fs2_open/code/network/multimsgs.h Diff File
mod - /trunk/fs2_open/code/network/multiutil.h Diff File
mod - /trunk/fs2_open/code/object/object.h Diff File
rm - /trunk/fs2_open/code/openil File
mod - /trunk/fs2_open/code/osapi/osapi.h Diff File
mod - /trunk/fs2_open/code/osapi/osregistry_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/pcxutils/pcxutils.h Diff File
mod - /trunk/fs2_open/code/ship/shiphit.cpp Diff File
mod - /trunk/fs2_open/code/stats/scoring.h Diff File
mod - /trunk/fs2_open/code/stats/stats.cpp Diff File
mod - /trunk/fs2_open/code/tgautils/tgautils.cpp Diff File
mod - /trunk/fs2_open/code/tgautils/tgautils.h Diff File
mod - /trunk/fs2_open/code/vcodec/codec1.cpp Diff File
mod - /trunk/fs2_open/code/windows_stub/stubs.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File

trunk r1468

2005-02-02 20:26

phreak


Ported: N/A

Details Diff		 revert to default d-missile behavior if the electroinics parameters aren't specified.
added an option to customize the old-style disruption calculation as well.
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r1467

2005-02-02 10:09

taylor


Ported: N/A

Details Diff		 only model_load() if we using a ship other than the current one
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp Diff File

trunk r1466

2005-02-02 05:36

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0202
mod - /trunk/fs2_open/code/sound/ds.cpp Diff File
mod - /trunk/fs2_open/code/sound/ds.h Diff File
mod - /trunk/fs2_open/code/sound/fsspeech.h Diff File
mod - /trunk/fs2_open/code/sound/ogg/ogg.h Diff File
mod - /trunk/fs2_open/code/sound/rtvoice.cpp Diff File
mod - /trunk/fs2_open/code/sound/sound.cpp Diff File
mod - /trunk/fs2_open/code/sound/speech.cpp Diff File
mod - /trunk/fs2_open/code/sound/speech.h Diff File

trunk r1465

2005-02-01 01:54

taylor


Ported: N/A

Details Diff		 OGG fix for streams
mod - /trunk/fs2_open/code/sound/audiostr.cpp Diff File
mod - /trunk/fs2_open/code/sound/ogg/ogg.cpp Diff File

trunk r1464

2005-01-31 18:27

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0131-2
mod - /trunk/fs2_open/code/autopilot/autopilot.cpp Diff File
mod - /trunk/fs2_open/code/cfile/cfilelist.cpp Diff File
mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp Diff File
mod - /trunk/fs2_open/code/decals/decals.cpp Diff File
mod - /trunk/fs2_open/code/demo/demo.cpp Diff File
mod - /trunk/fs2_open/code/directx/dx8show.cpp Diff File
mod - /trunk/fs2_open/code/exceptionhandler/exceptionhandler.cpp Diff File
mod - /trunk/fs2_open/code/gamesnd/eventmusic.h Diff File
mod - /trunk/fs2_open/code/globalincs/globals.h Diff File
mod - /trunk/fs2_open/code/graphics/2d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/font.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grbatch.h Diff File
mod - /trunk/fs2_open/code/hud/hudconfig.cpp Diff File
mod - /trunk/fs2_open/code/jumpnode/jumpnode.cpp Diff File
mod - /trunk/fs2_open/code/localization/localize.cpp Diff File
mod - /trunk/fs2_open/code/menuui/credits.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/snazzyui.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionbriefcommon.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionbrief.h Diff File
mod - /trunk/fs2_open/code/missionui/missioncmdbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missioncmdbrief.h Diff File
mod - /trunk/fs2_open/code/missionui/missionscreencommon.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/network/multi_endgame.cpp Diff File
mod - /trunk/fs2_open/code/network/psnet.cpp Diff File
mod - /trunk/fs2_open/code/sound/ds.h Diff File
mod - /trunk/fs2_open/code/sound/fsspeech.cpp Diff File
mod - /trunk/fs2_open/code/ui/button.cpp Diff File
mod - /trunk/fs2_open/code/ui/inputbox.cpp Diff File
mod - /trunk/fs2_open/code/ui/slider.cpp Diff File
mod - /trunk/fs2_open/code/ui/slider2.cpp Diff File
mod - /trunk/fs2_open/code/ui/ui.h Diff File
mod - /trunk/fs2_open/code/ui/window.cpp Diff File
mod - /trunk/fs2_open/code/weapon/emp.cpp Diff File

trunk r1463

2005-01-31 05:34

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0131
mod - /trunk/fs2_open/code/graphics/grd3dsetup.h Diff File
mod - /trunk/fs2_open/code/graphics/grinternal.h Diff File
mod - /trunk/fs2_open/code/graphics/gropengltnl.h Diff File
mod - /trunk/fs2_open/code/graphics/grstub.h Diff File
mod - /trunk/fs2_open/code/hud/hudmessage.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudnavigation.h Diff File
mod - /trunk/fs2_open/code/hud/hudwingmanstatus.cpp Diff File
mod - /trunk/fs2_open/code/io/xmouse.cpp Diff File
mod - /trunk/fs2_open/code/network/multilag.h Diff File
mod - /trunk/fs2_open/code/network/psnet2.h Diff File
mod - /trunk/fs2_open/code/osapi/osapi_unix.cpp Diff File
mod - /trunk/fs2_open/code/osapi/osregistry.h Diff File
mod - /trunk/fs2_open/code/osapi/osregistry_unix.cpp Diff File
mod - /trunk/fs2_open/code/osapi/outwnd_unix.cpp Diff File
mod - /trunk/fs2_open/code/parse/encrypt.cpp Diff File
mod - /trunk/fs2_open/code/popup/popup.cpp Diff File
mod - /trunk/fs2_open/code/ship/aigoals.cpp Diff File
mod - /trunk/fs2_open/code/ship/shipcontrails.cpp Diff File
mod - /trunk/fs2_open/code/sound/acm.h Diff File
mod - /trunk/fs2_open/code/species_defs/species_defs.h Diff File
mod - /trunk/fs2_open/code/starfield/nebula.cpp Diff File
mod - /trunk/fs2_open/code/stats/medals.cpp Diff File

trunk r1462

2005-01-30 13:32

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0130
remove extra brace in cfile.cpp
mod - /trunk/fs2_open/code/cfile/cfile.cpp Diff File
mod - /trunk/fs2_open/code/windows_stub/config.h Diff File
mod - /trunk/fs2_open/code/windows_stub/stubs.cpp Diff File

trunk r1461

2005-01-30 09:09

taylor


Ported: N/A

Details Diff		 it's -nosound not -noaudio
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp Diff File

trunk r1460

2005-01-30 07:50

taylor


Ported: N/A

Details Diff		 merge with Linux/OSX tree - p0130
mod - /trunk/fs2_open/Makefile.am Diff File
mod - /trunk/fs2_open/code/Makefile.am Diff File
mod - /trunk/fs2_open/code/anim/animplay.cpp Diff File
mod - /trunk/fs2_open/code/cfile/cfile.cpp Diff File
mod - /trunk/fs2_open/code/cfile/cfile.h Diff File
mod - /trunk/fs2_open/code/cfile/cfilesystem.cpp Diff File
mod - /trunk/fs2_open/code/cfilearchiver/cfilearchiver.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/debugconsole/timerbar.cpp Diff File

trunk r1459

2005-01-30 05:49

Goober5000


Ported: N/A

Details Diff		 bah - rolled back the HTL fix that doesn't really work
--Goober5000
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File

trunk r1458

2005-01-30 04:36

Goober5000


Ported: N/A

Details Diff		 optional flags default to false I should think
--Goober5000
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r1457

2005-01-30 04:27

Goober5000


Ported: N/A

Details Diff		 nitpicked some boolean tests, and fixed two small bugs
--Goober5000
mod - /trunk/fs2_open/code/debris/debris.cpp Diff File
mod - /trunk/fs2_open/code/decals/decals.cpp Diff File
mod - /trunk/fs2_open/code/fireball/fireballs.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/windebug.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengltexture.cpp Diff File
mod - /trunk/fs2_open/code/model/modelcollide.cpp Diff File
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/object/object.cpp Diff File
mod - /trunk/fs2_open/code/object/objectdock.cpp Diff File
mod - /trunk/fs2_open/code/starfield/starfield.cpp Diff File

trunk r1456

2005-01-29 22:28

WMCoolmon


Ported: N/A

Details Diff		 Make sure hudnavigation uses the correct draw_brackets_Square
mod - /trunk/fs2_open/code/hud/hudnavigation.cpp Diff File

trunk r1455

2005-01-29 22:27

WMCoolmon


Ported: N/A

Details Diff		 This isn't needed anymore
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp Diff File

trunk r1454

2005-01-29 22:26

WMCoolmon


Ported: N/A

Details Diff		 HUD updates
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hud.h Diff File
mod - /trunk/fs2_open/code/hud/hudbrackets.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudbrackets.h Diff File
mod - /trunk/fs2_open/code/hud/hudshield.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtarget.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp Diff File

trunk r1453

2005-01-29 22:24

WMCoolmon


Ported: N/A

Details Diff		 Don't try and create a vertex buffer with no vertices (Seems to cause CTD) and fix to brackets in nonstandard res
mod - /trunk/fs2_open/code/graphics/grd3d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3drender.cpp Diff File

trunk r1452

2005-01-29 22:23

WMCoolmon


Ported: N/A

Details Diff		 Improved user-friendliness - give an Error instead of a CTD
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File

trunk r1451

2005-01-29 20:38

WMCoolmon


Ported: N/A

Details Diff		 If a required string doesn't exist, give an error instead of a warning...doi.
mod - /trunk/fs2_open/code/parse/parselo.cpp Diff File

trunk r1450

2005-01-29 20:34

WMCoolmon


Ported: N/A

Details Diff		 Made a bunch of ship.tbl variables optional
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 120 ... 160 ... 200 ... 240 ... 280 ... 320 ... 360 ... 378 379 380 381 382 383 384 ... 400 ... 437 438 439  Next  Last