Add Town10HD_Opt as default town

paduraru2009 · Jul 26, 2021 · e6379b4 · e6379b4
1 parent 00d8faa
commit e6379b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -95,7 +95,7 @@ pipeline
                             steps
                             {
                                 sh 'make package ARGS="--python-version=3.7,2 --chrono"'
-                                sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town10HD_Opt --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2"'
+                                sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2"'
                                 sh 'make examples ARGS="localhost 3654"'
                             }
                             post
@@ -298,7 +298,7 @@ pipeline
                                 """
                                 bat """
                                     call ../setEnv64.bat
-                                    make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town10HD_Opt --target-archive=AdditionalMaps --clean-intermediate"
+                                    make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt --target-archive=AdditionalMaps --clean-intermediate"
                                 """
                             }
                             post {

diff --git a/Unreal/CarlaUE4/Config/DefaultEngine.ini b/Unreal/CarlaUE4/Config/DefaultEngine.ini
@@ -9,12 +9,12 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum
 
 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Carla/Maps/Town03.Town03
-GameDefaultMap=/Game/Carla/Maps/Town03.Town03
-ServerDefaultMap=/Game/Carla/Maps/Town03.Town03
+EditorStartupMap=/Game/Carla/Maps/Town10HD_Opt.Town10HD_Opt
+GameDefaultMap=/Game/Carla/Maps/Town10HD_Opt.Town10HD_Opt
+ServerDefaultMap=/Game/Carla/Maps/Town10HD_Opt.Town10HD_Opt
 GlobalDefaultGameMode=/Game/Carla/Blueprints/Game/CarlaGameMode.CarlaGameMode_C
 GameInstanceClass=/Script/Carla.CarlaGameInstance
-TransitionMap=/Game/Carla/Maps/Town03.Town03
+TransitionMap=/Game/Carla/Maps/Town10HD_Opt.Town10HD_Opt
 GlobalDefaultServerGameMode=/Game/Carla/Blueprints/Game/CarlaGameMode.CarlaGameMode_C
 
 [/Script/Engine.RendererSettings]

diff --git a/Unreal/CarlaUE4/Config/DefaultGame.ini b/Unreal/CarlaUE4/Config/DefaultGame.ini
@@ -59,6 +59,8 @@ bSkipEditorContent=False
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town04_Opt")
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town05")
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town05_Opt")
++MapsToCook=(FilePath="/Game/Carla/Maps/Town10HD")
++MapsToCook=(FilePath="/Game/Carla/Maps/Town10HD_Opt")
 +MapsToCook=(FilePath="/Game/Carla/Maps/OpenDriveMap")
 +MapsToCook=(FilePath="/Game/Carla/Maps/TestMaps/EmptyMap")
 +DirectoriesToAlwaysCook=(Path="Carla/Static/GenericMaterials/Licenseplates/Textures")