Nadine Ganz 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

..

Packages

first testscene

2024-01-19 16:30:05 +01:00

AudioManager.asset

first testscene

2024-01-19 16:30:05 +01:00

BurstAotSettings_Android.json

first testscene

2024-01-19 16:30:05 +01:00

BurstAotSettings_StandaloneOSX.json

first testscene

2024-01-19 16:30:05 +01:00

ClusterInputManager.asset

first testscene

2024-01-19 16:30:05 +01:00

CommonBurstAotSettings.json

first testscene

2024-01-19 16:30:05 +01:00

DynamicsManager.asset

first testscene

2024-01-19 16:30:05 +01:00

EditorBuildSettings.asset

Merge branch 'master' into programming

2025-01-31 14:27:26 +01:00

EditorSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

GraphicsSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

InputManager.asset

first testscene

2024-01-19 16:30:05 +01:00

MemorySettings.asset

first testscene

2024-01-19 16:30:05 +01:00

NavMeshAreas.asset

first testscene

2024-01-19 16:30:05 +01:00

PackageManagerSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

Physics2DSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

PresetManager.asset

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

ProjectSettings.asset

Merge branch 'leveldesign'

2025-01-31 14:16:12 +01:00

ProjectVersion.txt

first testscene

2024-01-19 16:30:05 +01:00

QualitySettings.asset

first testscene

2024-01-19 16:30:05 +01:00

SceneTemplateSettings.json

first testscene

2024-01-19 16:30:05 +01:00

ShaderGraphSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

TagManager.asset

update Grotto leveldesign with lightmapping

2025-01-21 14:44:20 +01:00

TimelineSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

TimeManager.asset

first testscene

2024-01-19 16:30:05 +01:00

UnityConnectSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

URPProjectSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

VersionControlSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

VFXManager.asset

first testscene

2024-01-19 16:30:05 +01:00

XRPackageSettings.asset

first testscene

2024-01-19 16:30:05 +01:00

XRSettings.asset

first testscene

2024-01-19 16:30:05 +01:00