1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
12 changed files with 16 additions and 16 deletions
Showing only changes of commit 0b2796e94b - Show all commits

View file

@ -25,8 +25,8 @@
#include "../Configuration/Configuration.h" #include "../Configuration/Configuration.h"
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../Maps/LastMissionId.h" #include "../GameData/LastMissionId.h"
#include "../Maps/StoryProgress.h" #include "../GameData/StoryProgress.h"
#include "Application.h" #include "Application.h"

View file

@ -21,9 +21,10 @@
#include "../Configuration/Configuration.h" #include "../Configuration/Configuration.h"
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../Maps/Accessories.h" #include "../GameData/Accessories.h"
#define STYLENAMES_DEFINITION #define STYLENAMES_DEFINITION
#include "../Maps/StyleNames.h" #include "../GameData/StyleNames.h"
#include "../ImportExport/Export.h"
#include "Application.h" #include "Application.h"

View file

@ -15,9 +15,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../GameData/ArmourSets.h"
#include "../Maps/ArmourSets.h" #include "../GameData/StyleNames.h"
#include "../Maps/StyleNames.h"
#include "Application.h" #include "Application.h"

View file

@ -15,7 +15,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../Maps/StyleNames.h" #include "../GameData/StyleNames.h"
#include "Application.h" #include "Application.h"

View file

@ -16,8 +16,8 @@
#include "../FontAwesome/IconsFontAwesome5.h" #include "../FontAwesome/IconsFontAwesome5.h"
#include "../Maps/StyleNames.h" #include "../GameData/StyleNames.h"
#include "../Maps/WeaponParts.h" #include "../GameData/WeaponParts.h"
#include "Application.h" #include "Application.h"

View file

@ -157,6 +157,12 @@ add_executable(MassBuilderSaveTool
Application/Application_UpdateChecker.cpp Application/Application_UpdateChecker.cpp
Configuration/Configuration.h Configuration/Configuration.h
Configuration/Configuration.cpp Configuration/Configuration.cpp
GameData/Accessories.h
GameData/ArmourSets.h
GameData/LastMissionId.h
GameData/StoryProgress.h
GameData/StyleNames.h
GameData/WeaponParts.h
ProfileManager/ProfileManager.h ProfileManager/ProfileManager.h
ProfileManager/ProfileManager.cpp ProfileManager/ProfileManager.cpp
Profile/Profile.h Profile/Profile.h
@ -182,17 +188,11 @@ add_executable(MassBuilderSaveTool
Mass/Weapon.h Mass/Weapon.h
Mass/Weapon.cpp Mass/Weapon.cpp
Mass/WeaponPart.h Mass/WeaponPart.h
Maps/Accessories.h
Maps/ArmourSets.h
Maps/ArmourSlots.hpp Maps/ArmourSlots.hpp
Maps/BulletLauncherAttachmentStyles.hpp Maps/BulletLauncherAttachmentStyles.hpp
Maps/BulletLauncherSockets.hpp Maps/BulletLauncherSockets.hpp
Maps/DamageTypes.hpp Maps/DamageTypes.hpp
Maps/EffectColourModes.hpp Maps/EffectColourModes.hpp
Maps/LastMissionId.h
Maps/StoryProgress.h
Maps/StyleNames.h
Maps/WeaponParts.h
Maps/WeaponTypes.hpp Maps/WeaponTypes.hpp
ToastQueue/ToastQueue.h ToastQueue/ToastQueue.h
ToastQueue/ToastQueue.cpp ToastQueue/ToastQueue.cpp