| 
						
					 | 
					
						
						
						
						
							
						
						
							468ca0847a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-08-06 19:20:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1f1598cec
							
						
					 | 
					
						
						
							
							Merge leveldesign
						
						
						
						
						
						
					 | 
					
						2025-08-06 19:19:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							eeecf0df22
							
						
					 | 
					
						
						
							
							Merge branch 'master' into leveldesign
						
						
						
						
						
						
					 | 
					
						2025-08-06 19:15:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							148562ea3c
							
						
					 | 
					
						
						
							
							Baeckerei Update (videos scaled and rebaked occlusion)
						
						
						
						
						
						
					 | 
					
						2025-08-06 19:10:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd6f7fd233
							
						
					 | 
					
						
						
							
							Grotto Videos Update (phone screen added and alpha mask corrected)
						
						
						
						
						
						
					 | 
					
						2025-08-06 18:57:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc0aa14da6
							
						
					 | 
					
						
						
							
							Revert "Grotto Videos Update (added smartphone screen)"
						
						
						
						
						
						
						
						This reverts commit 93cd0746ecf5a772516a7f272c58fe869f4ed3a9. 
						
						
					 | 
					
						2025-08-06 18:23:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							93cd0746ec
							
						
					 | 
					
						
						
							
							Grotto Videos Update (added smartphone screen)
						
						
						
						
						
						
					 | 
					
						2025-08-06 18:20:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							2199681d3b
							
						
					 | 
					
						
						
							
							Baeckerei Videos Update (correction audio and faulty videos)
						
						
						
						
						
						
					 | 
					
						2025-08-06 18:20:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c8dcefbab
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-06 17:44:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a0931e6d3e
							
						
					 | 
					
						
						
							
							Fix position in grotto1
						
						
						
						
						
						
					 | 
					
						2025-08-06 17:43:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0755ed60ac
							
						
					 | 
					
						
						
							
							Add handling of speech errors
						
						
						
						
						
						
					 | 
					
						2025-08-06 16:17:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							911bcbbcab
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-06 12:07:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97863be2c5
							
						
					 | 
					
						
						
							
							Delete fade effect between SBBs, fix user position+handmenu in Baeckerei Outro
						
						
						
						
						
						
					 | 
					
						2025-08-06 12:07:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							79f94399cb
							
						
					 | 
					
						
						
							
							Add Hints to Story A Track
						
						
						
						
						
						
					 | 
					
						2025-08-06 10:28:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3ef821fdac
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-05 22:17:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1e189daeb
							
						
					 | 
					
						
						
							
							Add hints to SBB + Grotto, fixes
						
						
						
						
						
						
					 | 
					
						2025-08-05 22:16:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea35981ed8
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-08-05 15:47:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							737eda3e30
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-05 15:46:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b06bdc7973
							
						
					 | 
					
						
						
							
							Merge leveldesign
						
						
						
						
						
						
					 | 
					
						2025-08-05 15:45:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34df427885
							
						
					 | 
					
						
						
							
							Add routing from Puschlav; clean up SBB Scenes
						
						
						
						
						
						
					 | 
					
						2025-08-05 15:42:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89ba62605a
							
						
					 | 
					
						
						
							
							Grotto1: Clean up, add loading of minigame
						
						
						
						
						
						
					 | 
					
						2025-08-05 14:31:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8587fdbbd
							
						
					 | 
					
						
						
							
							Update Kueche_Abbruch in Grotto2+Grotto1
						
						
						
						
						
						
					 | 
					
						2025-08-05 14:14:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							727e33f5e3
							
						
					 | 
					
						
						
							
							Merge branch 'master' into leveldesign
						
						
						
						
						
						
					 | 
					
						2025-08-05 13:51:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4d0aa99499
							
						
					 | 
					
						
						
							
							Grotto2: Cleanup, add Outline, add Speak Hint
						
						
						
						
						
						
					 | 
					
						2025-08-05 13:17:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							8812c7fcac
							
						
					 | 
					
						
						
							
							Grotto Videos (Kueche-Outro) downscaled
						
						
						
						
						
						
					 | 
					
						2025-08-05 11:57:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							908bf78228
							
						
					 | 
					
						
						
							
							Castello Update (video size + chatbot color)
						
						
						
						
						
						
					 | 
					
						2025-08-05 10:10:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dba07ca889
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-08-05 09:39:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6607a68991
							
						
					 | 
					
						
						
							
							Merge commit '2d774b79142cb2377132de6baf2223813e767d79'
						
						
						
						
						
						
					 | 
					
						2025-08-05 09:39:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d774b7914
							
						
					 | 
					
						
						
							
							Grotto2 Update (GO positions)
						
						
						
						
						
						
					 | 
					
						2025-08-05 09:26:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef17908e08
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-04 21:14:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c72a2212dc
							
						
					 | 
					
						
						
							
							Change layer in direct interactor to everything
						
						
						
						
						
						
					 | 
					
						2025-08-04 21:13:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							153e1255a4
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-08-04 20:49:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ee344eada
							
						
					 | 
					
						
						
							
							Merge leveldesign
						
						
						
						
						
						
					 | 
					
						2025-08-04 20:48:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5280c12017
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-08-04 20:48:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							33fc13e908
							
						
					 | 
					
						
						
							
							Update speech intents
						
						
						
						
						
						
					 | 
					
						2025-08-04 20:44:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac004ea0ac
							
						
					 | 
					
						
						
							
							Add hints to Castello
						
						
						
						
						
						
					 | 
					
						2025-08-04 19:59:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1d8081fdb
							
						
					 | 
					
						
						
							
							Grotto1+3 Update (Video positions rotations scales)
						
						
						
						
						
						
					 | 
					
						2025-08-04 18:22:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3850273faf
							
						
					 | 
					
						
						
							
							Fix Chatbot Button and animation, add NamedPokeEvent
						
						
						
						
						
						
					 | 
					
						2025-08-04 17:41:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c2f5d4a51
							
						
					 | 
					
						
						
							
							Grotto1-3 Update (Video positions and scales, camera occlusion) + Handmenu-Shift
						
						
						
						
						
						
					 | 
					
						2025-08-04 17:25:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							664c3a0326
							
						
					 | 
					
						
						
							
							Update Castello, add Keystore
						
						
						
						
						
						
					 | 
					
						2025-08-04 16:37:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							59e31a8292
							
						
					 | 
					
						
						
							
							Grotto3 rebaked camera occlusion
						
						
						
						
						
						
					 | 
					
						2025-08-04 13:25:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							156d1ba169
							
						
					 | 
					
						
						
							
							Videos Grotto3 Outro scaled down
						
						
						
						
						
						
					 | 
					
						2025-08-04 13:21:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							095b6532b9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-07-31 17:09:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							50b20756e4
							
						
					 | 
					
						
						
							
							Merge leveldesign
						
						
						
						
						
						
					 | 
					
						2025-07-31 17:09:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea82367a8c
							
						
					 | 
					
						
						
							
							Merge branch 'programming'
						
						
						
						
						
						
					 | 
					
						2025-07-31 17:07:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							018c8bcbfe
							
						
					 | 
					
						
						
							
							Update Grotto 3: Bestellung_Essen, Grotto_Unterhaltung, Outro
						
						
						
						
						
						
					 | 
					
						2025-07-31 16:56:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							397ed32831
							
						
					 | 
					
						
						
							
							Castello Update (videos added + sitting-mesh improved)
						
						
						
						
						
						
					 | 
					
						2025-07-31 12:27:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b15624a17
							
						
					 | 
					
						
						
							
							Grotto1 Update (Unterbau Grotto-Haus + Postprocessing MainCamera + Papierset-Collider)
						
						
						
						
						
						
					 | 
					
						2025-07-31 10:19:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bcd7a0c5c
							
						
					 | 
					
						
						
							
							Castello Update (chatbot-source-cone scaled to zero) + sponsoren-panel Update
						
						
						
						
						
						
					 | 
					
						2025-07-31 09:45:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							53d5536158
							
						
					 | 
					
						
						
							
							Update HANDMENU positions in Tutorial and SBB
						
						
						
						
						
						
					 | 
					
						2025-07-31 09:40:15 +02:00 | 
					
					
						
						
							
							
							
						
					 |