Merge branch 'geode-sdk:main' into main

bindings/2.206/Cocos2d.bro

@@ -376,7 +376,7 @@ class cocos2d::CCScene {
 
 [[link(win, android)]]
 class cocos2d::CCSet {
-	static cocos2d::CCSet* create();
+	static cocos2d::CCSet* create() = m1 0x6c59d4, imac 0x7bfc00;
 
 	//CCSet(cocos2d::CCSet const&) = imac 0x7bf970, m1 0x6c576c;
 	CCSet() = imac 0x7bf920, m1 0x6c570c;
@@ -748,7 +748,7 @@ class cocos2d::CCFileUtils {
 
 [[link(win, android)]]
 class cocos2d::CCGLProgram {
-	bool initWithVertexShaderByteArray(char const*, char const*);
+	bool initWithVertexShaderByteArray(char const*, char const*) = m1 0x3a71ac;
 	bool initWithVertexShaderFilename(char const*, char const*);
 
 	unsigned int const getProgram();
@@ -773,17 +773,17 @@ class cocos2d::CCGLProgram {
 	void setUniformsForBuiltins() = m1 0x3a8704, imac 0x435940, ios 0x13c230;
 
 	// CCGLProgram(cocos2d::CCGLProgram const&);
-	// CCGLProgram();
-	void addAttribute(char const*, unsigned int);
+	CCGLProgram() = m1 0x3a6fd8;
+	void addAttribute(char const*, unsigned int) = m1 0x3a744c;
 	bool compileShader(unsigned int*, unsigned int, char const*);
 	char const* description();
 	char const* fragmentShaderLog();
-	bool link();
+	bool link() = m1 0x3a75e8;
 	// char const* logForOpenGLObject(unsigned int, void (__cdecl*)(unsigned int, unsigned int, int*), void (__cdecl*)(unsigned int, int, int*, char*));
 	char const* programLog();
 	void reset() = m1 0x3a89bc, imac 0x435c70;
 	bool updateUniformLocation(int, void*, unsigned int);
-	void updateUniforms();
+	void updateUniforms() = m1 0x3a7460;
 	void use() = m1 0x3a758c, imac 0x434970, ios 0x13b990;
 	char const* vertexShaderLog();
 }
@@ -2691,24 +2691,24 @@ class cocos2d::CCTextFieldTTF {
 
 	void setDelegate(cocos2d::CCTextFieldDelegate* var);
 
-	virtual void draw();
-	virtual const cocos2d::ccColor3B& getColorSpaceHolder();
-	virtual void setColorSpaceHolder(const cocos2d::ccColor3B& color);
-	virtual const char* getPlaceHolder();
-	virtual void setPlaceHolder(const char* text);
-	virtual void setSecureTextEntry(bool value);
-	virtual bool isSecureTextEntry();
-
-	virtual void setString(const char* text);
-	virtual const char* getString();
-
-	virtual bool attachWithIME();
-	virtual bool detachWithIME();
-	virtual bool canAttachWithIME();
-	virtual bool canDetachWithIME();
-	virtual void insertText(const char* text, int len, cocos2d::enumKeyCodes keyCode);
-	virtual void deleteBackward();
-	virtual const char* getContentText();
+	virtual void draw() = m1 0x21e620;
+	virtual const cocos2d::ccColor3B& getColorSpaceHolder() = m1 0x21e6e0;
+	virtual void setColorSpaceHolder(const cocos2d::ccColor3B& color) = m1 0x21e6e8;
+	virtual const char* getPlaceHolder() = m1 0x21eae8;
+	virtual void setPlaceHolder(const char* text) = m1 0x21e9a0;
+	virtual void setSecureTextEntry(bool value) = m1 0x21eb00;
+	virtual bool isSecureTextEntry() = m1 0x21eb54;
+
+	virtual void setString(const char* text) = m1 0x21e6fc;
+	virtual const char* getString() = m1 0x21e970;
+
+	virtual bool attachWithIME() = m1 0x21dd40;
+	virtual bool detachWithIME() = m1 0x21ddcc;
+	virtual bool canAttachWithIME() = m1 0x21de58;
+	virtual bool canDetachWithIME() = m1 0x21decc;
+	virtual void insertText(const char* text, int len, cocos2d::enumKeyCodes keyCode) = m1 0x21df40;
+	virtual void deleteBackward() = m1 0x21e2f8;
+	virtual const char* getContentText() = m1 0x21e5f0;
 }
 
 [[link(win, android)]]

bindings/2.206/GeometryDash.bro

@@ -2646,7 +2646,15 @@ class ConfigureValuePopupDelegate {
 class CountTriggerAction {
 	// CountTriggerAction(CountTriggerAction&&);
 
-	PAD = win 0x24;
+	bool m_unk0;
+	int m_previousCount;
+	int m_targetCount;
+	int m_targetGroup;
+	bool m_unk10;
+	int m_unk14;
+	int m_unk18;
+	int m_itemID;
+	bool m_multiActivate;
 	gd::vector<int> m_unkVecInt;
 }
 
@@ -7183,7 +7191,7 @@ class GameToolbox {
 	static CCMenuItemToggler* createToggleButton(gd::string label, cocos2d::SEL_MenuHandler selector, bool state, cocos2d::CCMenu* menu, cocos2d::CCPoint position, cocos2d::CCNode* parent, cocos2d::CCNode* labelParent, float buttonScale, float maxLabelScale, float maxLabelWidth, cocos2d::CCPoint labelOffset, char const* font, bool labelTop, int labelTag, cocos2d::CCArray* container) = win 0x63080, imac 0x4f9b80, m1 0x4528d0, ios 0x4a4f8;
 	static bool doWeHaveInternet();
 	static TodoReturn easeToText(int);
-	static TodoReturn fast_rand_0_1() = imac 0x4fc6c0;
+	static float fast_rand_0_1() = imac 0x4fc6c0, m1 0x4551ac;
 	static TodoReturn fast_rand_minus1_1();
 	static TodoReturn fast_rand();
 	static void fast_srand(uint64_t) = m1 0x45516c, imac 0x4fc670;
@@ -8811,14 +8819,14 @@ class GJEffectManager : cocos2d::CCNode {
 
 	virtual bool init() = m1 0x275984, imac 0x2d8d70;
 
-	void* m_unk140;
+	TriggerEffectDelegate* m_triggerEffectDelegate;
 	cocos2d::CCDictionary* m_unkObject148;
 	cocos2d::CCDictionary* m_unkDict150;
 	gd::vector<PulseEffectAction> m_pulseEffectVector; // 0x158
 	gd::unordered_map<int, gd::vector<PulseEffectAction>> m_pulseEffectMap; // 0x170
 	gd::unordered_map<int, OpacityEffectAction> m_opacityEffectMap; // 0x1a8
 	gd::vector<TouchToggleAction> m_unkVector1e0;
-	gd::unordered_map<int, gd::vector<CountTriggerAction>> m_unkMap1f8;
+	gd::unordered_map<int, gd::vector<CountTriggerAction>> m_countTriggerActions;
 	gd::vector<CollisionTriggerAction> m_unkVector230;
 	gd::vector<ToggleTriggerAction> m_unkVector248;
 	cocos2d::CCDictionary* m_colorActionDict;