All Projects FSSCP  wxFRED

Changesets: fs2open

Search Browse Back to Index

trunk r9559

2013-03-05 00:05

Goober5000


Ported: N/A

Details Diff		 minor enhancements
mod - /trunk/fsoinstaller/src/com/fsoinstaller/wizard/ConfigPage.java Diff File

trunk r9558

2013-03-05 00:05

Goober5000


Ported: N/A

Details Diff		 miscellaneous tweaks for testing
mod - /trunk/fsoinstaller/src/com/fsoinstaller/main/FreeSpaceOpenInstaller.java Diff File
mod - /trunk/fsoinstaller/src/com/fsoinstaller/wizard/InstallItem.java Diff File
mod - /trunk/fsoinstaller/src/com/fsoinstaller/wizard/InstallPage.java Diff File

trunk r9557

2013-03-04 23:42

Goober5000


Ported: N/A

Details Diff		 change the launching behavior to allow for future expansion
add an executor service
mod - /trunk/fsoinstaller/src/com/fsoinstaller/main/FreeSpaceOpenInstaller.java Diff File

trunk r9556

2013-03-04 23:39

Goober5000


Ported: N/A

Details Diff		 make downloading responsive to thread interruption
mod - /trunk/fsoinstaller/src/com/fsoinstaller/internet/Downloader.java Diff File

trunk r9554

2013-03-04 15:12

chief1983


Ported: N/A

Details Diff		 Clean up a few more Inferno references.
mod - /trunk/fs2_open/projects/MSVC_2005/Freespace2.sln Diff File
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/FS2_Open.xcscheme Diff File

trunk r9553

2013-03-03 04:14

Zacam


Ported: N/A

Details Diff		 aaaaaaaaand finally, lets make sure that we can actually see the "Inferno" directory for all those pilot files. *sighs* That had better be everything.
mod - /trunk/fs2_open/code/cfile/cfilesystem.cpp Diff File

trunk r9552

2013-03-03 03:33

Zacam


Ported: N/A

Details Diff		 Update to r9550: Make sure that we keep the right directory default for the reading of current player Pilot files until the Pilot code goes in.
mod - /trunk/fs2_open/code/playerman/managepilot.cpp Diff File

trunk r9551

2013-03-03 00:19

Zacam


Ported: N/A

Details Diff		 And lets not forget Global Section headers.
mod - /trunk/fs2_open/projects/MSVC_2008/Freespace2.sln Diff File

trunk r9550

2013-03-03 00:17

Zacam


Ported: N/A

Details Diff		 Whoops. When removing #ifdefs, check the #else block.
mod - /trunk/fs2_open/code/playerman/managepilot.cpp Diff File

trunk r9549

2013-03-02 21:39

Zacam


Ported: N/A

Details Diff		 pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings.
Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable)
Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)
mod - /trunk/fs2_open/code/Makefile.am Diff File
mod - /trunk/fs2_open/code/cfile/cfilesystem.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/globals.h Diff File
mod - /trunk/fs2_open/code/globalincs/version.h Diff File
mod - /trunk/fs2_open/code/hud/hudconfig.cpp Diff File
mod - /trunk/fs2_open/code/io/keycontrol.cpp Diff File
mod - /trunk/fs2_open/code/network/multi.h Diff File
mod - /trunk/fs2_open/code/network/multimsgs.cpp Diff File
mod - /trunk/fs2_open/code/network/stand_gui.cpp Diff File
mod - /trunk/fs2_open/code/playerman/managepilot.cpp Diff File
mod - /trunk/fs2_open/code/ui/window.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File
add - /trunk/fs2_open/projects/Eclipse File
add - /trunk/fs2_open/projects/Eclipse/Freespace2 File
add - /trunk/fs2_open/projects/Eclipse/Freespace2/.cproject File
add - /trunk/fs2_open/projects/Eclipse/Freespace2/.project File
add - /trunk/fs2_open/projects/Eclipse/Freespace2/.settings File
add - /trunk/fs2_open/projects/Eclipse/Freespace2/.settings/org.eclipse.cdt.codan.core.prefs File
add - /trunk/fs2_open/projects/Eclipse/Freespace2/.settings/org.eclipse.cdt.managedbuilder.core.prefs File
mod - /trunk/fs2_open/projects/MSVC_2005/Fred2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/Freespace2.sln Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/Freespace2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/libjpeg.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/liblua.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/libpng.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/wxFRED2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/zlib.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/Fred2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/Freespace2.sln Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/Freespace2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/code.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/libjpeg.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/liblua.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/libpng.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/zlib.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/Fred2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/Freespace2.sln Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/Freespace2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/libjpeg.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/liblua.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/libpng.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/wxFRED2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/zlib.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011 Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/Fred2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/Freespace2.sln Diff File
rm - /trunk/fs2_open/projects/MSVC_2011/Freespace2.v11.suo File
mod - /trunk/fs2_open/projects/MSVC_2011/Freespace2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/code.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/libjpeg.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/liblua.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/libpng.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/wxFRED2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/zlib.vcxproj Diff File
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
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/codeblocks/Freespace2/Freespace2.cbp Diff File

antipodes r9548

2013-03-01 18:06

Zacam


Ported: N/A

Details Diff		 Trunk Sync: r9544
mod - /branches/antipodes/code/ai/aicode.cpp Diff File
mod - /branches/antipodes/code/cmdline/cmdline.cpp Diff File
mod - /branches/antipodes/code/cmdline/cmdline.h Diff File
mod - /branches/antipodes/code/globalincs/windebug.cpp Diff File
mod - /branches/antipodes/code/hud/hudwingmanstatus.cpp Diff File
mod - /branches/antipodes/code/mission/missioncampaign.cpp Diff File
mod - /branches/antipodes/code/missionui/missionscreencommon.cpp Diff File
mod - /branches/antipodes/code/model/modelread.cpp Diff File
mod - /branches/antipodes/code/parse/lua.cpp Diff File
mod - /branches/antipodes/code/parse/sexp.cpp Diff File
mod - /branches/antipodes/code/ship/ship.cpp Diff File
mod - /branches/antipodes/code/ship/shiphit.cpp Diff File
mod - /branches/antipodes/code/weapon/emp.cpp Diff File
mod - /branches/antipodes/code/weapon/emp.h Diff File
mod - /branches/antipodes/code/weapon/weapon.h Diff File
mod - /branches/antipodes/code/weapon/weapons.cpp Diff File
mod - /branches/antipodes/code/windows_stub/stubs.cpp Diff File
mod - /branches/antipodes/configure.ac Diff File

trunk r9547

2013-03-01 16:44

chief1983


Ported: N/A

Details Diff		 Update trunk version to 3.6.19 to make sure nightlies are now properly indicated as newer than 3.6.18.
mod - /trunk/fs2_open/code/fred2/fred.rc Diff File
mod - /trunk/fs2_open/code/freespace2/freespace.rc Diff File
mod - /trunk/fs2_open/code/globalincs/version.h Diff File
mod - /trunk/fs2_open/code/wxfred2/wxFRED.fbp Diff File
mod - /trunk/fs2_open/code/wxfred2/wxfred.xrc Diff File
mod - /trunk/fs2_open/configure.ac Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/Fred2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2005/Freespace2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/Fred2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2008/Freespace2.vcproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/Fred2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2010/Freespace2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/Fred2.vcxproj Diff File
mod - /trunk/fs2_open/projects/MSVC_2011/Freespace2.vcxproj Diff File
mod - /trunk/fs2_open/projects/Xcode/English.lproj/InfoPlist.strings Diff File
mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /trunk/fs2_open/projects/Xcode4/English.lproj/InfoPlist.strings Diff File
mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj Diff File

fs2_open_3_6_18 r9546

2013-02-28 15:18

chief1983


Ported: N/A

Details Diff		 Update all the things. Bump version to 3.6.18 FINAL r9456, fix MSVC_2008 output filenames to have NO-INF instead of INF and _DEBUG instead of d/r, turn on speech and voice rec in FS2 and FRED2. This includes the binary InfoPlist.strings files in the Xcode projects this time.
mod - /branches/fs2_open_3_6_18/code/fred2/fred.rc Diff File
mod - /branches/fs2_open_3_6_18/code/freespace2/freespace.rc Diff File
mod - /branches/fs2_open_3_6_18/code/globalincs/version.h Diff File
mod - /branches/fs2_open_3_6_18/code/wxfred2/wxFRED.fbp Diff File
mod - /branches/fs2_open_3_6_18/code/wxfred2/wxfred.xrc Diff File
mod - /branches/fs2_open_3_6_18/configure.ac Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2005/Fred2.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2005/Freespace2.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2005/wxFRED2.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2008/Fred2.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2008/Freespace2.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2008/code.vcproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2010/Fred2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2010/Freespace2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2010/wxFRED2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2011/Fred2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2011/Freespace2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_2011/wxFRED2.vcxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_6/Fred2.dsp Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_6/Freespace2.dsp Diff File
mod - /branches/fs2_open_3_6_18/projects/MSVC_6/wxFRED2.dsp Diff File
mod - /branches/fs2_open_3_6_18/projects/Xcode/English.lproj/InfoPlist.strings Diff File
mod - /branches/fs2_open_3_6_18/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj Diff File
mod - /branches/fs2_open_3_6_18/projects/Xcode4/English.lproj/InfoPlist.strings Diff File
mod - /branches/fs2_open_3_6_18/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj Diff File

fs2_open_3_6_18 r9545

2013-02-28 13:00

chief1983


Ported: N/A

Details Diff		 Trunk sync r9544.
mod - /branches/fs2_open_3_6_18/code/missionui/missionscreencommon.cpp Diff File

trunk r9544

2013-02-27 00:38

karajorma


Ported: N/A

Details Diff		 Fix Mantis 2797 (Ship Loadout shouldn't remember the previous settings if the mission has changed) Affected Issues
0002797
mod - /trunk/fs2_open/code/missionui/missionscreencommon.cpp Diff File

fs2_open_3_6_18 r9543

2013-02-26 15:46

chief1983


Ported: N/A

Details Diff		 Trunk sync r9542.
mod - /branches/fs2_open_3_6_18/code/ai/aicode.cpp Diff File

trunk r9542

2013-02-22 01:13

Goober5000


Ported: N/A

Details Diff		 proper movement of ships attached to other ships
fixes Mantis 0002787		 Affected Issues
0002787
mod - /trunk/fs2_open/code/ai/aicode.cpp Diff File

fs2_open_3_6_18 r9541

2013-02-20 18:10

chief1983


Ported: N/A

Details Diff		 Copy trunk r9540 to 3.6.18 branch.
add - /branches/fs2_open_3_6_18 File

trunk r9540

2013-02-20 00:35

Goober5000


Ported: N/A

Details Diff		 fix Mantis 0002796 (capships always have an EMP time of 7.5 seconds) by adding a weapon flag to allow the full value of emp_time to be used Affected Issues
0002796
mod - /trunk/fs2_open/code/weapon/emp.cpp Diff File
mod - /trunk/fs2_open/code/weapon/emp.h Diff File
mod - /trunk/fs2_open/code/weapon/weapon.h Diff File
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File

trunk r9539

2013-02-19 23:46

Zacam


Ported: N/A

Details Diff		 Follow up to r9536: re-instate -no_warn, but put it behind a compiler level #ifdef flag to enable the ability to use it. And if you don't know how to do that, you have no business using it.
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/globalincs/windebug.cpp Diff File
mod - /trunk/fs2_open/code/windows_stub/stubs.cpp Diff File
mod - /trunk/fs2_open/configure.ac Diff File

trunk r9538

2013-02-19 10:22

m_m


Ported: N/A

Details Diff		 Fixed scripting issue with wrong type conversions.
mod - /trunk/fs2_open/code/parse/lua.cpp Diff File

trunk r9537

2013-02-17 23:04

Goober5000


Ported: N/A

Details Diff		 follow-up to revision 9127: that commit breaks FSPort (causing part of the nameplated Orions to be translucent), so let's just check that "nameplate" is the entire texture name
mod - /trunk/fs2_open/code/model/modelread.cpp Diff File

trunk r9536

2013-02-17 09:33

The_E


Ported: N/A

Details Diff		 Removing the -nowarn commandline argument. The encouragement of bad habits is a serious bug.
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/globalincs/windebug.cpp Diff File
mod - /trunk/fs2_open/code/windows_stub/stubs.cpp Diff File

trunk r9535

2013-02-16 15:56

The_E


Ported: N/A

Details Diff		 From AMS: Fix for Mantis 2293: Destroyed/departed AI showing up as present in wingmen display. Affected Issues
0002293
mod - /trunk/fs2_open/code/hud/hudwingmanstatus.cpp Diff File

trunk r9534

2013-02-16 04:23

niffiwan


Ported: N/A

Details Diff		 Fix for mantis 2786: from Yarn - make +Main Hall: always override +Flags:
i.e. so retail-compatible campaigns can use the second main hall in retail and a different main hall in FSO		 Affected Issues
0002786
mod - /trunk/fs2_open/code/mission/missioncampaign.cpp Diff File
 First  Prev  1 2 3 ... 40 ... 69 70 71 72 73 74 75 ... 80 ... 120 ... 160 ... 200 ... 240 ... 280 ... 320 ... 360 ... 400 ... 437 438 439  Next  Last