Merge branch 'master' into programming

This commit is contained in:
Nadine Ganz 2025-08-04 20:49:16 +02:00
commit 153e1255a4
23 changed files with 7021 additions and 3348 deletions

View File

@ -6169,7 +6169,7 @@ Transform:
m_GameObject: {fileID: 5062890667805923359}
serializedVersion: 2
m_LocalRotation: {x: 0.30385044, y: 0.11574215, z: -0.2555331, w: 0.91048425}
m_LocalPosition: {x: -0.0088, y: 0.0107, z: -0.0439}
m_LocalPosition: {x: -0.0462, y: 0.0282, z: -0.0276}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

View File

@ -1 +1 @@
2025-07-30T19:21:06.7104071Z
2025-08-04T16:03:18.8396148Z

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 382f78a1e5cb4e5489fc19061bfce014
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5ba57d765d3fdcf41b5eb53708e75bc6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 36300000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b4f1d0f6b075d494fbe197fc6ff5ecf5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2815c5032ffb1be4db88a7548f7b51e6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 36300000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -8,13 +8,13 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/0.0-Menu.unity
guid: c83d90128ed611646968487737573267
- enabled: 1
- enabled: 0
path: Assets/Scenes/0.5-Tutorial.unity
guid: c759c76caca997646b54b537cab5ad11
- enabled: 1
- enabled: 0
path: Assets/Scenes/1.0-SBB.unity
guid: 6a1144d40bbf04513a9929856271d4e7
- enabled: 1
- enabled: 0
path: Assets/Scenes/2.0-SBB.unity
guid: 0492708372646415eb23036f23680178
- enabled: 1
@ -23,7 +23,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/2.6-Castello.unity
guid: 8554de5c9e3d141a1bee7985b31e8313
- enabled: 1
- enabled: 0
path: Assets/Scenes/3.0-SBB.unity
guid: a21f6e13e09234179a685c8f89b0e031
- enabled: 1