ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving another fucking merge conflict with files that never changed.

Browse Source
This commit is contained in:
Jamie Greunbaum 2025-06-08 16:05:15 -04:00
parent 0bc27a6915
commit b1e3fd1ca2
26 changed files with 106 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Audio/Music/I Feel Good.wav Normal file
View File

Binary file not shown.

0
Assets/Audio/Music/The Chase.ogg.meta → Assets/Audio/Music/I Feel Good.wav.meta
View File

BIN
Assets/Audio/Music/Opening.wav Normal file
View File

Binary file not shown.

2
Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta → Assets/Audio/Music/Opening.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d3a32efe2355015408181f263148aa5b
guid: 3706c5fb6f7901a429b0066b315e7a71
AudioImporter:
externalObjects: {}
serializedVersion: 7

BIN
Assets/Audio/Music/The Chase.ogg
View File

Binary file not shown.

BIN
Assets/Audio/Music/The Chase.wav Normal file
View File

Binary file not shown.

2
Assets/Audio/Music/Think About It.ogg.meta → Assets/Audio/Music/The Chase.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ada408cff3af7d64088105703fc32e60
guid: ebb0e1809180b8e4b8ae4c4fe1671ae7
AudioImporter:
externalObjects: {}
serializedVersion: 7

BIN
Assets/Audio/Music/Think About It.ogg
View File

Binary file not shown.

BIN
Assets/Audio/Music/Think About It.wav Normal file
View File

Binary file not shown.

41
Assets/Audio/Music/Think About It.wav.meta Normal file
View File

@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: fd2e7d68447011640a244f302d442395
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:

BIN
Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg
View File

Binary file not shown.

BIN
Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav Normal file
View File

Binary file not shown.

41
Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta Normal file
View File

@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: f464650920c273d4fb42a86c4acaf05f
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:

4
Assets/Scenes/witwics.unity
View File

@ -1021,7 +1021,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 24300002, guid: 6a25e5828fa5ccb4495cc6300b09a686,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
@ -14773,7 +14773,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 24300002, guid: aee65367b763a1b48875117a038466bd,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0

13
Assets/UdonSharp/GameManager.cs
View File

@ -894,6 +894,17 @@ public class GameManager : UdonSharpBehaviour
[NetworkCallable]
public void PlayMusic(MusicEventType MusicEvent)
{
PlayMusicInternal(MusicEvent, false);
}
[NetworkCallable]
public void PlayMusicLoop(MusicEventType MusicEvent)
{
PlayMusicInternal(MusicEvent, true);
}
private void PlayMusicInternal(MusicEventType MusicEvent, bool Loop)
{
_MusicPlayer.Stop();
@ -906,6 +917,8 @@ public class GameManager : UdonSharpBehaviour
default: _MusicPlayer.clip = null; break;
}
_MusicPlayer.loop = Loop;
if (_MusicPlayer.clip != null)
_MusicPlayer.Play();
}

2
Assets/UdonSharp/UtilityScripts/BoneFollower.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/InteractToggle.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
View File

@ -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:

2
Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
View File

@ -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:

BIN
Raw Files/Music/I Feel Good.aup3 Normal file
View File

Binary file not shown.

BIN
Raw Files/Music/Opening.aup3 Normal file
View File

Binary file not shown.

BIN
Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3
View File

Binary file not shown.

BIN
Raw Files/SFX/Woo Woo.aup3 Normal file
View File

Binary file not shown.