Merge branch 'anysad/custom-popups-countdowns' into HEAD

FunkinCrew · Jul 28, 2024 · 3a9e051 · 3a9e051
2 parents aa1231e + ca4d975
commit 3a9e051
Show file tree

Hide file tree

Showing 54 changed files with 4 additions and 2 deletions.
diff --git a/exclude/data/ui/chart-editor/toolboxes/metadata.xml b/exclude/data/ui/chart-editor/toolboxes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<collapsible-dialog id="toolboxMetadata" title="Song Metadata" width="345" height="472">
+<collapsible-dialog id="toolboxMetadata" title="Song Metadata" width="345" height="492">
     <vbox width="100%" height="100%">
-        <frame text="Variation: Default" width="100%" height="230" id="frameVariation">
+        <frame text="Variation: Default" width="100%" height="250" id="frameVariation">
             <vbox width="100%" height="100%">
                 <grid columns="2" height="100%">
                     <label text="Song Name:" verticalAlign="center" horizontalAlign="right" />

diff --git a/shared/images/bad.png → preload/images/ui/popup/funkin/bad.png b/shared/images/bad.png → preload/images/ui/popup/funkin/bad.png
diff --git a/shared/images/combo.png → preload/images/ui/popup/funkin/combo.png b/shared/images/combo.png → preload/images/ui/popup/funkin/combo.png
diff --git a/shared/images/good.png → preload/images/ui/popup/funkin/good.png b/shared/images/good.png → preload/images/ui/popup/funkin/good.png
diff --git a/preload/images/num0.png → preload/images/ui/popup/funkin/num0.png b/preload/images/num0.png → preload/images/ui/popup/funkin/num0.png
diff --git a/preload/images/num1.png → preload/images/ui/popup/funkin/num1.png b/preload/images/num1.png → preload/images/ui/popup/funkin/num1.png
diff --git a/preload/images/num2.png → preload/images/ui/popup/funkin/num2.png b/preload/images/num2.png → preload/images/ui/popup/funkin/num2.png
diff --git a/preload/images/num3.png → preload/images/ui/popup/funkin/num3.png b/preload/images/num3.png → preload/images/ui/popup/funkin/num3.png
diff --git a/preload/images/num4.png → preload/images/ui/popup/funkin/num4.png b/preload/images/num4.png → preload/images/ui/popup/funkin/num4.png
diff --git a/preload/images/num5.png → preload/images/ui/popup/funkin/num5.png b/preload/images/num5.png → preload/images/ui/popup/funkin/num5.png
diff --git a/preload/images/num6.png → preload/images/ui/popup/funkin/num6.png b/preload/images/num6.png → preload/images/ui/popup/funkin/num6.png
diff --git a/preload/images/num7.png → preload/images/ui/popup/funkin/num7.png b/preload/images/num7.png → preload/images/ui/popup/funkin/num7.png
diff --git a/preload/images/num8.png → preload/images/ui/popup/funkin/num8.png b/preload/images/num8.png → preload/images/ui/popup/funkin/num8.png
diff --git a/preload/images/num9.png → preload/images/ui/popup/funkin/num9.png b/preload/images/num9.png → preload/images/ui/popup/funkin/num9.png
diff --git a/shared/images/shit.png → preload/images/ui/popup/funkin/shit.png b/shared/images/shit.png → preload/images/ui/popup/funkin/shit.png
diff --git a/shared/images/sick.png → preload/images/ui/popup/funkin/sick.png b/shared/images/sick.png → preload/images/ui/popup/funkin/sick.png
diff --git a/week6/images/weeb/pixelUI/bad-pixel.png → preload/images/ui/popup/pixel/bad.png b/week6/images/weeb/pixelUI/bad-pixel.png → preload/images/ui/popup/pixel/bad.png
diff --git a/week6/images/weeb/pixelUI/combo-pixel.png → preload/images/ui/popup/pixel/combo.png b/week6/images/weeb/pixelUI/combo-pixel.png → preload/images/ui/popup/pixel/combo.png
diff --git a/week6/images/weeb/pixelUI/good-pixel.png → preload/images/ui/popup/pixel/good.png b/week6/images/weeb/pixelUI/good-pixel.png → preload/images/ui/popup/pixel/good.png
diff --git a/week6/images/weeb/pixelUI/num0-pixel.png → preload/images/ui/popup/pixel/num0.png b/week6/images/weeb/pixelUI/num0-pixel.png → preload/images/ui/popup/pixel/num0.png
diff --git a/week6/images/weeb/pixelUI/num1-pixel.png → preload/images/ui/popup/pixel/num1.png b/week6/images/weeb/pixelUI/num1-pixel.png → preload/images/ui/popup/pixel/num1.png
diff --git a/week6/images/weeb/pixelUI/num2-pixel.png → preload/images/ui/popup/pixel/num2.png b/week6/images/weeb/pixelUI/num2-pixel.png → preload/images/ui/popup/pixel/num2.png
diff --git a/week6/images/weeb/pixelUI/num3-pixel.png → preload/images/ui/popup/pixel/num3.png b/week6/images/weeb/pixelUI/num3-pixel.png → preload/images/ui/popup/pixel/num3.png
diff --git a/week6/images/weeb/pixelUI/num4-pixel.png → preload/images/ui/popup/pixel/num4.png b/week6/images/weeb/pixelUI/num4-pixel.png → preload/images/ui/popup/pixel/num4.png
diff --git a/week6/images/weeb/pixelUI/num5-pixel.png → preload/images/ui/popup/pixel/num5.png b/week6/images/weeb/pixelUI/num5-pixel.png → preload/images/ui/popup/pixel/num5.png
diff --git a/week6/images/weeb/pixelUI/num6-pixel.png → preload/images/ui/popup/pixel/num6.png b/week6/images/weeb/pixelUI/num6-pixel.png → preload/images/ui/popup/pixel/num6.png
diff --git a/week6/images/weeb/pixelUI/num7-pixel.png → preload/images/ui/popup/pixel/num7.png b/week6/images/weeb/pixelUI/num7-pixel.png → preload/images/ui/popup/pixel/num7.png
diff --git a/week6/images/weeb/pixelUI/num8-pixel.png → preload/images/ui/popup/pixel/num8.png b/week6/images/weeb/pixelUI/num8-pixel.png → preload/images/ui/popup/pixel/num8.png
diff --git a/week6/images/weeb/pixelUI/num9-pixel.png → preload/images/ui/popup/pixel/num9.png b/week6/images/weeb/pixelUI/num9-pixel.png → preload/images/ui/popup/pixel/num9.png
diff --git a/week6/images/weeb/pixelUI/shit-pixel.png → preload/images/ui/popup/pixel/shit.png b/week6/images/weeb/pixelUI/shit-pixel.png → preload/images/ui/popup/pixel/shit.png
diff --git a/week6/images/weeb/pixelUI/sick-pixel.png → preload/images/ui/popup/pixel/sick.png b/week6/images/weeb/pixelUI/sick-pixel.png → preload/images/ui/popup/pixel/sick.png
diff --git a/preload/scripts/stages/schoolEvil.hxc b/preload/scripts/stages/schoolEvil.hxc
@@ -3,6 +3,8 @@ import funkin.play.stage.Stage;
 import funkin.graphics.shaders.WiggleEffectRuntime;
 import funkin.graphics.shaders.WiggleEffectType;
 import flixel.addons.effects.FlxTrail;
+import funkin.play.Countdown;
+import funkin.play.components.PopUpStuff;
 
 class SchoolEvilStage extends Stage
 {

diff --git a/shared/images/go.png → shared/images/ui/countdown/funkin/go.png b/shared/images/go.png → shared/images/ui/countdown/funkin/go.png
diff --git a/shared/images/ready.png → shared/images/ui/countdown/funkin/ready.png b/shared/images/ready.png → shared/images/ui/countdown/funkin/ready.png
diff --git a/shared/images/set.png → shared/images/ui/countdown/funkin/set.png b/shared/images/set.png → shared/images/ui/countdown/funkin/set.png
diff --git a/week6/images/weeb/pixelUI/date-pixel.png → shared/images/ui/countdown/pixel/go.png b/week6/images/weeb/pixelUI/date-pixel.png → shared/images/ui/countdown/pixel/go.png
diff --git a/week6/images/weeb/pixelUI/ready-pixel.png → shared/images/ui/countdown/pixel/ready.png b/week6/images/weeb/pixelUI/ready-pixel.png → shared/images/ui/countdown/pixel/ready.png
diff --git a/week6/images/weeb/pixelUI/set-pixel.png → shared/images/ui/countdown/pixel/set.png b/week6/images/weeb/pixelUI/set-pixel.png → shared/images/ui/countdown/pixel/set.png
diff --git a/shared/sounds/introGo.mp3 → ...nds/gameplay/countdown/funkin/introGO.mp3 b/shared/sounds/introGo.mp3 → ...nds/gameplay/countdown/funkin/introGO.mp3
diff --git a/shared/sounds/introGo.ogg → ...nds/gameplay/countdown/funkin/introGO.ogg b/shared/sounds/introGo.ogg → ...nds/gameplay/countdown/funkin/introGO.ogg
diff --git a/shared/sounds/intro1.mp3 → ...ds/gameplay/countdown/funkin/introONE.mp3 b/shared/sounds/intro1.mp3 → ...ds/gameplay/countdown/funkin/introONE.mp3
diff --git a/shared/sounds/intro1.ogg → ...ds/gameplay/countdown/funkin/introONE.ogg b/shared/sounds/intro1.ogg → ...ds/gameplay/countdown/funkin/introONE.ogg
diff --git a/shared/sounds/intro3.mp3 → .../gameplay/countdown/funkin/introTHREE.mp3 b/shared/sounds/intro3.mp3 → .../gameplay/countdown/funkin/introTHREE.mp3
diff --git a/shared/sounds/intro3.ogg → .../gameplay/countdown/funkin/introTHREE.ogg b/shared/sounds/intro3.ogg → .../gameplay/countdown/funkin/introTHREE.ogg
diff --git a/shared/sounds/intro2.mp3 → ...ds/gameplay/countdown/funkin/introTWO.mp3 b/shared/sounds/intro2.mp3 → ...ds/gameplay/countdown/funkin/introTWO.mp3
diff --git a/shared/sounds/intro2.ogg → ...ds/gameplay/countdown/funkin/introTWO.ogg b/shared/sounds/intro2.ogg → ...ds/gameplay/countdown/funkin/introTWO.ogg
diff --git a/week6/sounds/introGo-pixel.mp3 → ...unds/gameplay/countdown/pixel/introGO.mp3 b/week6/sounds/introGo-pixel.mp3 → ...unds/gameplay/countdown/pixel/introGO.mp3
diff --git a/week6/sounds/introGo-pixel.ogg → ...unds/gameplay/countdown/pixel/introGO.ogg b/week6/sounds/introGo-pixel.ogg → ...unds/gameplay/countdown/pixel/introGO.ogg
diff --git a/week6/sounds/intro1-pixel.mp3 → ...nds/gameplay/countdown/pixel/introONE.mp3 b/week6/sounds/intro1-pixel.mp3 → ...nds/gameplay/countdown/pixel/introONE.mp3
diff --git a/week6/sounds/intro1-pixel.ogg → ...nds/gameplay/countdown/pixel/introONE.ogg b/week6/sounds/intro1-pixel.ogg → ...nds/gameplay/countdown/pixel/introONE.ogg
diff --git a/week6/sounds/intro3-pixel.mp3 → ...s/gameplay/countdown/pixel/introTHREE.mp3 b/week6/sounds/intro3-pixel.mp3 → ...s/gameplay/countdown/pixel/introTHREE.mp3
diff --git a/week6/sounds/intro3-pixel.ogg → ...s/gameplay/countdown/pixel/introTHREE.ogg b/week6/sounds/intro3-pixel.ogg → ...s/gameplay/countdown/pixel/introTHREE.ogg
diff --git a/week6/sounds/intro2-pixel.mp3 → ...nds/gameplay/countdown/pixel/introTWO.mp3 b/week6/sounds/intro2-pixel.mp3 → ...nds/gameplay/countdown/pixel/introTWO.mp3
diff --git a/week6/sounds/intro2-pixel.ogg → ...nds/gameplay/countdown/pixel/introTWO.ogg b/week6/sounds/intro2-pixel.ogg → ...nds/gameplay/countdown/pixel/introTWO.ogg