Here is the nightly for Linux on 21 Aug 2015 - Revision 509bd8c
Open non-feature issues in
Mantis: 126
Group: Standard
fso_Standard_20150821_509bd8c.tar.bz2MD5Sum------------------------------------------------------------------------
commit 72af305
Author: MageKing17 <Thu Aug 20 14:27:57 2015 -0700>
Commit: MageKing17 <Thu Aug 20 14:53:01 2015 -0700>
Fix Mantis #2436.
code/playerman/playercontrol.cpp | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit 51832fd
Author: asarium <Thu Aug 20 11:53:23 2015 +0200>
Commit: asarium <Thu Aug 20 22:52:49 2015 +0200>
Fix SCP_string version of vsprintf
code/parse/parselo.cpp | 109 ++++++++-----------------------------------------
1 file changed, 17 insertions(+), 92 deletions(-)
------------------------------------------------------------------------
commit b4c625c
Author: Lari Nieminen <Thu Aug 20 22:07:56 2015 +0300>
Commit: Lari Nieminen <Thu Aug 20 22:07:56 2015 +0300>
Revert "Fixes Mantis #2436: Mouse controls ignore the axis binds." due to the joystick axis problems it caused
code/playerman/playercontrol.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 27d8518
Author: MageKing17 <Wed Aug 19 22:17:05 2015 -0700>
Commit: MageKing17 <Wed Aug 19 22:17:05 2015 -0700>
Remove do_damage check before calling hit functions in beam collisions.
code/weapon/beam.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit b296300
Author: MageKing17 <Wed Aug 19 22:15:08 2015 -0700>
Commit: MageKing17 <Wed Aug 19 22:15:23 2015 -0700>
Simplify some references to Weapon_info[b->weapon_info_index].
code/weapon/beam.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 2027983
Author: MageKing17 <Wed Aug 19 16:33:13 2015 -0700>
Commit: MageKing17 <Wed Aug 19 16:33:13 2015 -0700>
Move the temporary grammar files into the build directory.
.gitignore | 5 ---
code/freespace2/freespace.rc | 2 +-
projects/MSVC_2010/Freespace2.vcxproj | 31 +++++++++-----
projects/MSVC_2010/code.vcxproj | 49 ++++++++++------------
projects/MSVC_2010/code.vcxproj.filters | 2 +-
projects/MSVC_2012/Freespace2.vcxproj | 18 ++++++---
projects/MSVC_2012/code.vcxproj | 72 +++++++++++++--------------------
projects/MSVC_2012/code.vcxproj.filters | 2 +-
projects/MSVC_2013/Freespace2.vcxproj | 8 ++++
projects/MSVC_2013/code.vcxproj | 66 ++++++++++++------------------
projects/MSVC_2013/code.vcxproj.filters | 2 +-
projects/MSVC_2015/Freespace2.vcxproj | 8 ++++
projects/MSVC_2015/code.vcxproj | 66 ++++++++++++------------------
projects/MSVC_2015/code.vcxproj.filters | 2 +-
14 files changed, 154 insertions(+), 179 deletions(-)
------------------------------------------------------------------------
commit e5b7d48
Author: MageKing17 <Wed Aug 19 14:52:15 2015 -0700>
Commit: MageKing17 <Wed Aug 19 14:52:15 2015 -0700>
Add a couple more static_cast<int>()s to get rid of warnings.
code/autopilot/autopilot.cpp | 2 +-
code/ship/ship.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 048d65d
Author: MageKing17 <Wed Aug 19 00:50:18 2015 -0700>
Commit: MageKing17 <Wed Aug 19 00:50:18 2015 -0700>
Makes glide decay work even when not thrusting.
code/ai/ai_profiles.cpp | 2 ++
code/ai/ai_profiles.h | 1 +
code/physics/physics.cpp | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit e94511b
Author: MageKing17 <Wed Aug 19 00:06:11 2015 -0700>
Commit: MageKing17 <Wed Aug 19 00:06:11 2015 -0700>
Add CHA_ONTURRETFIRED support to beam and swarm turrets.
code/ai/aiturret.cpp | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 1684b7f
Author: MageKing17 <Wed Aug 12 20:34:51 2015 -0700>
Commit: MageKing17 <Wed Aug 12 20:52:56 2015 -0700>
Make a few more changes to ship_info based on m!m's notes.
code/globalincs/pstypes.h | 8 +++++++
code/ship/ship.cpp | 56 +++++++++++------------------------------------
code/ship/ship.h | 14 +++++++-----
3 files changed, 29 insertions(+), 49 deletions(-)
------------------------------------------------------------------------
commit 4fb6f3d
Author: MageKing17 <Wed Aug 12 14:39:42 2015 -0700>
Commit: MageKing17 <Wed Aug 12 14:39:42 2015 -0700>
Changing a `Ship_info.size()` to `!Ship_info.empty()` as pointed out by m!m.
code/menuui/techmenu.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 439ea76
Author: MageKing17 <Wed Aug 12 14:39:12 2015 -0700>
Commit: MageKing17 <Wed Aug 12 14:39:12 2015 -0700>
Adding static_cast<int>() to locations pointed out by m!m.
code/io/keycontrol.cpp | 4 ++--
code/parse/sexp.cpp | 2 +-
code/pilotfile/csg.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 529fd19
Author: MageKing17 <Wed Aug 12 14:23:36 2015 -0700>
Commit: MageKing17 <Wed Aug 12 14:23:36 2015 -0700>
Revert unintended missiongoals.cpp changes from vectorization commit.
code/mission/missiongoals.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit d953b2e
Author: MageKing17 <Tue Aug 11 14:42:21 2015 -0700>
Commit: MageKing17 <Tue Aug 11 14:42:21 2015 -0700>
Fix the Num_ship_classes reference added by PR #269 to Ship_info.size().
code/ship/ship.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 1ffe262
Author: MageKing17 <Thu Aug 6 00:28:04 2015 -0700>
Commit: MageKing17 <Thu Aug 6 00:28:04 2015 -0700>
Add collision_lod and auto_shield_spread_mid_span to clone() and move().
code/ship/ship.cpp | 4 ++++
1 file changed, 4 insertions(+)
------------------------------------------------------------------------
commit 179229f
Author: MageKing17 <Thu Jun 18 14:45:43 2015 -0700>
Commit: MageKing17 <Thu Jun 18 14:45:43 2015 -0700>
Add max_shield_recharge and shield_impact_explosion_anim to copy/move functions.
code/ship/ship.cpp | 4 ++++
1 file changed, 4 insertions(+)
------------------------------------------------------------------------
commit db781c1
Author: MageKing17 <Fri May 29 02:06:04 2015 -0700>
Commit: MageKing17 <Fri May 29 02:06:04 2015 -0700>
Hopefully fix VS 2010 compilation.
code/ship/ship.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 8fb0436
Author: MageKing17 <Thu May 28 23:56:22 2015 -0700>
Commit: MageKing17 <Thu May 28 23:56:22 2015 -0700>
Add new variables to clone() and move().
code/ship/ship.cpp | 7 +++++++
1 file changed, 7 insertions(+)
------------------------------------------------------------------------
commit 764c1ab
Author: MageKing17 <Mon May 18 10:09:29 2015 -0700>
Commit: MageKing17 <Mon May 18 10:09:29 2015 -0700>
Fix F3 lab using old idx value.
code/lab/lab.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit cde82a9
Author: MageKing17 <Mon May 18 10:08:12 2015 -0700>
Commit: MageKing17 <Mon May 18 10:08:12 2015 -0700>
Get rid of erroneous assertion.
code/ship/ship.cpp | 2 --
1 file changed, 2 deletions(-)
------------------------------------------------------------------------
commit 9db390b
Author: MageKing17 <Tue May 12 19:45:55 2015 -0700>
Commit: MageKing17 <Tue May 12 19:45:55 2015 -0700>
Avoid bug in older clang versions.
code/ship/ship.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 48095d3
Author: MageKing17 <Tue May 12 19:45:11 2015 -0700>
Commit: MageKing17 <Tue May 12 19:45:11 2015 -0700>
Fix a few typos.
code/ship/ship.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit 51a8932
Author: MageKing17 <Tue May 12 19:44:26 2015 -0700>
Commit: MageKing17 <Tue May 12 19:44:26 2015 -0700>
Add glowpoint_bank_override_map to the ship_info operations.
code/ship/ship.cpp | 6 ++++++
1 file changed, 6 insertions(+)
------------------------------------------------------------------------
commit e59bb76
Author: MageKing17 <Tue May 5 14:43:20 2015 -0700>
Commit: MageKing17 <Tue May 5 14:43:20 2015 -0700>
Get rid of warning on 64-bit compilers.
code/ship/ship.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 15f6549
Author: MageKing17 <Mon Apr 27 00:05:57 2015 -0700>
Commit: MageKing17 <Mon Apr 27 00:05:57 2015 -0700>
Ship templates!
code/ship/ship.cpp | 233 +++++++++++++++++++++++++++++++++++++++--------------
code/ship/ship.h | 3 +-
2 files changed, 175 insertions(+), 61 deletions(-)
------------------------------------------------------------------------
commit 3a7307d
Author: MageKing17 <Mon Apr 27 00:03:20 2015 -0700>
Commit: MageKing17 <Mon Apr 27 00:03:20 2015 -0700>
Somewhat-related followup to Ship_info vectorization.
code/missionui/missionscreencommon.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit bc0c7cf
Author: MageKing17 <Mon Apr 27 00:01:22 2015 -0700>
Commit: MageKing17 <Mon Apr 27 00:01:22 2015 -0700>
Vectorization of Ship_info.
code/ai/aicode.cpp | 8 +-
code/autopilot/autopilot.cpp | 4 +-
code/fireball/fireballs.cpp | 2 +-
code/fred2/AltShipClassDlg.cpp | 8 +-
code/fred2/briefingeditordlg.cpp | 16 +-
code/fred2/fredview.cpp | 10 +-
code/fred2/initialships.cpp | 21 +-
code/fred2/mainfrm.cpp | 19 +-
code/fred2/management.cpp | 6 +-
code/fred2/playerstarteditor.cpp | 9 +-
code/fred2/sexp_tree.cpp | 12 +-
code/fred2/shieldsysdlg.cpp | 4 +-
code/fred2/shipeditordlg.cpp | 4 +-
code/freespace2/freespace.cpp | 10 +-
code/hud/hud.cpp | 44 +-
code/hud/hudparse.cpp | 17 +-
code/io/keycontrol.cpp | 12 +-
code/lab/lab.cpp | 14 +-
code/menuui/barracks.cpp | 13 +-
code/menuui/techmenu.cpp | 30 +-
code/mission/missioncampaign.cpp | 8 +-
code/mission/missiongoals.cpp | 9 +-
code/mission/missionparse.cpp | 28 +-
code/missionui/missionbrief.cpp | 2 +-
code/missionui/missiondebrief.cpp | 7 +-
code/missionui/missionscreencommon.cpp | 12 +-
code/missionui/missionshipchoice.cpp | 18 +-
code/missionui/missionweaponchoice.cpp | 10 +-
code/missionui/redalert.cpp | 4 +-
code/model/modelread.cpp | 16 +-
code/network/multi_campaign.cpp | 8 +-
code/network/multi_ingame.cpp | 12 +-
code/network/multi_obj.cpp | 4 +-
code/network/multiteamselect.cpp | 6 +-
code/network/multiutil.cpp | 32 +-
code/parse/lua.cpp | 62 +-
code/parse/sexp.cpp | 18 +-
code/pilotfile/csg.cpp | 20 +-
code/pilotfile/pilotfile.cpp | 12 +-
code/ship/afterburner.cpp | 6 +-
code/ship/shield.cpp | 4 +-
code/ship/ship.cpp | 1494 ++++++++++++++++++++++----------
code/ship/ship.h | 18 +-
code/stats/scoring.cpp | 5 +-
44 files changed, 1315 insertions(+), 763 deletions(-)
------------------------------------------------------------------------
commit 5daf294
Author: MageKing17 <Sun Apr 26 15:51:37 2015 -0700>
Commit: MageKing17 <Sun Apr 26 15:51:37 2015 -0700>
Remove irrelevant assertion.
code/ship/ship.cpp | 2 --
1 file changed, 2 deletions(-)
------------------------------------------------------------------------
commit 0bcb3f2
Author: MageKing17 <Sun Apr 26 13:48:11 2015 -0700>
Commit: MageKing17 <Sun Apr 26 13:48:11 2015 -0700>
Fix automatic "$Short name:" generation.
code/ship/ship.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 9e66027
Author: MageKing17 <Sun Apr 26 13:38:20 2015 -0700>
Commit: MageKing17 <Sun Apr 26 13:38:20 2015 -0700>
Remove unused "tspecies_names" pointer array.
code/ship/ship.cpp | 12 ------------
1 file changed, 12 deletions(-)
