last update from PC

2 months ago · a0f788b962
7 changed files with 635 additions and 49 deletions
--- a/Assets/5_Scenes/DreconDemo.unity
+++ b/Assets/5_Scenes/DreconDemo.unity
@ -953,22 +953,22 @@ LineRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Positions:
-  - {x: -355.3355, y: -21.90924, z: -267.06592}
-  - {x: -122.237686, y: -21.90924, z: -267.06592}
-  - {x: -122.237686, y: -21.90924, z: -66.9456}
-  - {x: -355.3355, y: -21.90924, z: -66.9456}
-  - {x: -355.3355, y: -21.90924, z: -267.06592}
-  - {x: -355.3355, y: 444.75458, z: -267.06592}
-  - {x: -122.237686, y: 444.75458, z: -267.06592}
-  - {x: -122.237686, y: -21.90924, z: -267.06592}
-  - {x: -122.237686, y: 444.75458, z: -267.06592}
-  - {x: -122.237686, y: 444.75458, z: -66.9456}
-  - {x: -122.237686, y: -21.90924, z: -66.9456}
-  - {x: -122.237686, y: 444.75458, z: -66.9456}
-  - {x: -355.3355, y: 444.75458, z: -66.9456}
-  - {x: -355.3355, y: -21.90924, z: -66.9456}
-  - {x: -355.3355, y: 444.75458, z: -66.9456}
-  - {x: -355.3355, y: 444.75458, z: -267.06592}
+  - {x: -376.6859, y: -23.177887, z: -272.8673}
+  - {x: -125.60805, y: -23.177887, z: -272.8673}
+  - {x: -125.60805, y: -23.177887, z: -59.82173}
+  - {x: -376.6859, y: -23.177887, z: -59.82173}
+  - {x: -376.6859, y: -23.177887, z: -272.8673}
+  - {x: -376.6859, y: 444.87686, z: -272.8673}
+  - {x: -125.60805, y: 444.87686, z: -272.8673}
+  - {x: -125.60805, y: -23.177887, z: -272.8673}
+  - {x: -125.60805, y: 444.87686, z: -272.8673}
+  - {x: -125.60805, y: 444.87686, z: -59.82173}
+  - {x: -125.60805, y: -23.177887, z: -59.82173}
+  - {x: -125.60805, y: 444.87686, z: -59.82173}
+  - {x: -376.6859, y: 444.87686, z: -59.82173}
+  - {x: -376.6859, y: -23.177887, z: -59.82173}
+  - {x: -376.6859, y: 444.87686, z: -59.82173}
+  - {x: -376.6859, y: 444.87686, z: -272.8673}
  m_Parameters:
    serializedVersion: 3
    widthMultiplier: 1
@ -1302,7 +1302,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 62178361}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.12400308, y: -0.092653364, z: 0.011630281, w: 0.9878782}
+  m_LocalRotation: {x: 0.12400305, y: -0.09265332, z: 0.011630273, w: 0.9878782}
  m_LocalPosition: {x: 24.371735, y: 51, z: -83.27547}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -2087,7 +2087,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 153031623}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.000012147184, y: 0.9991337, z: 0.041616086, w: -0.000077417935}
+  m_LocalRotation: {x: -0.000012148617, y: 0.9991337, z: 0.041616086, w: -0.00007738355}
  m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -3906,8 +3906,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 320225263}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.10993699, y: 0.8057186, z: -0.56010866, w: -0.15814482}
-  m_LocalPosition: {x: 146.21152, y: 328.14352, z: -324.69608}
+  m_LocalRotation: {x: -0.10993414, y: 0.8057189, z: -0.56011003, w: -0.15814036}
+  m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -4252,8 +4252,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 330585543}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.10993699, y: 0.8057186, z: -0.56010866, w: -0.15814482}
-  m_LocalPosition: {x: 146.21152, y: 328.14352, z: -324.69608}
+  m_LocalRotation: {x: -0.10993414, y: 0.8057189, z: -0.56011003, w: -0.15814036}
+  m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -8010,7 +8010,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 605393721}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.03109301, y: 0.0021573673, z: 0.00006711165, w: 0.99951416}
+  m_LocalRotation: {x: -0.03109299, y: 0.0021573328, z: 0.000067110544, w: 0.99951416}
  m_LocalPosition: {x: 18.109629, y: 8.274419, z: -10.463577}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -11678,7 +11678,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 882491594}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.25553572, y: 0.6641597, z: -0.65266776, w: 0.26003513}
+  m_LocalRotation: {x: 0.25553414, y: 0.6641603, z: -0.65266836, w: 0.26003355}
  m_LocalPosition: {x: 18.100853, y: 10.055965, z: -0.48116565}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -11989,7 +11989,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 917542184}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.00006332729, y: 0.73596877, z: -0.6770155, w: -0.000046156118}
+  m_LocalRotation: {x: -0.000063312706, y: 0.73596877, z: -0.6770155, w: -0.000046140267}
  m_LocalPosition: {x: 18.099787, y: 68.54034, z: 4.499522}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -22311,7 +22311,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1634889327}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.2595026, y: 0.6790122, z: -0.626495, w: -0.2812559}
+  m_LocalRotation: {x: -0.25950274, y: 0.6790122, z: -0.62649494, w: -0.28125608}
  m_LocalPosition: {x: 11.361925, y: 9.244215, z: 7.779041}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -24649,22 +24649,22 @@ LineRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Positions:
-  - {x: -88.9374, y: -17.252304, z: -246.52295}
-  - {x: 175.06326, y: -17.252304, z: -246.52295}
-  - {x: 175.06326, y: -17.252304, z: -8.855934}
-  - {x: -88.9374, y: -17.252304, z: -8.855934}
-  - {x: -88.9374, y: -17.252304, z: -246.52295}
-  - {x: -88.9374, y: 427.2486, z: -246.52295}
-  - {x: 175.06326, y: 427.2486, z: -246.52295}
-  - {x: 175.06326, y: -17.252304, z: -246.52295}
-  - {x: 175.06326, y: 427.2486, z: -246.52295}
-  - {x: 175.06326, y: 427.2486, z: -8.855934}
-  - {x: 175.06326, y: -17.252304, z: -8.855934}
-  - {x: 175.06326, y: 427.2486, z: -8.855934}
-  - {x: -88.9374, y: 427.2486, z: -8.855934}
-  - {x: -88.9374, y: -17.252304, z: -8.855934}
-  - {x: -88.9374, y: 427.2486, z: -8.855934}
-  - {x: -88.9374, y: 427.2486, z: -246.52295}
+  - {x: -76.07253, y: -15.348312, z: -228.04462}
+  - {x: 154.02725, y: -15.348312, z: -228.04462}
+  - {x: 154.02725, y: -15.348312, z: -18.986488}
+  - {x: -76.07253, y: -15.348312, z: -18.986488}
+  - {x: -76.07253, y: -15.348312, z: -228.04462}
+  - {x: -76.07253, y: 477.6352, z: -228.04462}
+  - {x: 154.02725, y: 477.6352, z: -228.04462}
+  - {x: 154.02725, y: -15.348312, z: -228.04462}
+  - {x: 154.02725, y: 477.6352, z: -228.04462}
+  - {x: 154.02725, y: 477.6352, z: -18.986488}
+  - {x: 154.02725, y: -15.348312, z: -18.986488}
+  - {x: 154.02725, y: 477.6352, z: -18.986488}
+  - {x: -76.07253, y: 477.6352, z: -18.986488}
+  - {x: -76.07253, y: -15.348312, z: -18.986488}
+  - {x: -76.07253, y: 477.6352, z: -18.986488}
+  - {x: -76.07253, y: 477.6352, z: -228.04462}
  m_Parameters:
    serializedVersion: 3
    widthMultiplier: 1
@ -26416,9 +26416,9 @@ MonoBehaviour:
  m_Rewards: {fileID: 459103776}
  m_CameraBlendMin: 10
  m_CameraBlendMax: 15
-  m_CameraSwapMin: 45
-  m_CameraSwapMax: 60
-  m_CameraController: 1
+  m_CameraSwapMin: 30
+  m_CameraSwapMax: 42
+  m_CameraController: 0
  m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2}
  m_BackgroundColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0}
  m_PoseCanvas: {fileID: 607314882}
--- a/Assets/8_Scripts/1_Managers/FPSManager.cs
+++ b/Assets/8_Scripts/1_Managers/FPSManager.cs
@ -11,6 +11,10 @@ public class FPSManager : MonoBehaviour
        Application.targetFrameRate = m_FPS;
    }

+    private void Start()
+    {
+        Cursor.visible = false;
+    }
    // Update is called once per frame
    void Update()
    {
--- a/Assets/8_Scripts/1_Managers/Model
+++ b/Assets/8_Scripts/1_Managers/Model
@ -65,7 +65,7 @@ public class ModelManager : MonoBehaviour

    private void LoadLocalModels()
    {
-        DirectoryInfo dirInfo = new DirectoryInfo("C:\\Users\\caile\\Desktop\\onnx");
+        DirectoryInfo dirInfo = new DirectoryInfo("C:\\Users\\cailean\\Desktop\\onnx");
        FileInfo[] nnList = dirInfo.GetFiles("*.onnx");
        // Sort files by filename (assuming filenames are numeric)
        Array.Sort(nnList, (x, y) => {
--- a/Objects/Camera/EnvironmentCamera.asset
+++ b/Objects/Camera/EnvironmentCamera.asset
@ -12,5 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0f7b5c8cb85f2ca47917380097e32b3f, type: 3}
  m_Name: EnvironmentCamera
  m_EditorClassIdentifier: 
-  cameraWeight: 0.4
+  cameraWeight: 0.65
  cameraLayer: 0
+  cut: 1
--- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx
+++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx
@ -205,7 +205,7 @@ Material:
    - _Ior: 1.5
    - _IridescenceMask: 1
    - _IridescenceThickness: 1
-    - _LerpTexture: 0.03875969
+    - _LerpTexture: 0.13178295
    - _LinkDetailsWithBase: 1
    - _MaterialID: 1
    - _Metallic: 0
--- a/Assets/ML-Agents/Timers/DreconDemo_timers.json
+++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json
@ -1 +1 @@
-{"count":1,"self":71.42183039999999,"total":74.1264125,"children":{"InitializeActuators":{"count":1,"self":0.0010065,"total":0.0010065,"children":null},"InitializeSensors":{"count":1,"self":0.0019974999999999997,"total":0.0019974999999999997,"children":null},"AgentSendState":{"count":3630,"self":0.0251757,"total":0.77684159999999991,"children":{"CollectObservations":{"count":1815,"self":0.6498783,"total":0.6498783,"children":null},"WriteActionMask":{"count":1815,"self":0.0052984,"total":0.0052984,"children":null},"RequestDecision":{"count":1815,"self":0.0964892,"total":0.0964892,"children":null}}},"DecideAction":{"count":3630,"self":1.2874345999999999,"total":1.2874345999999999,"children":null},"AgentAct":{"count":3630,"self":0.6363014,"total":0.6363014,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717934896","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 54d62fb1-d031-4cf8-972f-61a26f9b4ce4 -accessToken nDJK2CK7Mfn8E4WwlfB4xRQLHGqrIOWOlcuQLOi8Y88005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717934970"}}
+{"count":1,"self":524.24115199999994,"total":539.9031876,"children":{"InitializeActuators":{"count":1,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"InitializeSensors":{"count":1,"self":0,"total":0,"children":null},"AgentSendState":{"count":30893,"self":0.22616319999999998,"total":4.276452,"children":{"CollectObservations":{"count":15447,"self":3.5449827999999997,"total":3.5449827999999997,"children":null},"WriteActionMask":{"count":15447,"self":0.018633,"total":0.018633,"children":null},"RequestDecision":{"count":15447,"self":0.48667299999999997,"total":0.48667299999999997,"children":null}}},"DecideAction":{"count":30893,"self":6.4849948,"total":6.4849947,"children":null},"AgentAct":{"count":30893,"self":4.8985851999999994,"total":4.8985851,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1718115972","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\cailean\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cailean -hubSessionId 6db3f480-211a-43c5-922f-a785109fba83 -accessToken MxrOJag39Px-tPJ4uoz92M8sX0YNzZkm0q4Z0pPlqFI005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1718116512"}}
--- a/581
+++ b/581
@ -0,0 +1,581 @@
+[33mcommit 6e69e9bbbfec3e7aabf4fc2ab6ae2a1d5b4a975e[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32maudio[m[33m, [m[1;31morigin/audio[m[33m, [m[1;31morigin/HEAD[m[33m)[m
+Author: Cailean Finn <[email protected]>
+Date:   Sun Jun 9 13:09:41 2024 +0100
+
+    dolly updated
+
+[33mcommit a628209428d1253a7d6db7d0bcf40f7dc75bea86[m
+Author: Cailean Finn <[email protected]>
+Date:   Sun Jun 9 12:44:52 2024 +0100
+
+    humanoid xml & bertil added
+
+[33mcommit a113700afcfe247be2599a22dce35077ee322ac6[m
+Author: Cailean Finn <[email protected]>
+Date:   Sun Jun 9 11:56:57 2024 +0100
+
+    everything is working!!
+
+[33mcommit 91ca4abbf346c7c7d93b5b77fd9245df7a7fc422[m
+Author: Cailean Finn <[email protected]>
+Date:   Sun Jun 9 11:40:32 2024 +0100
+
+    updates to cameras, texts, and scripts
+
+[33mcommit 46d9217f7df1d1f18af895b644c54422498b6fe0[m
+Author: cailean <[email protected]>
+Date:   Fri Jun 7 16:28:14 2024 +0100
+
+    small adjustments
+
+[33mcommit 6b5ee3a8a0d65de0625f312fc3ab591cdc1406e3[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon Jun 3 13:37:02 2024 +0100
+
+    shader lerp added
+
+[33mcommit 5480dcae56de163d6eac14be326cca23a4369c74[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon Jun 3 13:09:14 2024 +0100
+
+    camera switch sound update
+
+[33mcommit 89bc001bb9874896dcff95e756953546cc251a30[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue May 28 16:42:27 2024 +0100
+
+    camera adj
+
+[33mcommit cfcf5ecd7ed2eeddf132b2b3ae4ebb5410e836b8[m
+Author: cailean <[email protected]>
+Date:   Mon May 27 16:48:54 2024 +0100
+
+    small update
+
+[33mcommit f468ff917708c4c205659138cf637adce7229c0c[m
+Author: cailean <[email protected]>
+Date:   Mon May 27 16:21:52 2024 +0100
+
+    camera update call
+
+[33mcommit bfa4c7ec63639586aa0fa6a0ec54c279b9c0a266[m
+Author: cailean <[email protected]>
+Date:   Mon May 27 15:39:47 2024 +0100
+
+    updated cameras + end episode threshold
+
+[33mcommit 8c05d9df029e8db1af101865f8d7e172c1861831[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon May 27 12:00:56 2024 +0100
+
+    small changes
+
+[33mcommit 2c0252aeb9f011d4a050d0e33140ad0a8ff50eaf[m
+Author: Cailean Finn <[email protected]>
+Date:   Sun May 26 18:23:08 2024 +0100
+
+    fixed actuations camera
+
+[33mcommit 1dda487592d8c3a161673d421cb895e33c8b686e[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri May 24 16:08:39 2024 +0100
+
+    small update
+
+[33mcommit 494bbb501c02c6a4dd4872dc53d34b98d7db7e40[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri May 24 16:08:27 2024 +0100
+
+    script subtitle fix
+
+[33mcommit 2112cd131555db810ad73a47f09969e024b4e330[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri May 24 15:19:48 2024 +0100
+
+    added swarm
+
+[33mcommit 29b182200dca5fc4570862d6d332a1881ce6efe2[m
+Author: Cailean Finn <[email protected]>
+Date:   Thu May 23 14:19:36 2024 +0100
+
+    new changes week 1
+
+[33mcommit ee8e2e7bf2ffca714ac1fb03f7cd8b39e53fa909[m
+Author: cailean <[email protected]>
+Date:   Wed May 8 19:05:15 2024 +0100
+
+    small update
+
+[33mcommit ff5369e54f0f0f2ca94ce4b5ff982c12faff8290[m
+Author: cailean <[email protected]>
+Date:   Wed May 8 19:04:40 2024 +0100
+
+    audio added for text scroll
+
+[33mcommit 67429355ad120c93febe81b61c0574109065e6fa[m
+Author: cailean <[email protected]>
+Date:   Wed May 8 14:31:02 2024 +0100
+
+    update to script
+
+[33mcommit df9e7b4706006cc66a4e7f580f5f3cbe4beccea9[m
+Author: cailean <[email protected]>
+Date:   Wed May 8 14:07:34 2024 +0100
+
+    actuations adj
+
+[33mcommit 52b7649ffed1fc632d8997e5ddf4c2760522901b[m
+Author: cailean <[email protected]>
+Date:   Wed May 8 13:27:51 2024 +0100
+
+    fps & camera adjs
+
+[33mcommit 6346d0246b4c9cd127d4c30a6f507d14ac507270[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue May 7 20:52:15 2024 +0100
+
+    titled added
+
+[33mcommit 1efc176061db1a0ec2d7fa78eb72c82333e28961[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue May 7 15:58:46 2024 +0100
+
+    camera updates
+
+[33mcommit a05be120719a86d1ef70c992ae2b8f1f30c28a6e[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue May 7 15:28:54 2024 +0100
+
+    graveyard/telephone poles/rocks added
+
+[33mcommit c3d0078e83dbf6db1395f0be5c1d1de3aff41aeb[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon May 6 15:36:49 2024 +0100
+
+    e-waste pile added
+
+[33mcommit 80417418ce531998e0f6500c97130b853c3f7073[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon May 6 15:31:11 2024 +0100
+
+    environment ready!
+
+[33mcommit 811e97547b16558329800521efd70e0353d1e8bf[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon May 6 13:55:55 2024 +0100
+
+    custom rt added for split-screen
+
+[33mcommit 9a9096a57d93d105ad3d344cda8e2ffc438aaba6[m
+Author: Cailean Finn <[email protected]>
+Date:   Thu May 2 16:51:49 2024 +0100
+
+    font update!
+
+[33mcommit e43c2b83ee4aaf9b78cde65d573979f2b2c90064[m
+Author: Cailean Finn <[email protected]>
+Date:   Thu May 2 16:31:37 2024 +0100
+
+    ui changes
+
+[33mcommit da19f519765ef883ec2f31c6eb978e03bbe187d0[m
+Author: Cailean Finn <[email protected]>
+Date:   Thu May 2 14:41:26 2024 +0100
+
+    wireframe cube added & pose cam added to main brain
+
+[33mcommit 6d87d3085921e4b1d4320468fe5992f48535fba9[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 17:07:18 2024 +0100
+
+    update
+
+[33mcommit 65c1638b43b1c43f288f54f5a25fa1d4ac5d59c4[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 17:07:08 2024 +0100
+
+    smoke vfx added
+
+[33mcommit e7e63927d4a1e845244b8a0d9e28547adf29d689[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 15:26:24 2024 +0100
+
+    background color added
+
+[33mcommit b79865919dc9684ab7d9e6add57fc9ebc5ec810e[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 15:08:36 2024 +0100
+
+    shader color added to match sky color
+
+[33mcommit 2408b8d57df938189a349596c4dcde3b39446e6c[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 14:35:57 2024 +0100
+
+    update
+
+[33mcommit e1402f96bf3ec530e2283504614084ee19bf7eb7[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed May 1 14:35:40 2024 +0100
+
+    camera weights added
+
+[33mcommit 7e3cc463def74b00155d200f4226de0c25935967[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 21:09:23 2024 +0100
+
+    update
+
+[33mcommit 9ddaf68d0274daa80100a0813348e7505aea9474[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 20:24:39 2024 +0100
+
+    disabled pose camera
+
+[33mcommit d06aabc8084e4698d30c6e472b0ffdc2afeba2e1[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 20:18:20 2024 +0100
+
+    replaced w/ correct script (howl)
+
+[33mcommit 56ae7d2e2fa76e80fe773e63411d7c0bbb94c0e9[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 20:11:19 2024 +0100
+
+    del disappear shader from target animation
+
+[33mcommit 10b01dc347b02e286414f7f2854344784f88e832[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 16:14:03 2024 +0100
+
+    render txt done ui
+
+[33mcommit d5364dbac4ad0e8fc6c4b277ca7831f65f6ff17f[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 15:42:17 2024 +0100
+
+    alpha render text working
+
+[33mcommit f6645aa96a5f0af02e8618ea14ceab04dfc9a9b9[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 14:03:42 2024 +0100
+
+    user input del & pose camera fixed
+
+[33mcommit fef5072ec20eb2e8fbcf457f136a36585c58e33f[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 30 12:58:02 2024 +0100
+
+    ortho pose cam setup
+
+[33mcommit 7934c4d0315ee831065323e70643e23261558cbd[m
+Author: cailean <[email protected]>
+Date:   Mon Apr 29 15:52:09 2024 +0100
+
+    added sfx for fail & spawn
+
+[33mcommit a4de1e11040b9582b47f5a2eb5b1912aefbfdb7e[m
+Author: cailean <[email protected]>
+Date:   Mon Apr 29 13:21:37 2024 +0100
+
+    model swap manager added
+
+[33mcommit 024200a8a7c60f4467733803b2418f583fc3bf48[m
+Author: cailean <[email protected]>
+Date:   Mon Apr 29 12:16:16 2024 +0100
+
+    looping of text & audio, statistics/model info text added
+
+[33mcommit 2b7b7fb9cace97f3552c89cc0ee3c665920d590b[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 15:13:21 2024 +0100
+
+    tags updated & new material for actuations
+
+[33mcommit 099fceda06f2db9ccea5fe3946e445ebe509129c[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 15:03:27 2024 +0100
+
+    camera controller added
+
+[33mcommit 67792552dc08072ab18ae78b76f37ffa4b7e3c42[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 14:15:35 2024 +0100
+
+    body fully implemented
+
+[33mcommit 9afff5f79339995cb28935849f84982d5dd25746[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 12:42:31 2024 +0100
+
+    more fmod settings updated
+
+[33mcommit b5a5bb7bcba6952a1d3bc21ef2e90794a4d2688b[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 12:42:00 2024 +0100
+
+    updated fmod studio settings
+
+[33mcommit 40d65f6140d79fb7b849fc594c51f0be2718e519[m
+Author: cailean <[email protected]>
+Date:   Fri Apr 19 11:49:59 2024 +0100
+
+    fmod bank directory added
+
+[33mcommit 3a308e405a5552f8999ed1d27617ecf1e5cfbccd[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 18 17:54:42 2024 +0100
+
+    actuation body added
+
+[33mcommit 87600829802be78899f452246488285d6d33cb51[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 18 16:27:57 2024 +0100
+
+    blend shapes added for character
+
+[33mcommit 3b3b39a72a9fbe50037c458f1a5d7a6cefcab856[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 17 15:55:00 2024 +0100
+
+    removed debuglog in shader
+
+[33mcommit a34c1e2c59c183b0891355be670926865cb66611[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 17 15:54:22 2024 +0100
+
+    added dissapear shader & flare removed from sun
+
+[33mcommit f27043f1f05cbef0c4cc1a70cee13250c310c97f[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 17 14:35:11 2024 +0100
+
+    grayscale shader added, no double sided texture
+
+[33mcommit 2d7c53b669d1ba2a0db6b65df7255ea4e03ecdca[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 17 14:12:50 2024 +0100
+
+    vfx opacity adjusted
+
+[33mcommit 0cf434c51e53e9e0b102ff379dff96c6e1013046[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 16 16:32:17 2024 +0100
+
+    camera statue pan added
+
+[33mcommit 2d21c79f74532a72e1f2e5c9640eda3a4e3d858e[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 16 16:03:44 2024 +0100
+
+    character and statue model added
+
+[33mcommit 8431641e0c4876c40664dd536526adbbb319fe1d[m
+Author: cailean <[email protected]>
+Date:   Mon Apr 15 15:58:11 2024 +0100
+
+    moloch character added
+
+[33mcommit 92b27d3d585740a5579ebc11e9eb58ad9d5aebb9[m
+Author: cailean <[email protected]>
+Date:   Mon Apr 15 11:48:45 2024 +0100
+
+    smplx avatar added
+
+[33mcommit 3381a52f2f47800dcdc5d65ec5bf533c60122b51[m
+Author: Cailean Finn <[email protected]>
+Date:   Mon Apr 15 10:43:55 2024 +0100
+
+    actuations demo added
+
+[33mcommit 63e2ce1871e5c7d1e5aa353cc33f4a546f8410fe[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Apr 12 13:46:41 2024 +0100
+
+    jointdrive controller added
+
+[33mcommit 4b6d2492ab7833e6e10a44b7190adeaf04db8c22[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Apr 12 12:14:17 2024 +0100
+
+    inference mode
+
+[33mcommit 4b4419127c9b4a0f2a5f44456fdb6912407d3c33[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Apr 12 12:10:21 2024 +0100
+
+    rotating plane & vertex snap removed
+
+[33mcommit 05b448f618a69fef0dc304be8f765d0fec3a0142[m[33m ([m[1;31morigin/main[m[33m)[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Apr 12 11:35:03 2024 +0100
+
+    dof blur quality lowered
+
+[33mcommit 40f3297d55d4358674d90f9c80ac7fbaa3ada6eb[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Apr 12 10:12:00 2024 +0100
+
+    added incremental garbage collection
+
+[33mcommit 66abe8dfca29943350388f914c3f3a367ecaa4c3[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 11 17:11:34 2024 +0100
+
+    added volume for body cam
+
+[33mcommit 8c46a110bc26655937b3ac095f2b694dd9b58f45[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 11 16:47:59 2024 +0100
+
+    ciruclar loop added for bodies & camera updates
+
+[33mcommit d63ac5c4e8221418b6869411223ae9cc55f09483[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 10 16:02:42 2024 +0100
+
+    save
+
+[33mcommit 67935a60c42b1b339c3ae1387c19f3a2ed50794b[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 10 16:01:45 2024 +0100
+
+    added dolly landscape sweep
+
+[33mcommit 393207a6ed75e8aa60838adf41d9d472114cb154[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 10 15:28:09 2024 +0100
+
+    added dolly camera
+
+[33mcommit 6ec36a39a49a4c8110b8e6d1cbecbeedc99b37d1[m
+Author: Cailean Finn <[email protected]>
+Date:   Wed Apr 10 13:57:44 2024 +0100
+
+    camera manager added
+
+[33mcommit c899944e1a73d13475716ef06c487edb7b8aca28[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 9 17:48:12 2024 +0100
+
+    save
+
+[33mcommit 44f03fd82bcd477ee6437d17f7714762dacd0480[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 9 16:45:05 2024 +0100
+
+    footstep audio added
+
+[33mcommit faa835d79068d93480f2e7f9613c0535ed0cba0b[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 9 13:26:34 2024 +0100
+
+    humanoid materials added
+
+[33mcommit 864e873e9c8c841087861151b8ad800659787909[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 9 13:01:56 2024 +0100
+
+    font added, sound rearranged
+
+[33mcommit 58f4c1b88fc2cc715749f0cee04e996356b9299e[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 4 16:06:03 2024 +0100
+
+    fmod added & sound working
+
+[33mcommit 37674424a68f6ab9d05c7db6187e73445212d608[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 4 14:59:38 2024 +0100
+
+    subtitle update
+
+[33mcommit 61990221d00be001834ba147f22baff960fd825d[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 4 14:30:50 2024 +0100
+
+    script added & managers for narration/subtitles
+
+[33mcommit 7f2392f43e366092d0fbac45a658fac5908c3118[m
+Author: cailean <[email protected]>
+Date:   Thu Apr 4 13:09:38 2024 +0100
+
+    adjusted physics layers & body manager
+
+[33mcommit cce101049747f0ab17f8fe922cd8f2ec2e07daff[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 2 17:21:20 2024 +0100
+
+    added spawner for humanoid
+
+[33mcommit 6ea603ad5b9a0eebe74cfd852aac27153b06ddff[m
+Author: cailean <[email protected]>
+Date:   Tue Apr 2 14:47:50 2024 +0100
+
+    added volumes for dof cameras
+
+[33mcommit 914f1c8b79126b6c9610d81ffe55ed2c561b782e[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 2 13:55:27 2024 +0100
+
+    splat added to working dir
+
+[33mcommit b90aefbf5981cbff6dea57c26666f0d688f26454[m
+Author: Cailean Finn <[email protected]>
+Date:   Tue Apr 2 12:56:15 2024 +0100
+
+    added environment objects
+
+[33mcommit 0c43e5ccd41976b736e660c4bfe483dddc61bb9e[m[33m ([m[1;31morigin/master[m[33m)[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 28 17:34:32 2024 +0000
+
+    removed terrain col on end episode & vfx graph adj
+
+[33mcommit c58d9a1e80ea94069726a389b9fc96884fd36afd[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 28 14:56:02 2024 +0000
+
+    save
+
+[33mcommit 0535f6df4c1f1a76eb930b2e96237dc0cb39dc3d[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 28 14:55:33 2024 +0000
+
+    organisation & splat changes
+
+[33mcommit d487af62b8bf452c2f50801d6b3fb61809fb0a42[m
+Author: cailean <[email protected]>
+Date:   Mon Mar 25 16:49:08 2024 +0000
+
+    added splats & vertex snapping shader
+
+[33mcommit 5a566fb98af2ce3623a6b46fa92c1075a0add325[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Mar 22 15:44:30 2024 +0000
+
+    cameras added & endepisode altered for actuations and waitime
+
+[33mcommit 4765189c219a31c14b9395aafa1c176f9ea0af9b[m
+Author: Cailean Finn <[email protected]>
+Date:   Fri Mar 22 13:43:57 2024 +0000
+
+    layer changes, camera added
+
+[33mcommit ea73e8b0dbb27d2590c609f6de7ad46d643dba18[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 21 16:30:50 2024 +0000
+
+    updated applied layers to clone
+
+[33mcommit d1b7830bed6de825cc3f27826495934cdaa1ccc4[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 21 15:33:35 2024 +0000
+
+    init unity
+
+[33mcommit 21d0c3a2340b683994ee794c7c77c084ec34ac34[m
+Author: cailean <[email protected]>
+Date:   Thu Mar 21 15:32:50 2024 +0000
+
+    init