[SirKnightly]

Here is the nightly for 15 June 2020 - Revision 7f1d21e



Group: Linux
nightly_20200615_7f1d21e-builds-Linux.tar.gz (Mirror)


Group: Win32
nightly_20200615_7f1d21e-builds-Win32.zip (Mirror)


Group: Win64
nightly_20200615_7f1d21e-builds-Win64.zip (Mirror)


Group: MacOSX
nightly_20200615_7f1d21e-builds-MacOSX.tar.gz (Mirror)

Code: [Select]

------------------------------------------------------------------------
commit 56f8247
Author: asarium
Commit: asarium

    Completely remove santlr4_shared target
 lib/antlr4-cpp-runtime/CHANGES                |  1 +
 lib/antlr4-cpp-runtime/runtime/CMakeLists.txt | 20 ++++++++++----------
 lib/antlr4.cmake                              |  4 +---
 3 files changed, 12 insertions(+), 13 deletions(-)

------------------------------------------------------------------------
commit aedf541
Author: Goober5000
Commit: Goober5000

    combine hits-left and sim-hits-left
 code/parse/sexp.cpp | 56 +++++++++++------------------------------------------
 1 file changed, 11 insertions(+), 45 deletions(-)

------------------------------------------------------------------------
commit 426498e
Author: Goober5000
Commit: Goober5000

    merge and upgrade the time sexps
 code/parse/sexp.cpp | 144 +++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 75 deletions(-)

------------------------------------------------------------------------
commit 63d40b7
Author: Goober5000
Commit: Goober5000

    combine and upgrade more sexps
 code/parse/sexp.cpp | 297 ++++++++++++++++++++++++++++------------------------
 1 file changed, 159 insertions(+), 138 deletions(-)

------------------------------------------------------------------------
commit 75d8116
Author: Goober5000
Commit: Goober5000

    combine goal sexps
 code/parse/sexp.cpp | 168 +++++++++++++++++-----------------------------------
 1 file changed, 54 insertions(+), 114 deletions(-)

------------------------------------------------------------------------
commit b59da60
Author: Goober5000
Commit: Goober5000

    also combine gse_recharge
 code/parse/sexp.cpp | 74 +++++++++++++++--------------------------------------
 1 file changed, 20 insertions(+), 54 deletions(-)

------------------------------------------------------------------------
commit 63ccb84
Author: Goober5000
Commit: Goober5000

    combine is_ship_stealthy and is_friendly_stealth_invisible, and fix a spelling mistake
 code/parse/sexp.cpp | 55 ++++++++++++-----------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

------------------------------------------------------------------------
commit 1861065
Author: Goober5000
Commit: Goober5000

    add these tweaks to keep the major merges in optimum shape
 code/parse/sexp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit ed5f6a2
Author: David Gibson
Commit: David Gibson

    Adjusted spacing on weapon descriptions for beams to match formatting for non-beams
 code/weapon/weapons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit e9a5bb3
Author: David Gibson
Commit: David Gibson

    Restores mvp-style range and velocity handling, and adapts it properly to consider beam weapons.
 code/weapon/weapons.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit a5ba2ce
Author: David Gibson
Commit: David Gibson

    Corrected comment inaccuracies
 code/weapon/weapons.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

------------------------------------------------------------------------
commit 0ad15fd
Author: David Gibson
Commit: David Gibson

    Accounted for the differences in range/velocity handling for beams
 code/weapon/weapons.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 930b3fe
Author: David Gibson
Commit: David Gibson

    Second pass on burst and beam spew for accuracy
 code/weapon/weapons.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit ffcb4b8
Author: David Gibson
Commit: David Gibson

    first pass of including beam and burst weapons
 code/weapon/weapons.cpp | 50 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

------------------------------------------------------------------------
commit 3ecc006
Author: Goober5000
Commit: Goober5000

    small tweak
 code/parse/sexp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

------------------------------------------------------------------------
commit 54b3b9c
Author: asarium
Commit: asarium

    Fix Antlr installation step
 lib/antlr4-cpp-runtime/CHANGES                |  1 +
 lib/antlr4-cpp-runtime/runtime/CMakeLists.txt | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

------------------------------------------------------------------------
commit ff1e328
Author: Goober5000
Commit: Goober5000

    tweak sexp name
 code/parse/sexp.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit bfc8075
Author: Goober5000
Commit: Goober5000

    upgrade the objective sexps 2
 code/parse/sexp.cpp | 443 +++++++++++++++++++++++-----------------------------
 1 file changed, 198 insertions(+), 245 deletions(-)

------------------------------------------------------------------------
commit 15db77d
Author: asarium
Commit: asarium

    Add capability to have comments in scripting args
 code/scripting/ade.cpp                             |   5 +-
 code/scripting/ade_api.h                           |   2 +-
 code/scripting/api/libs/audio.cpp                  |   9 +-
 code/scripting/api/libs/base.cpp                   |  14 +-
 code/scripting/api/libs/mission.cpp                |   7 +-
 code/scripting/api/objs/controls.cpp               |   8 +-
 code/scripting/api/objs/vecmath.cpp                |  19 +-
 code/scripting/doc_html.cpp                        |   4 +
 code/scripting/doc_json.cpp                        |   6 +-
 code/scripting/doc_parser.cpp                      |  20 +-
 code/scripting/doc_parser.h                        |   1 +
 parsers/arg_parser/ArgumentList.g4                 |  11 +-
 parsers/arg_parser/generated/ArgumentList.interp   |   4 +-
 parsers/arg_parser/generated/ArgumentList.tokens   |   7 +-
 parsers/arg_parser/generated/ArgumentListLexer.cpp | 214 +++++++++++----------
 parsers/arg_parser/generated/ArgumentListLexer.h   |   4 +-
 .../arg_parser/generated/ArgumentListLexer.interp  |   5 +-
 .../arg_parser/generated/ArgumentListLexer.tokens  |   7 +-
 .../arg_parser/generated/ArgumentListParser.cpp    |  97 +++++++---
 parsers/arg_parser/generated/ArgumentListParser.h  |   6 +-
 test/src/scripting/doc_parser.cpp                  |  59 ++++++
 21 files changed, 341 insertions(+), 168 deletions(-)