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
26 changed files with 33 additions and 34 deletions
Showing only changes of commit 29b6e57956 - Show all commits

View file

@ -160,34 +160,34 @@ add_executable(MassBuilderSaveTool
GameData/Accessories.h GameData/Accessories.h
GameData/ArmourSets.h GameData/ArmourSets.h
GameData/LastMissionId.h GameData/LastMissionId.h
GameData/ResourceIDs.h
GameData/StoryProgress.h GameData/StoryProgress.h
GameData/StyleNames.h GameData/StyleNames.h
GameData/WeaponParts.h GameData/WeaponParts.h
GameObjects/Accessory.h
GameObjects/ArmourPart.h
GameObjects/BulletLauncherAttachment.h
GameObjects/CustomStyle.h
GameObjects/Decal.h
GameObjects/Joints.h
GameObjects/Mass.h
GameObjects/Mass.cpp
GameObjects/Mass_Frame.cpp
GameObjects/Mass_Armour.cpp
GameObjects/Mass_Weapons.cpp
GameObjects/Mass_Styles.cpp
GameObjects/Mass_DecalsAccessories.cpp
GameObjects/MassPropertyNames.h
GameObjects/Profile.h
GameObjects/Profile.cpp
GameObjects/ProfilePropertyNames.h
GameObjects/Weapon.h
GameObjects/Weapon.cpp
GameObjects/WeaponPart.h
ProfileManager/ProfileManager.h ProfileManager/ProfileManager.h
ProfileManager/ProfileManager.cpp ProfileManager/ProfileManager.cpp
Profile/Profile.h
Profile/Profile.cpp
Profile/PropertyNames.h
Profile/ResourceIDs.h
MassManager/MassManager.h MassManager/MassManager.h
MassManager/MassManager.cpp MassManager/MassManager.cpp
Mass/Accessory.h
Mass/ArmourPart.h
Mass/BulletLauncherAttachment.h
Mass/CustomStyle.h
Mass/Decal.h
Mass/Joints.h
Mass/Mass.h
Mass/Mass.cpp
Mass/Mass_Frame.cpp
Mass/Mass_Armour.cpp
Mass/Mass_Weapons.cpp
Mass/Mass_Styles.cpp
Mass/Mass_DecalsAccessories.cpp
Mass/PropertyNames.h
Mass/Weapon.h
Mass/Weapon.cpp
Mass/WeaponPart.h
Maps/ArmourSlots.hpp Maps/ArmourSlots.hpp
Maps/BulletLauncherAttachmentStyles.hpp Maps/BulletLauncherAttachmentStyles.hpp
Maps/BulletLauncherSockets.hpp Maps/BulletLauncherSockets.hpp

View file

@ -21,7 +21,7 @@
#include <Corrade/Containers/ScopeGuard.h> #include <Corrade/Containers/ScopeGuard.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"

View file

@ -16,7 +16,7 @@
#include <algorithm> #include <algorithm>
#include "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ByteProperty.h" #include "../Gvas/Types/ByteProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// 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 "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// 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 "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// 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 "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ColourStructProperty.h" #include "../Gvas/Types/ColourStructProperty.h"

View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// 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 "PropertyNames.h" #include "MassPropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/BoolProperty.h"

View file

@ -19,7 +19,7 @@
#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Pair.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>
#include "PropertyNames.h" #include "ProfilePropertyNames.h"
#include "../Logger/Logger.h" #include "../Logger/Logger.h"
#include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ArrayProperty.h"
#include "../Gvas/Types/ResourceItemValue.h" #include "../Gvas/Types/ResourceItemValue.h"

View file

@ -21,10 +21,9 @@
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include "../GameData/ResourceIDs.h"
#include "../Gvas/File.h" #include "../Gvas/File.h"
#include "ResourceIDs.h"
using namespace Corrade; using namespace Corrade;
namespace mbst { namespace GameObjects { namespace mbst { namespace GameObjects {

View file

@ -18,7 +18,7 @@
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include "../Mass/CustomStyle.h" #include "../GameObjects/CustomStyle.h"
using namespace Corrade; using namespace Corrade;

View file

@ -18,7 +18,7 @@
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include "../Mass/CustomStyle.h" #include "../GameObjects/CustomStyle.h"
using namespace Corrade; using namespace Corrade;

View file

@ -22,7 +22,7 @@
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include "../Mass/Mass.h" #include "../GameObjects/Mass.h"
using namespace Corrade; using namespace Corrade;

View file

@ -23,7 +23,7 @@
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include "../Profile/Profile.h" #include "../GameObjects/Profile.h"
using namespace Corrade; using namespace Corrade;