| 
						
					 | 
					
						
						
						
						
							
						
						
							a3b4907e48
							
						
					 | 
					
						
						
							
							Merge branch 'leveldesign'
						
						
						
						
						
						
					 | 
					
						2025-03-07 09:36:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e7f2271c2
							
						
					 | 
					
						
						
							
							Grotto update (trees, lighting, background) + SBB video-background
						
						
						
						
						
						
					 | 
					
						2025-03-06 17:59:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99b8e3ae7b
							
						
					 | 
					
						
						
							
							Add videos in 3.0 SBB
						
						
						
						
						
						
					 | 
					
						2025-03-06 17:45:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0dd798319e
							
						
					 | 
					
						
						
							
							Update videos in 1.0 SBB
						
						
						
						
						
						
					 | 
					
						2025-03-06 16:22:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							93d873e72e
							
						
					 | 
					
						
						
							
							Update handmenu in 1.0 SBB
						
						
						
						
						
						
					 | 
					
						2025-03-06 10:40:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							81f5c02933
							
						
					 | 
					
						
						
							
							Merge commit 'b4e5cd0204e2093cbd57712e7b234b55af671531'
						
						
						
						
						
						
					 | 
					
						2025-03-05 17:50:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2f72bd8eb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
					 | 
					
						2025-03-05 17:48:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad3c8687c1
							
						
					 | 
					
						
						
							
							new Depthkits 4/4
						
						
						
						
						
						
					 | 
					
						2025-03-05 17:29:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4e5cd0204
							
						
					 | 
					
						
						
							
							Add Story B Bestellung in BT
						
						
						
						
						
						
					 | 
					
						2025-03-05 16:33:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe52f1e090
							
						
					 | 
					
						
						
							
							new Depthkits 1/4
						
						
						
						
						
						
					 | 
					
						2025-03-05 16:32:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3ea44e476f
							
						
					 | 
					
						
						
							
							Update Handmenu: add audio, (de)activate buttons in BT
						
						
						
						
						
						
					 | 
					
						2025-03-05 13:45:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							232a44c084
							
						
					 | 
					
						
						
							
							Update list BT Objects
						
						
						
						
						
						
					 | 
					
						2025-03-04 10:44:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b263642e73
							
						
					 | 
					
						
						
							
							Replace topfuntersetzer
						
						
						
						
						
						
					 | 
					
						2025-02-28 10:35:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6b776e97c
							
						
					 | 
					
						
						
							
							Add more videos to 1.0 SBB
						
						
						
						
						
						
					 | 
					
						2025-02-27 16:40:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1fce94b68e
							
						
					 | 
					
						
						
							
							Load Videos from Application Persistant Path
						
						
						
						
						
						
					 | 
					
						2025-02-27 14:56:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37ae416370
							
						
					 | 
					
						
						
							
							Fix bug in NamedDepthkitPlayer and add first video in scene 1.0
						
						
						
						
						
						
					 | 
					
						2025-02-26 15:52:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ad65571775
							
						
					 | 
					
						
						
							
							Edit BTC
						
						
						
						
						
						
					 | 
					
						2025-02-19 13:12:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							d098275f47
							
						
					 | 
					
						
						
							
							Merge branch 'master' into leveldesign
						
						
						
						
						
						
						
						# Conflicts:
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset 
						
						
					 | 
					
						2025-02-17 15:56:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							caca42663e
							
						
					 | 
					
						
						
							
							Update FMOD Banks + Story
						
						
						
						
						
						
					 | 
					
						2025-02-17 14:50:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e9c124195e
							
						
					 | 
					
						
						
							
							Update grotto Nachfrage_Kellner (wip)
						
						
						
						
						
						
					 | 
					
						2025-02-17 08:49:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b51b0ed0c4
							
						
					 | 
					
						
						
							
							Add Fmod attenuation object
						
						
						
						
						
						
					 | 
					
						2025-02-14 16:14:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce3bc5abe9
							
						
					 | 
					
						
						
							
							Test-Scene with new Prefabs (Gerichte, Getränke, Topfuntersetzer, Tazzin, Pfeffer und Salz)
						
						
						
						
						
						
					 | 
					
						2025-02-14 14:16:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc0b04739f
							
						
					 | 
					
						
						
							
							model-warnings corrected + lightmap corrections
						
						
						
						
						
						
					 | 
					
						2025-02-14 11:37:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ea6211b8b
							
						
					 | 
					
						
						
							
							Deactivate second oil + wine
						
						
						
						
						
						
					 | 
					
						2025-02-12 16:51:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5af4d33d3b
							
						
					 | 
					
						
						
							
							Story Grotto Essen bestellen
						
						
						
						
						
						
					 | 
					
						2025-02-12 15:09:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99d1d4897f
							
						
					 | 
					
						
						
							
							Update story grotto kueche outro
						
						
						
						
						
						
					 | 
					
						2025-02-12 13:57:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8321b89e0c
							
						
					 | 
					
						
						
							
							Update Grotto story Parmigiano
						
						
						
						
						
						
					 | 
					
						2025-02-12 11:27:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							d482d4244c
							
						
					 | 
					
						
						
							
							Zwiebeln schneiden (Test-Scene-Nick2)
						
						
						
						
						
						
					 | 
					
						2025-02-06 14:20:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							4daec2ac0b
							
						
					 | 
					
						
						
							
							_HANDMENU new
						
						
						
						
						
						
					 | 
					
						2025-02-06 07:33:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							19ce56e75a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/programming' into leveldesign
						
						
						
						
						
						
						
						# Conflicts:
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset 
						
						
					 | 
					
						2025-02-05 16:28:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ffe0a61ead
							
						
					 | 
					
						
						
							
							Rename "Test-Scene-Grotto" to "3.2-Grotto"
						
						
						
						
						
						
					 | 
					
						2025-02-05 16:12:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8385329fa2
							
						
					 | 
					
						
						
							
							Grotto collider fixes
						
						
						
						
						
						
					 | 
					
						2025-02-05 16:04:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							503bc45102
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/programming' into leveldesign
						
						
						
						
						
						
					 | 
					
						2025-02-05 15:45:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							131be78ed1
							
						
					 | 
					
						
						
							
							Grotto fixes
						
						
						
						
						
						
					 | 
					
						2025-02-05 14:49:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							545896b0b4
							
						
					 | 
					
						
						
							
							Grotto Sockets Positioning fixes
						
						
						
						
						
						
					 | 
					
						2025-02-05 14:16:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							3892093844
							
						
					 | 
					
						
						
							
							update Grotto Lighting Settings
						
						
						
						
						
						
					 | 
					
						2025-02-04 16:40:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							088ac2e78c
							
						
					 | 
					
						
						
							
							_Handmenu testings
						
						
						
						
						
						
					 | 
					
						2025-02-04 16:39:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							de02e91fec
							
						
					 | 
					
						
						
							
							update Test-Scene-Grotto (interactables, sockets, colliders, lighting)
						
						
						
						
						
						
					 | 
					
						2025-02-04 11:59:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4652e1c4f0
							
						
					 | 
					
						
						
							
							Fix merge conflict and add audio to Test Scene Grotto
						
						
						
						
						
						
					 | 
					
						2025-01-31 17:04:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6710135c34
							
						
					 | 
					
						
						
							
							Merge branch 'master' into programming
						
						
						
						
						
						
						
						# Conflicts:
#	Viagg-io/Assets/Resources/BuildDateTime.txt
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset 
						
						
					 | 
					
						2025-01-31 14:27:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c0379fb11a
							
						
					 | 
					
						
						
							
							Merge branch 'leveldesign'
						
						
						
						
						
						
						
						# Conflicts:
#	Viagg-io/Assets/Resources/BuildDateTime.txt
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset 
						
						
					 | 
					
						2025-01-31 14:16:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1b3171ea0
							
						
					 | 
					
						
						
							
							Update Test Scene Grotto (interactables sounds assignments corrected, interactables in own folder, materials with gpu instancing, camera occlusion, and more minor changes)
						
						
						
						
						
						
					 | 
					
						2025-01-28 22:28:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a35dae878
							
						
					 | 
					
						
						
							
							Update 3.2 story
						
						
						
						
						
						
					 | 
					
						2025-01-27 17:31:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							51b58383f5
							
						
					 | 
					
						
						
							
							Update Next buttons
						
						
						
						
						
						
					 | 
					
						2025-01-27 16:13:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be178e4478
							
						
					 | 
					
						
						
							
							Updated 3.2 Grotto story
						
						
						
						
						
						
					 | 
					
						2025-01-27 14:58:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d133d306e9
							
						
					 | 
					
						
						
							
							Update 3.5 Scene
						
						
						
						
						
						
					 | 
					
						2025-01-27 10:41:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							b041ab728f
							
						
					 | 
					
						
						
							
							Materialien und Texturen konsolidiert (ganze blocking-Objectszenen wie Grotto, Laden, etc. wurden in den Importeinstellungen OHNE Materialimport eingestellt. Das kann zu weissen oder fehlenden Materialien auf diesen Objekten führen.)
						
						
						
						
						
						
					 | 
					
						2025-01-24 10:43:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1e68a68f0
							
						
					 | 
					
						
						
							
							Transfer 3.2-Grotto --> Test-Scene-Grotto (wip)
						
						
						
						
						
						
					 | 
					
						2025-01-23 10:06:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed7c9b24e8
							
						
					 | 
					
						
						
							
							Merge branch 'leveldesign'
						
						
						
						
						
						
					 | 
					
						2025-01-21 17:00:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Gut
							
						 
					 | 
					
						
						
						
						
							
						
						
							f254593d57
							
						
					 | 
					
						
						
							
							update Grotto leveldesign with lightmapping
						
						
						
						
						
						
					 | 
					
						2025-01-21 14:44:20 +01:00 | 
					
					
						
						
							
							
							
						
					 |