Changesets: fs2open
|
trunk r5951 2010-02-25 23:58 Ported: N/A Details Diff |
fix handling of thread interruption remove unnecessary method in WorkerThread |
||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/internet/Connector.java | Diff File | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/utils/WorkerThread.java | Diff File | ||
|
trunk r5950 2010-02-25 23:58 Ported: N/A Details Diff |
tweaks and header comments | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/common/BaseURL.java | Diff File | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/common/InstallerNode.java | Diff File | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/common/InstallerNodeFactory.java | Diff File | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/common/InstallerNodeToken.java | Diff File | ||
| mod - /trunk/fsoinstaller/src/com/fsoinstaller/internet/Downloader.java | Diff File | ||
|
trunk r5949 2010-02-25 23:08 Ported: N/A Details Diff |
replace At4J with 7-Zip-JBinding | ||
| add - /trunk/fsoinstaller/docs/lgpl-2.1.txt | File | ||
| rm - /trunk/fsoinstaller/docs/lgpl-3.0.txt | File | ||
| mod - /trunk/fsoinstaller/docs/readme.txt | Diff File | ||
| rm - /trunk/fsoinstaller/lib/apache_cc_bzip2-1.0.jar | File | ||
| rm - /trunk/fsoinstaller/lib/at4j-full-1.1.jar | File | ||
| rm - /trunk/fsoinstaller/lib/entityfs-core-1.1.4.jar | File | ||
| rm - /trunk/fsoinstaller/lib/entityfs-util-1.1.4.jar | File | ||
| rm - /trunk/fsoinstaller/lib/lzma-4.65-patches.jar | File | ||
| add - /trunk/fsoinstaller/lib/sevenzipjbinding-AllPlatforms.jar | File | ||
| add - /trunk/fsoinstaller/lib/sevenzipjbinding.jar | File | ||
|
fs2_open_3_6_12 r5948 2010-02-25 11:19 Ported: N/A Details Diff |
Backport r5945 - FRED dialog fix - to 3.6.12 | ||
| mod - /branches/fs2_open_3_6_12/code/fred2/AltShipClassDlg.cpp | Diff File | ||
|
fs2_open_3_6_12 r5947 2010-02-25 11:09 Ported: N/A Details Diff |
Backport r5931 - Mantis 2133 Monitoring text - to 3.6.12 | ||
| mod - /branches/fs2_open_3_6_12/code/hud/hudparse.cpp | Diff File | ||
|
fs2_open_3_6_12 r5946 2010-02-25 11:06 Ported: N/A Details Diff |
Backport r5935 - afterburner assert - to 3.6.12 | ||
| mod - /branches/fs2_open_3_6_12/code/ship/ship.cpp | Diff File | ||
|
trunk r5945 2010-02-24 04:13 Ported: N/A Details Diff |
FRED should base the list on the selected object and not simply the first marked one. | ||
| mod - /trunk/fs2_open/code/fred2/AltShipClassDlg.cpp | Diff File | ||
|
antipodes r5944 2010-02-24 00:53 Ported: N/A Details Diff |
Applied Goober5000's Trunk Commit r5943 to the MSVC 2005 Project Files and the cleaned them up. | ||
| mod - /branches/antipodes/projects/MSVC_2005/Fred2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/Freespace2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/code.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/libjpeg.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/liblua.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/libpng.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/wxFRED2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/zlib.vcproj | Diff File | ||
|
trunk r5943 2010-02-24 00:11 Ported: N/A Details Diff |
fix bugs in VC2005 project files, probably caused by VC6 import | ||
| 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_2005/code.vcproj | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2005/wxFRED2.vcproj | Diff File | ||
|
karajorma r5942 2010-02-23 22:27 Ported: N/A Details Diff |
Sync with trunk | ||
| mod - /branches/karajorma/code/fred2/fred.rc | Diff File | ||
| mod - /branches/karajorma/code/freespace2/freespace.rc | Diff File | ||
| mod - /branches/karajorma/code/globalincs/version.h | Diff File | ||
| mod - /branches/karajorma/code/hud/hudparse.cpp | Diff File | ||
| mod - /branches/karajorma/code/ship/ship.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.vcproj | Diff File | ||
| mod - /branches/karajorma/projects/MSVC_2008/code.vcproj | Diff File | ||
| mod - /branches/karajorma/projects/Xcode/English.lproj/InfoPlist.strings | Diff File | ||
| mod - /branches/karajorma/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /branches/karajorma/projects/Xcode/Info.plist | Diff File | ||
|
antipodes r5941 2010-02-23 19:21 Ported: N/A Details Diff |
Taylor's recent updates to the code | ||
| mod - /branches/antipodes/code/sound/acm.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/ds.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/ds3d.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/dscap.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/sound.cpp | Diff File | ||
|
antipodes r5940 2010-02-23 16:47 Ported: N/A Details Diff |
Add some missing files to build with the code target in Xcode | ||
| mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
|
antipodes r5939 2010-02-23 13:10 Ported: N/A Details Diff |
Set SVN EOL Types on he new files. From chief1983: OS X XCode project update for the new Sound Code. |
||
| mod - /branches/antipodes/code/sound/acm.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/openal.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/openal.h | Diff File | ||
| mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
|
karajorma r5938 2010-02-23 08:50 Ported: N/A Details Diff |
These should have been removed. | ||
| rm - /branches/karajorma/code/io/trackir.cpp | File | ||
| rm - /branches/karajorma/code/io/trackir.h | File | ||
| rm - /branches/karajorma/code/math/bitarray.h | File | ||
| rm - /branches/karajorma/code/sound/acm.cpp | File | ||
| rm - /branches/karajorma/code/sound/midifile.cpp | File | ||
| rm - /branches/karajorma/code/sound/midifile.h | File | ||
| rm - /branches/karajorma/code/sound/midiseq.h | File | ||
| rm - /branches/karajorma/code/sound/winmidi.cpp | File | ||
| rm - /branches/karajorma/code/sound/winmidi.h | File | ||
| rm - /branches/karajorma/code/sound/winmidi_base.cpp | File | ||
|
karajorma r5937 2010-02-23 08:49 Ported: N/A Details Diff |
As promised, a much better fix for the issue of ships losing orders/getting protected as soon as something has disarm/disable orders. | ||
| 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/aigoals.cpp | Diff File | ||
| mod - /branches/karajorma/code/fred2/fred.rc | Diff File | ||
| mod - /branches/karajorma/code/fred2/missionsave.cpp | Diff File | ||
| mod - /branches/karajorma/code/fred2/resource.h | Diff File | ||
| mod - /branches/karajorma/code/fred2/shipflagsdlg.cpp | Diff File | ||
| mod - /branches/karajorma/code/fred2/shipflagsdlg.h | Diff File | ||
| mod - /branches/karajorma/code/globalincs/def_files.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/ship/ship.cpp | Diff File | ||
| mod - /branches/karajorma/code/ship/ship.h | Diff File | ||
|
antipodes r5936 2010-02-22 21:43 Ported: N/A Details Diff |
New Sound code addendum: For some STUPID reason, when I applied the patch at work, one file did not delete, one did not create. | ||
| rm - /branches/antipodes/code/directx/vdsound.lib | File | ||
| add - /branches/antipodes/code/sound/openal.h | File | ||
|
trunk r5935 2010-02-22 20:53 Ported: N/A Details Diff |
Change an assertion into a warning and auto-fix the data in release builds. | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
|
antipodes r5934 2010-02-22 19:20 Ported: N/A Details Diff |
The_E's fix for FRED compiling with taylors sound code. | ||
| mod - /branches/antipodes/code/fred2/management.cpp | Diff File | ||
|
antipodes r5933 2010-02-22 19:15 Ported: N/A Details Diff |
taylors Sound Code. Linux, MSVC 6, 2005 & 2008 compiling. (Mac OS-X Compiling still needs setup for the file changes) |
||
| mod - /branches/antipodes/code/Makefile.am | Diff File | ||
| mod - /branches/antipodes/code/cmdline/cmdline.cpp | Diff File | ||
| mod - /branches/antipodes/code/cutscene/mve_audio.cpp | Diff File | ||
| mod - /branches/antipodes/code/cutscene/mveplayer.cpp | Diff File | ||
| mod - /branches/antipodes/code/cutscene/oggplayer.cpp | Diff File | ||
| rm - /branches/antipodes/code/directx/vdsound.h | File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
| mod - /branches/antipodes/code/gamesnd/eventmusic.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/optionsmenumulti.cpp | Diff File | ||
| mod - /branches/antipodes/code/object/objectsnd.cpp | Diff File | ||
| rm - /branches/antipodes/code/sound/acm-openal.cpp | File | ||
| add - /branches/antipodes/code/sound/acm.cpp | File | ||
| mod - /branches/antipodes/code/sound/acm.h | Diff File | ||
| rm - /branches/antipodes/code/sound/audiostr-openal.cpp | File | ||
| mod - /branches/antipodes/code/sound/audiostr.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/channel.h | Diff File | ||
| mod - /branches/antipodes/code/sound/ds.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/ds.h | Diff File | ||
| mod - /branches/antipodes/code/sound/ds3d.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/ds3d.h | Diff File | ||
| mod - /branches/antipodes/code/sound/dscap.cpp | Diff File | ||
| add - /branches/antipodes/code/sound/openal.cpp | File | ||
| rm - /branches/antipodes/code/sound/rbaudio.cpp | File | ||
| rm - /branches/antipodes/code/sound/rbaudio.h | File | ||
| mod - /branches/antipodes/code/sound/rtvoice.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/sound.cpp | Diff File | ||
| mod - /branches/antipodes/code/sound/sound.h | Diff File | ||
| mod - /branches/antipodes/code/vcodec/codec1.cpp | Diff File | ||
| mod - /branches/antipodes/configure.ac | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/Fred2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/Freespace2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/code.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/Fred2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/Freespace2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/code.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/Fred2.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/Freespace2.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/code.dsp | Diff File | ||
|
antipodes r5932 2010-02-22 16:37 Ported: N/A Details Diff |
Trunk Sync - r5931. Updated build output filenames to 6, MSVC 6 project also outputs _ant (instead of _trunk) so as not to over-write Trunk build compiles. | ||
| mod - /branches/antipodes | Diff File | ||
| mod - /branches/antipodes/code/ai/aicode.cpp | Diff File | ||
| mod - /branches/antipodes/code/bmpman/bmpman.cpp | Diff File | ||
| mod - /branches/antipodes/code/cutscene/oggplayer.cpp | Diff File | ||
| mod - /branches/antipodes/code/fireball/fireballs.cpp | Diff File | ||
| add - /branches/antipodes/code/fred2/FictionViewerDlg.cpp | File | ||
| add - /branches/antipodes/code/fred2/FictionViewerDlg.h | File | ||
| mod - /branches/antipodes/code/fred2/createwingdlg.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/fred.rc | Diff File | ||
| mod - /branches/antipodes/code/fred2/fredview.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/fredview.h | Diff File | ||
| mod - /branches/antipodes/code/fred2/missionsave.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/resource.h | Diff File | ||
| mod - /branches/antipodes/code/fred2/sexp_tree.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/shipeditordlg.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/shipflagsdlg.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/shipflagsdlg.h | Diff File | ||
| mod - /branches/antipodes/code/fred2/waypointpathdlg.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/wing_editor.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.rc | Diff File | ||
| mod - /branches/antipodes/code/globalincs/version.h | Diff File | ||
| mod - /branches/antipodes/code/globalincs/windebug.cpp | Diff File | ||
| mod - /branches/antipodes/code/graphics/gropengltexture.h | Diff File | ||
| mod - /branches/antipodes/code/hud/hud.cpp | Diff File | ||
| mod - /branches/antipodes/code/hud/hudconfig.cpp | Diff File | ||
| mod - /branches/antipodes/code/hud/hudparse.cpp | Diff File | ||
| mod - /branches/antipodes/code/hud/hudparse.h | Diff File | ||
| mod - /branches/antipodes/code/hud/hudtarget.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missionbriefcommon.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missioncampaign.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missionmessage.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missionparse.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missionparse.h | Diff File | ||
| mod - /branches/antipodes/code/missionui/fictionviewer.cpp | Diff File | ||
| mod - /branches/antipodes/code/missionui/missionweaponchoice.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multi.h | Diff File | ||
| mod - /branches/antipodes/code/network/multi_obj.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multimsgs.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multimsgs.h | Diff File | ||
| mod - /branches/antipodes/code/network/multiui.cpp | Diff File | ||
| mod - /branches/antipodes/code/object/object.h | 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/ship.h | Diff File | ||
| mod - /branches/antipodes/code/ship/shipfx.cpp | Diff File | ||
| mod - /branches/antipodes/code/weapon/beam.cpp | Diff File | ||
| mod - /branches/antipodes/code/weapon/weapon.h | Diff File | ||
| mod - /branches/antipodes/code/weapon/weapons.cpp | Diff File | ||
| mod - /branches/antipodes/configure.ac | Diff File | ||
| rm - /branches/antipodes/projects/MSVC_2003 | File | ||
| mv - /branches/antipodes/projects/MSVC_2005 | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/Fred2.vcproj | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/Freespace2.sln | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/Freespace2.vcproj | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/code.vcproj | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/libjpeg.vcproj | Diff File | ||
| mv - /branches/antipodes/projects/MSVC_2005/liblua.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/Fred2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/Freespace2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2008/code.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/Fred2.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/Freespace2.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/Freespace2.dsw | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/code.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/libjpeg.dsp | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_6/liblua.dsp | Diff File | ||
| add - /branches/antipodes/projects/MSVC_6/libpng.dsp | File | ||
| mod - /branches/antipodes/projects/MSVC_6/wxFRED2.dsp | Diff File | ||
| add - /branches/antipodes/projects/MSVC_6/zlib.dsp | File | ||
| rm - /branches/antipodes/projects/MSVC_6_Release | File | ||
| mod - /branches/antipodes/projects/Xcode/English.lproj/InfoPlist.strings | Diff File | ||
| mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /branches/antipodes/projects/Xcode/Info.plist | Diff File | ||
|
trunk r5931 2010-02-20 17:24 Ported: N/A Details Diff |
For 3.6.12 RC: resolves the text "Monitoring" not showing on the HUD Escort monitor box. [Mantis 2133] | ||
| mod - /trunk/fs2_open/code/hud/hudparse.cpp | Diff File | ||
|
trunk r5930 2010-02-19 15:41 Ported: N/A Details Diff |
Get rid of one place we have to update the version. | ||
| mod - /trunk/fs2_open/projects/Xcode/Info.plist | Diff File | ||
|
trunk r5929 2010-02-19 14:57 Ported: N/A Details Diff |
Increase Trunk tagging and version to 3.6.13. | ||
| 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/configure.ac | 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_2008/code.vcproj | 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/Xcode/Info.plist | Diff File | ||
|
fs2_open_3_6_12 r5928 2010-02-19 01:51 Ported: N/A Details Diff |
upgrade the branched VC6 and VC2005 project files to match the trunk ones | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/Fred2.vcproj | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/Freespace2.sln | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/Freespace2.vcproj | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/code.vcproj | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/libjpeg.vcproj | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_2005/liblua.vcproj | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/Fred2.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/Freespace2.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/code.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/libjpeg.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/liblua.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/libpng.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/wxFRED2.dsp | Diff File | ||
| mod - /branches/fs2_open_3_6_12/projects/MSVC_6/zlib.dsp | Diff File | ||
|
fs2_open_3_6_12 r5927 2010-02-19 01:50 Ported: N/A Details Diff |
delete the obsolete branched project folders | ||
| rm - /branches/fs2_open_3_6_12/projects/MSVC_2003 | File | ||
| rm - /branches/fs2_open_3_6_12/projects/MSVC_6_Release | File | ||
