Merge remote-tracking branch 'origin/master'

Unreal/Config/DefaultGame.ini

@@ -6,7 +6,7 @@ CommonButtonAcceptKeyHandling=TriggerClick
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=4B0928DF4291E6F7F4F0D2BD9F00EF29
 ProjectName=SPIE Avatar
-ProjectVersion=0.1.2
+ProjectVersion=0.1.5
 
 [/Script/UnrealEd.ProjectPackagingSettings]
 Build=IfProjectHasCode

Unreal/Content/Schema/Spie_Config.schema.json

@@ -1,7 +1,6 @@
 {
 	"Categories": [
-		"SPIE Management Board",
-		"Spie_ONE_VisualSetup",
+		"SPIE",
 		"Project Setup",
 		"Debug",
 		"Volume",
@@ -18,7 +17,7 @@
 				"type": "integer",
 				"tooltip": "Which mode to load at startup",
 				"default": 0,
-				"category": "SPIE Management Board"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -27,7 +26,7 @@
 				"type": "string",
 				"tooltip": "Unique Name of this Avatar Application",
 				"default": "SPIE",
-				"category": "SPIE Management Board"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -36,7 +35,7 @@
 				"type": "boolean",
 				"tooltip": "Do you want to log all interaction?",
 				"default": true,
-				"category": "SPIE Management Board"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -46,7 +45,7 @@
 				"tooltip": "Showing in background logo",
 				"default": "One SPIE. \r\nJust ask me.",
 				"hotreload": true,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -55,7 +54,16 @@
 				"type": "string",
 				"tooltip": "What to say, when user is allowed to speak?",
 				"default": "Drücke und halte beim Sprechen den Knopf vor dir, damit ich dich hören kann.",
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
+			}
+		},
+		{
+			"InnovationDayIntro":
+			{
+				"type": "string",
+				"tooltip": "Intro speech for the Innovation Day mode",
+				"default": "Hallo und willkommen auf der One SPIE ! Ich bin ein virtueller Avatar mit dem du dich über unsere Hausmesse unterhalten kannst. By the way, you can talk in any language with me!",
+				"category": "SPIE"
 			}
 		},
 		{
@@ -63,7 +71,7 @@
 			{
 				"type": "float",
 				"default": 20,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -71,7 +79,7 @@
 			{
 				"type": "float",
 				"default": 1,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -80,7 +88,7 @@
 				"type": "float",
 				"default": 1,
 				"hotreload": true,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -94,7 +102,7 @@
 					"Z": 0
 				},
 				"hotreload": true,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -102,7 +110,7 @@
 			{
 				"type": "float",
 				"default": 0.02,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -110,7 +118,7 @@
 			{
 				"type": "float",
 				"default": 10,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -118,7 +126,7 @@
 			{
 				"type": "boolean",
 				"default": false,
-				"category": "Spie_ONE_VisualSetup"
+				"category": "SPIE"
 			}
 		},
 		{
@@ -658,7 +666,11 @@
 						}
 					],
 					"STTSpecialWords": [
-						"SPIE"
+						"SPIE",
+						"Innovation Day",
+						"Keynote",
+						"Clarissa Hack",
+						"Jérôme Morisson"
 					],
 					"PTTPostRollTime": 0.40000000596046448,
 					"FreespeechPostRollTime": 0.5,

Unreal/Content/Schema/SystemInstructions/Avatar_SPIE_Avatar_Instructions.schema.json

@@ -5,6 +5,18 @@
 			"SystemInstructions":
 			{
 				"type": "array",
+				"itemsType": "struct",
+				"itemsFields":
+				{
+					"Name":
+					{
+						"type": "string"
+					},
+					"Instruction":
+					{
+						"type": "string"
+					}
+				},
 				"default": [
 					{
 						"Name": "Name",
@@ -22,19 +34,7 @@
 						"Name": "Clothing Description",
 						"Instruction": "She is wearing a white polo shirt with the SPIE logo on the left side of the chest. The shirt has a collar and a few buttons at the neck. She is wearing a brown leather belt and a blue jeans. She wears light gray safety shoes with black shoe laces."
 					}
-				],
-				"itemsType": "struct",
-				"itemsFields":
-				{
-					"Name":
-					{
-						"type": "string"
-					},
-					"Instruction":
-					{
-						"type": "string"
-					}
-				}
+				]
 			}
 		},
 		{

Unreal/Content/Schema/SystemInstructions/Mode_DA_Mode_SPIE_SpieInnovationDay_Instructions.schema.json

@@ -44,7 +44,7 @@
 					},
 					{
 						"Name": "Database",
-						"Instruction": "For all questions related to SPIE, the Innovation Day, projects, technologies, or company initiatives, retrieve information from the internal database. Use the database as the primary source of information."
+						"Instruction": "For ALL questions related to SPIE, the Innovation Day, projects, technologies, or company initiatives, retrieve information from the internal database. Use the database as the primary source of information."
 					},
 					{
 						"Name": "Maintaining Focus",