[SirKnightly]

Here is the nightly for OS X on 30 Jan 2011 - Revision 6989

Group: Inferno
fso-OSX-Inferno-20110130_r6989.tgz
MD5Sum

Code: [Select]

------------------------------------------------------------------------
r6979 | Goober5000 | 2011-01-29 03:41:13 -0600 (Sat, 29 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/localization/localize.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp

this should fix the weird crashes in localization
------------------------------------------------------------------------
r6980 | Echelon9 | 2011-01-29 19:33:52 -0600 (Sat, 29 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/libjpeg/README
   D /trunk/fs2_open/libjpeg/cderror.h
   D /trunk/fs2_open/libjpeg/cdjpeg.h
   A /trunk/fs2_open/libjpeg/change.log
   A /trunk/fs2_open/libjpeg/install.txt
   A /trunk/fs2_open/libjpeg/jaricom.c
   M /trunk/fs2_open/libjpeg/jcapimin.c
   D /trunk/fs2_open/libjpeg/jccoefct.c
   D /trunk/fs2_open/libjpeg/jccolor.c
   D /trunk/fs2_open/libjpeg/jcdctmgr.c
   D /trunk/fs2_open/libjpeg/jchuff.c
   D /trunk/fs2_open/libjpeg/jchuff.h
   D /trunk/fs2_open/libjpeg/jcinit.c
   D /trunk/fs2_open/libjpeg/jcmainct.c
   D /trunk/fs2_open/libjpeg/jcmarker.c
   D /trunk/fs2_open/libjpeg/jcmaster.c
   A /trunk/fs2_open/libjpeg/jconfig.h
   A /trunk/fs2_open/libjpeg/jconfig.txt
   D /trunk/fs2_open/libjpeg/jconfig_lnx.h
   D /trunk/fs2_open/libjpeg/jconfig_vc.h
   M /trunk/fs2_open/libjpeg/jcparam.c
   D /trunk/fs2_open/libjpeg/jcphuff.c
   D /trunk/fs2_open/libjpeg/jcprepct.c
   D /trunk/fs2_open/libjpeg/jcsample.c
   M /trunk/fs2_open/libjpeg/jctrans.c
   M /trunk/fs2_open/libjpeg/jdapimin.c
   M /trunk/fs2_open/libjpeg/jdapistd.c
   A /trunk/fs2_open/libjpeg/jdarith.c
   D /trunk/fs2_open/libjpeg/jdatadst.c
   M /trunk/fs2_open/libjpeg/jdatasrc.c
   M /trunk/fs2_open/libjpeg/jdcoefct.c
   M /trunk/fs2_open/libjpeg/jdct.h
   M /trunk/fs2_open/libjpeg/jddctmgr.c
   M /trunk/fs2_open/libjpeg/jdhuff.c
   D /trunk/fs2_open/libjpeg/jdhuff.h
   M /trunk/fs2_open/libjpeg/jdinput.c
   M /trunk/fs2_open/libjpeg/jdmainct.c
   M /trunk/fs2_open/libjpeg/jdmarker.c
   M /trunk/fs2_open/libjpeg/jdmaster.c
   D /trunk/fs2_open/libjpeg/jdphuff.c
   M /trunk/fs2_open/libjpeg/jdsample.c
   M /trunk/fs2_open/libjpeg/jdtrans.c
   M /trunk/fs2_open/libjpeg/jerror.h
   D /trunk/fs2_open/libjpeg/jfdctflt.c
   D /trunk/fs2_open/libjpeg/jfdctfst.c
   D /trunk/fs2_open/libjpeg/jfdctint.c
   M /trunk/fs2_open/libjpeg/jidctflt.c
   M /trunk/fs2_open/libjpeg/jidctint.c
   D /trunk/fs2_open/libjpeg/jidctred.c
   M /trunk/fs2_open/libjpeg/jinclude.h
   D /trunk/fs2_open/libjpeg/jmemansi.c
   A /trunk/fs2_open/libjpeg/jmemnobs.c
   M /trunk/fs2_open/libjpeg/jmorecfg.h
   M /trunk/fs2_open/libjpeg/jpegint.h
   M /trunk/fs2_open/libjpeg/jpeglib.h
   M /trunk/fs2_open/libjpeg/jutils.c
   M /trunk/fs2_open/libjpeg/jversion.h
   A /trunk/fs2_open/libjpeg/libjpeg.txt
   D /trunk/fs2_open/libjpeg/transupp.h
   M /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj

Update libjpeg in source to v8c (16-Jan-11) from 6b (27-Mar-98). For more details see http://www.hard-light.net/forums/index.php?topic=74110.0
------------------------------------------------------------------------
r6981 | Zacam | 2011-01-29 19:40:18 -0600 (Sat, 29 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/MSVC_2005/libjpeg.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/libjpeg.vcproj
   M /trunk/fs2_open/projects/MSVC_2010/libjpeg.vcxproj
   M /trunk/fs2_open/projects/MSVC_2010/libjpeg.vcxproj.filters
   M /trunk/fs2_open/projects/MSVC_6/libjpeg.dsp

Microsoft Visual Studio 6/2005/2008/2010 project updates to use newer libjpeg code committed on 6980.
------------------------------------------------------------------------
r6982 | Zacam | 2011-01-29 23:59:36 -0600 (Sat, 29 Jan 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/Makefile.am
   M /trunk/fs2_open/code/fred2/fredstubs.cpp
   M /trunk/fs2_open/code/network/multi.cpp
   M /trunk/fs2_open/code/network/multi.h
   M /trunk/fs2_open/code/network/multi_obj.cpp
   M /trunk/fs2_open/code/network/multi_obj.h
   M /trunk/fs2_open/code/network/multi_options.cpp
   M /trunk/fs2_open/code/network/multi_xfer.cpp
   M /trunk/fs2_open/code/network/multilag.cpp
   M /trunk/fs2_open/code/network/multiui.cpp
   M /trunk/fs2_open/code/network/multiutil.h
   M /trunk/fs2_open/code/network/psnet2.cpp
   M /trunk/fs2_open/code/network/psnet2.h
   M /trunk/fs2_open/code/playerman/playercontrol.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/projects/MSVC_2005/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/code.vcproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj
   M /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters
   M /trunk/fs2_open/projects/MSVC_6/code.dsp
   M /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj
   M /trunk/fs2_open/projects/codeblocks/code/code.cbp

Resolves LNK4221 under MSVC. multi_oo and psnet are not actually linked/used, so references pointing to them now go to multi_obj and psnet2 respectively. (Same as Antipodes 6881)
http://www.hard-light.net/forums/index.php?topic=73147.0
------------------------------------------------------------------------
r6983 | Zacam | 2011-01-30 00:09:42 -0600 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   D /trunk/fs2_open/code/network/multi_oo.cpp
   D /trunk/fs2_open/code/network/multi_oo.h
   D /trunk/fs2_open/code/network/psnet.cpp
   D /trunk/fs2_open/code/network/psnet.h

It would have been NICE if Tortoise had actually _deleted_ the files when it asked if I wanted them removed. Stupid !@$^*&# Tortoise.
------------------------------------------------------------------------
r6984 | Goober5000 | 2011-01-30 01:07:33 -0600 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/shipflagsdlg.cpp
   M /trunk/fs2_open/code/fred2/voiceactingmanager.cpp

fix compilation
------------------------------------------------------------------------
r6985 | Goober5000 | 2011-01-30 01:55:05 -0600 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/missionsave.cpp

someone made a bug here!
------------------------------------------------------------------------
r6986 | Goober5000 | 2011-01-30 02:12:42 -0600 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fred.rc

fix ship flag dlg layout, which got messed up in The E's commit
------------------------------------------------------------------------
r6987 | Goober5000 | 2011-01-30 02:19:17 -0600 (Sun, 30 Jan 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/resource.h
   M /trunk/fs2_open/code/fred2/shipflagsdlg.cpp
   M /trunk/fs2_open/code/fred2/shipflagsdlg.h
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/object/object.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

commit the "immobile" flag, requested by Black Wolf, Diaspora, etc.  This is just the infrastructure; the flag doesn't actually do anything yet.
------------------------------------------------------------------------
r6988 | Goober5000 | 2011-01-30 03:17:15 -0600 (Sun, 30 Jan 2011) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

fix some errors with sexp numbering that free up 2 Change slots
merge the Nav operators into other categories
add the new Change2 category and set up hacks so that its operators will display in Change's menu
------------------------------------------------------------------------