Changesets: fs2open
karajorma r5926 2010-02-18 23:44 Ported: N/A Details Diff |
Sync with trunk | ||
mod - /branches/karajorma/code/Makefile.am | Diff File | ||
mod - /branches/karajorma/code/ai/ai.h | Diff File | ||
mod - /branches/karajorma/code/ai/ai_profiles.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/ai_profiles.h | Diff File | ||
mod - /branches/karajorma/code/ai/aibig.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/aicode.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/aigoals.cpp | Diff File | ||
mod - /branches/karajorma/code/ai/aigoals.h | Diff File | ||
mod - /branches/karajorma/code/ai/aiturret.cpp | Diff File | ||
mod - /branches/karajorma/code/asteroid/asteroid.h | Diff File | ||
mod - /branches/karajorma/code/bmpman/bm_internal.h | Diff File | ||
mod - /branches/karajorma/code/bmpman/bmpman.cpp | Diff File | ||
mod - /branches/karajorma/code/cfile/cfile.cpp | Diff File | ||
mod - /branches/karajorma/code/cfile/cfilesystem.cpp | Diff File | ||
mod - /branches/karajorma/code/cmdline/cmdline.cpp | Diff File | ||
mod - /branches/karajorma/code/cmdline/cmdline.h | Diff File | ||
mod - /branches/karajorma/code/cutscene/cutscenes.cpp | Diff File | ||
mod - /branches/karajorma/code/cutscene/oggplayer.cpp | Diff File | ||
mod - /branches/karajorma/code/debris/debris.cpp | Diff File | ||
mod - /branches/karajorma/code/fireball/fireballs.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/adjustgriddlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/bgbitmapdlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/bgbitmapdlg.h | Diff File | ||
mod - /branches/karajorma/code/fred2/createwingdlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fred.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fred.rc | Diff File | ||
mod - /branches/karajorma/code/fred2/freddoc.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fredrender.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fredview.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/fredview.h | Diff File | ||
mod - /branches/karajorma/code/fred2/mainfrm.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/management.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/management.h | Diff File | ||
mod - /branches/karajorma/code/fred2/missionsave.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/playerstarteditor.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/resource.h | Diff File | ||
mod - /branches/karajorma/code/fred2/sexp_tree.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/sexp_tree.h | Diff File | ||
mod - /branches/karajorma/code/fred2/shipeditordlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/shipflagsdlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/shipflagsdlg.h | Diff File | ||
mod - /branches/karajorma/code/fred2/shipspecialdamage.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/shipspecialhitpoints.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/waypointpathdlg.cpp | Diff File | ||
mod - /branches/karajorma/code/fred2/wing_editor.cpp | Diff File | ||
mod - /branches/karajorma/code/freespace2/freespace.cpp | Diff File | ||
mod - /branches/karajorma/code/freespace2/freespace.rc | Diff File | ||
mod - /branches/karajorma/code/globalincs/alphacolors.cpp | Diff File | ||
mod - /branches/karajorma/code/globalincs/alphacolors.h | Diff File | ||
mod - /branches/karajorma/code/globalincs/def_files.cpp | Diff File | ||
mod - /branches/karajorma/code/globalincs/globals.h | Diff File | ||
mod - /branches/karajorma/code/globalincs/mspdb_callstack.cpp | Diff File | ||
mod - /branches/karajorma/code/globalincs/mspdb_callstack.h | Diff File | ||
mod - /branches/karajorma/code/globalincs/systemvars.cpp | Diff File | ||
mod - /branches/karajorma/code/globalincs/version.cpp | Diff File | ||
mod - /branches/karajorma/code/globalincs/version.h | Diff File | ||
mod - /branches/karajorma/code/globalincs/vmallocator.h | Diff File | ||
mod - /branches/karajorma/code/globalincs/windebug.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/2d.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/2d.h | Diff File | ||
mod - /branches/karajorma/code/graphics/font.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/font.h | Diff File | ||
mod - /branches/karajorma/code/graphics/generic.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/generic.h | Diff File | ||
mod - /branches/karajorma/code/graphics/gropengl.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropenglbmpman.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropenglshader.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropenglshader.h | Diff File | ||
mod - /branches/karajorma/code/graphics/gropenglstate.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropenglstate.h | Diff File | ||
mod - /branches/karajorma/code/graphics/gropengltexture.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/gropengltexture.h | Diff File | ||
mod - /branches/karajorma/code/graphics/gropengltnl.cpp | Diff File | ||
mod - /branches/karajorma/code/graphics/grstub.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hud.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudconfig.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudescort.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudparse.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudparse.h | Diff File | ||
mod - /branches/karajorma/code/hud/hudshield.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudtarget.cpp | Diff File | ||
mod - /branches/karajorma/code/hud/hudtargetbox.cpp | Diff File | ||
mod - /branches/karajorma/code/io/keycontrol.cpp | Diff File | ||
mod - /branches/karajorma/code/lab/lab.cpp | Diff File | ||
mod - /branches/karajorma/code/lab/wmcgui.cpp | Diff File | ||
mod - /branches/karajorma/code/menuui/techmenu.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionbriefcommon.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missioncampaign.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionlog.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionmessage.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionparse.cpp | Diff File | ||
mod - /branches/karajorma/code/mission/missionparse.h | Diff File | ||
mod - /branches/karajorma/code/missionui/fictionviewer.cpp | Diff File | ||
mod - /branches/karajorma/code/missionui/fictionviewer.h | Diff File | ||
mod - /branches/karajorma/code/missionui/missionbrief.cpp | Diff File | ||
mod - /branches/karajorma/code/missionui/missioncmdbrief.cpp | Diff File | ||
mod - /branches/karajorma/code/missionui/missionshipchoice.cpp | Diff File | ||
mod - /branches/karajorma/code/missionui/missionweaponchoice.cpp | Diff File | ||
mod - /branches/karajorma/code/model/model.h | Diff File | ||
mod - /branches/karajorma/code/model/modelinterp.cpp | Diff File | ||
mod - /branches/karajorma/code/model/modelread.cpp | Diff File | ||
mod - /branches/karajorma/code/nebula/neb.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multi.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multi.h | Diff File | ||
mod - /branches/karajorma/code/network/multi_obj.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multi_pxo.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multimsgs.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multimsgs.h | Diff File | ||
mod - /branches/karajorma/code/network/multiteamselect.cpp | Diff File | ||
mod - /branches/karajorma/code/network/multiui.cpp | Diff File | ||
mod - /branches/karajorma/code/network/stand_gui.cpp | Diff File | ||
mod - /branches/karajorma/code/object/collideshipship.cpp | Diff File | ||
mod - /branches/karajorma/code/object/collideshipweapon.cpp | Diff File | ||
mod - /branches/karajorma/code/object/objcollide.cpp | Diff File | ||
mod - /branches/karajorma/code/object/objcollide.h | Diff File | ||
mod - /branches/karajorma/code/object/object.h | Diff File | ||
mod - /branches/karajorma/code/object/objectdock.cpp | Diff File | ||
mod - /branches/karajorma/code/object/parseobjectdock.cpp | Diff File | ||
mod - /branches/karajorma/code/osapi/osapi.cpp | Diff File | ||
mod - /branches/karajorma/code/osapi/outwnd.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/lua.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/parselo.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/parselo.h | Diff File | ||
mod - /branches/karajorma/code/parse/scripting.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/sexp.cpp | Diff File | ||
mod - /branches/karajorma/code/parse/sexp.h | Diff File | ||
mod - /branches/karajorma/code/particle/particle.cpp | Diff File | ||
mod - /branches/karajorma/code/particle/particle.h | Diff File | ||
mod - /branches/karajorma/code/physics/physics.cpp | Diff File | ||
mod - /branches/karajorma/code/physics/physics.h | Diff File | ||
mod - /branches/karajorma/code/playerman/player.h | Diff File | ||
mod - /branches/karajorma/code/playerman/playercontrol.cpp | Diff File | ||
mod - /branches/karajorma/code/radar/radar.cpp | Diff File | ||
mod - /branches/karajorma/code/radar/radarorb.cpp | Diff File | ||
mod - /branches/karajorma/code/render/3ddraw.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/afterburner.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/awacs.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/ship.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/ship.h | Diff File | ||
mod - /branches/karajorma/code/ship/shipfx.cpp | Diff File | ||
mod - /branches/karajorma/code/ship/shipfx.h | Diff File | ||
mod - /branches/karajorma/code/ship/shiphit.cpp | Diff File | ||
mod - /branches/karajorma/code/starfield/nebula.cpp | Diff File | ||
mod - /branches/karajorma/code/starfield/starfield.cpp | Diff File | ||
mod - /branches/karajorma/code/ui/ui.h | Diff File | ||
mod - /branches/karajorma/code/ui/window.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/beam.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/corkscrew.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/muzzleflash.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/shockwave.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/shockwave.h | Diff File | ||
mod - /branches/karajorma/code/weapon/swarm.cpp | Diff File | ||
mod - /branches/karajorma/code/weapon/weapon.h | Diff File | ||
mod - /branches/karajorma/code/weapon/weapons.cpp | Diff File | ||
mod - /branches/karajorma/configure.ac | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/Fred2.vcproj | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/Freespace2.sln | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/Freespace2.vcproj | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/code.vcproj | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/libjpeg.vcproj | Diff File | ||
mod - /branches/karajorma/projects/MSVC_2008/liblua.vcproj | Diff File | ||
trunk r5925 2010-02-17 22:55 Ported: N/A Details Diff |
SVN will ignore .git and .gitignore files now. | ||
mod - /trunk/fs2_open | Diff File | ||
fs2_open_3_6_12 r5924 2010-02-17 20:41 Ported: N/A Details Diff |
Update versioning and filenames for RC1 | ||
mod - /branches/fs2_open_3_6_12/code/fred2/fred.rc | Diff File | ||
mod - /branches/fs2_open_3_6_12/code/freespace2/freespace.rc | Diff File | ||
mod - /branches/fs2_open_3_6_12/code/globalincs/version.h | Diff File | ||
mod - /branches/fs2_open_3_6_12/configure.ac | Diff File | ||
mod - /branches/fs2_open_3_6_12/projects/MSVC_2008/Fred2.vcproj | Diff File | ||
mod - /branches/fs2_open_3_6_12/projects/MSVC_2008/Freespace2.vcproj | Diff File | ||
mod - /branches/fs2_open_3_6_12/projects/Xcode/English.lproj/InfoPlist.strings | Diff File | ||
mod - /branches/fs2_open_3_6_12/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
mod - /branches/fs2_open_3_6_12/projects/Xcode/Info.plist | Diff File | ||
trunk r5923 2010-02-17 05:27 Ported: N/A Details Diff |
reconvert MSVC_2005 project from MSVC_6 | ||
add - /trunk/fs2_open/projects/MSVC_2005 | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/Fred2.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/Freespace2.sln | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/Freespace2.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/code.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/libjpeg.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/liblua.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/libpng.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/wxFRED2.vcproj | File | ||
add - /trunk/fs2_open/projects/MSVC_2005/zlib.vcproj | File | ||
trunk r5922 2010-02-17 05:16 Ported: N/A Details Diff |
remove MSVC_6_Release which is now redundant, and MSVC_2003 and MSVC_2005 which are old and need fixing | ||
rm - /trunk/fs2_open/projects/MSVC_2003 | File | ||
rm - /trunk/fs2_open/projects/MSVC_2005 | File | ||
rm - /trunk/fs2_open/projects/MSVC_6_Release | File | ||
trunk r5921 2010-02-17 05:13 Ported: N/A Details Diff |
sync with MSVC6_Release | ||
mod - /trunk/fs2_open/projects/MSVC_6/Fred2.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/Freespace2.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/code.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/libjpeg.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/liblua.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/libpng.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/wxFRED2.dsp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/zlib.dsp | Diff File | ||
fs2_open_3_6_12 r5920 2010-02-17 04:08 Ported: N/A Details Diff |
branch for 3.6.12 | ||
add - /branches/fs2_open_3_6_12 | File | ||
trunk r5919 2010-02-16 00:22 Ported: N/A Details Diff |
Fix VS 2008 compiling of FRED. | ||
mod - /trunk/fs2_open/projects/MSVC_2008/Fred2.vcproj | Diff File | ||
trunk r5918 2010-02-15 17:04 Ported: N/A Details Diff |
Some *nix compilers (and potentially Mac in the near future) are dying on the build process regarding this comma. | ||
mod - /trunk/fs2_open/code/graphics/gropengltexture.h | Diff File | ||
trunk r5917 2010-02-15 14:53 Ported: N/A Details Diff |
fix coop kill limit check when set to none (Mantis 0002014) cleanup coop validation checks a little, particularly if future checks are added |
||
mod - /trunk/fs2_open/code/network/multiui.cpp | Diff File | ||
trunk r5916 2010-02-15 14:01 Ported: N/A Details Diff |
Merge branch 'misc' | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
trunk r5915 2010-02-15 06:01 Ported: N/A Details Diff |
clarify difference between knossos warpin and warpout in the code -- this should fix Mantis 0002128 "mabye" -> "maybe" |
||
mod - /trunk/fs2_open/code/fireball/fireballs.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/fred.rc | Diff File | ||
mod - /trunk/fs2_open/code/fred2/missionsave.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/resource.h | Diff File | ||
mod - /trunk/fs2_open/code/fred2/shipflagsdlg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/shipflagsdlg.h | Diff File | ||
mod - /trunk/fs2_open/code/freespace2/freespace.cpp | Diff File | ||
mod - /trunk/fs2_open/code/mission/missionparse.cpp | Diff File | ||
mod - /trunk/fs2_open/code/object/object.h | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.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/shipfx.cpp | Diff File | ||
trunk r5914 2010-02-15 05:22 Ported: N/A Details Diff |
add Fiction Viewer dialog FRED will now save fiction viewer information properly FRED will now also save "hidden" debriefing information properly |
||
add - /trunk/fs2_open/code/fred2/FictionViewerDlg.cpp | File | ||
add - /trunk/fs2_open/code/fred2/FictionViewerDlg.h | File | ||
mod - /trunk/fs2_open/code/fred2/fred.rc | Diff File | ||
mod - /trunk/fs2_open/code/fred2/fredview.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/fredview.h | Diff File | ||
mod - /trunk/fs2_open/code/fred2/missionsave.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/resource.h | Diff File | ||
mod - /trunk/fs2_open/code/missionui/fictionviewer.cpp | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/Fred2.dsp | Diff File | ||
trunk r5913 2010-02-15 05:08 Ported: N/A Details Diff |
sync png and zlib changes with MSVC6 | ||
mod - /trunk/fs2_open/projects/MSVC_6/Freespace2.dsw | Diff File | ||
mod - /trunk/fs2_open/projects/MSVC_6/code.dsp | Diff File | ||
add - /trunk/fs2_open/projects/MSVC_6/libpng.dsp | File | ||
add - /trunk/fs2_open/projects/MSVC_6/zlib.dsp | File | ||
trunk r5912 2010-02-13 19:46 Ported: N/A Details Diff |
Well, this is embarrassing. Forgot to apply "is_a_word_separator" in the briefing text coloring fix for Mantis 1992. As a result, it wasn't stopping coloring unless and until a whitespace was being hit, instead of stopping on valid word separators like it should have been. | ||
mod - /trunk/fs2_open/code/mission/missionbriefcommon.cpp | Diff File | ||
trunk r5911 2010-02-13 07:07 Ported: N/A Details Diff |
Mantis 2108 Fix (Mac Inferno build configurations do not correctly set INF_BUILD in Xcode) | ||
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
trunk r5910 2010-02-13 04:10 Ported: N/A Details Diff |
FUBAR's Mantis 2053 fix (Fix a few holes where invalid names could leak through.) | ||
mod - /trunk/fs2_open/code/fred2/createwingdlg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/shipeditordlg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/waypointpathdlg.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fred2/wing_editor.cpp | Diff File | ||
trunk r5909 2010-02-13 04:01 Ported: N/A Details Diff |
fix for potential (and real) null vec issue caused by sexped explosions | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5908 2010-02-12 12:42 Ported: N/A Details Diff |
Fixes for Mantis 0002071: Color inheritance and child gauge IDs, per KK. | ||
mod - /trunk/fs2_open/code/hud/hudparse.cpp | Diff File | ||
mod - /trunk/fs2_open/code/hud/hudparse.h | Diff File | ||
trunk r5907 2010-02-12 06:23 Ported: N/A Details Diff |
Better fix for Mantis 2106 (set-object-position crashing multiplayer) | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5906 2010-02-12 06:19 Ported: N/A Details Diff |
Bump the server version (should have done this when I broke the packet earlier this week). | ||
mod - /trunk/fs2_open/code/network/multi.h | Diff File | ||
trunk r5905 2010-02-12 02:42 Ported: N/A Details Diff |
Whoever designed a comparison function that reports false when the arguments are the same should be shot! | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5904 2010-02-12 02:14 Ported: N/A Details Diff |
Deprecate <any support ship class> in favour of something that does exactly what it says on the tin. | ||
mod - /trunk/fs2_open/code/fred2/sexp_tree.cpp | Diff File | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r5903 2010-02-12 01:42 Ported: N/A Details Diff |
Fix Mantis 2094 (Set-Support-ship results in support ships that can't rearm even though present in the mission). Thanks to FUBAR for the spading on this. | ||
mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
trunk r5902 2010-02-11 11:47 Ported: N/A Details Diff |
Patch for Mantis 0002001: Primary weapon loadouts with text names no longer show # or anything to the right. Works with $Alt Name: as well. | ||
mod - /trunk/fs2_open/code/missionui/missionweaponchoice.cpp | Diff File |