-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into remove-htmlagilitypack
# Conflicts: # UltraStar Play/Assets/Common/Common.asmdef
- Loading branch information
Showing
102 changed files
with
89 additions
and
2,039 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
216 changes: 0 additions & 216 deletions
216
UltraStar Play/Assets/Common/Audio/SongAudioPlayer/VlcAudioSupportProvider.cs
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
UltraStar Play/Assets/Common/Audio/SongAudioPlayer/VlcAudioSupportProvider.cs.meta
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
UltraStar Play/Assets/Common/Vfx/VfxPrefabs/BackgroundLightPrefabs.meta
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.