From e446fccd3e39d01bcc4cad518d3e93b04ac1987f Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 23:21:04 +1000 Subject: [PATCH 1/2] content dirs --- Packages/packages-lock.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- ProjectSettings/VFXManager.asset | 2 +- SteamBuild.WIN.vdf | 4 ++-- SteamBuild.vdf | 23 ----------------------- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100755 SteamBuild.vdf diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cd5a96f..1271455 100755 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.8.7", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a74c35f..88bb9cf 100755 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index 807920d..87823a9 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -12,6 +12,6 @@ VFXManager: m_MaxDeltaTime: 0.05 m_MaxScrubTime: 30 m_CompiledVersion: 7 - m_RuntimeVersion: 33 + m_RuntimeVersion: 35 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} m_BatchEmptyLifetime: 300 diff --git a/SteamBuild.WIN.vdf b/SteamBuild.WIN.vdf index dbff92c..622f237 100755 --- a/SteamBuild.WIN.vdf +++ b/SteamBuild.WIN.vdf @@ -3,8 +3,8 @@ "AppID" "2599680" // your AppID "Desc" "SpaceRace Windows" // internal description for this build - "ContentRoot" "C:\Users\ntr\code\SpaceRace\Build\SpaceRace-Win" // root content folder, relative to location of this file - "BuildOutput" "C:\Users\ntr\code\SpaceRace\Build\steam-output" // build output folder for build logs and build cache files + "ContentRoot" "/home/ntr/SpaceRace/Build/Win" // root content folder, relative to location of this file + "BuildOutput" "/home/ntr/SpaceRace/Build/steam-output" // build output folder for build logs and build cache files "Depots" { diff --git a/SteamBuild.vdf b/SteamBuild.vdf deleted file mode 100755 index dbff92c..0000000 --- a/SteamBuild.vdf +++ /dev/null @@ -1,23 +0,0 @@ -"AppBuild" -{ - "AppID" "2599680" // your AppID - "Desc" "SpaceRace Windows" // internal description for this build - - "ContentRoot" "C:\Users\ntr\code\SpaceRace\Build\SpaceRace-Win" // root content folder, relative to location of this file - "BuildOutput" "C:\Users\ntr\code\SpaceRace\Build\steam-output" // build output folder for build logs and build cache files - - "Depots" - { - "2599682" // your DepotID - { - "FileMapping" - { - "LocalPath" "*" // all files from contentroot folder - "DepotPath" "." // mapped into the root of the depot - "recursive" "1" // include all subfolders - } - - "FileExclusion" "SpaceRace_BurstDebugInformation_DoNotShip*" // exclude - } - } -} \ No newline at end of file From a0d591a378f636820981a1cf377ebd0e73640765 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 23:33:38 +1000 Subject: [PATCH 2/2] rm attributes --- .gitattributes | 2 +- ProjectSettings/ShaderGraphSettings.asset | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 ProjectSettings/ShaderGraphSettings.asset diff --git a/.gitattributes b/.gitattributes index f7e36dc..c74f908 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ -*.wav filter=lfs diff=lfs merge=lfs -text *.blend filter=lfs diff=lfs merge=lfs -text *.blend1 filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text *.exr filter=lfs diff=lfs merge=lfs -text *.otf filter=lfs diff=lfs merge=lfs -text diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset old mode 100755 new mode 100644