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

This commit is contained in:
HJfod 2023-02-04 11:28:40 +02:00
commit 6e206350a8
2 changed files with 39 additions and 4 deletions

View file

@ -167,8 +167,8 @@ elseif(EXISTS ${GEODE_PLATFORM_BIN_PATH})
)
else()
message(FATAL_ERROR
"No valid loader binary to link to! Install prebuilts with `geode sdk install-prebuilts`, "
"or build Geode from source and add `set(GEODE_LINK_NIGHTLY On)` to your CMakeLists.txt "
"No valid loader binary to link to! Install prebuilts with `geode sdk install-binaries`, "
"or build Geode from source and add `set(GEODE_LINK_NIGHTLY ON)` to your CMakeLists.txt "
"in the line before calling add_subdirectory for Geode."
)
endif()

View file

@ -22,8 +22,10 @@ class AchievementBar : cocos2d::CCNodeRGBA {
PAD = win 0x24;
}
class AchievementCell {
class AchievementCell : cocos2d::CCLayer {
void loadFromDict(cocos2d::CCDictionary*) = mac 0x10eaa0, win 0x59010;
virtual bool init() = win 0x11070;
}
class AchievementManager : cocos2d::CCNode {
@ -2307,10 +2309,14 @@ class GJMapPack : cocos2d::CCNode {
cocos2d::ccColor3B m_barColour;
int m_MId;
bool m_isGauntlet;
virtual bool init() = win 0xc0080;
static GJMapPack *create() = win 0xbffe0;
}
class GJMessageCell : TableViewCell {
void updateBGColor(unsigned int index) = win 0x5c6b0;
void loadFromMessage(GJUserMessage *) = win 0x64b60;
}
class GJOptionsLayer : FLAlertLayer {
@ -2460,6 +2466,10 @@ class GJUserCell : TableViewCell {
void updateBGColor(unsigned int index) = win 0x5c6b0;
}
class GJUserMessage : cocos2d::CCNode {
virtual bool init() = win 0x33b40;
}
class GJUserScore : cocos2d::CCNode {
IconType getIconType() const {
return m_iconType;
@ -2568,6 +2578,12 @@ class GooglePlayDelegate {
virtual void googlePlaySignedIn() {}
}
class GooglePlayManager : cocos2d::CCNode {
virtual bool init() = win 0x11070;
static GooglePlayManager *sharedState() = win 0x4295a0;
}
class GameLevelManager : cocos2d::CCNode {
cocos2d::CCArray* createAndGetScores(gd::string, GJScoreType) = win 0xa2780;
GJGameLevel* createNewLevel() = mac 0x2b8180, win 0xa0db0;
@ -3899,11 +3915,15 @@ class LocalLevelManager : cocos2d::CCNode {
class MapPackCell : TableViewCell {
void updateBGColor(unsigned int index) = win 0x5c6b0;
void loadFromMapPack(GJMapPack *) = win 0x5cac0;
}
class MenuGameLayer {
void resetPlayer() = mac 0x28fdc0, win 0x18f4b0;
void destroyPlayer() = win 0x190100;
void update(float) = mac 0x28fa70, win 0x18f190;
virtual bool init() = win 0x18e770;
void updateColors() = win 0x18edd0;
}
class MenuLayer : cocos2d::CCLayer, FLAlertLayerProtocol, GooglePlayDelegate {
@ -4017,6 +4037,10 @@ class ObjectManager : cocos2d::CCNode {
void setup() = win 0x2c3b0;
}
class KeysLayer : cocos2d::CCLayer {
virtual bool init() = win 0x154560;
}
class ObjectToolbox : cocos2d::CCNode {
cocos2d::CCArray* allKeys() {
return m_frameToKeyDict->allKeys();
@ -4849,7 +4873,13 @@ class SetIDLayer {
static SetIDLayer* create(GameObject*) = mac 0x168f20, win 0x22eb90;
}
class SetIDPopup {}
class SetIDPopup : FLAlertLayer, TextInputDelegate {
void valueChanged() = win 0x10a60;
bool init(int, int, int, gd::string, gd::string, bool, int) = win 0x143270;
static SetIDPopup *create(int, int, int, gd::string, gd::string, bool, int) = win 0x143130;
}
class SetIDPopupDelegate {
virtual void setIDPopupClosed(SetIDPopup*, int) {}
@ -5339,6 +5369,11 @@ class VideoOptionsLayer : FLAlertLayer {
}
class LevelTools {
static gd::string base64EncodeString(gd::string) = win 0x18b310;
static gd::string base64DecodeString(gd::string) = mac 0x294510, win 0x18b3b0;
static GJGameLevel *getLevel(int, bool) = win 0x189370;
static bool verifyLevelIntegrity(gd::string, int) = win 0x18b180;
static float xPosForTime(float, CCArray *, int) = win 0x18acd0;
static float timeForXPos(float, CCArray *, int) = win 0x18ae70;
}
// clang-format on