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

fix unresolved merge conflict

Browse source
This commit is contained in:
HJfod 2022-11-22 23:39:09 +02:00
parent 182ced8e17
commit 384efb32bb
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/GeometryDash.bro
View file

@ -5314,11 +5314,7 @@ class TextArea : cocos2d::CCSprite {
virtual void draw() {} virtual void draw() {}
virtual void setOpacity(unsigned char) = mac 0x19f760, win 0x33800; virtual void setOpacity(unsigned char) = mac 0x19f760, win 0x33800;
bool init(gd::string str, char const* font, float width, float height, cocos2d::CCPoint anchor, float scale, bool disableColor) = mac 0x19ec70, win 0x33370, ios 0x92444; bool init(gd::string str, char const* font, float width, float height, cocos2d::CCPoint anchor, float scale, bool disableColor) = mac 0x19ec70, win 0x33370, ios 0x92444;
<<<<<<< HEAD
static TextArea* create(gd::string str, char const* font, float width, float height, cocos2d::CCPoint anchor, float scale, bool disableColor) = mac 0x19eb40, win 0x33270; static TextArea* create(gd::string str, char const* font, float width, float height, cocos2d::CCPoint anchor, float scale, bool disableColor) = mac 0x19eb40, win 0x33270;
=======
static TextArea* create(gd::string str, char const* font, float scale, float width, cocos2d::CCPoint anchor, float height, bool disableColor) = mac 0x19eb40, win 0x33270;
>>>>>>> main
void colorAllCharactersTo(cocos2d::ccColor3B color) = win 0x33830; void colorAllCharactersTo(cocos2d::ccColor3B color) = win 0x33830;
void setString(gd::string str) = mac 0x19eda0, win 0x33480; void setString(gd::string str) = mac 0x19eda0, win 0x33480;