[SirKnightly]

Here is the nightly for 31 March 2024 - Revision 055cc6e4c



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


Group: MacOSX-arm64
nightly_20240331_055cc6e4c-builds-Mac-arm64.tar.gz (Mirror)


Group: MacOSX-x86_64
nightly_20240331_055cc6e4c-builds-Mac-x86_64.tar.gz (Mirror)


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


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

Code: [Select]

------------------------------------------------------------------------
commit d564329ff
Author: JohnAFernandez
Commit: JohnAFernandez

    Remove old TODOs and add confirmation
 .../src/mission/dialogs/LoadoutEditorDialogModel.h  |  2 +-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp             | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

------------------------------------------------------------------------
commit 534c69ee6
Author: JohnAFernandez
Commit: JohnAFernandez

    More dialog adjustments
 qtfred/ui/LoadoutDialog.ui | 70 ++++++++--------------------------------------
 1 file changed, 11 insertions(+), 59 deletions(-)

------------------------------------------------------------------------
commit b3bafb83b
Author: JohnAFernandez
Commit: JohnAFernandez

    Remove Unused Code and Add Skip Validation
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 250 +-----
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |   9 +-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 160 ++--
 qtfred/src/ui/dialogs/LoadoutDialog.h              |   1 +
 qtfred/ui/LoadoutDialog.ui                         | 843 +++++++++++----------
 5 files changed, 541 insertions(+), 722 deletions(-)

------------------------------------------------------------------------
commit 9783e9620
Author: JohnAFernandez
Commit: JohnAFernandez

    No Shadowing and more Column Adjustments
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 8 ++++----
 qtfred/src/ui/dialogs/LoadoutDialog.cpp                 | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

------------------------------------------------------------------------
commit 103275e48
Author: JohnAFernandez
Commit: JohnAFernandez

    Don't for get to save required status
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp |  1 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp                 | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

------------------------------------------------------------------------
commit 16ff22cce
Author: JohnAFernandez
Commit: JohnAFernandez

    Add Functionality for Required Weapons
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 36 ++++++++++++++++-
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  8 +++-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 46 ++++++++++++++++------
 3 files changed, 74 insertions(+), 16 deletions(-)

------------------------------------------------------------------------
commit ef31905f3
Author: JohnAFernandez
Commit: JohnAFernandez

    Appease Clang by not having prefix by accident
 qtfred/src/ui/dialogs/LoadoutDialog.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

------------------------------------------------------------------------
commit 18f76652c
Author: JohnAFernandez
Commit: JohnAFernandez

    It's no longer crashing
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 25 +++++++++++-----------
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  2 +-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 15 +++++++------
 3 files changed, 23 insertions(+), 19 deletions(-)

------------------------------------------------------------------------
commit f52ebc8cc
Author: JohnAFernandez
Commit: JohnAFernandez

    Save my progress ....
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 56 +++++++++++--------
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  2 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 64 +++++++++++++++++-----
 3 files changed, 83 insertions(+), 39 deletions(-)

------------------------------------------------------------------------
commit 88897b907
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix Setting
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 9ab82ae60
Author: JohnAFernandez
Commit: JohnAFernandez

    Adding Functionality to CombobBox
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 44 ++++++++++++++++++++++
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  2 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 16 ++++----
 3 files changed, 55 insertions(+), 7 deletions(-)

------------------------------------------------------------------------
commit c01c7da12
Author: JohnAFernandez
Commit: JohnAFernandez

    Version 2, Adding Buttons
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   |  27 +-
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |   2 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 144 +++-
 qtfred/src/ui/dialogs/LoadoutDialog.h              |  14 +-
 qtfred/ui/LoadoutDialog.ui                         | 911 +++++++++++++++------
 5 files changed, 843 insertions(+), 255 deletions(-)

------------------------------------------------------------------------
commit 817fa2cd9
Author: JohnAFernandez
Commit: JohnAFernandez

    Save progress because this is a huge headache
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 144 ++++++++++++++-------
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |   2 +-
 2 files changed, 97 insertions(+), 49 deletions(-)

------------------------------------------------------------------------
commit 41be93448
Author: JohnAFernandez
Commit: JohnAFernandez

    Finish Polishing Regular List behavior
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 82 +++++++++++++++++-
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  6 +-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 98 +++++++++++++++-------
 qtfred/ui/LoadoutDialog.ui                         |  6 +-
 4 files changed, 155 insertions(+), 37 deletions(-)

------------------------------------------------------------------------
commit b870675cc
Author: JohnAFernandez
Commit: JohnAFernandez

    Properly Clear list when switching modes
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 121 ++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 38 deletions(-)

------------------------------------------------------------------------
commit 5b3dddff4
Author: JohnAFernandez
Commit: JohnAFernandez

    New way of "Clearing" rows
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 77 +++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 9 deletions(-)

------------------------------------------------------------------------
commit 8c904c36f
Author: JohnAFernandez
Commit: JohnAFernandez

    Add extra allocated to newly enabled
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

------------------------------------------------------------------------
commit c7f80725f
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix copy paste mistake
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

------------------------------------------------------------------------
commit 5af559d1c
Author: JohnAFernandez
Commit: JohnAFernandez

    Update Window size and Label names
 qtfred/ui/LoadoutDialog.ui | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit d4246432d
Author: JohnAFernandez
Commit: JohnAFernandez

    Make List selection update on multiselect
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 108 +++++++-------------------------
 1 file changed, 24 insertions(+), 84 deletions(-)

------------------------------------------------------------------------
commit 95bc875ac
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix Updating the UI
 .../mission/dialogs/LoadoutEditorDialogModel.cpp    | 21 +++++++++++++++++----
 qtfred/src/ui/dialogs/LoadoutDialog.cpp             | 20 +++++++-------------
 qtfred/src/ui/dialogs/LoadoutDialog.h               |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

------------------------------------------------------------------------
commit 6b72772ac
Author: JohnAFernandez
Commit: JohnAFernandez

    More Polishing
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 53 +++++++++++++++++----------------
 qtfred/ui/LoadoutDialog.ui              |  2 +-
 2 files changed, 28 insertions(+), 27 deletions(-)

------------------------------------------------------------------------
commit 6de289734
Author: JohnAFernandez
Commit: JohnAFernandez

    Ok, making progress on fixing spinbox
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 48 ++++++++++++++++++++++++++++-----
 qtfred/src/ui/dialogs/LoadoutDialog.h   | 12 ++++++---
 2 files changed, 51 insertions(+), 9 deletions(-)

------------------------------------------------------------------------
commit 7a83c71b8
Author: JohnAFernandez
Commit: JohnAFernandez

    Starting to fix Functionality
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 13 ++++++++-----
 qtfred/src/ui/dialogs/LoadoutDialog.h   | 18 ++++++++++++++----
 qtfred/ui/LoadoutDialog.ui              | 21 ++++++++++++++++-----
 3 files changed, 38 insertions(+), 14 deletions(-)

------------------------------------------------------------------------
commit 74805c83b
Author: JohnAFernandez
Commit: JohnAFernandez

    Make sure Usable ships make more sense
 qtfred/ui/LoadoutDialog.ui | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

------------------------------------------------------------------------
commit c9f324426
Author: JohnAFernandez
Commit: JohnAFernandez

    Ok, prevent some crashes due to missing items
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit 308e2edb3
Author: JohnAFernandez
Commit: JohnAFernandez

    Ok, it is at least updating correctly.
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 35 +++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

------------------------------------------------------------------------
commit 2baec05a5
Author: JohnAFernandez
Commit: JohnAFernandez

    More Linter fixes
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

------------------------------------------------------------------------
commit bf2dbb4a0
Author: JohnAFernandez
Commit: JohnAFernandez

    Trying hard to fix things
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

------------------------------------------------------------------------
commit 228a8994e
Author: JohnAFernandez
Commit: JohnAFernandez

    Appease linters
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 3 ---
 1 file changed, 3 deletions(-)

------------------------------------------------------------------------
commit fe2561c89
Author: JohnAFernandez
Commit: JohnAFernandez

    Fixn
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 6 ++----
 qtfred/src/ui/dialogs/LoadoutDialog.cpp                 | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit ee73fadad
Author: JohnAFernandez
Commit: JohnAFernandez

    Get the code to compile at least
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 50 ++++++++++++++++++++++
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |  1 -
 2 files changed, 50 insertions(+), 1 deletion(-)

------------------------------------------------------------------------
commit d75e4e46a
Author: JohnAFernandez
Commit: JohnAFernandez

    A good chunk of further fixes
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 73 +++++++++++++++++----------------
 1 file changed, 37 insertions(+), 36 deletions(-)

------------------------------------------------------------------------
commit 2d90756fe
Author: JohnAFernandez
Commit: JohnAFernandez

    Gotta keep chipping away at the boulder
 qtfred/src/ui/dialogs/LoadoutDialog.cpp |  40 +--
 qtfred/src/ui/dialogs/LoadoutDialog.h   |   2 +-
 qtfred/ui/LoadoutDialog.ui              |   6 +-
 qtfred/ui/LoadoutDialog.ui.autosave     | 511 --------------------------------
 4 files changed, 26 insertions(+), 533 deletions(-)

------------------------------------------------------------------------
commit 807e416eb
Author: JohnAFernandez
Commit: JohnAFernandez

    Why yes, there's tons more errors
 qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 3 ++-
 qtfred/src/ui/dialogs/LoadoutDialog.cpp                 | 7 ++-----
 qtfred/src/ui/dialogs/LoadoutDialog.h                   | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit b8bb4d445
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix some compilation errors
 qtfred/src/ui/dialogs/LoadoutDialog.cpp |  6 ------
 qtfred/src/ui/dialogs/LoadoutDialog.h   | 10 ++++++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

------------------------------------------------------------------------
commit f0f57bf57
Author: JohnAFernandez
Commit: JohnAFernandez

    Remove duplicate function definitions
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

------------------------------------------------------------------------
commit 8b081bf2e
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix no class declaration
 qtfred/src/ui/dialogs/LoadoutDialog.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

------------------------------------------------------------------------
commit 1f034209d
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix incomplete line
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

------------------------------------------------------------------------
commit cef7abb1d
Author: JohnAFernandez
Commit: JohnAFernandez

    Disable Reset Lists
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 38 +++++++++++++++------------------
 qtfred/src/ui/dialogs/LoadoutDialog.h   |  2 --
 2 files changed, 17 insertions(+), 23 deletions(-)

------------------------------------------------------------------------
commit d9909e2a2
Author: JohnAFernandez
Commit: JohnAFernandez

    Cleaning out further functions to fit new paradigm.
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 141 +++-----------------------------
 qtfred/src/ui/dialogs/LoadoutDialog.h   |   3 +-
 2 files changed, 11 insertions(+), 133 deletions(-)

------------------------------------------------------------------------
commit 90097293c
Author: JohnAFernandez
Commit: JohnAFernandez

    Refactor UpdateUI() to reflect new UI structure
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 217 +++++++++++++++++++-------------
 1 file changed, 133 insertions(+), 84 deletions(-)

------------------------------------------------------------------------
commit c2aa94bdd
Author: JohnAFernandez
Commit: JohnAFernandez

    Properly update list widgets
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 77 +++++++++++++++------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

------------------------------------------------------------------------
commit 404a8c9bb
Author: JohnAFernandez
Commit: JohnAFernandez

    Cleaning things up a little
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 92 ++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 41 deletions(-)

------------------------------------------------------------------------
commit 209583b44
Author: JohnAFernandez
Commit: JohnAFernandez

    Save changes.
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 24 ++++++++++++++++++++----
 qtfred/src/ui/dialogs/LoadoutDialog.h   |  4 ++++
 2 files changed, 24 insertions(+), 4 deletions(-)

------------------------------------------------------------------------
commit 5c746f13a
Author: JohnAFernandez
Commit: JohnAFernandez

    Pretty Much Completely Redone
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   |   9 +-
 .../src/mission/dialogs/LoadoutEditorDialogModel.h |   6 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 260 +++++++--------------
 qtfred/src/ui/dialogs/LoadoutDialog.h              |  10 +-
 4 files changed, 98 insertions(+), 187 deletions(-)

------------------------------------------------------------------------
commit dae99e5b8
Author: JohnAFernandez
Commit: JohnAFernandez

    Also, add add/remove to ui file
 qtfred/ui/LoadoutDialog.ui | 505 ++++++++++++++++++++++++---------------------
 1 file changed, 268 insertions(+), 237 deletions(-)

------------------------------------------------------------------------
commit e5f0b674b
Author: JohnAFernandez
Commit: JohnAFernandez

    Rearrange Editor to use add/remove
 qtfred/src/ui/dialogs/LoadoutDialog.cpp |  26 +-
 qtfred/ui/LoadoutDialog.ui.autosave     | 511 ++++++++++++++++++++++++++++++++
 2 files changed, 527 insertions(+), 10 deletions(-)

------------------------------------------------------------------------
commit eebc2bfd5
Author: JohnAFernandez
Commit: JohnAFernandez

    Fix
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 8 +++-----
 qtfred/ui/LoadoutDialog.ui              | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

------------------------------------------------------------------------
commit 7eb64e59b
Author: JohnAFernandez
Commit: JohnAFernandez

    Fixes
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

------------------------------------------------------------------------
commit 7db278410
Author: JohnAFernandez
Commit: JohnAFernandez

    A little more cleanup
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

------------------------------------------------------------------------
commit ed4d18736
Author: JohnAFernandez
Commit: JohnAFernandez

    Getting Close hopefully to properly functioning
 qtfred/src/ui/dialogs/LoadoutDialog.cpp | 78 +++++++++++++++++++--------------
 qtfred/src/ui/dialogs/LoadoutDialog.h   |  2 +
 2 files changed, 47 insertions(+), 33 deletions(-)

------------------------------------------------------------------------
commit 1bbcdc3dc
Author: JohnAFernandez
Commit: JohnAFernandez

    Finish the Loadout Dialog
 code/ship/ship.cpp                                 |   6 +-
 qtfred/source_groups.cmake                         |   8 +-
 qtfred/src/mission/Editor.cpp                      |  57 +-
 qtfred/src/mission/Editor.h                        |  11 +
 .../mission/dialogs/LoadoutEditorDialogModel.cpp   | 885 +++++++++++++++++++++
 .../src/mission/dialogs/LoadoutEditorDialogModel.h | 104 +++
 qtfred/src/ui/FredView.cpp                         |   5 +
 qtfred/src/ui/FredView.h                           |   1 +
 qtfred/src/ui/dialogs/LoadoutDialog.cpp            | 722 ++++++++++++++++-
 qtfred/src/ui/dialogs/LoadoutDialog.h              |  40 +-
 qtfred/ui/FredView.ui                              |  12 +-
 qtfred/ui/LoadoutDialog.ui                         | 149 +++-
 12 files changed, 1913 insertions(+), 87 deletions(-)

------------------------------------------------------------------------
commit c36551fbd
Author: JohnAFernandez
Commit: JohnAFernandez

    Edits to the Dialog for Clarity. Conciseness
 .../{TeamLoadoutDialog.cpp => LoadoutDialog.cpp}   |   0
 .../{TeamLoadoutDialog.h => LoadoutDialog.h}       |   0
 .../ui/{TeamLoadoutDialog.ui => LoadoutDialog.ui}  | 435 +++++++++++----------
 3 files changed, 239 insertions(+), 196 deletions(-)