All Projects FSSCP  wxFRED

Changesets: fs2open

Search Browse Back to Index

trunk r1549

2005-03-03 02:13

WMCoolmon


Ported: N/A

Details Diff		 Made HUD shield icon auto-generation off unless "generate icon" ship flag is specified for the ship.
mod - /trunk/fs2_open/code/hud/hudshield.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.h Diff File

trunk r1548

2005-03-03 01:41

Goober5000


Ported: N/A

Details Diff		 removed the "error" in the new docking code
--Goober5000
mod - /trunk/fs2_open/code/ship/aicode.cpp Diff File

trunk r1547

2005-03-03 01:05

WMCoolmon


Ported: N/A

Details Diff		 Merge of WMC's codebase. "Features and bugs, making Goober say "Grr!", as release would be stalled now for two months for sure"
mod - /trunk/fs2_open/code/autopilot/autopilot.cpp Diff File
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp Diff File
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp Diff File
mod - /trunk/fs2_open/code/controlconfig/controlsconfig.h Diff File
mod - /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.h Diff File
mod - /trunk/fs2_open/code/gamesequence/gamesequence.cpp Diff File
mod - /trunk/fs2_open/code/gamesequence/gamesequence.h Diff File
mod - /trunk/fs2_open/code/globalincs/linklist.h Diff File
mod - /trunk/fs2_open/code/globalincs/systemvars.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/systemvars.h Diff File
mod - /trunk/fs2_open/code/graphics/2d.h Diff File
mod - /trunk/fs2_open/code/graphics/tmapper.h Diff File
mod - /trunk/fs2_open/code/hud/hudbrackets.cpp 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
mod - /trunk/fs2_open/code/io/keycontrol.cpp Diff File
mod - /trunk/fs2_open/code/io/keycontrol.h Diff File
mod - /trunk/fs2_open/code/io/mouse.cpp Diff File
mod - /trunk/fs2_open/code/jpgutils/jpgutils.cpp Diff File
mod - /trunk/fs2_open/code/jumpnode/jumpnode.cpp Diff File
mod - /trunk/fs2_open/code/jumpnode/jumpnode.h Diff File
add - /trunk/fs2_open/code/lab File
add - /trunk/fs2_open/code/lab/lab.cpp File
add - /trunk/fs2_open/code/lab/lab.h File
add - /trunk/fs2_open/code/lab/wmcgui.cpp File
add - /trunk/fs2_open/code/lab/wmcgui.h File
mod - /trunk/fs2_open/code/math/vecmat.cpp Diff File
mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp Diff File
mod - /trunk/fs2_open/code/menuui/techmenu.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionshipchoice.cpp Diff File
mod - /trunk/fs2_open/code/model/model.h Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/nebula/neb.cpp Diff File
mod - /trunk/fs2_open/code/object/object.cpp Diff File
mod - /trunk/fs2_open/code/object/object.h Diff File
mod - /trunk/fs2_open/code/object/objectdock.cpp Diff File
mod - /trunk/fs2_open/code/object/objectdock.h 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/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.h Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/render/3d.h Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/sound/sound.cpp Diff File

trunk r1546

2005-03-03 00:32

taylor


Ported: N/A

Details Diff		 well that was good and wrong
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File

trunk r1545

2005-03-02 22:55

WMCoolmon


Ported: N/A

Details Diff		 Turret AI code optimizations. If freaky stuff happens, call WMC()
mod - /trunk/fs2_open/code/ship/aicode.cpp Diff File

trunk r1544

2005-03-02 22:53

WMCoolmon


Ported: N/A

Details Diff		 This should really be like this to prevent crashing
mod - /trunk/fs2_open/code/ship/shipcontrails.cpp Diff File

trunk r1543

2005-03-02 21:39

Bobboau


Ported: N/A

Details Diff		 added trilist suport to the poly rendering functions
and a gr_bitmap_list function that uses it
mod - /trunk/fs2_open/code/graphics/2d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3drender.cpp Diff File
mod - /trunk/fs2_open/code/graphics/tmapper.h Diff File
mod - /trunk/fs2_open/code/render/3d.h Diff File
mod - /trunk/fs2_open/code/render/3ddraw.cpp Diff File

trunk r1542

2005-03-02 19:33

taylor


Ported: N/A

Details Diff		 use the back buffer for screen saves, this didn't work on Windows at one
point but I'm out of things to try and it may be ok after other fixes
mod - /trunk/fs2_open/code/graphics/gropengl.cpp Diff File

trunk r1541

2005-03-02 16:24

taylor


Ported: N/A

Details Diff		 more NO_NETWORK/INF_BUILD goodness for Windows, takes care of a few warnings too
mod - /trunk/fs2_open/code/asteroid/asteroid.cpp Diff File
mod - /trunk/fs2_open/code/controlconfig/controlsconfig.cpp Diff File
mod - /trunk/fs2_open/code/debris/debris.cpp Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.cpp Diff File
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudartillery.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudconfig.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudescort.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudlock.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudmessage.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudreticle.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudshield.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudsquadmsg.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtarget.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudtargetbox.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudwingmanstatus.cpp Diff File
mod - /trunk/fs2_open/code/io/keycontrol.cpp Diff File
mod - /trunk/fs2_open/code/menuui/barracks.cpp Diff File
mod - /trunk/fs2_open/code/menuui/mainhallmenu.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/mission/missiongoals.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionlog.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionmessage.cpp Diff File
mod - /trunk/fs2_open/code/mission/missionparse.cpp Diff File
mod - /trunk/fs2_open/code/mission/missiontraining.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionbrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missiondebrief.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionpause.cpp 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/nebula/neblightning.cpp Diff File
mod - /trunk/fs2_open/code/object/collideshipweapon.cpp Diff File
mod - /trunk/fs2_open/code/object/object.cpp Diff File
mod - /trunk/fs2_open/code/parse/sexp.cpp Diff File
mod - /trunk/fs2_open/code/playerman/managepilot.cpp Diff File
mod - /trunk/fs2_open/code/playerman/playercontrol.cpp Diff File
mod - /trunk/fs2_open/code/popup/popupdead.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/ship/afterburner.cpp Diff File
mod - /trunk/fs2_open/code/ship/aicode.cpp Diff File
mod - /trunk/fs2_open/code/ship/aigoals.cpp Diff File
mod - /trunk/fs2_open/code/ship/awacs.cpp Diff File
mod - /trunk/fs2_open/code/ship/shield.cpp Diff File
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File
mod - /trunk/fs2_open/code/ship/shipfx.cpp Diff File
mod - /trunk/fs2_open/code/ship/shiphit.cpp Diff File
mod - /trunk/fs2_open/code/stats/scoring.cpp Diff File
mod - /trunk/fs2_open/code/stats/stats.cpp Diff File
mod - /trunk/fs2_open/code/weapon/beam.cpp Diff File
mod - /trunk/fs2_open/code/weapon/emp.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r1540

2005-03-02 16:18

taylor


Ported: N/A

Details Diff		 better support for Inferno builds (in PreProcDefines.h now, no networking support)
make sure NO_NETWORK builds are as friendly on Windows as it is on Linux/OSX
revert a timeout in Client.h back to the original value before Linux merge
mod - /trunk/fs2_open/code/Makefile.am Diff File
mod - /trunk/fs2_open/code/PreProcDefines.h 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/udpsocket.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/pstypes.h Diff File
mod - /trunk/fs2_open/code/hud/hudobserver.cpp Diff File
mod - /trunk/fs2_open/code/irc/irc.cpp Diff File
mod - /trunk/fs2_open/code/menuui/optionsmenumulti.cpp Diff File
mod - /trunk/fs2_open/code/missionui/chatbox.cpp Diff File
mod - /trunk/fs2_open/code/network/fs2ox.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.cpp 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_endgame.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_ingame.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_kick.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_log.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_pinfo.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_ping.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_pmsg.cpp Diff File
mod - /trunk/fs2_open/code/network/multi_rate.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_update.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/multilag.cpp 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/psnet.cpp Diff File
mod - /trunk/fs2_open/code/network/psnet2.cpp Diff File
mod - /trunk/fs2_open/code/network/stand_gui-unix.cpp Diff File
mod - /trunk/fs2_open/code/network/stand_gui.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File

trunk r1539

2005-03-01 22:13

taylor


Ported: N/A

Details Diff		 that one should never have slipped passed me (Linux specific)
mod - /trunk/fs2_open/code/cfile/cfile.cpp Diff File

trunk r1538

2005-03-01 18:08

taylor


Ported: N/A

Details Diff		 make sure starfield bitmaps render when not in HTL mode
slight header fix for osapi.h
add some string overflow protection to modelread and bmpman
s/NO_NETWORKING/NO_NETWORK/g (Inferno builds)
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp Diff File
mod - /trunk/fs2_open/code/globalincs/pstypes.h Diff File
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File
mod - /trunk/fs2_open/code/osapi/osapi.h Diff File
mod - /trunk/fs2_open/code/starfield/starfield.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File

trunk r1537

2005-03-01 18:05

taylor


Ported: N/A

Details Diff		 unbreak Linux build (not valid C/C++ anyway, block scope)
mod - /trunk/fs2_open/code/ship/ship.cpp Diff File

trunk r1536

2005-03-01 01:55

Bobboau


Ported: N/A

Details Diff		 oh, hey look I've commited something :D
animation system, weapon models detail box alt-tab bug, probly other stuff
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/2d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3d.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dbatch.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dbmpman.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dcalls.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dinternal.h Diff File
mod - /trunk/fs2_open/code/graphics/grd3dlight.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3drender.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grd3dsetup.cpp Diff File
mod - /trunk/fs2_open/code/lighting/lighting.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/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/object/object.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/parse/parselo.h 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/ship/shipcontrails.cpp Diff File
mod - /trunk/fs2_open/code/starfield/starfield.cpp Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r1535

2005-02-27 20:24

taylor


Ported: N/A

Details Diff		 uugh, missed the initial tree move (WMC: probable locking problem)
mod - /trunk/fs2_open/code/sound/audiostr.cpp Diff File

trunk r1534

2005-02-27 19:29

WMCoolmon


Ported: N/A

Details Diff		 Removed unneccessary variable
mod - /trunk/fs2_open/code/ship/aicode.cpp Diff File

trunk r1533

2005-02-27 18:42

WMCoolmon


Ported: N/A

Details Diff		 Added a white component to lightning so it isn't just a big blue block
mod - /trunk/fs2_open/code/model/modelinterp.cpp Diff File

trunk r1532

2005-02-27 18:27

WMCoolmon


Ported: N/A

Details Diff		 Some HUD work
mod - /trunk/fs2_open/code/hud/hudparse.cpp Diff File

trunk r1531

2005-02-27 09:09

Goober5000


Ported: N/A

Details Diff		 First stage of "apply to all ships in this wing" weapon loadout button code.
Button hooks only, pending interface art. The "apply-to-all" code itself
still has to be written.
--Goober5000
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.h Diff File

trunk r1530

2005-02-27 05:38

WMCoolmon


Ported: N/A

Details Diff		 Nonstandard res stuff
mod - /trunk/fs2_open/code/graphics/grd3dbatch.cpp Diff 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/gropengl.cpp Diff File
mod - /trunk/fs2_open/code/graphics/grstub.h Diff File

trunk r1529

2005-02-27 02:08

WMCoolmon


Ported: N/A

Details Diff		 More nonstandard res stuff
mod - /trunk/fs2_open/code/graphics/2d.h Diff File

trunk r1528

2005-02-27 02:07

WMCoolmon


Ported: N/A

Details Diff		 nonstandard res HUD stuff
mod - /trunk/fs2_open/code/hud/hud.cpp Diff File
mod - /trunk/fs2_open/code/hud/hud.h Diff File

trunk r1527

2005-02-23 08:17

taylor


Ported: N/A

Details Diff		 few more compiler warning fixes (didn't mean to commit iostream.h change)
lower warning level to 3 to stop MSVC6 from complaining about C++ headers
mod - /trunk/fs2_open/code/fs2open_pxo/Client.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/TCP_Client.cpp Diff File
mod - /trunk/fs2_open/code/hud/hudconfig.cpp Diff File
mod - /trunk/fs2_open/code/sound/audiostr.cpp Diff File
mod - /trunk/fs2_open/code/ui/slider.cpp Diff File
mod - /trunk/fs2_open/projects/MSVC_6/code.dsp Diff File

trunk r1526

2005-02-23 00:11

taylor


Ported: N/A

Details Diff		 more consolidation of various graphics variables
some header cleaning
only one tmapper_internal for OGL, don't use more than two tex/pass now
seperate out 2d matrix mode to allow -2d_poof in OGL and maybe fix missing
interface when set 3d matrix stuff doesn't have corresponding end
add dump_frame stuff for OGL, mostly useless but allows trailer recording
mod - /trunk/fs2_open/code/graphics/grd3dbatch.h Diff 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/grinternal.h Diff File
mod - /trunk/fs2_open/code/graphics/gropengl.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengl.h Diff File
mod - /trunk/fs2_open/code/graphics/gropengltnl.cpp Diff File
mod - /trunk/fs2_open/code/graphics/gropengltnl.h Diff File

trunk r1525

2005-02-23 00:05

taylor


Ported: N/A

Details Diff		 compiler warning fixes (for MSVC++ 6)
have the warp effect only load as many LODs as will get used
head off strange bug in release when corrupt soundtrack number gets used
(will still Assert in debug)
don't ever try and save a campaign savefile in multi or standalone modes
first try at 32bit->16bit color conversion for TGA code (for TGA only ship textures)
mod - /trunk/fs2_open/code/fireball/fireballs.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/Client.cpp Diff File
mod - /trunk/fs2_open/code/fs2open_pxo/TCP_Client.cpp Diff File
mod - /trunk/fs2_open/code/gamesnd/eventmusic.cpp Diff File
mod - /trunk/fs2_open/code/mission/missioncampaign.cpp Diff File
mod - /trunk/fs2_open/code/missionui/missioncmdbrief.cpp Diff File
mod - /trunk/fs2_open/code/model/model.h Diff File
mod - /trunk/fs2_open/code/parse/parselo.cpp Diff File
mod - /trunk/fs2_open/code/tgautils/tgautils.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 80 ... 120 ... 160 ... 200 ... 240 ... 280 ... 320 ... 360 ... 375 376 377 378 379 380 381 ... 400 ... 437 438 439  Next  Last