From 1379afa15c408253f89b2d62369e8a0919823850 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Fri, 12 Apr 2024 13:14:56 +0200 Subject: [PATCH] Merge branch 'master' of git@ooftooft.net:Racesm.git # Conflicts: # Assets/Scenes/Racetrack mini.unity --- .../SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta | 7 +++++++ .../SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta | 7 +++++++ Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta create mode 100644 Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta create mode 100644 Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta new file mode 100644 index 0000000..2f7eb2e --- /dev/null +++ b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58f7e79a87c79824597746e8c1bfe400 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta new file mode 100644 index 0000000..73c9a86 --- /dev/null +++ b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f58d25b9e504a4f41ab4a71cf87c1845 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta b/Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta new file mode 100644 index 0000000..dbd396a --- /dev/null +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d782ab132601a814383476237b843de4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: