[SirKnightly]

Here is the nightly for 11 March 2021 - Revision 5105f35a3



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


Group: Win32-SSE2
nightly_20210311_5105f35a3-builds-Win32-SSE2.zip (Mirror)


Group: Win64-SSE2
nightly_20210311_5105f35a3-builds-x64-SSE2.zip (Mirror)

Code: [Select]

------------------------------------------------------------------------
commit f02557211
Author: Goober5000
Commit: Goober5000

    rewrite stuffing of lists
 code/asteroid/asteroid.cpp       |   4 +-
 code/hud/hudparse.cpp            |   2 +-
 code/iff_defs/iff_defs.cpp       |  23 +-
 code/mission/missioncampaign.cpp |   4 +-
 code/mission/missionparse.cpp    | 104 ++++---
 code/parse/parselo.cpp           | 650 +++++++++++----------------------------
 code/parse/parselo.h             |  57 ++--
 code/ship/ship.cpp               |  80 ++---
 code/weapon/weapons.cpp          |   4 +-
 9 files changed, 317 insertions(+), 611 deletions(-)

------------------------------------------------------------------------
commit 497a0e080
Author: Goober5000
Commit: Goober5000

    fix character type for isdigit
 code/asteroid/asteroid.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit f60d2d8e3
Author: Baezon
Commit: Baezon

    comment changes
 code/ai/aibig.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit 19c0f6473
Author: z64555
Commit: z64555

    Upgrade a few Assert()'s into Assertion()'s with error messages
 code/controlconfig/controlsconfigcommon.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

------------------------------------------------------------------------
commit 78ac82d6e
Author: z64555
Commit: z64555

    Replace Int3()'s with UNREACHABLE * control_config_bind_btn uses UNREACHABLE macro when an unknown order is passed to it
 code/controlconfig/controlsconfig.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

------------------------------------------------------------------------
commit 2dd40bcbd
Author: Baezon
Commit: Baezon

    typo
 code/ai/aibig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 5c9582aef
Author: z64555
Commit: z64555

    Fix bug where "Clear Conflict" button was disabled on Ship tab unless the conflicted items included an axis.
 code/controlconfig/controlsconfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit c3c4c21fc
Author: Baezon
Commit: Baezon

    typo
 code/ai/aibig.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit 03dbdf7f0
Author: Goober5000
Commit: Goober5000

    don't display unmodified annotations
 fred2/eventeditor.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

------------------------------------------------------------------------
commit aff1ad40f
Author: Goober5000
Commit: Goober5000

    better handling of unexpected characters that come after numbers
 code/parse/parselo.cpp | 40 ++++++++++++++++++++++++++++++++++++----
 code/parse/parselo.h   |  2 +-
 2 files changed, 37 insertions(+), 5 deletions(-)

------------------------------------------------------------------------
commit 14a8db0dd
Author: Goober5000
Commit: Goober5000

    check for all possible strings
 code/mission/missionparse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 258ffdf56
Author: Goober5000
Commit: Goober5000

    a token consisting of a single + or - is not a valid number
 code/parse/parselo.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

------------------------------------------------------------------------
commit 4bdb9165e
Author: Baezon
Commit: Baezon

    bugfix
 code/ai/aibig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 81c771b8e
Author: Baezon
Commit: Baezon

    clean up
 code/ai/ai_flags.h      |  1 +
 code/ai/ai_profiles.cpp |  2 ++
 code/ai/aibig.cpp       | 65 +++++++++++++++++++++++++++++++++----------------
 3 files changed, 47 insertions(+), 21 deletions(-)

------------------------------------------------------------------------
commit 1fca306fc
Author: z64555
Commit: z64555

    Address clang-tidy issues.
 code/controlconfig/controlsconfig.cpp       |  6 ++----
 code/controlconfig/controlsconfig.h         | 26 ++++++++++++--------------
 code/controlconfig/controlsconfigcommon.cpp | 18 +++++++++++-------
 code/pilotfile/plr.cpp                      |  6 +++---
 4 files changed, 28 insertions(+), 28 deletions(-)

------------------------------------------------------------------------
commit f51502e4a
Author: z64555
Commit: z64555

    Make qtFred and Fred changes consistent with each other.
 fred2/sexp_tree.cpp                 |  8 +++++---
 qtfred/src/ui/widgets/sexp_tree.cpp | 11 ++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

------------------------------------------------------------------------
commit 754f0ea87
Author: z64555
Commit: z64555

    Removed unused local variable.
 code/controlconfig/controlsconfig.cpp | 1 -
 1 file changed, 1 deletion(-)

------------------------------------------------------------------------
commit 9145922cb
Author: z64555
Commit: z64555

    Fix default_item to use default_bindings.
 code/controlconfig/controlsconfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 89a2c4dbc
Author: z64555
Commit: z64555

    Missed another break.
 code/controlconfig/controlsconfigcommon.cpp | 1 +
 1 file changed, 1 insertion(+)

------------------------------------------------------------------------
commit 2cd557e48
Author: z64555
Commit: z64555

    Expletives and default breaks.
 code/controlconfig/controlsconfig.h         | 31 ++++++++++++++++++++++++-----
 code/controlconfig/controlsconfigcommon.cpp | 19 ++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

------------------------------------------------------------------------
commit e5df64ab7
Author: z64555
Commit: z64555

    Address uninitialized variable issue.
 code/controlconfig/controlsconfigcommon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 52b0b19d1
Author: z64555
Commit: z64555

    Update qtFred sexp_tree::get_listing_opf_keypress
 qtfred/src/ui/widgets/sexp_tree.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 36a2355e8
Author: z64555
Commit: z64555

    Address exceedingly frivolous signed/unsigned mismatch errors.
 code/controlconfig/controlsconfig.cpp       | 20 ++++++++++++--------
 code/controlconfig/controlsconfigcommon.cpp | 14 +++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

------------------------------------------------------------------------
commit 351e8e0c4
Author: z64555
Commit: z64555

    Address short/int size mismatches.
 code/controlconfig/controlsconfig.cpp       | 12 ++++++------
 code/controlconfig/controlsconfigcommon.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

------------------------------------------------------------------------
commit 91e0d8f57
Author: z64555
Commit: z64555

    QoL: Highlight/select the found key, be it primary or secondary, should the search mode find it.
 code/controlconfig/controlsconfig.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit f8f26e3b2
Author: z64555
Commit: z64555

    Fix bug where search mode wouldn't detect joy buttons correclty. * Fix bug where joy hats were ignored.
 code/controlconfig/controlsconfig.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit 873a3c344
Author: z64555
Commit: z64555

    Fix bug with displaying joy button text * Fix a number of warnings
 code/controlconfig/controlsconfig.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit 1318b814d
Author: z64555
Commit: z64555

    Fix out-of-bounds error due to axis controls index.
 code/controlconfig/controlsconfig.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

------------------------------------------------------------------------
commit 4c8f5f789
Author: z64555
Commit: z64555

    Grey out empty/unbound items * Joy axis bindings now use the same color logic as the keys and buttons
 code/controlconfig/controlsconfig.cpp | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

------------------------------------------------------------------------
commit b9b922b23
Author: z64555
Commit: z64555

    Fix bug where int conflict wasn't incremented for unselected items. * Fix color highlighting of mouse-over lines * Fix color highlighting of selected bindings * Fix bug when trying to select an item while the selected line is an axis control * Allow user to select an empty item * Expand hitbox of items so players aren't required to click exactly on the text to select it.
 code/controlconfig/controlsconfig.cpp | 130 ++++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 54 deletions(-)

------------------------------------------------------------------------
commit 716b4a320
Author: z64555
Commit: z64555

    Moves the listbox draw function out of do_frame() * Adjusts listbox positioning and widths of the binding columns for better display. * Adds DCF tools to adjust the text positioning in the listbox
 code/controlconfig/controlsconfig.cpp | 389 ++++++++++++++++++++--------------
 1 file changed, 234 insertions(+), 155 deletions(-)

------------------------------------------------------------------------
commit 3c592b799
Author: z64555
Commit: z64555

    Fix bug where the "disallowed key" popup would spam you, blocking you from doing a meaningful bind.
 code/controlconfig/controlsconfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit c8c8a8d89
Author: z64555
Commit: z64555

    Fix bug where unbound items were flagged as conflicted. * Fix bug where Cc_lines was accessed after being cleared. (Incorrectly assumed control_config_cancel_exit() was an exit point)
 code/controlconfig/controlsconfig.cpp       |  1 -
 code/controlconfig/controlsconfig.h         | 11 ++++++-----
 code/controlconfig/controlsconfigcommon.cpp | 27 +++++++++++++--------------
 3 files changed, 19 insertions(+), 20 deletions(-)

------------------------------------------------------------------------
commit 12b19a32b
Author: z64555
Commit: z64555

    Fix bug where unbound joy buttons would persist as a valid binding.
 code/controlconfig/controlsconfig.h         | 2 +-
 code/controlconfig/controlsconfigcommon.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 40e114351
Author: z64555
Commit: z64555

    Miscellaneous fixes to allow building. * declare CCB before CC_bind. * update various functions to use new binding aggregate classes.
 code/controlconfig/controlsconfig.h |  1 +
 code/gamehelp/gameplayhelp.cpp      | 17 +++++------------
 code/pilotfile/csg.cpp              |  8 ++++----
 code/pilotfile/plr.cpp              | 14 +++++++-------
 code/pilotfile/plr_convert.cpp      | 21 +++++++++++----------
 5 files changed, 28 insertions(+), 33 deletions(-)

------------------------------------------------------------------------
commit 704c600ef
Author: z64555
Commit: z64555

    update control_config_clear()
 code/controlconfig/controlsconfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 5dde26fc3
Author: z64555
Commit: z64555

    Update check_control_used() to use primary and secondary.
 code/controlconfig/controlsconfig.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

------------------------------------------------------------------------
commit cb5f80b0d
Author: z64555
Commit: z64555

    Complete refactor of control_config_do_frame() * Add textify method to CC_bind * Replace string printing of key and joy bindings with primary and secondary bindings.
 code/controlconfig/controlsconfig.cpp       | 131 ++++++++++++++++------------
 code/controlconfig/controlsconfig.h         |   5 ++
 code/controlconfig/controlsconfigcommon.cpp |  68 +++++++++++++++
 3 files changed, 150 insertions(+), 54 deletions(-)

------------------------------------------------------------------------
commit 32636968b
Author: z64555
Commit: z64555

    Refactor browse mode in control_config_do_frame() * Allow joy button presses to dismiss help overlay while in browse mode * Refactor selected item cycling
 code/controlconfig/controlsconfig.cpp | 113 ++++++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 32 deletions(-)

------------------------------------------------------------------------
commit e546a75c6
Author: z64555
Commit: z64555

    Fix possible bug where joy btn was ignored in bind mode * Refactor search mode in control_config_do_frame() * Dismiss help overlay in search mode when joy button is pressed * Fix possible bug where nav buttons were not reset in search mode
 code/controlconfig/controlsconfig.cpp | 93 ++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 35 deletions(-)

------------------------------------------------------------------------
commit 9b0aab3f8
Author: z64555
Commit: z64555

    replace CCI::joy_id and ::key_id with ::primary and ::secondary (through inheritance of CCB) * Add convenience methods to CCB * Convert CC_bind into a class and define convenience methods * Set underlying type of enum CID to short * controlconfigdefaults.tbl: Should the CCI be disabled by an override, clear its binding. * Control config menu: Should the help overlay be active during bind mode, dismiss it, don't bind anything, and stay in bind mode (fixes inconstant behavior) * Refactor bind mode handling in control_config_do_frame()
 code/controlconfig/controlsconfig.cpp       | 623 ++++++++++++++++------------
 code/controlconfig/controlsconfig.h         | 110 ++++-
 code/controlconfig/controlsconfigcommon.cpp | 149 ++++++-
 3 files changed, 586 insertions(+), 296 deletions(-)

------------------------------------------------------------------------
commit 7f2baec38
Author: z64555
Commit: z64555

    Remove Control_config::key_default and ::joy_default, redirect calls to the default presets
 code/controlconfig/controlsconfig.cpp       |  8 +++++---
 code/controlconfig/controlsconfig.h         |  2 --
 code/controlconfig/controlsconfigcommon.cpp | 16 +++++++---------
 fred2/sexp_tree.cpp                         |  8 ++++----
 4 files changed, 16 insertions(+), 18 deletions(-)

------------------------------------------------------------------------
commit a3d3be11f
Author: Baezon
Commit: Baezon

    initial testing version
 code/ai/aibig.cpp | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 106 insertions(+), 7 deletions(-)