[SirKnightly]

Here is the nightly for FreeBSD on 12 Aug 2015 - Revision 92a5839

Open non-feature issues in Mantis: 126

Group: Standard
fso_Standard_20150812_92a5839.tar.bz2
MD5Sum

Code: [Select]

------------------------------------------------------------------------
commit cd58240
Author: MageKing17 <Mon Aug 10 10:05:44 2015 -0700>
Commit: MageKing17 <Mon Aug 10 10:05:44 2015 -0700>

    Fix another copy-paste error, this time in the assertions.
 code/ship/ship.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 36f7ac9
Author: MageKing17 <Sun Aug 9 18:12:09 2015 -0700>
Commit: MageKing17 <Sun Aug 9 18:12:09 2015 -0700>

    Fix another copy-paste error.
 code/ship/ship.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 5c3d7b0
Author: DahBlount <Sun Aug 9 19:16:45 2015 -0500>
Commit: DahBlount <Sun Aug 9 19:29:16 2015 -0500>

    Turret bank fix and ammo removal
 code/ai/aiturret.cpp  | 12 +++++++-----
 code/weapon/swarm.cpp |  9 +++------
 2 files changed, 10 insertions(+), 11 deletions(-)

------------------------------------------------------------------------
commit 51be6ae
Author: MageKing17 <Sun Aug 9 17:21:22 2015 -0700>
Commit: MageKing17 <Sun Aug 9 17:21:22 2015 -0700>

    Fix copy-paste error.
 code/ship/ship.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit d59ee59
Author: MageKing17 <Sun Aug 9 17:13:19 2015 -0700>
Commit: MageKing17 <Sun Aug 9 17:13:19 2015 -0700>

    Make subsys_set() use cargo_size for ammo.
 code/ship/ship.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 3b43614
Author: MageKing17 <Sun Aug 9 16:31:40 2015 -0700>
Commit: MageKing17 <Sun Aug 9 16:53:50 2015 -0700>

    Hopefully fix FRED and turret ammo.
 code/fred2/weaponeditordlg.cpp | 72 +++++++++++++++++++++++++++++++++++-------
 code/mission/missionparse.cpp  | 24 +++++++++++---
 code/ship/ship.cpp             | 29 +++++++++++++++--
 code/ship/ship.h               |  1 +
 4 files changed, 107 insertions(+), 19 deletions(-)