Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weapons Editor Dialog and Table Viewer #6169

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+2,001 −1
Open

Weapons Editor Dialog and Table Viewer #6169

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
744c947
Add Weapons Dialog
TheForce172 May 22, 2024
32fecda
Add TBL Viewer
TheForce172 May 26, 2024
0b24125
Add Comments
TheForce172 May 26, 2024
144822c
Appease GCC / Clang
TheForce172 May 27, 2024
d86bee5
Merge branch 'master' into feature/weaponsDialog
TheForce172 Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Loading
Loading status checks…
Merge branch 'master' into feature/weaponsDialog
@TheForce172
TheForce172 authored Jun 21, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit d86bee5b69da68d25d35722560ca5d0462a580d1
5 changes: 5 additions & 0 deletions qtfred/source_groups.cmake
View file
Original file line number Diff line number Diff line change
@@ -90,6 +90,8 @@ add_file_folder("Source/Mission/Dialogs/ShipEditor"
src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.h
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.cpp
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.h
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.cpp
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.h
)

add_file_folder("Source/UI"
@@ -162,6 +164,8 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
src/ui/dialogs/ShipEditor/BankModel.h
src/ui/dialogs/ShipEditor/WeaponsTBLViewer.cpp
src/ui/dialogs/ShipEditor/WeaponsTBLViewer.h
src/ui/dialogs/ShipEditor/ShipPathsDialog.h
src/ui/dialogs/ShipEditor/ShipPathsDialog.cpp
)

add_file_folder("Source/UI/Util"
@@ -216,6 +220,7 @@ add_file_folder("UI"
ui/ShipTextureReplacementDialog.ui
ui/ShipTBLViewer.ui
ui/ShipWeaponsDialog.ui
ui/ShipPathsDialog.ui
)

add_file_folder("Resources"
1 change: 1 addition & 0 deletions qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.h
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
#include "ShipTextureReplacementDialog.h"
#include "ShipTBLViewer.h"
#include "ShipWeaponsDialog.h"
#include "ShipPathsDialog.h"

#include <QAbstractButton>
#include <QtWidgets/QDialog>
You are viewing a condensed version of this merge commit. You can view the full changes here.