Merge remote-tracking branch 'origin/main' into justin/navigation

2-shot · Sep 7, 2024 · 032c8e0 · 032c8e0
2 parents 9c03ff7 + 2c4627a
commit 032c8e0
Show file tree

Hide file tree

Showing 69 changed files with 32 additions and 958 deletions.
diff --git a/Audio/Sound Effects/UI/hover/tick_002.ogg b/Audio/Sound Effects/UI/hover/tick_002.ogg
diff --git a/Audio/Sound Effects/UI/hover/tick_002.ogg.import b/Audio/Sound Effects/UI/hover/tick_002.ogg.import
diff --git a/Audio/Sound Effects/UI/pause/minimize_008.ogg b/Audio/Sound Effects/UI/pause/minimize_008.ogg
diff --git a/Audio/Sound Effects/UI/pause/minimize_008.ogg.import b/Audio/Sound Effects/UI/pause/minimize_008.ogg.import
diff --git a/Audio/Sound Effects/UI/un-pause/maximize_008.ogg b/Audio/Sound Effects/UI/un-pause/maximize_008.ogg
diff --git a/Audio/Sound Effects/UI/un-pause/maximize_008.ogg.import b/Audio/Sound Effects/UI/un-pause/maximize_008.ogg.import
diff --git a/Audio/Sound Effects/rat scutter sound/463789__shyguy014__mouse-squeaks.wav b/Audio/Sound Effects/rat scutter sound/463789__shyguy014__mouse-squeaks.wav
diff --git a/Audio/Sound Effects/rat scutter sound/463789__shyguy014__mouse-squeaks.wav.import b/Audio/Sound Effects/rat scutter sound/463789__shyguy014__mouse-squeaks.wav.import
diff --git a/Audio/Sound Effects/slime sounds/SlimeWalk1_edit.wav b/Audio/Sound Effects/slime sounds/SlimeWalk1_edit.wav
diff --git a/Audio/Sound Effects/slime sounds/SlimeWalk1_edit.wav.import b/Audio/Sound Effects/slime sounds/SlimeWalk1_edit.wav.import
diff --git a/Audio/Sound Effects/slime sounds/idle sound/369728__joedl__slime.wav b/Audio/Sound Effects/slime sounds/idle sound/369728__joedl__slime.wav
diff --git a/Audio/Sound Effects/slime sounds/idle sound/369728__joedl__slime.wav.import b/Audio/Sound Effects/slime sounds/idle sound/369728__joedl__slime.wav.import
diff --git a/Audio/Sound Effects/slime sounds/movement sound/158759__stephensaldanha__slime-movement.wav b/Audio/Sound Effects/slime sounds/movement sound/158759__stephensaldanha__slime-movement.wav
diff --git a/...nd Effects/slime sounds/movement sound/158759__stephensaldanha__slime-movement.wav.import b/...nd Effects/slime sounds/movement sound/158759__stephensaldanha__slime-movement.wav.import
diff --git a/...o/Sound Effects/slime sounds/movement sound/188384__wubitog__slime-attack-or-movement.wav b/...o/Sound Effects/slime sounds/movement sound/188384__wubitog__slime-attack-or-movement.wav
diff --git a/... Effects/slime sounds/movement sound/188384__wubitog__slime-attack-or-movement.wav.import b/... Effects/slime sounds/movement sound/188384__wubitog__slime-attack-or-movement.wav.import
diff --git a/... Effects/slime sounds/slime being trapped sound/25444__insinger__high-trem-guit-celli.wav b/... Effects/slime sounds/slime being trapped sound/25444__insinger__high-trem-guit-celli.wav
diff --git a/...s/slime sounds/slime being trapped sound/25444__insinger__high-trem-guit-celli.wav.import b/...s/slime sounds/slime being trapped sound/25444__insinger__high-trem-guit-celli.wav.import
diff --git a/Audio/Sound Effects/slime sounds/slime being trapped sound/394930__giddster__eye-goo.wav b/Audio/Sound Effects/slime sounds/slime being trapped sound/394930__giddster__eye-goo.wav
diff --git a/...Sound Effects/slime sounds/slime being trapped sound/394930__giddster__eye-goo.wav.import b/...Sound Effects/slime sounds/slime being trapped sound/394930__giddster__eye-goo.wav.import
diff --git a/.../Sound Effects/slime sounds/slime being trapped sound/459478__yokuca__gerbil-sherring.mp3 b/.../Sound Effects/slime sounds/slime being trapped sound/459478__yokuca__gerbil-sherring.mp3
diff --git a/...Effects/slime sounds/slime being trapped sound/459478__yokuca__gerbil-sherring.mp3.import b/...Effects/slime sounds/slime being trapped sound/459478__yokuca__gerbil-sherring.mp3.import
diff --git a/Audio/soundtrack/Burn The World Waltz .mp3 b/Audio/soundtrack/Burn The World Waltz .mp3
diff --git a/Audio/soundtrack/Burn The World Waltz .mp3.import b/Audio/soundtrack/Burn The World Waltz .mp3.import
diff --git a/Audio/soundtrack/Organic Grunge.mp3 b/Audio/soundtrack/Organic Grunge.mp3
diff --git a/Audio/soundtrack/Organic Grunge.mp3.import b/Audio/soundtrack/Organic Grunge.mp3.import
diff --git a/Audio/soundtrack/Rocket Power.mp3 b/Audio/soundtrack/Rocket Power.mp3
diff --git a/Audio/soundtrack/Rocket Power.mp3.import b/Audio/soundtrack/Rocket Power.mp3.import
diff --git a/Audio/soundtrack/Take the Lead.mp3 b/Audio/soundtrack/Take the Lead.mp3
diff --git a/Audio/soundtrack/Take the Lead.mp3.import b/Audio/soundtrack/Take the Lead.mp3.import
diff --git a/Audio/soundtrack/Waltz Primordial .mp3 b/Audio/soundtrack/Waltz Primordial .mp3
diff --git a/Audio/soundtrack/Waltz Primordial .mp3.import b/Audio/soundtrack/Waltz Primordial .mp3.import
diff --git a/Menus/MainMenu.tscn b/Menus/MainMenu.tscn
diff --git a/Menus/gmtk2024-logo.png b/Menus/gmtk2024-logo.png
diff --git a/Menus/gmtk2024-logo.png.import b/Menus/gmtk2024-logo.png.import
diff --git a/Objects/Art Sets/Orb on Wood Pillar.png b/Objects/Art Sets/Orb on Wood Pillar.png