diff --git a/Assets/Audio/Music/The Chase.ogg b/Assets/Audio/Music/The Chase.ogg deleted file mode 100644 index 1d3ec62..0000000 Binary files a/Assets/Audio/Music/The Chase.ogg and /dev/null differ diff --git a/Assets/Audio/Music/The Chase.ogg.meta b/Assets/Audio/Music/The Chase.ogg.meta deleted file mode 100644 index 631f02d..0000000 --- a/Assets/Audio/Music/The Chase.ogg.meta +++ /dev/null @@ -1,41 +0,0 @@ -fileFormatVersion: 2 -guid: 408c94c3132deb04187b5f2ac79f075d -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.84999996 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: - 4: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.25 - conversionMode: 0 - preloadAudioData: 0 - 7: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.25 - conversionMode: 0 - preloadAudioData: 0 - forceToMono: 1 - normalize: 1 - loadInBackground: 1 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Audio/Music/The Chase.wav.meta b/Assets/Audio/Music/The Chase.wav.meta index aee5c97..b571ecd 100644 --- a/Assets/Audio/Music/The Chase.wav.meta +++ b/Assets/Audio/Music/The Chase.wav.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Audio/Music/The Chase.wav.meta guid: ebb0e1809180b8e4b8ae4c4fe1671ae7 +======== +guid: 680142b640a682d4a92c9935828c2311 +>>>>>>>> d6b6ce7 (Updated lots of music stuff:):Assets/Audio/Music/I Feel Good.wav.meta AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Music/Think About It.ogg b/Assets/Audio/Music/Think About It.ogg deleted file mode 100644 index 76a83dc..0000000 Binary files a/Assets/Audio/Music/Think About It.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg deleted file mode 100644 index ab62246..0000000 Binary files a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta deleted file mode 100644 index 27648c7..0000000 --- a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta +++ /dev/null @@ -1,41 +0,0 @@ -fileFormatVersion: 2 -guid: d3a32efe2355015408181f263148aa5b -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.84999996 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: - 4: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.25 - conversionMode: 0 - preloadAudioData: 0 - 7: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 0.25 - conversionMode: 0 - preloadAudioData: 0 - forceToMono: 1 - normalize: 1 - loadInBackground: 1 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 b/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 index 8ebd8d5..0743df6 100644 Binary files a/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 and b/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 differ