Hard Light Productions Forums

Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Nightly Builds => Topic started by: SirKnightly on March 16, 2023, 01:48:52 am

Title: Nightly: 16 March 2023 - Revision 75a14625c
Post by: SirKnightly on March 16, 2023, 01:48:52 am: Here is the nightly for 16 March 2023 - Revision 75a14625c

Group: Win32-SSE2
nightly_20230316_75a14625c-builds-Win32-SSE2.zip (http://scp.indiegames.us/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Win32-SSE2.zip) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Win32-SSE2.zip))

Group: MacOSX
nightly_20230316_75a14625c-builds-Mac.tar.gz (http://scp.indiegames.us/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Mac.tar.gz) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Mac.tar.gz))

Group: Linux
nightly_20230316_75a14625c-builds-Linux.tar.gz (http://scp.indiegames.us/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Linux.tar.gz) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-Linux.tar.gz))

Group: Win64-SSE2
nightly_20230316_75a14625c-builds-x64-SSE2.zip (http://scp.indiegames.us/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-x64-SSE2.zip) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230316_75a14625c/nightly_20230316_75a14625c-builds-x64-SSE2.zip))

Code: [Select]
------------------------------------------------------------------------ commit 27d9e412c Author: mjn-mixael Commit: mjn-mixael use qtfred style warning instead of fred qtfred/src/mission/missionsave.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ------------------------------------------------------------------------ commit 6e51c7cc0 Author: James Carthew Commit: James Carthew Fixed missionsave.cpp - removed deprecated MB_OK MessageBox command. qtfred/src/mission/missionsave.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ------------------------------------------------------------------------ commit 638745cb1 Author: James Carthew Commit: James Carthew Fixed compilation error in BriefingEditorDialog.ui qtfred/ui/BriefingEditorDialog.ui | 2 -- 1 file changed, 2 deletions(-) ------------------------------------------------------------------------ commit 4e9309a15 Author: the-maddin Commit: the-maddin Comment branch types qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ------------------------------------------------------------------------ commit ddeb40aa6 Author: the-maddin Commit: the-maddin checks fix qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 1 + qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------------------------------ commit db68e3086 Author: the-maddin Commit: the-maddin fix qvector error qtfred/src/ui/dialogs/CampaignEditorDialog.h | 1 + 1 file changed, 1 insertion(+) ------------------------------------------------------------------------ commit a1fc0907c Author: the-maddin Commit: the-maddin unified warning message handling .../mission/dialogs/CampaignEditorDialogModel.cpp | 39 +++++++++++----------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 33 +++++++++++++----- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 31 ++++++++++++++--- 3 files changed, 71 insertions(+), 32 deletions(-) ------------------------------------------------------------------------ commit 2c5f52a28 Author: the-maddin Commit: the-maddin Integrated error checking fred2/campaigntreewnd.cpp | 37 ++++--- .../mission/dialogs/CampaignEditorDialogModel.cpp | 117 ++++++++++++++++----- .../mission/dialogs/CampaignEditorDialogModel.h | 8 +- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 42 +++++--- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 8 +- 5 files changed, 156 insertions(+), 56 deletions(-) ------------------------------------------------------------------------ commit 5d0fadba1 Author: the-maddin Commit: the-maddin doxy qtfred/src/CheckedDataListModel.h | 130 ++++++++++++++++----- .../mission/dialogs/CampaignEditorDialogModel.h | 14 ++- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 40 ++++++- 3 files changed, 155 insertions(+), 29 deletions(-) ------------------------------------------------------------------------ commit 401a26623 Author: the-maddin Commit: the-maddin changes z64555 v1.4 .../mission/dialogs/CampaignEditorDialogModel.cpp | 420 +++++++++++---------- .../mission/dialogs/CampaignEditorDialogModel.h | 59 ++- 2 files changed, 239 insertions(+), 240 deletions(-) ------------------------------------------------------------------------ commit 9336d7264 Author: the-maddin Commit: the-maddin changes z64555 v1.3 qtfred/src/CheckedDataListModel.h | 8 +-- .../mission/dialogs/CampaignEditorDialogModel.cpp | 66 ++++++++++++++-------- .../mission/dialogs/CampaignEditorDialogModel.h | 10 ++-- qtfred/src/mission/missionsave.cpp | 26 +++++---- qtfred/src/mission/missionsave.h | 5 +- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 51 ++++++++++------- qtfred/src/ui/widgets/sexp_tree.cpp | 3 +- 7 files changed, 103 insertions(+), 66 deletions(-) ------------------------------------------------------------------------ commit ec3ad17fa Author: the-maddin Commit: the-maddin changes z64555 v1.2 qtfred/src/CheckedDataListModel.h | 20 +++++++++++++------- .../mission/dialogs/CampaignEditorDialogModel.cpp | 18 +++++++++--------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) ------------------------------------------------------------------------ commit d9a9cb5f9 Author: the-maddin Commit: the-maddin changes z64555 v1.1 qtfred/src/CheckedDataListModel.h | 50 ++++++++++++---------- .../mission/dialogs/CampaignEditorDialogModel.cpp | 8 ++-- .../mission/dialogs/CampaignEditorDialogModel.h | 6 +-- 3 files changed, 35 insertions(+), 29 deletions(-) ------------------------------------------------------------------------ commit 0a7ff1bc1 Author: the-maddin Commit: the-maddin changes jg18 v3 code/menuui/readyroom.cpp | 2 +- qtfred/src/CheckedDataListModel.h | 8 +++--- .../mission/dialogs/CampaignEditorDialogModel.cpp | 30 ++++++++++++---------- 3 files changed, 22 insertions(+), 18 deletions(-) ------------------------------------------------------------------------ commit e5f80a160 Author: the-maddin Commit: the-maddin incorporate feedback qtfred/src/CheckedDataListModel.h | 12 ++++++------ .../src/mission/dialogs/CampaignEditorDialogModel.cpp | 18 +++++++++--------- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 4 ++-- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) ------------------------------------------------------------------------ commit e3a153ef5 Author: the-maddin Commit: the-maddin Clarify abbreviations qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 3 +++ 1 file changed, 3 insertions(+) ------------------------------------------------------------------------ commit ccf86293c Author: the-maddin Commit: the-maddin incorporate feedback code/menuui/readyroom.cpp | 4 ++-- code/mission/missioncampaign.cpp | 2 +- qtfred/src/CheckedDataListModel.h | 4 ++-- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 6 +++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 4 ++-- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 6 +++--- qtfred/src/ui/widgets/sexp_tree.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) ------------------------------------------------------------------------ commit f142780b9 Author: the-maddin Commit: the-maddin clang qtfred/src/CheckedDataListModel.h | 4 ++-- qtfred/src/mission/missionsave.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ------------------------------------------------------------------------ commit 8bf51ff85 Author: the-maddin Commit: the-maddin fix CheckedDataListModel pointer issue qtfred/src/CheckedDataListModel.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) ------------------------------------------------------------------------ commit 84cb7fddb Author: the-maddin Commit: the-maddin Export campaign model to Campaign struct .../mission/dialogs/CampaignEditorDialogModel.cpp | 121 ++++++++++++++++++++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 14 +-- 2 files changed, 123 insertions(+), 12 deletions(-) ------------------------------------------------------------------------ commit 566d15dfe Author: the-maddin Commit: the-maddin Add first mission selection, always keep valid .../mission/dialogs/CampaignEditorDialogModel.cpp | 61 ++++++++++++++++++---- .../mission/dialogs/CampaignEditorDialogModel.h | 7 ++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 7 +++ qtfred/ui/CampaignEditorDialog.ui | 39 +++++++++++--- 4 files changed, 95 insertions(+), 19 deletions(-) ------------------------------------------------------------------------ commit 0d82ca5be Author: the-maddin Commit: the-maddin clang stuff qtfred/src/CheckedDataListModel.h | 6 +++--- qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 10 ++++++---- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 4 +--- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 9 +++------ 4 files changed, 13 insertions(+), 16 deletions(-) ------------------------------------------------------------------------ commit 4857f320a Author: the-maddin Commit: the-maddin Saving part 2: Campaign Specs to Campaign .../mission/dialogs/CampaignEditorDialogModel.cpp | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) ------------------------------------------------------------------------ commit 636f6933b Author: the-maddin Commit: the-maddin Ensure correct flags and loop state qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 15 ++++++++++++++- qtfred/src/mission/missionsave.cpp | 3 +-- 2 files changed, 15 insertions(+), 3 deletions(-) ------------------------------------------------------------------------ commit a8483c5a8 Author: the-maddin Commit: the-maddin Saving part 1: Output Campaign to file .../mission/dialogs/CampaignEditorDialogModel.cpp | 11 +- qtfred/src/mission/missionsave.cpp | 196 +++++++++++++++++++++ qtfred/src/mission/missionsave.h | 18 +- 3 files changed, 220 insertions(+), 5 deletions(-) ------------------------------------------------------------------------ commit 5eb4c3557 Author: the-maddin Commit: the-maddin clang msvc qtfred/src/CheckedDataListModel.h | 4 ++-- qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ------------------------------------------------------------------------ commit 15752d172 Author: the-maddin Commit: the-maddin Integrate branch buttons into context menu .../mission/dialogs/CampaignEditorDialogModel.cpp | 24 ++++++++ .../mission/dialogs/CampaignEditorDialogModel.h | 2 + qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 10 ---- qtfred/src/ui/widgets/sexp_tree.cpp | 14 +++++ qtfred/src/ui/widgets/sexp_tree.h | 2 + qtfred/ui/CampaignEditorDialog.ui | 66 +--------------------- 6 files changed, 44 insertions(+), 74 deletions(-) ------------------------------------------------------------------------ commit 413842c84 Author: the-maddin Commit: the-maddin Branch moving & branch UI misc .../mission/dialogs/CampaignEditorDialogModel.cpp | 23 +++++++++++++++++--- .../mission/dialogs/CampaignEditorDialogModel.h | 7 +++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 25 +++++++++------------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 3 --- 4 files changed, 34 insertions(+), 24 deletions(-) ------------------------------------------------------------------------ commit e41bde6da Author: the-maddin Commit: the-maddin Fix branch sexptree popup menu part 3 .../mission/dialogs/CampaignEditorDialogModel.cpp | 72 ++++++++++++++++------ .../mission/dialogs/CampaignEditorDialogModel.h | 24 ++++---- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 65 ++++++++++++------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 4 +- qtfred/src/ui/widgets/sexp_tree.cpp | 15 +++++ qtfred/src/ui/widgets/sexp_tree.h | 2 + 6 files changed, 127 insertions(+), 55 deletions(-) ------------------------------------------------------------------------ commit e37ca8fd8 Author: the-maddin Commit: the-maddin Model data access fix qtfred/src/CheckedDataListModel.h | 11 ++++++----- qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 12 ++++++------ qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) ------------------------------------------------------------------------ commit e2099271c Author: the-maddin Commit: the-maddin Fix branch sexptree popup menu part 2 qtfred/src/CheckedDataListModel.h | 56 ++++++++++++++++++++++ .../mission/dialogs/CampaignEditorDialogModel.cpp | 9 ++++ .../mission/dialogs/CampaignEditorDialogModel.h | 17 +++++-- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 4 +- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 4 +- qtfred/src/ui/widgets/sexp_tree.cpp | 34 ++++++------- qtfred/src/ui/widgets/sexp_tree.h | 6 +-- 7 files changed, 99 insertions(+), 31 deletions(-) ------------------------------------------------------------------------ commit 19817f4cd Author: the-maddin Commit: the-maddin reorder model impl and lazy init some constants .../mission/dialogs/CampaignEditorDialogModel.cpp | 448 +++++++++++---------- .../mission/dialogs/CampaignEditorDialogModel.h | 10 +- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 10 +- 3 files changed, 244 insertions(+), 224 deletions(-) ------------------------------------------------------------------------ commit c41e5c9d7 Author: the-maddin Commit: the-maddin Always replace corrupted model after load attempt qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 5 ++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) ------------------------------------------------------------------------ commit b08109c2f Author: the-maddin Commit: the-maddin Fix branch sexptree popup menu part 1 qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 11 +++++++++++ qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 1 + qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 2 ++ qtfred/ui/CampaignEditorDialog.ui | 3 --- 4 files changed, 14 insertions(+), 3 deletions(-) ------------------------------------------------------------------------ commit 30b484b27 Author: the-maddin Commit: the-maddin Use AssociatedPlainTextDocument .../mission/dialogs/CampaignEditorDialogModel.cpp | 25 +++++++--------------- .../mission/dialogs/CampaignEditorDialogModel.h | 11 ++++------ 2 files changed, 12 insertions(+), 24 deletions(-) ------------------------------------------------------------------------ commit 298903439 Author: the-maddin Commit: the-maddin Dialog cleanup qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 18 ++++++++++-------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 1 + qtfred/ui/CampaignEditorDialog.ui | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) ------------------------------------------------------------------------ commit eec2ce171 Author: the-maddin Commit: the-maddin Model structure and TextEdit cleanup .../mission/dialogs/CampaignEditorDialogModel.cpp | 142 +++++++++----- .../mission/dialogs/CampaignEditorDialogModel.h | 206 +++++++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 47 +---- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 1 + qtfred/ui/CampaignEditorDialog.ui | 1 - 5 files changed, 211 insertions(+), 186 deletions(-) ------------------------------------------------------------------------ commit 439f63336 Author: the-maddin Commit: the-maddin Add branches & conditions in model .../mission/dialogs/CampaignEditorDialogModel.cpp | 21 +++++++++++++++++---- .../src/mission/dialogs/CampaignEditorDialogModel.h | 11 +++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) ------------------------------------------------------------------------ commit 458d2f5e1 Author: the-maddin Commit: the-maddin custom mission selection & linking context menu .../mission/dialogs/CampaignEditorDialogModel.cpp | 35 +++++++++- .../mission/dialogs/CampaignEditorDialogModel.h | 13 ++-- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 81 ++++++++++++++++++++-- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 3 +- qtfred/ui/CampaignEditorDialog.ui | 34 +++++---- 5 files changed, 136 insertions(+), 30 deletions(-) ------------------------------------------------------------------------ commit 2f361340f Author: the-maddin Commit: the-maddin Parse eligible & campaign missions for event names .../mission/dialogs/CampaignEditorDialogModel.cpp | 112 +++++++++++++++------ .../mission/dialogs/CampaignEditorDialogModel.h | 28 +++++- 2 files changed, 109 insertions(+), 31 deletions(-) ------------------------------------------------------------------------ commit 41d65630f Author: the-maddin Commit: the-maddin validate and use current branch index qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 12 +++++++++++- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 3 +++ qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) ------------------------------------------------------------------------ commit 8db39a6c6 Author: the-maddin Commit: the-maddin WIP note qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 8 +++++--- qtfred/ui/CampaignEditorDialog.ui | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) ------------------------------------------------------------------------ commit ec84c7183 Author: the-maddin Commit: the-maddin comboBox tweak qtfred/ui/CampaignEditorDialog.ui | 15 +++++++++++++++ 1 file changed, 15 insertions(+) ------------------------------------------------------------------------ commit 16a5b1ccc Author: the-maddin Commit: the-maddin Improve mission list robustness qtfred/src/CheckedDataListModel.h | 11 +++++++---- qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) ------------------------------------------------------------------------ commit 856726d00 Author: the-maddin Commit: the-maddin pick pulled model changes qtfred/src/CheckedDataListModel.h | 169 +++++++++++++++++++++++++++----------- 1 file changed, 122 insertions(+), 47 deletions(-) ------------------------------------------------------------------------ commit dd2c5a22a Author: the-maddin Commit: the-maddin Comboboxes for loop brief & anim .../mission/dialogs/CampaignEditorDialogModel.cpp | 13 ++++++- .../mission/dialogs/CampaignEditorDialogModel.h | 2 ++ qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 30 ++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 3 -- qtfred/ui/CampaignEditorDialog.ui | 42 +++++----------------- 5 files changed, 34 insertions(+), 56 deletions(-) ------------------------------------------------------------------------ commit b97129da8 Author: the-maddin Commit: the-maddin Cleanup mission list loading, drop mission object .../mission/dialogs/CampaignEditorDialogModel.cpp | 70 ++++++++++++---------- .../mission/dialogs/CampaignEditorDialogModel.h | 11 ++-- 2 files changed, 45 insertions(+), 36 deletions(-) ------------------------------------------------------------------------ commit a7badba0d Author: the-maddin Commit: the-maddin cleanup .../mission/dialogs/CampaignEditorDialogModel.cpp | 28 +++++++++++----------- .../mission/dialogs/CampaignEditorDialogModel.h | 26 ++++++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 24 +++++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 4 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) ------------------------------------------------------------------------ commit 93a1f3e6b Author: the-maddin Commit: the-maddin Use finer UI update control instead of modelChanged .../mission/dialogs/CampaignEditorDialogModel.cpp | 29 ++++++-- .../mission/dialogs/CampaignEditorDialogModel.h | 22 ++----- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 77 +++++++++++----------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 8 ++- 4 files changed, 71 insertions(+), 65 deletions(-) ------------------------------------------------------------------------ commit b19399021 Author: the-maddin Commit: the-maddin load and display loop data .../mission/dialogs/CampaignEditorDialogModel.cpp | 47 ++++++++++++++------- .../mission/dialogs/CampaignEditorDialogModel.h | 48 ++++++++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 27 +++++++----- 3 files changed, 76 insertions(+), 46 deletions(-) ------------------------------------------------------------------------ commit c95fe1c9d Author: the-maddin Commit: the-maddin clang qtfred/src/main.cpp | 86 ++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) ------------------------------------------------------------------------ commit f40549679 Author: the-maddin Commit: the-maddin Clang-tidy fixes qtfred/src/main.cpp | 6 ++--- .../mission/dialogs/CampaignEditorDialogModel.cpp | 28 ++++++++++++++-------- .../mission/dialogs/CampaignEditorDialogModel.h | 2 +- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 3 ++- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-) ------------------------------------------------------------------------ commit 33b63e5b6 Author: the-maddin Commit: the-maddin Implement FRED-Mission button qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 11 ++++++----- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) ------------------------------------------------------------------------ commit b64bd789b Author: the-maddin Commit: the-maddin Some more clang fixes qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 10 +++++----- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 4 ++-- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 6 ++---- 3 files changed, 9 insertions(+), 11 deletions(-) ------------------------------------------------------------------------ commit 9011319e2 Author: the-maddin Commit: the-maddin Use new CheckedDataListModel .../mission/dialogs/CampaignEditorDialogModel.cpp | 68 +++++++++++----------- .../mission/dialogs/CampaignEditorDialogModel.h | 13 +++-- 2 files changed, 41 insertions(+), 40 deletions(-) ------------------------------------------------------------------------ commit 3fd825b1d Author: the-maddin Commit: the-maddin SaveAs shortcut qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------------------------------ commit b21d38024 Author: the-maddin Commit: the-maddin Handle branch tree selection .../mission/dialogs/CampaignEditorDialogModel.cpp | 11 ++++++++-- .../mission/dialogs/CampaignEditorDialogModel.h | 15 ++++++++----- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 25 ++++++++++++++++------ qtfred/src/ui/dialogs/CampaignEditorDialog.h | 1 + 4 files changed, 39 insertions(+), 13 deletions(-) ------------------------------------------------------------------------ commit c2e8ba9fa Author: the-maddin Commit: the-maddin Use campaign branch sexp_tree and load formulas .../mission/dialogs/CampaignEditorDialogModel.cpp | 49 +++++++++++++++++++-- .../mission/dialogs/CampaignEditorDialogModel.h | 51 ++++++++++++++-------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 36 ++++++++++++--- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 7 ++- qtfred/ui/CampaignEditorDialog.ui | 33 ++++++++------ 5 files changed, 134 insertions(+), 42 deletions(-) ------------------------------------------------------------------------ commit 61fb9c5dd Author: the-maddin Commit: the-maddin CMission Data: use combo boxes where possible qtfred/src/main.cpp | 3 + .../mission/dialogs/CampaignEditorDialogModel.cpp | 36 +++++++++++ .../mission/dialogs/CampaignEditorDialogModel.h | 6 +- qtfred/src/mission/management.cpp | 12 ++++ qtfred/src/mission/management.h | 3 + qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 23 +++++--- qtfred/ui/CampaignEditorDialog.ui | 69 +++++++++++----------- 7 files changed, 105 insertions(+), 47 deletions(-) ------------------------------------------------------------------------ commit f7ecb85df Author: the-maddin Commit: the-maddin CampaignMissionData: load cmission, display editable cmission data .../mission/dialogs/CampaignEditorDialogModel.cpp | 65 ++++++++++-------- .../mission/dialogs/CampaignEditorDialogModel.h | 77 ++++++++++++---------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 22 ++++--- 3 files changed, 93 insertions(+), 71 deletions(-) ------------------------------------------------------------------------ commit 144ae46cc Author: the-maddin Commit: the-maddin model initialisation cleanup qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 12 +++++------- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 14 ++++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) ------------------------------------------------------------------------ commit 1a8168247 Author: the-maddin Commit: the-maddin Show player number of multi campaigns qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 2 +- qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 9 ++++++++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) ------------------------------------------------------------------------ commit 3349c99a0 Author: the-maddin Commit: the-maddin Clean up data entry widget signalling .../mission/dialogs/CampaignEditorDialogModel.h | 23 +++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 82 +++++++--------------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 13 ---- 3 files changed, 39 insertions(+), 79 deletions(-) ------------------------------------------------------------------------ commit 6e2723a31 Author: the-maddin Commit: the-maddin Update widgets on mission selection change .../mission/dialogs/CampaignEditorDialogModel.cpp | 15 ++++--- .../mission/dialogs/CampaignEditorDialogModel.h | 8 +++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 38 ++++++++++++------ qtfred/src/ui/dialogs/CampaignEditorDialog.h | 7 ++-- qtfred/ui/CampaignEditorDialog.ui | 46 +++++++++------------- 5 files changed, 65 insertions(+), 49 deletions(-) ------------------------------------------------------------------------ commit 9241c49f3 Author: the-maddin Commit: the-maddin Warn before dropping unloadable missionDropped qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 13 +++++++++++++ qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 3 +++ qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) ------------------------------------------------------------------------ commit 80fc7a5cb Author: the-maddin Commit: the-maddin gcc11: add missing include code/math/vecmat.h | 1 + 1 file changed, 1 insertion(+) ------------------------------------------------------------------------ commit ca982fa1a Author: the-maddin Commit: the-maddin Immutable campaignType, file load & menu changes .../mission/dialogs/CampaignEditorDialogModel.cpp | 13 +++-- .../mission/dialogs/CampaignEditorDialogModel.h | 15 ++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 66 ++++++++-------------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 2 - qtfred/ui/CampaignEditorDialog.ui | 27 ++++++++- 5 files changed, 62 insertions(+), 61 deletions(-) ------------------------------------------------------------------------ commit 20fc9d629 Author: the-maddin Commit: the-maddin Create available mission list .../mission/dialogs/CampaignEditorDialogModel.cpp | 67 +++++++++++++++++++--- .../mission/dialogs/CampaignEditorDialogModel.h | 39 +++++++++---- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 16 ++++-- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 2 - qtfred/ui/CampaignEditorDialog.ui | 28 +++++---- 5 files changed, 116 insertions(+), 36 deletions(-) ------------------------------------------------------------------------ commit 881f47670 Author: the-maddin Commit: the-maddin Use CheckedDataListModel improvements .../mission/dialogs/CampaignEditorDialogModel.cpp | 33 +++++++++++----------- .../mission/dialogs/CampaignEditorDialogModel.h | 5 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) ------------------------------------------------------------------------ commit 54a64cb91 Author: the-maddin Commit: the-maddin Deal with windows filenames in CFile .../mission/dialogs/CampaignEditorDialogModel.cpp | 42 +++++++++++----------- .../mission/dialogs/CampaignEditorDialogModel.h | 5 ++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 3 ++ 3 files changed, 26 insertions(+), 24 deletions(-) ------------------------------------------------------------------------ commit 232eb2a09 Author: the-maddin Commit: the-maddin Allow full-length paths for campaign files code/menuui/readyroom.cpp | 2 +- code/mission/missioncampaign.cpp | 2 +- code/mission/missioncampaign.h | 3 ++- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 8 ++------ 4 files changed, 6 insertions(+), 9 deletions(-) ------------------------------------------------------------------------ commit fc65df048 Author: the-maddin Commit: the-maddin Register initial... lists changes qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 3 +++ qtfred/src/mission/dialogs/CampaignEditorDialogModel.h | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ------------------------------------------------------------------------ commit f2cfac14b Author: the-maddin Commit: the-maddin Fix compile issue, correct reload behaviour qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ------------------------------------------------------------------------ commit 5cbe64c79 Author: the-maddin Commit: the-maddin Implement initial ships/weapons lists, intialize model by loading campaign file .../mission/dialogs/CampaignEditorDialogModel.cpp | 43 ++++++++++++++++------ .../mission/dialogs/CampaignEditorDialogModel.h | 19 ++++++---- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 3 ++ qtfred/ui/CampaignEditorDialog.ui | 12 +++--- 4 files changed, 52 insertions(+), 25 deletions(-) ------------------------------------------------------------------------ commit e2b9a5a1a Author: the-maddin Commit: the-maddin Initial campaign loading & trivial uiUpdate functionality .../mission/dialogs/CampaignEditorDialogModel.cpp | 19 ++++++++++-- .../mission/dialogs/CampaignEditorDialogModel.h | 35 +++++++++++----------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 11 +++++-- qtfred/ui/CampaignEditorDialog.ui | 20 ++----------- 4 files changed, 45 insertions(+), 40 deletions(-) ------------------------------------------------------------------------ commit da83c3aa4 Author: the-maddin Commit: the-maddin Tie campaignmodel to campaign file, use QStrings in model .../mission/dialogs/CampaignEditorDialogModel.cpp | 17 ++--- .../mission/dialogs/CampaignEditorDialogModel.h | 82 +++++++++++----------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 64 ++++++++--------- 3 files changed, 80 insertions(+), 83 deletions(-) ------------------------------------------------------------------------ commit 30237c898 Author: the-maddin Commit: the-maddin initial updateUI, explicit model modification flagging .../mission/dialogs/CampaignEditorDialogModel.cpp | 3 +- .../mission/dialogs/CampaignEditorDialogModel.h | 11 +++++--- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 33 +++++++++++++++++++++- 3 files changed, 41 insertions(+), 6 deletions(-) ------------------------------------------------------------------------ commit ca23d30c9 Author: the-maddin Commit: the-maddin File ops UI logic, cleanup .../mission/dialogs/CampaignEditorDialogModel.cpp | 39 ++++-- .../mission/dialogs/CampaignEditorDialogModel.h | 81 ++++++----- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 154 +++++++++++++-------- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 12 +- qtfred/ui/CampaignEditorDialog.ui | 2 +- 5 files changed, 182 insertions(+), 106 deletions(-) ------------------------------------------------------------------------ commit 53e30ba77 Author: the-maddin Commit: the-maddin Connect some more signals/slots .../mission/dialogs/CampaignEditorDialogModel.cpp | 8 ++- .../mission/dialogs/CampaignEditorDialogModel.h | 64 +++++++++++++++------- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 27 ++++++--- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 7 ++- qtfred/ui/CampaignEditorDialog.ui | 5 +- 5 files changed, 78 insertions(+), 33 deletions(-) ------------------------------------------------------------------------ commit c4f84ea9f Author: the-maddin Commit: the-maddin alternative layout qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 30 +- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 6 +- qtfred/ui/CampaignEditorDialog.ui | 654 ++++++++++++++----------- 3 files changed, 372 insertions(+), 318 deletions(-) ------------------------------------------------------------------------ commit 7acd4c649 Author: the-maddin Commit: the-maddin sync changes to model (initial) .../mission/dialogs/CampaignEditorDialogModel.cpp | 8 ++++ .../mission/dialogs/CampaignEditorDialogModel.h | 56 ++++++++++++++++++++++ qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 16 +++---- 3 files changed, 72 insertions(+), 8 deletions(-) ------------------------------------------------------------------------ commit 04c136f59 Author: the-maddin Commit: the-maddin add model with initial functionality qtfred/source_groups.cmake | 2 + .../mission/dialogs/CampaignEditorDialogModel.cpp | 30 +++++++++++++++ .../mission/dialogs/CampaignEditorDialogModel.h | 45 ++++++++++++++++++++++ qtfred/src/ui/FredView.cpp | 2 +- qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 23 +++++++---- qtfred/src/ui/dialogs/CampaignEditorDialog.h | 14 ++++--- 6 files changed, 102 insertions(+), 14 deletions(-) ------------------------------------------------------------------------ commit 376847327 Author: the-maddin Commit: the-maddin Add more slots qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 50 ++++++++++++++++++++++++++ qtfred/src/ui/dialogs/CampaignEditorDialog.h | 13 +++++++ qtfred/ui/CampaignEditorDialog.ui | 32 ++++++++++++++--- 3 files changed, 91 insertions(+), 4 deletions(-) ------------------------------------------------------------------------ commit 52427a7ec Author: the-maddin Commit: the-maddin Add initial CampaignEditorDialog qtfred/source_groups.cmake | 4 + qtfred/src/ui/FredView.cpp | 6 + qtfred/src/ui/FredView.h | 1 + qtfred/src/ui/dialogs/CampaignEditorDialog.cpp | 142 ++++++++ qtfred/src/ui/dialogs/CampaignEditorDialog.h | 60 ++++ qtfred/ui/CampaignEditorDialog.ui | 451 +++++++++++++++++++++++++ 6 files changed, 664 insertions(+)