Merge branch 'master' into 654-embedded-browser-Lysander

uni-bremen-agst · Nov 9, 2023 · b5e8f96 · b5e8f96
2 parents d6254a3 + 70b44cc
commit b5e8f96
Show file tree

Hide file tree

Showing 26 changed files with 1,779 additions and 662 deletions.
diff --git a/Assets/Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.asset b/Assets/Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.asset
diff --git a/...Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.asset.meta b/...Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.asset.meta
diff --git a/...gins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.png b/...gins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.png
diff --git a/...s/Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.png.meta b/...s/Plugins/Modern UI Pack/Textures/Border/Rounded/256px/Rounded Filled 256px Dark.png.meta
diff --git a/Assets/Resources/Prefabs/Players/DesktopPlayer.prefab b/Assets/Resources/Prefabs/Players/DesktopPlayer.prefab
@@ -16,7 +16,6 @@ GameObject:
   - component: {fileID: -1556465120740209359}
   - component: {fileID: 2429369898342928831}
   - component: {fileID: 6840467278216287030}
-  - component: {fileID: 6800333804276665222}
   - component: {fileID: 182833635018827598}
   - component: {fileID: 9190471872809942182}
   - component: {fileID: 403608537903628731}
@@ -122,9 +121,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 49626a155a935004f985ad777a29244b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  move: 0
-  clickDown: 0
-  clickUp: 0
+  Move: 0
+  ClickDown: 0
+  ClickUp: 0
 --- !u!114 &637028239384079898
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -169,18 +168,6 @@ AudioListener:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6839967699279661599}
   m_Enabled: 1
---- !u!114 &6800333804276665222
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6839967699279661599}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3e7d657fc8c84c81b2d2918eac9c228e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &182833635018827598
 MonoBehaviour:
   m_ObjectHideFlags: 0