From 75bd66fc36ca10250b4b5e6670beb0e575fa87b9 Mon Sep 17 00:00:00 2001 From: henrisel Date: Sun, 25 Jan 2026 13:11:58 +0200 Subject: [PATCH] add back minigames after merge --- 3d-generation-pipeline/README.md | 1 - .../Plugins/FMOD/Resources/FMODStudioSettings.asset | 2 +- Assets/_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- .../Scripts/ModeGeneration/InvokeAiClient.cs | 12 +++++------- .../_PROJECT/Scripts/ModeGeneration/TrellisClient.cs | 9 +++------ 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index c4c87f0a..69718a96 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -20,7 +20,6 @@ * peaks vaatama pea poole, mitte xr origin * klaas on näha temast eespool * pööramine kaamera poole - sujuvalt (slerp) -* küsida Danielilt asukoha kohta ### Notes diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 2dec2c2f..b1fdae1e 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9278f69f0e286a7d44be6c579fd11c088a78a54c4c83e98dffe3b66602d85b1 +oid sha256:497eac71f5a5f4d5717d9e17db11117ff2a67522436e28dde666f4e3eedb1620 size 20242 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index c73c949b..d0d498ab 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3376b49edc7681faecc6a347ba8e374e158f54a495966bd76480c96ef8d8b427 -size 67169088 +oid sha256:9d45908cdaa0aad4f1c00fe4b7da892b119f6b380b95301023ecb7f3e6a40f66 +size 67898653 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs b/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs index 2273fd87..d9d3f767 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs @@ -21,19 +21,17 @@ public class InvokeAiClient : MonoBehaviour private void Awake() { - httpClient = new HttpClient - { - Timeout = TimeSpan.FromSeconds(120) - }; - httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.invokeAIUrl); - Instance = this; } // Start is called before the first frame update void Start() { - + httpClient = new HttpClient + { + Timeout = TimeSpan.FromSeconds(120) + }; + httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.invokeAIUrl); } // Update is called once per frame diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/TrellisClient.cs b/Assets/_PROJECT/Scripts/ModeGeneration/TrellisClient.cs index d8697852..14e1d974 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/TrellisClient.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/TrellisClient.cs @@ -13,18 +13,15 @@ public class TrellisClient : MonoBehaviour private void Awake() { - httpClient = new HttpClient(); - httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.TrellisUrl); - Instance = this; - - TestConnection(); } // Start is called before the first frame update void Start() { - + httpClient = new HttpClient(); + httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.TrellisUrl); + TestConnection(); } // Update is called once per frame