Hard Light Productions Forums

Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Nightly Builds => Topic started by: SirKnightly on July 04, 2016, 12:53:54 pm

Title: Nightly (Windows): 04 Jul 2016 - Revision 774140d
Post by: SirKnightly on July 04, 2016, 12:53:54 pm
Here is the nightly for Windows on 04 Jul 2016 - Revision 774140d

Open non-feature issues in Mantis (http://scp.indiegames.us/mantis/view_all_set.php?type=3&source_query_id=611): 123

Group: NO-SSE
fso_NO-SSE_20160704_774140d.7z (http://swc.fs2downloads.com/builds/WIN/fso_NO-SSE_20160704_774140d.7z)
MD5Sum (http://swc.fs2downloads.com/builds/WIN/fso_NO-SSE_20160704_774140d.md5)

Group: Standard
fso_Standard_20160704_774140d.7z (http://swc.fs2downloads.com/builds/WIN/fso_Standard_20160704_774140d.7z)
MD5Sum (http://swc.fs2downloads.com/builds/WIN/fso_Standard_20160704_774140d.md5)

Group: AVX
fso_AVX_20160704_774140d.7z (http://swc.fs2downloads.com/builds/WIN/fso_AVX_20160704_774140d.7z)
MD5Sum (http://swc.fs2downloads.com/builds/WIN/fso_AVX_20160704_774140d.md5)

Group: SSE
fso_SSE_20160704_774140d.7z (http://swc.fs2downloads.com/builds/WIN/fso_SSE_20160704_774140d.7z)
MD5Sum (http://swc.fs2downloads.com/builds/WIN/fso_SSE_20160704_774140d.md5)

Code: [Select]
------------------------------------------------------------------------
commit bf6cbb9
Author: MageKing17 <Sun Jul 3 02:17:07 2016 -0700>
Commit: MageKing17 <Sun Jul 3 02:17:07 2016 -0700>

    Fix color table parsing.
 code/globalincs/alphacolors.cpp | 1 +
 1 file changed, 1 insertion(+)


Title: Re: Nightly (Windows): 04 Jul 2016 - Revision 774140d
Post by: Trivial Psychic on July 04, 2016, 11:54:04 pm
Be advised, the launcher won't display the date line or the code identifier line in the name for this build.  It is simply listed as "FS2 Open 3.7.5 (CPU Variant)".
Title: Re: Nightly (Windows): 04 Jul 2016 - Revision 774140d
Post by: AdmiralRalwood on July 04, 2016, 11:56:46 pm
Quote from: Trivial Psychic on July 04, 2016, 11:54:04 pm
Be advised, the launcher won't display the date line or the code identifier line in the name for this build.  It is simply listed as "FS2 Open 3.7.5 (CPU Variant)".
It's an annoying side-effect of the hash ending in "d" that should probably be fixed at some point.
Title: Re: Nightly (Windows): 04 Jul 2016 - Revision 774140d
Post by: jg18 on July 05, 2016, 12:22:49 am
I think this should fix both this issue and also a similar issue with tokens consisting of numbers followed by an 'r'.

Code: [Select]
diff --git a/code/datastructures/FSOExecutable.cpp b/code/datastructures/FSOExecutable.cpp
index 9b3feed..9a84b1d 100644
--- a/code/datastructures/FSOExecutable.cpp
+++ b/code/datastructures/FSOExecutable.cpp
@@ -278,6 +278,7 @@ FSOExecutable FSOExecutable::GetBinaryVersion(wxString binaryname) {
  wxLogWarning(
  _T("Revision version number out of range (%ld) in executable %s"),
  tempVersion, binaryname.c_str());
+ ver.string += wxString::Format(ver.string.IsEmpty() ? _T("%s") : _T(" %s"), token.c_str());
  }
  } else {
  wxLogWarning(
@@ -297,6 +298,7 @@ FSOExecutable FSOExecutable::GetBinaryVersion(wxString binaryname) {
  wxLogWarning(
  _T("Revision version number out of range (%ld) in executable %s"),
  tempVersion, binaryname.c_str());
+ ver.string += wxString::Format(ver.string.IsEmpty() ? _T("%s") : _T(" %s"), token.c_str());
  }
  } else {
  wxLogWarning(

I don't have a wxL fork set up at the moment but I'll try to get on that and generate a pull request this week.
Title: Re: Nightly (Windows): 04 Jul 2016 - Revision 774140d
Post by: Iss Mneur on September 17, 2016, 03:13:20 pm
The bug in wxLauncher handling of the git hashs now has a patch (https://github.com/scp-fs2open/wxLauncher/pull/151) that will be in the next release of wxLauncher.