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

# Conflicts:
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
#	Assets/Scenes/Car Customization.unity.meta
This commit is contained in:
PokingPines
2024-04-22 08:22:55 +02:00
945 changed files with 1000588 additions and 2949 deletions

View File

@@ -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":809.2977152,"total":4632.3942763,"children":{"InitializeActuators":{"count":10,"self":0.0025077999999999997,"total":0.0025077999999999997,"children":null},"InitializeSensors":{"count":10,"self":0.0025223,"total":0.0025223,"children":null},"AgentSendState":{"count":1255617,"self":31.879206399999998,"total":70.695593899999992,"children":{"CollectObservations":{"count":2511240,"self":11.534297599999999,"total":11.5342975,"children":null},"WriteActionMask":{"count":2511240,"self":1.0299128,"total":1.0299128,"children":null},"RequestDecision":{"count":2511240,"self":4.8350608,"total":26.2521764,"children":{"AgentInfo.ToProto":{"count":2511240,"self":3.9296072,"total":21.417115499999998,"children":{"GenerateSensorData":{"count":2511240,"self":14.390806399999999,"total":17.4875084,"children":{"RayPerceptionSensor.Perceive":{"count":5022480,"self":3.0967018,"total":3.0967018,"children":null}}}}}}}}},"DecideAction":{"count":1255617,"self":3650.8291071999997,"total":3650.8292428,"children":null},"AgentAct":{"count":1255617,"self":101.3596032,"total":101.56567179999999,"children":{"AgentInfo.ToProto":{"count":13246,"self":0.042745899999999996,"total":0.20606549999999998,"children":{"GenerateSensorData":{"count":13246,"self":0.1278361,"total":0.16331959999999998,"children":{"RayPerceptionSensor.Perceive":{"count":26492,"self":0.0354835,"total":0.0354835,"children":null}}}}}}}},"gauges":{"BensonV6.1.CumulativeReward":{"count":13246,"max":26.7048168,"min":-0.06671302,"runningAverage":17.17633,"value":18.1915569,"weightedAverage":18.4008961}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713626948","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 e08cc479-296a-466a-a392-68af5330fc09 -accessToken S1StEIprioU2rzDDo5vTCfsRe2zgz-zUchvR2e0iCUQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713631580"}}

View File

@@ -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":42.998300799999996,"total":43.4843429,"children":{"InitializeActuators":{"count":1,"self":0.0009975,"total":0.0009975,"children":null},"InitializeSensors":{"count":1,"self":0.0035107,"total":0.0035107,"children":null},"AgentSendState":{"count":1884,"self":0.0346849,"total":0.0636719,"children":{"CollectObservations":{"count":377,"self":0.0123839,"total":0.0123839,"children":null},"WriteActionMask":{"count":377,"self":0.0010061999999999998,"total":0.0010061999999999998,"children":null},"RequestDecision":{"count":377,"self":0.015596899999999999,"total":0.015596899999999999,"children":null}}},"DecideAction":{"count":1884,"self":0.3403078,"total":0.3445643,"children":{"RayPerceptionSensor.Perceive":{"count":754,"self":0.0042565,"total":0.0042565,"children":null}}},"AgentAct":{"count":1884,"self":0.07230099999999999,"total":0.07230099999999999,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":1,"max":25.4530888,"min":25.4530888,"runningAverage":25.4530888,"value":25.4530888,"weightedAverage":25.4530888}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713641553","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId bbb0aaf3-8271-4af0-b4cd-7f6b72fbe10b -accessToken RLm1ElgSaMlooMCc0_C3-0lLa7Ak20pME_OI2U67cZg005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713641596"}}

View File

@@ -1,6 +1,27 @@
fileFormatVersion: 2
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
guid: 3950f1a182dfa4e4198dd80c8cc7adfb
TextScriptImporter:
=======
guid: c51225fde5101214fa7a6f13dc68546c
DefaultImporter:
>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb:Assets/Scenes/Car Customization.unity.meta
=======
<<<<<<< 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
>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb
externalObjects: {}
userData:
assetBundleName: