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

Once again fixed the bug that made risk cards not work right. It came back at

Browse Source 
some point during the hundreds of useless fucking merge conflicts that had to
be resolved. Fuck Linus Torvalds.
This commit is contained in:
Jamie Greunbaum
2025-06-11 16:14:47 -04:00
parent 7484ba3dd7
commit 9c8d8e35cf
6 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Audio/Music/I Feel Good.wav.meta
+3 -7
View File
@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Audio/Music/The Chase.ogg.meta
guid: 408c94c3132deb04187b5f2ac79f075d
========
guid: ada408cff3af7d64088105703fc32e60
>>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta
AudioImporter:
externalObjects: {}
serializedVersion: 7
@@ -11,7 +7,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
@@ -21,7 +17,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
@@ -30,7 +26,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
Assets/Audio/Music/Opening.wav.meta
+3 -7
View File
@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Audio/Music/Opening.wav.meta
guid: 3706c5fb6f7901a429b0066b315e7a71
========
guid: ada408cff3af7d64088105703fc32e60
>>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta
AudioImporter:
externalObjects: {}
serializedVersion: 7
@@ -11,7 +7,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
@@ -21,7 +17,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
@@ -30,7 +26,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
Assets/Audio/Music/The Chase.wav.meta
+3 -7
View File
@@ -1,9 +1,5 @@
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
@@ -11,7 +7,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
@@ -21,7 +17,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
@@ -30,7 +26,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
Assets/Audio/Music/Think About It.wav.meta
+3 -7
View File
@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Audio/Music/Think About It.wav.meta
guid: fd2e7d68447011640a244f302d442395
========
guid: ada408cff3af7d64088105703fc32e60
>>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta
AudioImporter:
externalObjects: {}
serializedVersion: 7
@@ -11,7 +7,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
@@ -21,7 +17,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
@@ -30,7 +26,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta
+3 -7
View File
@@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta
guid: f464650920c273d4fb42a86c4acaf05f
========
guid: 680142b640a682d4a92c9935828c2311
>>>>>>>> d6b6ce7 (Updated lots of music stuff:):Assets/Audio/Music/I Feel Good.wav.meta
AudioImporter:
externalObjects: {}
serializedVersion: 7
@@ -11,7 +7,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
@@ -21,7 +17,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0
@@ -30,7 +26,7 @@ AudioImporter:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
sampleRateOverride: 0
compressionFormat: 1
quality: 0.25
conversionMode: 0