diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 7981676a..c375461a 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -30,7 +30,6 @@ * cafe: * võiks saada hinnata saadud tellimust * "order again" nupp - * continuos collision spawnitud orderitele Can't/Won't Do: * glTF loading: vahetada ära shader Universal render pipeline Lit, mitte panna buildi kaasa glTf oma - **ei saa, objekt on siis ilma tekstuurita, lihtsalt hall** diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset index e55e2402..3adee157 100644 --- a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95153ddc300e7209a3587d1ecd64d598b2ce9aac7032c824ce16e5bf8f331ce3 -size 2717980 +oid sha256:9b44c887685103ad63c4304b34eb596a32268c15e0fc1834f225140f88cf3d3c +size 2718509 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 9d5152bf..3b3a70ed 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:efa8201d58c106498933eb430a1121221c436ab6404490b94cf4672b1b584d87 -size 68694459 +oid sha256:c4b5f1e81843b525db2ec46b02dff4456df5dc9fcaed94f59046c85ebb9be9cc +size 68694460 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/CafeWaiterNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/CafeWaiterNPC.cs index 1886a9b9..75cbc287 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/CafeWaiterNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/CafeWaiterNPC.cs @@ -204,6 +204,7 @@ public class CafeWaiterNPC : NPCController private void InitializeSpawnedObject(GameObject spawnedObject) { Rigidbody rigidbody = spawnedObject.AddComponent(); + rigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; //spawnedObject.AddComponent(); //spawnedObject.AddComponent();