[SirKnightly]

Here is the nightly for OS X on 21 Nov 2013 - Revision 10144

Group: Standard
fso-OSX-Standard-20131121_r10144.tgz
MD5Sum

Code: [Select]

------------------------------------------------------------------------
r10116 | Goober5000 | 2013-11-18 20:06:50 -0600 (Mon, 18 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/missionsave.cpp

fix Mantis #2933: don't output alt ship class information using fout_version
------------------------------------------------------------------------
r10117 | Goober5000 | 2013-11-18 21:43:35 -0600 (Mon, 18 Nov 2013) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/fs2netd/tcp_client.cpp
   M /trunk/fs2_open/code/network/multimsgs.cpp

fix Mantis #2955: crash when trying to join multiplayer server, caused by trying to memcpy an integer into a ushort
(also add some sanity asserts)
------------------------------------------------------------------------
r10118 | Goober5000 | 2013-11-18 22:30:13 -0600 (Mon, 18 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/menuui/mainhallmenu.cpp
   M /trunk/fs2_open/code/menuui/mainhallmenu.h
   M /trunk/fs2_open/code/menuui/playermenu.cpp

let's not make expensive copies of all these SCP_strings
------------------------------------------------------------------------
r10119 | Goober5000 | 2013-11-18 23:06:04 -0600 (Mon, 18 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/menuui/mainhallmenu.cpp
   M /trunk/fs2_open/code/menuui/mainhallmenu.h

turns out gcc doesn't like the two angled brackets adjacent to one another
------------------------------------------------------------------------
r10120 | chief1983 | 2013-11-19 00:00:39 -0600 (Tue, 19 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/network/multi_options.cpp
   M /trunk/fs2_open/code/network/stand_gui-unix.cpp

Fix WebUI server name changes updating in clients and FS2NetD.
------------------------------------------------------------------------
r10121 | chief1983 | 2013-11-19 00:32:02 -0600 (Tue, 19 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/network/stand_gui-unix.cpp

Add support for the framecap menu option.
------------------------------------------------------------------------
r10124 | niffiwan | 2013-11-19 03:56:59 -0600 (Tue, 19 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/missiondebrief.cpp
   M /trunk/fs2_open/code/stats/medals.cpp
   M /trunk/fs2_open/code/stats/medals.h
   M /trunk/fs2_open/code/stats/scoring.cpp
   M /trunk/fs2_open/code/stats/scoring.h

Persona-specific promotion debriefings (from Yarn)
------------------------------------------------------------------------
r10125 | niffiwan | 2013-11-19 04:20:04 -0600 (Tue, 19 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/stats/scoring.cpp

fix gcc warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
------------------------------------------------------------------------
r10127 | Goober5000 | 2013-11-19 19:45:47 -0600 (Tue, 19 Nov 2013) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

make init_ship_entry actually init all the fields in ship_info
make draw_weapon_models a ship flag instead of a boolean
remove the MAX_SHIP_FLAGS #define because it didn't mean what everybody thought it meant
------------------------------------------------------------------------
r10128 | Goober5000 | 2013-11-19 21:56:47 -0600 (Tue, 19 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/stats/medals.cpp
   M /trunk/fs2_open/code/stats/medals.h

medal_stuff passes the duck test, so make it an official class
------------------------------------------------------------------------
r10129 | chief1983 | 2013-11-20 02:11:02 -0600 (Wed, 20 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/freespace2/freespace.cpp
   M /trunk/fs2_open/code/globalincs/systemvars.cpp

Fix #2957 - FreeBSD RAND_MAX is 0x7ffffffd, not 0x7fffffff, so we can't always assume that it's the latter.  Also move the check earlier in the code, if it's going to break at all, break immediately on any non-conforming platform so we can fine tune this some more.
------------------------------------------------------------------------
r10130 | karajorma | 2013-11-20 05:26:55 -0600 (Wed, 20 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/localization/localize.cpp

Yarn's fix for Mantis 2941 (Strings.tbms without the current language crash the game).
------------------------------------------------------------------------
r10131 | Goober5000 | 2013-11-20 21:06:31 -0600 (Wed, 20 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/species_defs/species_defs.cpp
   M /trunk/fs2_open/code/species_defs/species_defs.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

allow modder to specify countermeasure type on a per-species basis
------------------------------------------------------------------------
r10132 | chief1983 | 2013-11-20 23:42:55 -0600 (Wed, 20 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

Fix #2959 by reverting r10082.  I can probably talk zookeeper into converting the troublesome SCP_vectors into static variables so this isn't causing memset issues.
------------------------------------------------------------------------
r10135 | zookeeper | 2013-11-21 01:03:50 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/hud/hudescort.cpp
   M /trunk/fs2_open/code/hud/hudets.cpp
   M /trunk/fs2_open/code/hud/hudshield.cpp
   M /trunk/fs2_open/code/hud/hudshield.h
   M /trunk/fs2_open/code/hud/hudtarget.cpp
   M /trunk/fs2_open/code/io/keycontrol.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/model/modelread.cpp
   M /trunk/fs2_open/code/network/multi_ingame.cpp
   M /trunk/fs2_open/code/network/multi_obj.cpp
   M /trunk/fs2_open/code/network/multimsgs.cpp
   M /trunk/fs2_open/code/object/collideshipship.cpp
   M /trunk/fs2_open/code/object/collideshipweapon.cpp
   M /trunk/fs2_open/code/object/object.cpp
   M /trunk/fs2_open/code/object/object.h
   M /trunk/fs2_open/code/object/objectshield.cpp
   M /trunk/fs2_open/code/object/objectshield.h
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/ship/shield.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/ship/shiphit.cpp
   M /trunk/fs2_open/code/weapon/beam.cpp

Merged model point shields from zookeeper branch.
------------------------------------------------------------------------
r10136 | Goober5000 | 2013-11-21 01:05:45 -0600 (Thu, 21 Nov 2013) | 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/hud/hudtarget.cpp
   M /trunk/fs2_open/code/mission/missionmessage.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/ship/ship.h

scramble messages on a per-ship basis
------------------------------------------------------------------------
r10137 | zookeeper | 2013-11-21 01:37:06 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

Remember to initialize shield_point_augment_ctrls.
------------------------------------------------------------------------
r10138 | Goober5000 | 2013-11-21 01:50:05 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp

Fix an actual Volition bug.  This has AI balance implications, but it's already in the "pick a random weapon" section, so it will probably be all right.
------------------------------------------------------------------------
r10139 | Goober5000 | 2013-11-21 02:23:55 -0600 (Thu, 21 Nov 2013) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudlock.cpp

fix Echelon9's fix >:(
also add a judicious Assert for Mantis #2958
------------------------------------------------------------------------
r10140 | Goober5000 | 2013-11-21 02:26:00 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

fix an off-by-one error
------------------------------------------------------------------------
r10141 | Goober5000 | 2013-11-21 02:26:45 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

re-commit r10082, except for ship.h, because it's the size of the ship_weapon struct that's causing the mysterious crashes (Mantis #2958)
------------------------------------------------------------------------
r10143 | Echelon9 | 2013-11-21 04:29:49 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudshield.cpp

LLVM/Clang warns that a dangling else can occur without one level of braces
------------------------------------------------------------------------
r10144 | chief1983 | 2013-11-21 12:11:43 -0600 (Thu, 21 Nov 2013) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.h

Recommit the ship.h part of 10082 as the OBO fixes seem to have fixed #2958.
------------------------------------------------------------------------