diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 98408c5e..ee90cdea 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -7,7 +7,7 @@ ProjectID=F58CF58249FB6CF654B46CA3DB0FE64D Build=IfProjectHasCode BuildConfiguration=PPBC_Development BuildTarget= -StagingDirectory=(Path="D:/Builds/Fortis19") +StagingDirectory=(Path="D:/shared/Builds/FortisTest") FullRebuild=False ForDistribution=False IncludeDebugFiles=False @@ -72,6 +72,50 @@ bSkipMovies=False +IniKeyBlacklist=EncryptionKey +IniKeyBlacklist=IniKeyBlacklist +IniKeyBlacklist=IniSectionBlacklist ++MapsToCook=(FilePath="/Game/Otrada/Maps/L_NavMesh") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/L_NavMesh") ++MapsToCook=(FilePath="/Game/Freestyle/Maps/L_NavMesh") ++MapsToCook=(FilePath="/Game/Taktika/Maps/L_NavMesh") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Yard") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Roads_Bake") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_people") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_OutsideBuildings") ++MapsToCook=(FilePath="/Game/Taktika/Optimization/Merged_Mesh/Foliage_Cars/TKT_MergedCars") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Landscape") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Exterior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Day_Light") ++MapsToCook=(FilePath="/Game/Taktika/Maps/TKT_Cars") ++MapsToCook=(FilePath="/Game/Maps/L_DeveloperTactics") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F01_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F03_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F03_Reflections") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F04_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F04_Reflections") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F05_Reflections") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S01F05+_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F01_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F03_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F04_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F04_Reflections") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F05+_Interior") ++MapsToCook=(FilePath="/Game/Taktika/Maps/Interior/TKT_S02F05+_Reflections") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradizio_People") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Nightlight") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_MainScene") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_DayLight") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Cars") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_3P_buildings") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Landscape") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/L_DeveloperTradition") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Exterior_Buildings") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F1") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F2") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Interior_F3") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Reflection_F1") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Reflection_F2") ++MapsToCook=(FilePath="/Game/Tradicio/Maps/Tradicio_Interiors/Tradicio_Reflection_F3") ++MapsToCook=(FilePath="") ++MapsToCook=(FilePath="") +DirectoriesToAlwaysStageAsUFS=(Path="Script") +DirectoriesToAlwaysStageAsNonUFS=(Path="Script") diff --git a/Content/Blueprints/Environment/BP_SplineMovement.uasset b/Content/Blueprints/Environment/BP_SplineMovement.uasset index fb52a256..32b25f55 100644 Binary files a/Content/Blueprints/Environment/BP_SplineMovement.uasset and b/Content/Blueprints/Environment/BP_SplineMovement.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Boat_Medium.uasset b/Content/Blueprints/LevelActors/BP_Boat_Medium.uasset index 68af5ae1..0795c66d 100644 Binary files a/Content/Blueprints/LevelActors/BP_Boat_Medium.uasset and b/Content/Blueprints/LevelActors/BP_Boat_Medium.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Boat_Small.uasset b/Content/Blueprints/LevelActors/BP_Boat_Small.uasset index e4ededf7..20856aa3 100644 Binary files a/Content/Blueprints/LevelActors/BP_Boat_Small.uasset and b/Content/Blueprints/LevelActors/BP_Boat_Small.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Boat_Yacht.uasset b/Content/Blueprints/LevelActors/BP_Boat_Yacht.uasset index 1380ddb5..1a93731c 100644 Binary files a/Content/Blueprints/LevelActors/BP_Boat_Yacht.uasset and b/Content/Blueprints/LevelActors/BP_Boat_Yacht.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car.uasset b/Content/Blueprints/LevelActors/BP_Car.uasset index ae78c75e..59c683ef 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car.uasset and b/Content/Blueprints/LevelActors/BP_Car.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_BMW_Blue.uasset b/Content/Blueprints/LevelActors/BP_Car_BMW_Blue.uasset index cb8ed932..760790f4 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_BMW_Blue.uasset and b/Content/Blueprints/LevelActors/BP_Car_BMW_Blue.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_BMW_Brown.uasset b/Content/Blueprints/LevelActors/BP_Car_BMW_Brown.uasset index 0becbf7c..5d3db789 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_BMW_Brown.uasset and b/Content/Blueprints/LevelActors/BP_Car_BMW_Brown.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_BMW_Red.uasset b/Content/Blueprints/LevelActors/BP_Car_BMW_Red.uasset index 34c8f350..786ceacd 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_BMW_Red.uasset and b/Content/Blueprints/LevelActors/BP_Car_BMW_Red.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_SUV.uasset b/Content/Blueprints/LevelActors/BP_Car_SUV.uasset index 89ad6ac1..9dd3d8e8 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_SUV.uasset and b/Content/Blueprints/LevelActors/BP_Car_SUV.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_SUV_White.uasset b/Content/Blueprints/LevelActors/BP_Car_SUV_White.uasset index dd748af6..3597c159 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_SUV_White.uasset and b/Content/Blueprints/LevelActors/BP_Car_SUV_White.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Car_Sedan.uasset b/Content/Blueprints/LevelActors/BP_Car_Sedan.uasset index c67025bf..658ca3ae 100644 Binary files a/Content/Blueprints/LevelActors/BP_Car_Sedan.uasset and b/Content/Blueprints/LevelActors/BP_Car_Sedan.uasset differ diff --git a/Content/Blueprints/LevelActors/BP_Tram_TatraT3.uasset b/Content/Blueprints/LevelActors/BP_Tram_TatraT3.uasset index 19e53835..510c3219 100644 Binary files a/Content/Blueprints/LevelActors/BP_Tram_TatraT3.uasset and b/Content/Blueprints/LevelActors/BP_Tram_TatraT3.uasset differ diff --git a/Content/Blueprints/Lighting/BP_SkyLightFake.uasset b/Content/Blueprints/Lighting/BP_SkyLightFake.uasset index 96327e71..38edf068 100644 Binary files a/Content/Blueprints/Lighting/BP_SkyLightFake.uasset and b/Content/Blueprints/Lighting/BP_SkyLightFake.uasset differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index 13f8f2cb..42509d9b 100644 Binary files a/Content/Blueprints/Managers/BP_Controller.uasset and b/Content/Blueprints/Managers/BP_Controller.uasset differ diff --git a/Content/Blueprints/Managers/BP_PawnOverview.uasset b/Content/Blueprints/Managers/BP_PawnOverview.uasset index 19840ef4..da3dc3e9 100644 Binary files a/Content/Blueprints/Managers/BP_PawnOverview.uasset and b/Content/Blueprints/Managers/BP_PawnOverview.uasset differ diff --git a/Content/Blueprints/Player/BP_PlayerStateManager.uasset b/Content/Blueprints/Player/BP_PlayerStateManager.uasset index 7e45a309..49406fc1 100644 Binary files a/Content/Blueprints/Player/BP_PlayerStateManager.uasset and b/Content/Blueprints/Player/BP_PlayerStateManager.uasset differ diff --git a/Content/Blueprints/Points/BP_Point.uasset b/Content/Blueprints/Points/BP_Point.uasset index 016524bb..6ac34c06 100644 Binary files a/Content/Blueprints/Points/BP_Point.uasset and b/Content/Blueprints/Points/BP_Point.uasset differ diff --git a/Content/Blueprints/Structures/Enum_NavigationState.uasset b/Content/Blueprints/Structures/Enum_NavigationState.uasset index cf3a99f2..94acbba3 100644 Binary files a/Content/Blueprints/Structures/Enum_NavigationState.uasset and b/Content/Blueprints/Structures/Enum_NavigationState.uasset differ diff --git a/Content/Blueprints/Structures/Enum_PointGeneralType.uasset b/Content/Blueprints/Structures/Enum_PointGeneralType.uasset index 6593dda3..16eb7667 100644 Binary files a/Content/Blueprints/Structures/Enum_PointGeneralType.uasset and b/Content/Blueprints/Structures/Enum_PointGeneralType.uasset differ diff --git a/Content/Blueprints/Structures/Struct_ViewState.uasset b/Content/Blueprints/Structures/Struct_ViewState.uasset index 64aae186..8045684f 100644 Binary files a/Content/Blueprints/Structures/Struct_ViewState.uasset and b/Content/Blueprints/Structures/Struct_ViewState.uasset differ diff --git a/Content/Core/Data/Parkings/DT_ParkingsRC.uasset b/Content/Core/Data/Parkings/DT_ParkingsRC.uasset new file mode 100644 index 00000000..20edb73b Binary files /dev/null and b/Content/Core/Data/Parkings/DT_ParkingsRC.uasset differ diff --git a/Content/Freestyle/Maps/Freestyle_Developer.umap b/Content/Freestyle/Maps/Freestyle_Developer.umap index 97eb4237..f149d1bd 100644 Binary files a/Content/Freestyle/Maps/Freestyle_Developer.umap and b/Content/Freestyle/Maps/Freestyle_Developer.umap differ diff --git a/Content/HUD/Widgets/UW_ButtonPoint.uasset b/Content/HUD/Widgets/UW_ButtonPoint.uasset index 61f8708f..309b3618 100644 Binary files a/Content/HUD/Widgets/UW_ButtonPoint.uasset and b/Content/HUD/Widgets/UW_ButtonPoint.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatCard.uasset b/Content/HUD/Widgets/UW_FilterFlatCard.uasset index 154a3798..c1b06821 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatCard.uasset and b/Content/HUD/Widgets/UW_FilterFlatCard.uasset differ diff --git a/Content/HUD/Widgets/UW_Infrastructure.uasset b/Content/HUD/Widgets/UW_Infrastructure.uasset index d80f98fe..4a82c156 100644 Binary files a/Content/HUD/Widgets/UW_Infrastructure.uasset and b/Content/HUD/Widgets/UW_Infrastructure.uasset differ diff --git a/Content/Maps/L_DeveloperTactics.umap b/Content/Maps/L_DeveloperTactics.umap index 9d174971..dc9ae4b5 100644 Binary files a/Content/Maps/L_DeveloperTactics.umap and b/Content/Maps/L_DeveloperTactics.umap differ diff --git a/Content/Otrada/Maps/L_Developer_Otrada.umap b/Content/Otrada/Maps/L_Developer_Otrada.umap index 3239fdef..8daf488b 100644 Binary files a/Content/Otrada/Maps/L_Developer_Otrada.umap and b/Content/Otrada/Maps/L_Developer_Otrada.umap differ diff --git a/Content/Otrada/Maps/Otrada_Day_Light.umap b/Content/Otrada/Maps/Otrada_Day_Light.umap index f6cfdfde..77665cf1 100644 Binary files a/Content/Otrada/Maps/Otrada_Day_Light.umap and b/Content/Otrada/Maps/Otrada_Day_Light.umap differ diff --git a/Content/Taktika/Assets/Exterior/Materials/NewMaterial.uasset b/Content/Taktika/Assets/Exterior/Materials/NewMaterial.uasset index 169f7f42..2bab1cfa 100644 Binary files a/Content/Taktika/Assets/Exterior/Materials/NewMaterial.uasset and b/Content/Taktika/Assets/Exterior/Materials/NewMaterial.uasset differ diff --git a/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_1Lvl.umap b/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_1Lvl.umap index bc1e62e2..96ca48a2 100644 Binary files a/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_1Lvl.umap and b/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_1Lvl.umap differ diff --git a/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_2Lvl.umap b/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_2Lvl.umap index a8e2ba6d..287e798a 100644 Binary files a/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_2Lvl.umap and b/Content/Taktika/Maps/Interior/Parking/Parking_Reflection_2Lvl.umap differ diff --git a/Content/Taktika/Maps/TKT_Day_Light.umap b/Content/Taktika/Maps/TKT_Day_Light.umap index ee78044b..52292175 100644 Binary files a/Content/Taktika/Maps/TKT_Day_Light.umap and b/Content/Taktika/Maps/TKT_Day_Light.umap differ diff --git a/Content/Taktika/Maps/TKT_MainScene.umap b/Content/Taktika/Maps/TKT_MainScene.umap index dfaec268..261076b8 100644 Binary files a/Content/Taktika/Maps/TKT_MainScene.umap and b/Content/Taktika/Maps/TKT_MainScene.umap differ diff --git a/Content/Tradicio/Maps/L_DeveloperTradition.umap b/Content/Tradicio/Maps/L_DeveloperTradition.umap index 675bdbc2..5ab2ec9b 100644 Binary files a/Content/Tradicio/Maps/L_DeveloperTradition.umap and b/Content/Tradicio/Maps/L_DeveloperTradition.umap differ diff --git a/Content/Tradicio/NewMaterial_day_good1.uasset b/Content/Tradicio/NewMaterial_day_good1.uasset index 8e598fdc..a7e2b40c 100644 Binary files a/Content/Tradicio/NewMaterial_day_good1.uasset and b/Content/Tradicio/NewMaterial_day_good1.uasset differ diff --git a/Source/FORTIS_Taktika/Public/ResComPlayerStateManager.h b/Source/FORTIS_Taktika/Public/ResComPlayerStateManager.h index f3f5c6d6..e3a6fa76 100644 --- a/Source/FORTIS_Taktika/Public/ResComPlayerStateManager.h +++ b/Source/FORTIS_Taktika/Public/ResComPlayerStateManager.h @@ -18,6 +18,7 @@ enum Enum_PlayerState floorOverview UMETA(DisplayName = "floorOverview"), flatOverview UMETA(DisplayName = "flatOverview"), freeWalk UMETA(DisplayName = "freeWalk"), + parking UMETA(DisplayName = "parking") }; UCLASS()