7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 01:45:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/geode-sdk/geode into main

Browse source
This commit is contained in:
HJfod 2023-04-11 20:41:51 +03:00
commit 11a90adf12
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bindings/Cocos2d.bro
View file

@ -137,6 +137,7 @@ class cocos2d::CCDirector {
auto calculateDeltaTime() = mac 0x2497a0; auto calculateDeltaTime() = mac 0x2497a0;
auto calculateMPF() = mac 0x19eac0; auto calculateMPF() = mac 0x19eac0;
auto convertToGL(cocos2d::CCPoint const&) = mac 0x24a210; auto convertToGL(cocos2d::CCPoint const&) = mac 0x24a210;
auto convertToUI(cocos2d::CCPoint const&) = mac 0x24a340;
auto drawScene() = mac 0x249690; auto drawScene() = mac 0x249690;
auto willSwitchToScene(cocos2d::CCScene* scene); auto willSwitchToScene(cocos2d::CCScene* scene);
@ -190,6 +191,10 @@ class cocos2d::CCEaseBackIn {
static cocos2d::CCEaseBackIn* create(cocos2d::CCActionInterval*) = mac 0x2a41b0; static cocos2d::CCEaseBackIn* create(cocos2d::CCActionInterval*) = mac 0x2a41b0;
} }
class cocos2d::CCEaseElasticIn {
static cocos2d::CCEaseElasticIn* create(cocos2d::CCActionInterval*, float) = mac 0x2a2e00;
}
class cocos2d::CCEaseElasticOut { class cocos2d::CCEaseElasticOut {
static cocos2d::CCEaseElasticOut* create(cocos2d::CCActionInterval*, float) = mac 0x2a3080; static cocos2d::CCEaseElasticOut* create(cocos2d::CCActionInterval*, float) = mac 0x2a3080;
} }
@ -724,6 +729,11 @@ class cocos2d::CCScaleTo {
static cocos2d::CCScaleTo* create(float, float, float) = mac 0x1f70f0; static cocos2d::CCScaleTo* create(float, float, float) = mac 0x1f70f0;
} }
class cocos2d::CCScaleBy {
static cocos2d::CCScaleTo* create(float, float) = mac 0x1f73c0;
static cocos2d::CCScaleTo* create(float, float, float) = mac 0x1f7480;
}
class cocos2d::CCScene { class cocos2d::CCScene {
static cocos2d::CCScene* create() = mac 0x13c140, ios 0x163070; static cocos2d::CCScene* create() = mac 0x13c140, ios 0x163070;
auto getHighestChildZ() = mac 0x13c200, ios 0x1630e4; auto getHighestChildZ() = mac 0x13c200, ios 0x1630e4;
@ -745,6 +755,8 @@ class cocos2d::CCSequence {
class cocos2d::CCSet { class cocos2d::CCSet {
CCSet() = mac 0x45ad80, ios 0x10e870; CCSet() = mac 0x45ad80, ios 0x10e870;
static auto create() = mac 0x45b0b0;
auto addObject(cocos2d::CCObject*) = mac 0x45b1f0;
virtual ~CCSet() = mac 0x45b050, ios 0x10ebcc; virtual ~CCSet() = mac 0x45b050, ios 0x10ebcc;
virtual auto acceptVisitor(cocos2d::CCDataVisitor&) = mac 0x45b090, ios 0x10ec04; virtual auto acceptVisitor(cocos2d::CCDataVisitor&) = mac 0x45b090, ios 0x10ec04;
auto anyObject() = mac 0x45b410; auto anyObject() = mac 0x45b410;

2
bindings/GeometryDash.bro
View file

@ -4676,7 +4676,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
void flipGravity(bool, bool) = mac 0x21c090, win 0x1f59d0; void flipGravity(bool, bool) = mac 0x21c090, win 0x1f59d0;
void flipMod() = mac 0x21a4c0; void flipMod() = mac 0x21a4c0;
void getActiveMode() = mac 0x22b950, win 0x1f5df0; void getActiveMode() = mac 0x22b950, win 0x1f5df0;
void getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870; float getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870;
void getOldPosition(float) = mac 0x21a830; void getOldPosition(float) = mac 0x21a830;
void getSecondColor() = mac 0x22cee0; void getSecondColor() = mac 0x22cee0;
void gravityDown() = mac 0x22e930; void gravityDown() = mac 0x22e930;

2
loader/include/Geode/loader/ModEvent.hpp
View file

@ -52,7 +52,7 @@ namespace geode {
* @param type Type of event to listen to. Ignored if mod is nullptr * @param type Type of event to listen to. Ignored if mod is nullptr
*/ */
ModStateFilter(Mod* mod, ModEventType type); ModStateFilter(Mod* mod, ModEventType type);
ModStateFilter(ModStateFilter const&); ModStateFilter(ModStateFilter const&) = default;
}; };
} }

2
loader/src/loader/ModEvent.cpp
View file

@ -21,5 +21,3 @@ ListenerResult ModStateFilter::handle(utils::MiniFunction<Callback> fn, ModState
} }
ModStateFilter::ModStateFilter(Mod* mod, ModEventType type) : m_mod(mod), m_type(type) {} ModStateFilter::ModStateFilter(Mod* mod, ModEventType type) : m_mod(mod), m_type(type) {}
ModStateFilter::ModStateFilter(ModStateFilter const& other) : m_mod(other.m_mod), m_type(other.m_type) {}