Merge branch 'final-round'

2025-06-08 22:59:25 -04:00
parent 2c21a705f6 a66d3f1465
commit b70d36cb4c
67 changed files with 7218 additions and 343 deletions
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: 680142b640a682d4a92c9935828c2311
+<<<<<<<< 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
@@ -1,5 +1,9 @@
 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
@@ -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
@@ -1,5 +1,9 @@
 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
@@ -1,5 +1,9 @@
 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
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Audio/Music/I Feel Good.wav.meta
+guid: 680142b640a682d4a92c9935828c2311
+========
 guid: 68d48e4c48967bf4ca3491c98a2d8c7f
+>>>>>>>> final-round:Assets/Audio/SFX/Final Round - Correct.ogg.meta
 AudioImporter:
  externalObjects: {}
  serializedVersion: 7