diff --git a/CUE4Parse b/CUE4Parse index 61042149..52292cb8 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 61042149e8e2a4ea2bd34300b4f276cf6cec6ab8 +Subproject commit 52292cb88d4de990fbcf6e07fac883e3a8d13d4f diff --git a/FModel/Settings/CustomDirectory.cs b/FModel/Settings/CustomDirectory.cs index 471cb93f..14b4a388 100644 --- a/FModel/Settings/CustomDirectory.cs +++ b/FModel/Settings/CustomDirectory.cs @@ -13,9 +13,9 @@ public class CustomDirectory : ViewModel case "Fortnite [LIVE]": return new List { - new("Cosmetics", "FortniteGame/Content/Athena/Items/Cosmetics/"), - new("Emotes [AUDIO]", "FortniteGame/Content/Athena/Sounds/Emotes/"), - new("Music Packs [AUDIO]", "FortniteGame/Content/Athena/Sounds/MusicPacks/"), + new("Cosmetics", "FortniteGame/Plugins/GameFeatures/BRCosmetics/Content/Athena/Items/Cosmetics/"), + new("Emotes [AUDIO]", "FortniteGame/Plugins/GameFeatures/BRCosmetics/Content/Athena/Sounds/Emotes/"), + new("Music Packs [AUDIO]", "FortniteGame/Plugins/GameFeatures/BRCosmetics/Content/Athena/Sounds/MusicPacks/"), new("Weapons", "FortniteGame/Content/Athena/Items/Weapons/"), new("Strings", "FortniteGame/Content/Localization/") }; diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 11eac187..0eac6eea 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -42,6 +42,7 @@ using CUE4Parse.GameTypes.DBD.Encryption.Aes; using CUE4Parse.GameTypes.PAXDEI.Encryption.Aes; using CUE4Parse.GameTypes.NetEase.MAR.Encryption.Aes; using CUE4Parse.GameTypes.FSR.Encryption.Aes; +using CUE4Parse.UE4.Assets.Exports.Atom; using EpicManifestParser; using FModel.Creator; using FModel.Extensions; @@ -854,6 +855,7 @@ public class CUE4ParseViewModel : ViewModel return false; } case UWorld when isNone && UserSettings.Default.PreviewWorlds: + case UAtomModel when isNone && UserSettings.Default.PreviewStaticMeshes: case UStaticMesh when isNone && UserSettings.Default.PreviewStaticMeshes: case USkeletalMesh when isNone && UserSettings.Default.PreviewSkeletalMeshes: case USkeleton when isNone && UserSettings.Default.SaveSkeletonAsMesh: diff --git a/FModel/ViewModels/GameSelectorViewModel.cs b/FModel/ViewModels/GameSelectorViewModel.cs index af6653b9..273248b2 100644 --- a/FModel/ViewModels/GameSelectorViewModel.cs +++ b/FModel/ViewModels/GameSelectorViewModel.cs @@ -101,8 +101,8 @@ public class GameSelectorViewModel : ViewModel .GroupBy(value => (int)value == ((int)value & ~0xF)); private IEnumerable EnumerateDetectedGames() { - yield return GetUnrealEngineGame("Fortnite", "\\FortniteGame\\Content\\Paks", EGame.GAME_UE5_4); - yield return DirectorySettings.Default("Fortnite [LIVE]", Constants._FN_LIVE_TRIGGER, ue: EGame.GAME_UE5_4); + yield return GetUnrealEngineGame("Fortnite", "\\FortniteGame\\Content\\Paks", EGame.GAME_UE5_5); + yield return DirectorySettings.Default("Fortnite [LIVE]", Constants._FN_LIVE_TRIGGER, ue: EGame.GAME_UE5_5); yield return GetUnrealEngineGame("Pewee", "\\RogueCompany\\Content\\Paks", EGame.GAME_RogueCompany); yield return GetUnrealEngineGame("Rosemallow", "\\Indiana\\Content\\Paks", EGame.GAME_UE4_21); yield return GetUnrealEngineGame("Catnip", "\\OakGame\\Content\\Paks", EGame.GAME_Borderlands3); diff --git a/FModel/Views/DirectorySelector.xaml b/FModel/Views/DirectorySelector.xaml index a4fa8eff..badcfc23 100644 --- a/FModel/Views/DirectorySelector.xaml +++ b/FModel/Views/DirectorySelector.xaml @@ -80,7 +80,8 @@ + IsChecked="{Binding UseCustomEGames, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + BorderBrush="White" Style="{StaticResource HighlightedCheckBox}" /> diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml index a8516833..4cd0164e 100644 --- a/FModel/Views/Resources/Resources.xaml +++ b/FModel/Views/Resources/Resources.xaml @@ -80,6 +80,31 @@ + +