Automatic PR with changes from the template repo

.clang-format

@@ -70,7 +70,19 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: true
 SpacesInSquareBrackets: false
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 Standard: Cpp11
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
 ---
@@ -146,7 +158,28 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: true
 SpacesInSquareBrackets: false
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 Standard: Cpp11
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
 ...
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates

.editorconfig

@@ -1,11 +1,26 @@
 [*]
 charset = utf-8
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 end_of_line = crlf
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
 indent_size = 4
 indent_style = space
 insert_final_newline = false
 max_line_length = 120
 tab_width = 4
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
@@ -946,3 +961,35 @@ ij_python_wrap_long_lines = false
 
 [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
 ij_toml_keep_indents_on_empty_lines = false
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+trim_trailing_whitespace = true
+
+[{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}]
+# In yaml, a two-space indent is used by default in many of the solutions we integrate with.
+# Examples are GitHub Actions and Kubernetes
+indent_size = 2
+
+[{*.h,*.hpp,*.hxx,*.c,*.cpp,*.cxx}]
+# .clang-format should take precedence, but for editors which do not do that we're adding those settings here, too.
+indent_style = tab
+
+[*.red]
+# Those are yaml files, but do use a 4 space indent
+indent_size = 4
+
+[{*.markdown,*.md}]
+# In markdown a [double whitespace at the end of a line acts as a line break](https://www.markdownguide.org/basic-syntax/#line-breaks).
+# Even though it's controversial to use it for that purpose (there are alternatives like using the `<br />` html tag),
+# let's not break it accidentally in files that already use the double whitespace.
+trim_trailing_whitespace = false
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates

.gitignore

@@ -13,6 +13,18 @@
 *.pch
 
 # Compiled Dynamic libraries
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
 *.so
 *.dylib
 *.dll
@@ -29,6 +41,9 @@ __pycache__/
 # User generated local cmake configuration
 CMakeUserPresets.json
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 
 ### IDE ###
 # User generated local IDE configuration
@@ -37,3 +52,15 @@ CMakeUserPresets.json
 ### VCPKG ###
 # Temporary measure which fixes build agent issue
 vcpkg_registry_cache/
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates

.teamcity/MacOS/Project.kt

@@ -51,7 +51,15 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
     id(buildName.toId())
     name = buildName
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     artifactRules = "%env.CMAKE_INSTALL_PREFIX%"
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         param("env.SENTRY_CLI_DEBUG_SYMBOL_TYPE", "dsym")
@@ -73,7 +81,19 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
         param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite")
         param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache")
         param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         param("env.CTEST_PARALLEL_LEVEL", "1")
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
     }
 
 

.teamcity/Windows/Project.kt

@@ -24,7 +24,16 @@ val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug")
 val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal")
 val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev")
 val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features")
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
 
 object Project : Project({
     id("Windows")
@@ -34,15 +43,32 @@ object Project : Project({
     buildType(Internal)
     buildType(TrinityDev)
     buildType(Release)
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     buildType(ReleaseDevFeatures)
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
 })
 
 
 class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({
     id(buildName.toId())
     this.name = buildName
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     artifactRules = "%env.CMAKE_INSTALL_PREFIX%"
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         param("env.GIT_TAG_HASH_OVERRIDE", "")
@@ -63,7 +89,19 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
         param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite")
         param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache")
         param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         param("env.CTEST_PARALLEL_LEVEL", "1")
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
     }
 
     vcs {
@@ -91,7 +129,19 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
             scriptContent = """
                 REM unfortunately ninja does not find the VS environment otherwise
                 REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64
+=======
+                call "%env.VSDEV_BAT_PATH%" -arch=x64
+>>>>>>> template/carbonengine/resources-updates
+=======
+                call "%env.VSDEV_BAT_PATH%" -arch=x64
+>>>>>>> template/carbonengine/resources-updates
+=======
+                call "%env.VSDEV_BAT_PATH%" -arch=x64
+>>>>>>> template/carbonengine/resources-updates
                 echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%']
                 echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%']
                 echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%']

.teamcity/_Self.kt/Project.kt

@@ -8,7 +8,19 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 
 object Project : Project({
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     description = "Build / Publish pipeline for https://github.com/carbonengine/resources"
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */