Skip to content

Commit

Permalink
Merge branch 'master' into remove-htmlagilitypack
Browse files Browse the repository at this point in the history
# Conflicts:
#	UltraStar Play/Assets/Common/Common.asmdef
  • Loading branch information
AnsisMalins committed Oct 30, 2024
2 parents 9cba577 + 7d774e3 commit 8008675
Show file tree
Hide file tree
Showing 102 changed files with 89 additions and 2,039 deletions.
8 changes: 0 additions & 8 deletions UltraStar Play/Assets/Background Bokeh VFX.meta

This file was deleted.

8 changes: 0 additions & 8 deletions UltraStar Play/Assets/CartoonVFX9X.meta

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions UltraStar Play/Assets/Common/Common.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"LiteNetLib",
"com.whisper.unity",
"FfmpegUnity",
"VLCUnity",
"OneJS"
],
"includePlatforms": [],
Expand All @@ -41,11 +40,9 @@
"Facepunch.Steamworks.Win64.dll",
"Flurl.dll",
"Flurl.Http.dll",
"LibVLCSharp.dll",
"Mono.CSharp.dll",
"Mono.Data.Sqlite.dll",
"ICSharpCode.SharpZipLib.dll",
"WindowsInput.dll",
"Newtonsoft.Json.dll"
],
"autoReferenced": false,
Expand Down
45 changes: 0 additions & 45 deletions UltraStar Play/Assets/Common/Scene/CommonSceneObjects.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@ Transform:
- {fileID: 7636903613077760542}
- {fileID: 2387165587785593930}
- {fileID: 1254943028971831099}
- {fileID: 1054933196838542567}
- {fileID: 4753279627030846288}
- {fileID: 4725083428892299482}
- {fileID: 8210014063461271944}
Expand Down Expand Up @@ -9564,50 +9563,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
whisperManagerPrefab: {fileID: 4159576471388054935, guid: cbc5e63d248305843853deae3bbaa2db,
type: 3}
--- !u!1 &8811285264585202488
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1054933196838542567}
- component: {fileID: 5112597850325165970}
m_Layer: 5
m_Name: VlcManager
m_TagString: MelodyManiaOnly
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1054933196838542567
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8811285264585202488}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5483831765678408185}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5112597850325165970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8811285264585202488}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 048c3cbb87e745e46afa5a568b7e9626, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8818085272773697541
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public List<IBinding> GetBindings()
bb.BindExistingInstance(WebViewManager.Instance);
bb.BindExistingInstance(ModManager.Instance);
bb.BindExistingInstance(RuntimeUiInspectionManager.Instance);
bb.BindExistingInstance(VlcManager.Instance);
bb.Bind(typeof(FocusableNavigator)).ToExistingInstance(DefaultFocusableNavigator.Instance);

// Steam
Expand Down

This file was deleted.

Loading

0 comments on commit 8008675

Please sign in to comment.