[SirKnightly]

Here is the nightly for Windows on 21 Nov 2013 - Revision 10143

Group: NO-SSE
fso-WIN-NO-SSE-20131121_r10143.7z
MD5Sum

Group: Standard
fso-WIN-Standard-20131121_r10143.7z
MD5Sum

Group: SSE
fso-WIN-SSE-20131121_r10143.7z
MD5Sum

Code: [Select]

------------------------------------------------------------------------
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
------------------------------------------------------------------------