Pouring simulator map is created. Apartment map updated to include hu…

…man head
robcog-iai · Jun 20, 2023 · f28944b · f28944b
1 parent 1a6b05b
commit f28944b
Show file tree

Hide file tree

Showing 117 changed files with 176 additions and 648 deletions.
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -83,11 +83,6 @@ bUseMouseForTouch=False
 bEnableMouseSmoothing=True
 bEnableFOVScaling=True
 bCaptureMouseOnLaunch=True
-bEnableLegacyInputScales=True
-bEnableMotionControls=True
-bFilterInputByPlatformUser=False
-bShouldFlushPressedKeysOnViewportFocusLost=True
-bEnableDynamicComponentInputBinding=True
 bAlwaysShowTouchInterface=False
 bShowConsoleOnFourFingerTap=True
 bEnableGestureRecognizer=False
@@ -113,6 +108,8 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="SLGenericTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=N)
 +ActionMappings=(ActionName="VizQCineCamTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=K)
 +ActionMappings=(ActionName="VizQCineCamEffectTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=J)
++ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Up)
++ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Down)
 +AxisMappings=(AxisName="LeftGrasp",Scale=1.000000,Key=Vive_Left_Trigger_Axis)
 +AxisMappings=(AxisName="RightGrasp",Scale=1.000000,Key=Vive_Right_Trigger_Axis)
 DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput

diff --git a/Config/SteamVRBindings/gamepad.json b/Config/SteamVRBindings/gamepad.json
@@ -9,5 +9,5 @@
 			"sources": []
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/holographic_controller.json b/Config/SteamVRBindings/holographic_controller.json
@@ -40,5 +40,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/hpmotioncontroller.json b/Config/SteamVRBindings/hpmotioncontroller.json
@@ -40,5 +40,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/indexhmd.json b/Config/SteamVRBindings/indexhmd.json
@@ -9,5 +9,5 @@
 			"sources": []
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/knuckles.json b/Config/SteamVRBindings/knuckles.json
@@ -40,5 +40,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/oculus_touch.json b/Config/SteamVRBindings/oculus_touch.json
@@ -40,5 +40,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/rift.json b/Config/SteamVRBindings/rift.json
@@ -9,5 +9,5 @@
 			"sources": []
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json
@@ -183,6 +183,14 @@
 			"name": "/actions/main/in/RightGraspHelper",
 			"type": "boolean"
 		},
+		{
+			"name": "/actions/main/in/SLAudioStartTrigger",
+			"type": "boolean"
+		},
+		{
+			"name": "/actions/main/in/SLAudioStopTrigger",
+			"type": "boolean"
+		},
 		{
 			"name": "/actions/main/in/LeftGrasp axis",
 			"type": "vector1"
@@ -199,6 +207,106 @@
 		}
 	],
 	"default_bindings": [
+		{
+			"controller_type": "gamepad",
+			"binding_url": "gamepad.json"
+		},
+		{
+			"controller_type": "holographic_controller",
+			"binding_url": "holographic_controller.json"
+		},
+		{
+			"controller_type": "hpmotioncontroller",
+			"binding_url": "hpmotioncontroller.json"
+		},
+		{
+			"controller_type": "indexhmd",
+			"binding_url": "indexhmd.json"
+		},
+		{
+			"controller_type": "knuckles",
+			"binding_url": "knuckles.json"
+		},
+		{
+			"controller_type": "oculus_touch",
+			"binding_url": "oculus_touch.json"
+		},
+		{
+			"controller_type": "rift",
+			"binding_url": "rift.json"
+		},
+		{
+			"controller_type": "vive",
+			"binding_url": "vive.json"
+		},
+		{
+			"controller_type": "vive_controller",
+			"binding_url": "vive_controller.json"
+		},
+		{
+			"controller_type": "vive_cosmos_controller",
+			"binding_url": "vive_cosmos_controller.json"
+		},
+		{
+			"controller_type": "vive_pro",
+			"binding_url": "vive_pro.json"
+		},
+		{
+			"controller_type": "vive_tracker",
+			"binding_url": "vive_tracker.json"
+		},
+		{
+			"controller_type": "vive_tracker_camera",
+			"binding_url": "vive_tracker_camera.json"
+		},
+		{
+			"controller_type": "vive_tracker_chest",
+			"binding_url": "vive_tracker_chest.json"
+		},
+		{
+			"controller_type": "vive_tracker_handed",
+			"binding_url": "vive_tracker_handed.json"
+		},
+		{
+			"controller_type": "vive_tracker_keyboard",
+			"binding_url": "vive_tracker_keyboard.json"
+		},
+		{
+			"controller_type": "vive_tracker_left_elbow",
+			"binding_url": "vive_tracker_left_elbow.json"
+		},
+		{
+			"controller_type": "vive_tracker_left_foot",
+			"binding_url": "vive_tracker_left_foot.json"
+		},
+		{
+			"controller_type": "vive_tracker_left_knee",
+			"binding_url": "vive_tracker_left_knee.json"
+		},
+		{
+			"controller_type": "vive_tracker_left_shoulder",
+			"binding_url": "vive_tracker_left_shoulder.json"
+		},
+		{
+			"controller_type": "vive_tracker_right_elbow",
+			"binding_url": "vive_tracker_right_elbow.json"
+		},
+		{
+			"controller_type": "vive_tracker_right_foot",
+			"binding_url": "vive_tracker_right_foot.json"
+		},
+		{
+			"controller_type": "vive_tracker_right_knee",
+			"binding_url": "vive_tracker_right_knee.json"
+		},
+		{
+			"controller_type": "vive_tracker_right_shoulder",
+			"binding_url": "vive_tracker_right_shoulder.json"
+		},
+		{
+			"controller_type": "vive_tracker_waist",
+			"binding_url": "vive_tracker_waist.json"
+		},
 		{
 			"controller_type": "knuckles",
 			"binding_url": "knuckles.json"
@@ -341,6 +449,8 @@
 			"/actions/main/in/SLTrigger": "SLTrigger",
 			"/actions/main/in/LeftGraspHelper": "LeftGraspHelper",
 			"/actions/main/in/RightGraspHelper": "RightGraspHelper",
+			"/actions/main/in/SLAudioStartTrigger": "SLAudioStartTrigger",
+			"/actions/main/in/SLAudioStopTrigger": "SLAudioStopTrigger",
 			"/actions/main/in/LeftGrasp axis": "LeftGrasp",
 			"/actions/main/in/RightGrasp axis": "RightGrasp",
 			"/actions/main": "Main Game Actions"

diff --git a/Config/SteamVRBindings/vive.json b/Config/SteamVRBindings/vive.json
@@ -9,5 +9,5 @@
 			"sources": []
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json
@@ -141,6 +141,36 @@
 						}
 					}
 				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"north":
+						{
+							"output": "/actions/main/in/SLAudioStartTrigger"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"south":
+						{
+							"output": "/actions/main/in/SLAudioStopTrigger"
+						}
+					}
+				},
 				{
 					"mode": "trigger",
 					"path": "/user/hand/left/input/trigger",
@@ -197,5 +227,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_cosmos_controller.json b/Config/SteamVRBindings/vive_cosmos_controller.json
@@ -40,5 +40,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_pro.json b/Config/SteamVRBindings/vive_pro.json
@@ -9,5 +9,5 @@
 			"sources": []
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker.json b/Config/SteamVRBindings/vive_tracker.json
@@ -60,5 +60,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_camera.json b/Config/SteamVRBindings/vive_tracker_camera.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_chest.json b/Config/SteamVRBindings/vive_tracker_chest.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_handed.json b/Config/SteamVRBindings/vive_tracker_handed.json
@@ -60,5 +60,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_keyboard.json b/Config/SteamVRBindings/vive_tracker_keyboard.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_left_elbow.json b/Config/SteamVRBindings/vive_tracker_left_elbow.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_left_foot.json b/Config/SteamVRBindings/vive_tracker_left_foot.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_left_knee.json b/Config/SteamVRBindings/vive_tracker_left_knee.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_left_shoulder.json b/Config/SteamVRBindings/vive_tracker_left_shoulder.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_right_elbow.json b/Config/SteamVRBindings/vive_tracker_right_elbow.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_right_foot.json b/Config/SteamVRBindings/vive_tracker_right_foot.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_right_knee.json b/Config/SteamVRBindings/vive_tracker_right_knee.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_right_shoulder.json b/Config/SteamVRBindings/vive_tracker_right_shoulder.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Config/SteamVRBindings/vive_tracker_waist.json b/Config/SteamVRBindings/vive_tracker_waist.json
@@ -15,5 +15,5 @@
 			]
 		}
 	},
-	"description": ""
+	"description": "RobCoG-18319896"
 }
diff --git a/Content/Levels/Laborraum.umap b/Content/Levels/Laborraum.umap
diff --git a/Content/Maps/Apartment/Main.umap b/Content/Maps/Apartment/Main.umap
diff --git a/Content/Maps/Simulation/BP_SimulatorActor.uasset b/Content/Maps/Simulation/BP_SimulatorActor.uasset
diff --git a/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset b/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset
diff --git a/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset b/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset
diff --git a/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset b/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBigBowl.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBigBowl.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMCup.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMMilkPitcher.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMMilkPitcher.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMRedBowl.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMRedBowl.uasset
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SM_EspressoCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SM_EspressoCup.uasset
diff --git a/...Bowl/BP_SimulatorActor_15Particles.uasset → ...Bowl/BP_SimulatorActor_15Particles.uasset b/...Bowl/BP_SimulatorActor_15Particles.uasset → ...Bowl/BP_SimulatorActor_15Particles.uasset
diff --git a/...torActor_30ParticlesMiddlePosition.uasset → ...torActor_30ParticlesMiddlePosition.uasset b/...torActor_30ParticlesMiddlePosition.uasset → ...torActor_30ParticlesMiddlePosition.uasset
diff --git a/...torActor_15ParticlesMiddlePosition.uasset → ...torActor_15ParticlesMiddlePosition.uasset b/...torActor_15ParticlesMiddlePosition.uasset → ...torActor_15ParticlesMiddlePosition.uasset
diff --git a/...Bowl/BP_SimulatorActor_30Particles.uasset → ...cale/BP_SimulatorActor_30Particles.uasset b/...Bowl/BP_SimulatorActor_30Particles.uasset → ...cale/BP_SimulatorActor_30Particles.uasset
diff --git a/...s/Simulation/PouringSimulator_single.umap → ...t/Maps/Simulation/PouringSimulator_1.umap b/...s/Simulation/PouringSimulator_single.umap → ...t/Maps/Simulation/PouringSimulator_1.umap
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigBowl.uasset b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigBowl.uasset
diff --git a/...SimulatorActor_BigSource_SmallDest.uasset → ...SimulatorActor_BigSource_SmallDest.uasset b/...SimulatorActor_BigSource_SmallDest.uasset → ...SimulatorActor_BigSource_SmallDest.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest1.uasset b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest1.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigBowl.uasset b/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigBowl.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/BP_Sim_SMCup_SM_EspressoCup.uasset b/Content/Maps/Simulation/SourceSMCup/BP_Sim_SMCup_SM_EspressoCup.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1.uasset b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1_C.uasset b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1_C.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/Default__BP_SimulatorActor_15Particles1_C.uasset b/Content/Maps/Simulation/SourceSMCup/Default__BP_SimulatorActor_15Particles1_C.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCupDestSmall/BP_SimulatorActor_15Particles1.uasset b/Content/Maps/Simulation/SourceSMCupDestSmall/BP_SimulatorActor_15Particles1.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset
diff --git a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset
diff --git a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset
diff --git a/Content/Models/SM_Bowl.uasset b/Content/Models/SM_Bowl.uasset
diff --git a/Plugins/USemLog b/Plugins/USemLog
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,5 +40,5 @@ @@
     			]
     		}
     	},
-    	"description": ""
+    	"description": "RobCoG-18319896"
     }
+2 −0		Source/USemLog/Classes/Actors/SLPouringParticleAgentClass.h
+32 −0		Source/USemLog/Classes/Actors/SLStaticMeshAgentClass.h
+4 −0		Source/USemLog/Classes/Events/ISLEvent.h
+3 −0		Source/USemLog/Classes/Events/SLContactEvent.h
+10 −2		Source/USemLog/Classes/Events/SLContactEventHandler.h
+3 −0		Source/USemLog/Classes/Events/SLContainerEvent.h
+3 −0		Source/USemLog/Classes/Events/SLDummyEvent.h
+3 −0		Source/USemLog/Classes/Events/SLGraspEvent.h
+3 −0		Source/USemLog/Classes/Events/SLPickUpEvent.h
+3 −0		Source/USemLog/Classes/Events/SLPouringEvent.h
+3 −0		Source/USemLog/Classes/Events/SLPreGraspEvent.h
+3 −0		Source/USemLog/Classes/Events/SLPutDownEvent.h
+3 −0		Source/USemLog/Classes/Events/SLReachEvent.h
+3 −0		Source/USemLog/Classes/Events/SLSlicingEvent.h
+3 −0		Source/USemLog/Classes/Events/SLSlideEvent.h
+3 −0		Source/USemLog/Classes/Events/SLSupportedByEvent.h
+3 −0		Source/USemLog/Classes/Events/SLTransportEvent.h
+49 −0		Source/USemLog/Classes/Individuals/Type/SLCustomStaticMeshComponentIndividual.h
+2 −1		Source/USemLog/Classes/Individuals/Type/SLIndividualTypes.h
+68 −0		Source/USemLog/Classes/Knowrob/SLKRRestClient.h
+6 −0		Source/USemLog/Classes/Monitors/SLContactMonitorInterface.h
+2 −0		Source/USemLog/Classes/Monitors/SLMonitorStructs.h
+45 −0		Source/USemLog/Classes/Runtime/SLLoggerManager.h
+34 −0		Source/USemLog/Classes/Runtime/SLLoggerStructs.h
+5 −0		Source/USemLog/Classes/Runtime/SLSymbolicLogger.h
+81 −0		Source/USemLog/Classes/Speech/SLSpeechRestClient.h
+1 −1		Source/USemLog/Private/Actors/SLPouringParticleAgentClass.cpp
+33 −0		Source/USemLog/Private/Actors/SLStaticMeshAgentClass.cpp
+39 −0		Source/USemLog/Private/Classes/Actors/SLRestModuleAgentClass.cpp
+24 −0		Source/USemLog/Private/Events/SLContactEvent.cpp
+32 −3		Source/USemLog/Private/Events/SLContactEventHandler.cpp
+21 −0		Source/USemLog/Private/Events/SLContainerEvent.cpp
+5 −0		Source/USemLog/Private/Events/SLDummyEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLGraspEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLPickUpEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLPouringEvent.cpp
+3 −2		Source/USemLog/Private/Events/SLPouringEventHandler.cpp
+19 −0		Source/USemLog/Private/Events/SLPreGraspEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLPutDownEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLReachEvent.cpp
+19 −0		Source/USemLog/Private/Events/SLSlicingEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLSlideEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLSupportedByEvent.cpp
+20 −0		Source/USemLog/Private/Events/SLTransportEvent.cpp
+7 −1		Source/USemLog/Private/Individuals/SLIndividualUtils.cpp
+18 −7		Source/USemLog/Private/Individuals/Type/SLBaseIndividual.cpp
+87 −0		Source/USemLog/Private/Individuals/Type/SLCustomStaticMeshComponentIndividual.cpp
+1 −0		Source/USemLog/Private/Knowrob/SLKRMsgDispatcher.cpp
+242 −0		Source/USemLog/Private/Knowrob/SLKRRestClient.cpp
+82 −1		Source/USemLog/Private/Runtime/SLLoggerManager.cpp
+14 −0		Source/USemLog/Private/Runtime/SLSymbolicLogger.cpp
+232 −0		Source/USemLog/Private/Speech/SLSpeechRestClient.cpp
+34 −0		Source/USemLog/Public/Classes/Actors/SLRestModuleAgentClass.h
+3 −0		Source/USemLog/USemLog.Build.cs