stuff

TheSillyDoggo · TheSillyDoggo · commit 8ca0d4418e74 · 2026-04-10T16:20:23.000+10:00
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,16 @@
+# 2.8.4
+
+- Added Gravity Arrow
+- Added Show button in Editor
+- Added Show button in Endscreen
+- Added Show button in Level
+- Made mod data save when closing the menu
+- Changed Button to only appear after the end screen has appeared
+- Fixed crashing using cross fade transition on Android
+- Fixed cross fade transition not updating every frame
+- Fixed crash entering editor with show trajectory enabled
+- Fixed menus being clipped wrong with fade animation
+
 # 2.8.3
 
 - Optimised UI
diff --git a/mod-2.2074.json b/mod-2.2074.json
@@ -1,6 +1,6 @@
 {
 	"geode": "4.10.0",
-	"version": "v2.8.3-beta.1",
+	"version": "v2.8.4-beta.1",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "5.5.3",
-	"version": "v2.8.3",
+	"version": "v2.8.4",
 	"gd": {
 		"win": "2.2081",
 		"android": "2.2081",
diff --git a/resources/translations b/resources/translations
@@ -1 +1 @@
-Subproject commit e7f31580b37fc8a2dff58380c4d4e4dd0794a64c
+Subproject commit a60d47e7a796f051a6ff306089ebd5a454e3b382
diff --git a/src/Client/CategoryNode.cpp b/src/Client/CategoryNode.cpp
@@ -2,6 +2,7 @@
 #include "../Utils/Casts.hpp"
 #include "../GUI/BetterMouseDispatcher.hpp"
 #include "../Utils/Num.hpp"
+#include <ScrollLayer.hpp>
 
 CategoryNode* CategoryNode::create()
 {
@@ -133,12 +134,10 @@ bool CategoryNode::init()
     bg = EasyBG::create();
     bg->setContentSize(getContentSize());
 
-    scroll = geode::ScrollLayer::create(this->getContentSize());
-    scroll->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
+    scroll = qolmod::ScrollLayer::create(this->getContentSize());
     scroll->m_peekLimitTop = 15;
     scroll->m_peekLimitBottom = 15;
     scroll->setTouchEnabled(false);
-    scroll->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
 
     scrollbar = BetterScrollbar::create(scroll);
     // updates size
diff --git a/src/GUI/AndroidBall.cpp b/src/GUI/AndroidBall.cpp
@@ -109,6 +109,8 @@ void AndroidBall::reloadTextures()
     setColonThreeSecret(colonThreeEnabled);
 }
 
+#include "Modules/ButtonVisibility.hpp"
+
 bool AndroidBall::shouldFunction()
 {
     #ifdef GEODE_IS_DESKTOP
@@ -127,8 +129,23 @@ bool AndroidBall::shouldFunction()
     if (CCScene::get() && CCScene::get()->getChildByType<LoadingLayer>(0))
         return false;
 
-    if (PlayLayer::get() && (!PlayLayer::get()->m_levelEndAnimationStarted && !PlayLayer::get()->m_isPaused))
-        return false;
+    if (!ShowButtonInEditor::get()->getRealEnabled())
+    {
+        if (LevelEditorLayer::get() && !LevelEditorLayer::get()->getChildByType<EditorPauseLayer>(0))
+            return false;
+    }
+
+    if (auto pl = PlayLayer::get())
+    {
+        if (ShowButtonInEndScreen::get()->getRealEnabled() && pl->getChildByType<EndLevelLayer>(0))
+            return true;
+
+        if (pl->m_isPaused)
+            return true;
+
+        if (!ShowButtonInGame::get()->getRealEnabled())
+            return false;
+    }
 
     return true;
 }
diff --git a/src/GUI/AndroidUI.cpp b/src/GUI/AndroidUI.cpp
@@ -224,6 +224,8 @@ AndroidUI::~AndroidUI()
 {
     if (instance == this)
         instance = nullptr;
+
+    (void)Mod::get()->saveData();
 }
 
 void AndroidUI::close()
diff --git a/src/GUI/Categories/LabelsNode.cpp b/src/GUI/Categories/LabelsNode.cpp
@@ -5,6 +5,7 @@
 #include "../../Utils/Num.hpp"
 #include "../BetterButtonSprite.hpp"
 #include <Button.hpp>
+#include <ScrollLayer.hpp>
 
 using namespace qolmod;
 
@@ -23,12 +24,10 @@ bool LabelsNode::init()
     bg->setAnchorPoint(ccp(0, 0));
     bg->setContentSize(ccp((getContentWidth() - PRESETS_SIZE - 5), bg->getContentHeight() - ((TOPBAR_SIZE + 5))));
 
-    labelsScroll = ScrollLayer::create(bg->getContentSize());
-    labelsScroll->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
+    labelsScroll = qolmod::ScrollLayer::create(bg->getContentSize());
     labelsScroll->m_peekLimitTop = 15;
     labelsScroll->m_peekLimitBottom = 15;
     labelsScroll->setTouchEnabled(false);
-    labelsScroll->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
 
     auto bgTopbar = CCScale9Sprite::create("square02b_small.png");
     bgTopbar->setContentSize(ccp(this->getContentWidth(), TOPBAR_SIZE) / 0.5f);
diff --git a/src/GUI/CategorySelectMenu.cpp b/src/GUI/CategorySelectMenu.cpp
@@ -59,7 +59,7 @@ bool CategorySelectMenu::init()
     setAnchorPoint(ccp(0.5f, 0.5f));
     setContentSize(ccp(0, 0));
 
-    scroll = ScrollLayer::create(ccp(100, 100));
+    scroll = qolmod::ScrollLayer::create(ccp(100, 100));
     scroll->setID("category-select-menu-scroll");
     scroll->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
     scroll->m_peekLimitTop = 15;
diff --git a/src/GUI/CategorySelectMenu.hpp b/src/GUI/CategorySelectMenu.hpp
@@ -5,6 +5,7 @@
 #include "CategoryTabSprite.hpp"
 #include <CCMenuExt.hpp>
 #include <Button.hpp>
+#include <ScrollLayer.hpp>
 
 using namespace geode::prelude;
 
@@ -19,7 +20,7 @@ class CategorySelectMenu : public CCMenu
 {
     protected:
         float inset = 2.5f;
-        ScrollLayer* scroll = nullptr;
+        qolmod::ScrollLayer* scroll = nullptr;
         BetterScrollbar* scrollbar = nullptr;
         qolmod::CCMenuExt* bottomBtns = nullptr;
         qolmod::CCMenuExt* standardBtns = nullptr;
diff --git a/src/GUI/Modules/ButtonVisibility.hpp b/src/GUI/Modules/ButtonVisibility.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "../../Client/Module.hpp"
+#include <PopupBase.hpp>
+
+using namespace geode::prelude;
+
+class ShowButtonInEditor : public Module
+{
+    public:
+        MODULE_SETUP(ShowButtonInEditor)
+        {
+            setID("show-button-in-editor");
+            setCategory("Config/Button");
+            setDefaultEnabled(true);
+        }
+};
+
+class ShowButtonInEndScreen : public Module
+{
+    public:
+        MODULE_SETUP(ShowButtonInEndScreen)
+        {
+            setID("show-button-in-endscreen");
+            setCategory("Config/Button");
+            setDefaultEnabled(true);
+        }
+};
+
+class ShowButtonInGame : public Module
+{
+    public:
+        MODULE_SETUP(ShowButtonInGame)
+        {
+            setID("show-button-in-game");
+            setCategory("Config/Button");
+            setDefaultEnabled(false);
+        }
+};
+
+SUBMIT_HACK(ShowButtonInEditor);
+SUBMIT_HACK(ShowButtonInEndScreen);
+SUBMIT_HACK(ShowButtonInGame);
diff --git a/src/GUI/SelectFontUI.cpp b/src/GUI/SelectFontUI.cpp
@@ -4,6 +4,7 @@
 #include "../Localisation/LocalisationManager.hpp"
 #include "BetterAlertLayer.hpp"
 #include <Button.hpp>
+#include <ScrollLayer.hpp>
 
 using namespace qolmod;
 
@@ -267,20 +268,16 @@ bool SelectFontUI::setup()
     scrollbar2 = BetterScrollbar::create(scroll2);
     scrollbar2->setDisabled(true);
 
-    scroll1 = ScrollLayer::create(ccp(280 - 15, 160));
-    scroll1->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
+    scroll1 = qolmod::ScrollLayer::create(ccp(280 - 15, 160));
     scroll1->m_contentLayer->setContentHeight(height);
     scroll1->m_peekLimitTop = 15;
     scroll1->m_peekLimitBottom = 15;
-    scroll1->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
 
-    scroll2 = ScrollLayer::create(ccp(280 - 15, 160));
-    scroll2->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
+    scroll2 = qolmod::ScrollLayer::create(ccp(280 - 15, 160));
     scroll2->m_peekLimitTop = 15;
     scroll2->m_peekLimitBottom = 15;
     scroll2->setMouseEnabled(false);
     scroll2->setTouchEnabled(false);
-    scroll2->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
 
     scrollbar1->setLayer(scroll1);
     scrollbar2->setLayer(scroll2);
diff --git a/src/GUI/VersionInfoNode.cpp b/src/GUI/VersionInfoNode.cpp
@@ -25,8 +25,8 @@ bool VersionInfoNode::init(VersionInfoType type)
     if (type == VersionInfoType::QOLMod)
         checkForUpdate();
 
-    label = CCLabelBMFont::create("", "lexend.fnt"_spr);
-    // label->setTTFUsage(AdvLabelTTFUsage::None);
+    label = AdvLabelBMFont::createWithString("", "lexend.fnt"_spr);
+    label->setTTFUsage(AdvLabelTTFUsage::None);
     label->setAnchorPoint(ccp(0, 0));
     circle = LoadingCircleSprite::create(1);
     circle->setScale(0.22f);
diff --git a/src/GUI/VersionInfoNode.hpp b/src/GUI/VersionInfoNode.hpp
@@ -14,7 +14,7 @@ enum class VersionInfoType
 class VersionInfoNode : public cocos2d::CCNodeRGBA
 {
     protected:
-        CCLabelBMFont* label = nullptr;
+        AdvLabelBMFont* label = nullptr;
         LoadingCircleSprite* circle = nullptr;
         VersionInfoType type = VersionInfoType::GD;
         // geode::async::TaskHolder<geode::Mod::CheckUpdatesTask> updateListener;
diff --git a/src/Hacks/Level/GravityArrow.cpp b/src/Hacks/Level/GravityArrow.cpp
@@ -0,0 +1,75 @@
+#include "../../Client/Module.hpp"
+#include <Geode/modify/PlayerObject.hpp>
+
+using namespace geode::prelude;
+
+class GravityArrow : public Module
+{
+    public:
+        MODULE_SETUP(GravityArrow)
+        {
+            setID("gravity-arrow");
+            setCategory("Level");
+            setSafeModeTrigger(SafeModeTrigger::Attempt);
+        }
+};
+
+namespace qolmod
+{
+    class UntransformedNode : public CCNode
+    {
+        public:
+            CREATE_FUNC(UntransformedNode);
+
+            virtual void visit()
+            {
+                if (!GravityArrow::get()->getRealEnabled())
+                    return;
+
+                setRotation(-(getParent()->getRotation() + (static_cast<PlayerObject*>(getParent())->m_isSideways ? -90 : 0)));
+                setScale(1.0f / getParent()->getScale());
+
+                CCNode::visit();
+            }
+    };
+};
+
+SUBMIT_HACK(GravityArrow);
+
+class $modify (PlayerObject)
+{
+    struct Fields
+    {
+        CCNode* center = nullptr;
+        CCSprite* gravSprite = nullptr;
+    };
+
+    bool init(int player, int ship, GJBaseGameLayer* gameLayer, cocos2d::CCLayer* layer, bool playLayer)
+    {
+        if (!PlayerObject::init(player, ship, gameLayer, layer, playLayer))
+            return false;
+
+        auto fields = m_fields.self();
+
+        fields->center = qolmod::UntransformedNode::create();
+        fields->center->setID("gravity-arrow-center"_spr);
+        fields->center->setAdditionalTransform(CCAffineTransformMakeIdentity());
+
+        fields->gravSprite = CCSprite::createWithSpriteFrameName("edit_upBtn_001.png");
+        fields->gravSprite->setID("gravity-sprite"_spr);
+        fields->center->addChild(fields->gravSprite);
+        
+        this->addChild(fields->center, 69);
+        return true;
+    }
+
+    virtual void update(float dt)
+    {
+        PlayerObject::update(dt);
+
+        auto fields = m_fields.self();
+
+        fields->gravSprite->setPositionY((!m_isUpsideDown ? -1 : 1) * m_vehicleSize * 35);
+        fields->gravSprite->setScale((!m_isUpsideDown ? -1 : 1) * m_vehicleSize * 0.8f);
+    }
+};
diff --git a/src/Hacks/Level/ShowTrajectory/Hooks.cpp b/src/Hacks/Level/ShowTrajectory/Hooks.cpp
@@ -135,9 +135,9 @@ class $modify(GJBaseGameLayer)
     {
         if (TrajectoryNode::get() && TrajectoryNode::get()->isSimulating() && p1)
         {
-            gd::vector<GameObject*> p1old = *p1;
+            gd::vector<GameObject*> gobjs = gd::vector<GameObject*>({});
 
-            auto new_end = std::remove_if(p1->begin(), p1->end(), [this, p0](GameObject* obj)
+            for (auto obj : *p1)
             {
                 bool del = true;
                 
@@ -158,16 +158,13 @@ class $modify(GJBaseGameLayer)
 
                 if (del)
                     customCollisionCheck(p0, obj);
-                
-                return del;
-            });
-
-            p1->erase(new_end, p1->end());
-            p2 = p1->size();
+                else
+                    gobjs.push_back(obj);
+            }
 
-            GJBaseGameLayer::collisionCheckObjects(p0, p1, p2, p3);
+            p2 = gobjs.size();
 
-            *p1 = p1old;
+            GJBaseGameLayer::collisionCheckObjects(p0, &gobjs, p2, p3);
 
             return;
         }
diff --git a/src/IconEffects/IconEffectsUI.cpp b/src/IconEffects/IconEffectsUI.cpp
@@ -75,11 +75,9 @@ bool IconEffectsUI::init()
     menu->ignoreAnchorPointForPosition(true);
 
     scroll = geode::ScrollLayer::create(effectsBG->getContentSize() + ccp(-8, 0));
-    scroll->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
     scroll->m_peekLimitTop = 15;
     scroll->m_peekLimitBottom = 15;
     scroll->setTouchEnabled(true);
-    scroll->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
     scroll->m_contentLayer->setContentHeight(menu->getScaledContentHeight() + 30);
     scroll->m_contentLayer->addChild(menu);
     scroll->moveToTop();
diff --git a/src/Labels/UI/SetupLabelConfigUI.cpp b/src/Labels/UI/SetupLabelConfigUI.cpp
@@ -6,6 +6,7 @@
 #include "../../Localisation/LocalisationManager.hpp"
 #include "LabelEventCell.hpp"
 #include <Button.hpp>
+#include <ScrollLayer.hpp>
 
 using namespace qolmod;
 
@@ -367,11 +368,9 @@ void SetupLabelConfigUI::createPage3()
     eventsNone = CCLabelBMFont::create("No events added yet", "bigFont.fnt");
     eventsNone->setScale(0.45f);
 
-    eventScroll = ScrollLayer::create(leftBG->getScaledContentSize());
-    eventScroll->setUserObject("MouseDispatcherExt"_spr, CCNode::create());
+    eventScroll = qolmod::ScrollLayer::create(leftBG->getScaledContentSize());
     eventScroll->m_peekLimitTop = 15;
     eventScroll->m_peekLimitBottom = 15;
-    eventScroll->setUserObject("user95401.scrollbar_everywhere/scrollbar", CCNode::create());
 
     pages[2]->addChildAtPosition(leftBG, Anchor::Left, ccp(20, 5));
     pages[2]->addChildAtPosition(eventScroll, Anchor::Left, ccp(20, 5 - eventScroll->getContentHeight() / 2));
diff --git a/src/UI/Nodes/CCNodeWithShader.cpp b/src/UI/Nodes/CCNodeWithShader.cpp
diff --git a/src/UI/ScrollLayer.cpp b/src/UI/ScrollLayer.cpp
diff --git a/src/UI/ScrollLayer.hpp b/src/UI/ScrollLayer.hpp
diff --git a/src/Utils/Utils.cpp b/src/Utils/Utils.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"geode": "4.10.0",`
`3`		`- "version": "v2.8.3-beta.1",`
	`3`	`+ "version": "v2.8.4-beta.1",`
`4`	`4`	`"gd": {`
`5`	`5`	`"win": "2.2074",`
`6`	`6`	`"android": "2.2074",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"geode": "5.5.3",`
`3`		`- "version": "v2.8.3",`
	`3`	`+ "version": "v2.8.4",`
`4`	`4`	`"gd": {`
`5`	`5`	`"win": "2.2081",`
`6`	`6`	`"android": "2.2081",`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,8 @@ AndroidUI::~AndroidUI()`
`224`	`224`	`{`
`225`	`225`	`if (instance == this)`
`226`	`226`	`instance = nullptr;`
	`227`	`+`
	`228`	`+ (void)Mod::get()->saveData();`
`227`	`229`	`}`
`228`	`230`
`229`	`231`	`void AndroidUI::close()`