Merge branch 'ue5-dev' into marcel/setup-v2

CMakePresets.json

@@ -0,0 +1,70 @@
+{
+  "version": 8,
+  "configurePresets":
+  [
+    {
+      "name": "Common",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/Build/${presetName}",
+      "installDir": "${sourceDir}/Install/${presetName}",
+      "hidden": true
+    },
+    {
+      "name": "Linux-Common",
+      "inherits": "Common",
+      "cacheVariables":
+      {
+        "CMAKE_TOOLCHAIN_FILE": "CMake/LinuxToolchain.cmake"
+      },
+      "hidden": true
+    },
+    {
+      "name": "Windows-Debug",
+      "inherits": "Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "Windows-Development",
+      "inherits": "Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      }
+    },
+    {
+      "name": "Windows-Release",
+      "inherits": "Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "Linux-Debug",
+      "inherits": "Linux-Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "Linux-Development",
+      "inherits": "Linux-Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      }
+    },
+    {
+      "name": "Linux-Release",
+      "inherits": "Linux-Common",
+      "cacheVariables":
+      {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    }
+  ]
+}

CarlaSetup.bat

@@ -7,7 +7,23 @@ start cmd /c git -C Unreal/CarlaUnreal/Content clone -b ue5-dev https://bitbucke
 
 echo Installing Visual Studio 2022...
 curl -L -O https://aka.ms/vs/17/release/vs_community.exe || exit /b
-vs_Community.exe --add Microsoft.VisualStudio.Workload.NativeDesktop Microsoft.VisualStudio.Workload.NativeGame Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Component.Windows10SDK.18362  Microsoft.VisualStudio.Component.VC.CMake.Project Microsoft.Net.ComponentGroup.4.8.1.DeveloperTools Microsoft.VisualStudio.Component.VC.Llvm.Clang Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang --removeProductLang Es-es --addProductLang En-us --installWhileDownloading --passive --wait
+rem See: https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2022&preserve-view=true
+vs_Community.exe --add ^
+  Microsoft.VisualStudio.Workload.NativeDesktop ^
+  Microsoft.VisualStudio.Workload.NativeGame ^
+  Microsoft.VisualStudio.Workload.ManagedDesktop ^
+  Microsoft.VisualStudio.Component.Windows10SDK.18362 ^
+  Microsoft.VisualStudio.Component.VC.CMake.Project ^
+  Microsoft.Net.ComponentGroup.4.8.1.DeveloperTools ^
+  Microsoft.VisualStudio.Component.VC.Llvm.Clang ^
+  Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset ^
+  Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang ^
+  Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 ^
+  --removeProductLang Es-es ^
+  --addProductLang En-us ^
+  --installWhileDownloading ^
+  --passive ^
+  --wait
 del vs_community.exe
 echo Visual Studion 2022 Installed!!!
 
@@ -44,10 +60,10 @@ if errorlevel 1 (
 )
 
 
-echo Installing Python Pacakges...
+echo Installing Python Packages...
 python -m pip install --upgrade pip || exit /b
 python -m pip install -r requirements.txt || exit /b
-echo Python Pacakges Installed...
+echo Python Packages Installed...
 
 
 echo Switching to x64 Native Tools Command Prompt for VS 2022 command line...

CarlaSetup.sh

@@ -44,7 +44,7 @@ then
     echo "Git credentials are not set, they will be requested later on during the download of Unreal Engine Carla fork"
 fi
 
-echo "Installing Ubuntu Pacakges..."
+echo "Installing Ubuntu Packages..."
 if ! command -v retry &> /dev/null
 then
     sudo apt update
@@ -72,12 +72,12 @@ retry --until=success --times=12 --delay=300 -- sudo apt-get -y install \
     libxml2-dev \
     git \
     git-lfs
-echo "Ubuntu Pacakges Installed..."
+echo "Ubuntu Packages Installed..."
 
-echo "Installing Python Pacakges..."
+echo "Installing Python Packages..."
 pip3 install --upgrade pip
 pip3 install -r requirements.txt
-echo "Python Pacakges Installed..."
+echo "Python Packages Installed..."
 
 echo "Clonning CARLA Content asynchronously... (see the progres in ContentClone.log)"
 mkdir -p Unreal/CarlaUnreal/Content

README.md

@@ -24,7 +24,10 @@ environmental conditions.
 * Intel i7 gen 9th - 11th / Intel i9 gen 9th - 11th / AMD ryzen 7 / AMD ryzen 9
 * +32 GB RAM memory 
 * NVIDIA RTX 3070 / NVIDIA RTX 3080 / NVIDIA RTX 4090
-* Ubuntu 20.04
+* Ubuntu 22.04
+
+ >[!NOTE]
+> Ubuntu version 22.04 is required, the Unreal Engine 5.3 version of CARLA will not work on Ubuntu 20.04 or lower. 
 
 ## Documentation