Merge branch 'master' of git@ooftooft.net:Racesm

# Conflicts:
#	Assets/Imported Assets/Kevin Iglesias.meta
#	Assets/Imported Assets/Kevin Iglesias/Basic Motions/Animations/Idles.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta

.gitignore

@@ -10,6 +10,9 @@
 /[Ll]ogs/
 /[Uu]ser[Ss]ettings/
 
+venv
+.venv
+
 # MemoryCaptures can get excessive in size.
 # They also could contain extremely sensitive data
 /[Mm]emoryCaptures/

Assets/Imported Assets/Kevin Iglesias.meta

@@ -1,7 +1,12 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Imported Assets/Kevin Iglesias.meta
 guid: 3fbd4e731b87fd4469babb69c4af0ba9
 folderAsset: yes
 DefaultImporter:
+=======
+guid: 148686e89d63c1543b7c4ebf056f7fd0
+TextScriptImporter:
+>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/ML-Agents/Timers/AI training_timers.json

@@ -1 +1 @@
-{"count":1,"self":48.641856,"total":49.1630518,"children":{"InitializeActuators":{"count":1,"self":0.0010003,"total":0.0010003,"children":null},"InitializeSensors":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":2213,"self":0.044592599999999996,"total":0.0698158,"children":{"CollectObservations":{"count":443,"self":0.009644,"total":0.009644,"children":null},"WriteActionMask":{"count":443,"self":0.0005038,"total":0.0005038,"children":null},"RequestDecision":{"count":443,"self":0.0150754,"total":0.0150754,"children":null}}},"DecideAction":{"count":2213,"self":0.36232129999999996,"total":0.3648423,"children":{"RayPerceptionSensor.Perceive":{"count":886,"self":0.002521,"total":0.002521,"children":null}}},"AgentAct":{"count":2213,"self":0.0835345,"total":0.0835345,"children":null}},"gauges":{"BensonV4.CumulativeReward":{"count":3,"max":5.96420574,"min":5.87237167,"runningAverage":5.908585,"value":5.87237167,"weightedAverage":5.92717934}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713535484","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 4068a663-bd5e-4526-907d-88111baad304 -accessToken 2br8Tr5WDuAnqRzlr3wnNZ_EORRyV0BMpmUN7FvToCw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713535533"}}
+{"count":1,"self":111.86097919999999,"total":112.7056501,"children":{"InitializeActuators":{"count":1,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0020055,"total":0.0020055,"children":null},"AgentSendState":{"count":5396,"self":0.072008599999999992,"total":0.112703,"children":{"CollectObservations":{"count":1080,"self":0.0271168,"total":0.0271168,"children":null},"WriteActionMask":{"count":1080,"self":0,"total":0,"children":null},"RequestDecision":{"count":1080,"self":0.013577599999999999,"total":0.013577599999999999,"children":null}}},"DecideAction":{"count":5396,"self":0.5794904,"total":0.58251979999999992,"children":{"RayPerceptionSensor.Perceive":{"count":2160,"self":0.0030294,"total":0.0030294,"children":null}}},"AgentAct":{"count":5396,"self":0.1464373,"total":0.1464373,"children":null}},"gauges":{"BensonV4.CumulativeReward":{"count":7,"max":5.96420574,"min":5.79276133,"runningAverage":5.889879,"value":5.87086153,"weightedAverage":5.89014149}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713539474","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 391732a6-a2b0-4a93-b4a3-321236b9bad5 -accessToken 3KS6Z2WtkqT-u9ZbvfSgVazd2aJBTKTOTKNuyMYuWDs005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713539587"}}

Assets/ML-Agents/Timers/Racetrack mini_timers.json

@@ -1 +1 @@
-{"count":1,"self":23.0381088,"total":23.085529599999997,"children":{"InitializeActuators":{"count":1,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":1,"self":0.0025222,"total":0.0025222,"children":null},"AgentSendState":{"count":259,"self":0.0224122,"total":0.0368086,"children":{"CollectObservations":{"count":259,"self":0.0088755,"total":0.0088755,"children":null},"WriteActionMask":{"count":259,"self":0,"total":0,"children":null},"RequestDecision":{"count":259,"self":0.0055209,"total":0.0055209,"children":{"RayPerceptionSensor.Perceive":{"count":518,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":259,"self":0.00053259999999999994,"total":0.00053259999999999994,"children":null},"AgentAct":{"count":259,"self":0.0065574,"total":0.0065574,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712920022","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 36cd304d-8333-4e13-9400-40712c29b116 -accessToken V38nPLIXDhAumRkhp_UQDiAFhJHlz31FOZlSjW8et9U005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1712920045"}}
+{"count":1,"self":97.5037696,"total":167.3285572,"children":{"InitializeActuators":{"count":10,"self":0.0009995,"total":0.0009995,"children":null},"InitializeSensors":{"count":10,"self":0.0025031999999999997,"total":0.0025031999999999997,"children":null},"AgentSendState":{"count":25084,"self":0.7344769,"total":1.4976287,"children":{"CollectObservations":{"count":50170,"self":0.18223879999999998,"total":0.18223879999999998,"children":null},"WriteActionMask":{"count":50170,"self":0.0155993,"total":0.0155993,"children":null},"RequestDecision":{"count":50170,"self":0.10198059999999999,"total":0.56531369999999992,"children":{"AgentInfo.ToProto":{"count":50170,"self":0.0794458,"total":0.4633331,"children":{"GenerateSensorData":{"count":50170,"self":0.3300843,"total":0.3838873,"children":{"RayPerceptionSensor.Perceive":{"count":100340,"self":0.053803,"total":0.053803,"children":null}}}}}}}}},"DecideAction":{"count":25084,"self":66.8209536,"total":66.8209562,"children":null},"AgentAct":{"count":25084,"self":1.4979343999999999,"total":1.5027009,"children":{"AgentInfo.ToProto":{"count":325,"self":0.0010627,"total":0.0047665,"children":{"GenerateSensorData":{"count":325,"self":0.0037037999999999997,"total":0.0037037999999999997,"children":{"RayPerceptionSensor.Perceive":{"count":650,"self":0,"total":0,"children":null}}}}}}}},"gauges":{"BensonV4.CumulativeReward":{"count":325,"max":6.024157,"min":3.34493542,"runningAverage":5.78540325,"value":5.934206,"weightedAverage":5.82348061}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713539202","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 391732a6-a2b0-4a93-b4a3-321236b9bad5 -accessToken 3KS6Z2WtkqT-u9ZbvfSgVazd2aJBTKTOTKNuyMYuWDs005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713539370"}}

Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta

@@ -1,6 +1,17 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: cae2c1f325bcbe845b14e25e64899006
 TextScriptImporter:
+=======
+<<<<<<< HEAD:Assets/Imported Assets/Kevin Iglesias.meta
+guid: 3fbd4e731b87fd4469babb69c4af0ba9
+folderAsset: yes
+DefaultImporter:
+=======
+guid: 148686e89d63c1543b7c4ebf056f7fd0
+TextScriptImporter:
+>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
+>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Scenes/AI Training.unity

@@ -177,7 +177,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -238,7 +238,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -299,7 +299,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -323,7 +323,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!81 &765367129
 AudioListener:
   m_ObjectHideFlags: 0
@@ -452,7 +452,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -513,7 +513,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -578,7 +578,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
       propertyPath: CameraSide
@@ -1012,7 +1012,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1247,7 +1247,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1419,7 +1419,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1480,7 +1480,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1538,10 +1538,10 @@ PrefabInstance:
     - target: {fileID: 1228817729644437253, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_Model
       value: 
-      objectReference: {fileID: 5022602860645237092, guid: 5d1f7ab87b601564eb6f2b6e149a4315, type: 3}
+      objectReference: {fileID: 0}
     - target: {fileID: 1228817729644437253, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_BehaviorType
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8832687267391831282, guid: a3462884d5dfc9e49a4a1c1abb5c98e7, type: 3}
       propertyPath: m_Name