Skip to content

Comments

Fill out more of EnhacnedGameObject's Class members and other missing…#860

Merged
altalk23 merged 5 commits intogeode-sdk:mainfrom
CallocGD:main
Dec 25, 2024
Merged

Fill out more of EnhacnedGameObject's Class members and other missing…#860
altalk23 merged 5 commits intogeode-sdk:mainfrom
CallocGD:main

Conversation

@CallocGD
Copy link
Contributor

@CallocGD CallocGD commented Nov 27, 2024

Hopefully this pull request is better than yesterday's one where I was up at 2AM. Seems having GameObject's previous class members helped out but I am still hunting down the remaining ones that slipped through the cracks somehow thanks to this update.

@CallocGD
Copy link
Contributor Author

CallocGD commented Nov 27, 2024

I swear the verification system is screwed up.

altalk23
altalk23 reviewed Nov 27, 2024
View reviewed changes
bindings/2.2074/GeometryDash.bro Outdated
bool m_activatedByPlayer1;
bool m_activatedByPlayer2;
bool m_hasUniqueCoin;
cocos2d::CCColor3B m_unkAnimationColor;
Copy link
Member

@altalk23 altalk23 Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is supposed to be ccColor3B not uppercase

Copy link
Contributor Author

@CallocGD CallocGD Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@CallocGD CallocGD requested a review from altalk23 November 28, 2024 01:33
altalk23
altalk23 reviewed Nov 28, 2024
View reviewed changes
Copy link
Member

@altalk23 altalk23 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(last member) I'm not so sure about the validity of this as first member of effectgameobject is also cccolor3b (and pads dont match)
member tests could be helpful

@altalk23
Copy link
Member

altalk23 commented Nov 28, 2024

wow github is weird

altalk23
altalk23 reviewed Nov 28, 2024
View reviewed changes
bindings/2.2074/GeometryDash.bro

PAD = android32 0x25, win 0x2a, android64 0x22, mac 0x22;

bool m_poweredOn;
Copy link
Member

@altalk23 altalk23 Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this ones a weird one because android32 becomes 0x26 but others are fine, maybe the old pad was wrong

bindings/2.2074/GeometryDash.bro Outdated
bool m_activatedByPlayer1;
bool m_activatedByPlayer2;
bool m_hasUniqueCoin;
cocos2d::ccColor3B m_unkAnimationColor;
Copy link
Member

@altalk23 altalk23 Nov 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not so sure about the validity of this as first member of effectgameobject is also cccolor3b (and pads dont match)
member tests could be helpful

@altalk23 altalk23 merged commit 9ab5fa9 into geode-sdk:main Dec 25, 2024
13 checks passed
Kingminer7 added a commit to geode-catgirls/bindings that referenced this pull request Feb 12, 2025
@Kingminer7 @hiimjasmine00
@TechStudent10 @Zilko @Weebifying @matcool @RayDeeUx @Cvolton @prevter @dankmeme01 @HJfod @undefined06855 @FireMario211 @peonii @SorkoPiko @altalk23 @cgytrus @SpaghettDev @MarioMastr @CallocGD @TobyAdd @iArtie @qimiko @flurrybun @camila314 @speedyfriend433 @Taswert @capeling @Alphalaneous @AnhNguyenlost13 @Cosmella-v @maxnut @Pololak @blueblock6
Merge Geode main (#14)
e9377bc 
* updateSongObject

* MoreOptionsLayer macchew OS bindings (geode-sdk#864)

* OptionsLayer::onOptions (geode-sdk#865)

* DrawGridLayer (geode-sdk#866)

* DrawGridLayer

* random ahh double

* DrawGridLayer

* random ahh double

* Fix LevelEditorLayer (geode-sdk#867)

* Update GeometryDash.bro

* Update Android32.cpp

* LikeItemLayer::onDislike for flingus (geode-sdk#868)

* LikeItemLayer::onDislike for flingus

* wwhoops

* RewardsPage::show

* RewardsPage vfuncs

* xD (geode-sdk#861)

* yk what yeah (geode-sdk#862)

* fix cceglview::toggleFullScreen

* 0x34d30 (geode-sdk#869)

* add goldkey to specialrewarditem enum

* random fmod and gjbgl bindings

* Delegate return types (geode-sdk#870)

* Bindings for @AnhNguyenlost13

* CommentCell::onDelete for @RayDeeUx

* ccparticlesnow::createWithTotalParticles m1

* gameobject stuff

* Bindings for @SorkoPiko

* EditorUI::updateButtons for @ShineUA

* More @SorkoPiko bindings

* Even more @SorkoPiko bindings

* CCLightFlash::playEffect params (geode-sdk#871)

i asked for the pr when sleepy found them but nobody did it so here it is ig a week after

* fix return types

* fix menulayer onquit

* two macos bindings

* fix SecretRewardsLayer

* Update SecretRewardsLayer test

* EnhancedGameObject::activatedByPlayer windows offset (geode-sdk#872)

* SetupPulsePopup members (geode-sdk#873)

* GameCell and GJMoreGamesLayer

* fix build helper addr

* some action bindings

* :ned:

* this is so dumb

* CCSpawn create with array

* GJBaseGameLayer playExitDualEffect

* StarInfoPopup createFromString

* GameLevelManager::storeFriendRequest

* Bindings for @ShineUA @iArtie

* Members for @Alphalaneous (geode-sdk#874)

* Members for Alphalaneous

* It was in extras 💀

* SetupSpawnPopup::updateRemapButtons

* add arg names (geode-sdk#875)

* editorui tests windows

* Bindings for @SorkoPiko

* ccGLBindTexture2DN thanks prevter

* guess CCParticleSystem::resumeSystem may be wrong

* LevelListLayer::create crash fixed (geode-sdk#877)

* changes return type of GJBGL::addToSpeedObjects (geode-sdk#876)

* use the actual ctor

* two random bindings

* padless levelinfolayer

* Fix SetupTriggerPopup virtuals

* the mac

* addToggle + ratio

* InfoLayer onClose

* unregisterScriptKeypadHandler

* RateStarsLayer create

* two bindings for @Alphalaneous

* GJShopLayer and ShardsPage virtual functions

* LevelBrowserLayer updatePageLabel

* CCNodeContainer

* Some bindings for @Jouca

* Bindings for @SorkoPiko and @covernts

* CCLabelTTF

* gauntlet stuff i guess

* define vaargs ccspawn method inline for mac

* testing on prod!

This reverts commit d994347.

* update cpm to 0.40.2

* update broma, allow va args

* bring back ccspawn create inline

* ubuntu-latest strikes yet again

* FMODAudioEngine::getChannelGroup

* add bonus

* cocos2d::CCSpriteBatchNode::create macos

* updateLabel fix

* fix initWithFade

* three bindings for happy textures

* ccmenu initwitharray

* rest of happy textures bindings

* PlayerObject::runNormalRotation

* Fill out more of EnhacnedGameObject's Class members and other missing… (geode-sdk#860)

* Fill out more of EnhacnedGameObject's Class members and other missing functions

* Update GeometryDash.bro

* Update GeometryDash.bro

* Update GeometryDash.bro

* Update GeometryDash.bro

---------

Co-authored-by: alk <45172705+altalk23@users.noreply.github.com>

* GameObject::addGlow (geode-sdk#878)

* CCAnimateFrameCache

* a few playerobject funcs for silicon

* gjbgl switches

* PlayerObject::toggleVisibility for @covernts

* shouldExitHackedLevel() m1 mac

* FriendsProfilePage::onUpdate for windows (geode-sdk#879)

* GravityEffectSprite

* fix CCSprite create with rect

* return types for some EndLevelLayer methods (geode-sdk#880)

* Mac bindings for EndLevelLayer methods (geode-sdk#881)

* Mac bindings for EndLevelLayer methods

* oops

* please (geode-sdk#882)

* small thing

* small thing 2

* GJSmartTemplate and other classes (geode-sdk#883)

* GJSmartTemplate and other classes

* oh my lord

* cocso2d

* uhhhh

* revert verify

* SecretLayer2::scene for Viper (geode-sdk#884)

* GJPathSprite stuff

* day before yesterday I saw a rabbit, and yesterday a deer, and today, you. (geode-sdk#885)

* Fix EditLevelLayer and LevelPage constructors

* PlayLayer::createCheckpoint

* CCBlockLayer stuffs

* GameStatsManager::unlockSpecialChest for @GDColon

* Update verify.yml

* macOS BetterEdit bindings

* add poolmanager to 2.2704

* CCPoolManager::pop for @Alphalaneous

* did i really just do that

* A few EditorUI members

* absolute cinema

* EditorUI size checks
588 2300 empire

* hi, please don't hook these, thanks

* Two other bindings

* idk

* some UILayer offsets

* fix invalid syntax & iOS binding (geode-sdk#887)

* Update GeometryDash.bro

* Update GeometryDash.bro

* Update GeometryDash.bro (geode-sdk#888)

m_property534 -> m_controlID (EffectGameObject property rename)

* Bindings for @RayDeeUx

* "Overwrite all" in SyncBromaScript

* colorAllLines inline

* fixbug

* fixbug

* GameObjectEditorState

* what

* OH MY

* Okay I think I got it

* fix two macos bindings

* AnimatedGameObject and SetupAnimationPopup

* Fix function conventions in SyncBromaScript

* add return type, docs and function kind in json codegen data

* win 0xad710 @Cvolton (geode-sdk#890)

* StatsLayer create

* TOSPopup create

* add fancy popscenes

* LoadingCircleSprite bindings

* A few bindings for @Naxrin

* UpdateLabelXY iOS Binding (geode-sdk#891)

* Update GeometryDash.bro

* Update GeometryDash.bro

* Update GeometryDash.bro

* Fix global functions (geode-sdk#892)

* Fix global functions

* update actions

* Bindings for @willy-270

* BIndings for @deeprsnancex

* EditorUI::playtestStopped for @Hbg1010

* Icon Ninja bindings for @undefined06855

* bump broma, json, and fmt to match loader

* fix linux (geode-sdk#893)

* KeyframeGameObject and other classes (geode-sdk#894)

* LevelEditorLayer::removeObject for @Alphalaneous

* EditorUI::canSelectObject (geode-sdk#895)

* a mountaineer one said: 'why do we climb mountains? because they are there.'

* Remove comment

---------

Co-authored-by: Ashton <38200084+Alphalaneous@users.noreply.github.com>

* add createLoop and fix addToGroup return type

* LevelTools::timeForPos (Windows)

* GameObject::isSpawnableTrigger by @AnhNguyenlost13

* inline CCNodeRGBA::create on macos too

* CCNodeRGBA::create

* a few editor bindings

* editor bindings (geode-sdk#896)

* LevelEditorLayer::dirtifyTriggers

* wth

* return type

* EditorPauseLayer bindings (geode-sdk#897)

* LevelEditorLayer::addObjectToGroup for anh (geode-sdk#898)

* mac for LevelEditorLayer::addObjectToGroup for anh

* windows inline

* LevelTools::timeForPos (macOS)

* Add toggleMusicInPractice function return type and some 2.206 thing lol (geode-sdk#899)

* Update GeometryDash.bro

* There

* it's a int

* i'm assume it's void since it sets a hex address

* Update GeometryDash.bro

* Update GeometryDash.bro

* fix

* todo

* LevelTools::posForTime

* addGVToggle changes (geode-sdk#900)

* minor inconvenience

* 🧌

* Revert "addGVToggle changes (geode-sdk#900)" (geode-sdk#902)

This reverts commit 78639b9.

* A few arg names for GJOptionsLayer

* whoops

* LevelEditorLayer::getLastObjectX

* DrawGridLayer::timeForPos

* SetupTimeWarpPopup + GJEffectManager::colorExists

* Update GeometryDash.bro

* purge a few intel macos bindings

* add some bindings

* more mac bindings (geode-sdk#903)

* add matrix stuff

* FMODAudioEngine ctor and setupAudioEngine for mac

* setProjection

* const

* no const

* remove kazmath

* UILayer onCheck

* add CCScene ctor

* playSpeedParticle return type

---------

Co-authored-by: SpaghettDev <37266659+SpaghettDev@users.noreply.github.com>
Co-authored-by: NDrLEUxcwQsgKUWlrFELocR1z7QP <54683950+maxnut@users.noreply.github.com>

* endlevel animation player things (geode-sdk#889)

accidentally found for fun

* CCSpriteWithHue::shaderBody

* Some GhostTrailEffect bindings for @Naxrin

* getSFXIDs getSongIDs addresses (geode-sdk#904)

LevelEditorLayer::getSFXIDs address
LevelEditorLayer::getSongIDs address

* Random bindings for tutorial (geode-sdk#905)

* getSFXIDs / getSongIDs return types

* GhostTrailEffect

* edittriggerspopup create win (geode-sdk#906)

* DialogObject constructor

* EnhancedGameObject & GameObject stuff for Viper (geode-sdk#908)

* EnhancedGameObject::customObjectSetup windows for Viper

* Add const to some GameObject funcs

* rename property 155 156 + ccblocklayer create

* Fix member tests

* some gjbgl funcs

* EditorUI::getGroupCenter

* GameObject, EnhancedGameObject, and EffectGameObject virtual functions

* Fix virtual return types

* Other tutorial bindings

* getSongIDs and getSFXIDs for @Taswert

* CustomSongLayer::onSearch

* fix those two

* ccDrawLines and ccDrawRect

* A few EditButtonBar changes

* Rename m_unk1008 to m_background

* Update GeometryDash.bro (geode-sdk#910)

* Update GeometryDash.bro (geode-sdk#909)

* GJGroundLayer

* GJMGLayer

* GJGradientLayer, GradientTriggerObject, and SetupGradientPopup

* add that one drawRect overload that apparently was added after 2.200?

* ok wtf

* tryUpdateSpeedObject (m1)

* some win addresses and GJBaseGameLayer member (geode-sdk#912)

* Update GeometryDash.bro

* Update Android32.cpp

* Update Android64.cpp

* EditorUI::processSelectObjects (geode-sdk#914)

* dhsajdkdshdhkjashfljkdfh

* what are the chances

* forgot i had a few here

* GJEffectManager::playerButton

* ProfilePage::onUpdate

* Two EffectGameObject members

* InfoLayer::onRefreshComments

* Bindings for @Uproxide

* A few editor bindings for macOS

* GJBaseGameLayer::loadStartPosObject and StartPosObject::loadSettingsFromString (geode-sdk#917)

* Fix ZipUtils::base64URLDecode (geode-sdk#916)

* more editor bindings (geode-sdk#915)

* ugh

* asfjksajfkdsjf

* oops

* 3dl blend (geode-sdk#918)

* Some PlayLayer members

* PlayLayer macOS check

* PlayLayer iOS check

* GJGarageLayer::node() for macOS Intel by @dankmeme01 (geode-sdk#919)

* Rename a few PlayLayer members

* getRelativeSpriteColor (geode-sdk#920)

* fix(SyncBromaScript): Remove that stupid little hack

* add CCSpriteWithHue funcs for mac

* whoops forgot frameName

* GJItemIcon changes (m_player type change, constructor fix)

* CCAnimatedSprite::runAnimationForced

* CommunityCreditsPage::goToPage

* SpriteAnimationManager::stopAnimations

* CustomSongLayer::onSongBrowser for @OmgRod

* Fix UIPOptionsLayer inheritance

* Bruh

* Oh my God

* GJUINode and other classes

* Attempt to fix EnhancedGameObject members

* CreateParticlePopup and other classes (geode-sdk#921)

* First moves

* Commit the addresses

* Commit the members

* Whoops...

---------

Co-authored-by: Jasmine <52604018+hiimjustin000@users.noreply.github.com>

* Some bindings for @anatom3000

* A bunch of cocos bindings

* Add CCActionEase

* semicoon

* go back 2 commits

* SetupAnimSettingsPopup and SpecialAnimGameObject

* ArtTriggerGameObject and SetupArtSwitchPopup
Accidentally made changes on main :P

* add ccdrawcircle funcs for mac

---------

Co-authored-by: Justin <52604018+hiimjustin000@users.noreply.github.com>
Co-authored-by: TechStudent10 <76978184+TechStudent10@users.noreply.github.com>
Co-authored-by: Zilko <69888540+ZiLko@users.noreply.github.com>
Co-authored-by: Weebifying <70783792+Weebifying@users.noreply.github.com>
Co-authored-by: mat <26722564+matcool@users.noreply.github.com>
Co-authored-by: Erymanthus | RayDeeUx <51521765+RayDeeUx@users.noreply.github.com>
Co-authored-by: Cvolton <cvolton@cvolton.eu>
Co-authored-by: Oleksandr Nemesh <prevter@gmail.com>
Co-authored-by: dankmeme01 <42031238+dankmeme01@users.noreply.github.com>
Co-authored-by: HJfod <60038575+HJfod@users.noreply.github.com>
Co-authored-by: undefined06855 <98057141+undefined06855@users.noreply.github.com>
Co-authored-by: Fire <17692105+FireMario211@users.noreply.github.com>
Co-authored-by: peony <54771118+peonii@users.noreply.github.com>
Co-authored-by: Justin Pridgen <justincpridgen672@gmail.com>
Co-authored-by: SorkoPiko <orion.railean@gmail.com>
Co-authored-by: altalk23 <45172705+altalk23@users.noreply.github.com>
Co-authored-by: ConfiG <cgytrus@cgyt.ru>
Co-authored-by: SpaghettDev <37266659+SpaghettDev@users.noreply.github.com>
Co-authored-by: MarioMastr <84964352+MarioMastr@users.noreply.github.com>
Co-authored-by: Calloc <140273795+CallocGD@users.noreply.github.com>
Co-authored-by: TobyAdd <66429886+TobyAdd@users.noreply.github.com>
Co-authored-by: BitZ <85895666+iArtie@users.noreply.github.com>
Co-authored-by: Chloe <25387744+qimiko@users.noreply.github.com>
Co-authored-by: flurrybun <122103556+flurrybun@users.noreply.github.com>
Co-authored-by: camila314 <47485054+camila314@users.noreply.github.com>
Co-authored-by: speedyfriend433 <speedyfriend13@gmail.com>
Co-authored-by: Taswert <70364736+Taswert@users.noreply.github.com>
Co-authored-by: Capeling <113705504+Capeling@users.noreply.github.com>
Co-authored-by: Ashton <38200084+Alphalaneous@users.noreply.github.com>
Co-authored-by: Anh Nguyen <94160753+AnhNguyenlost13@users.noreply.github.com>
Co-authored-by: Jasmine <52604018+hiimjasmine00@users.noreply.github.com>
Co-authored-by: Viper <100521306+MuhXd@users.noreply.github.com>
Co-authored-by: NDrLEUxcwQsgKUWlrFELocR1z7QP <54683950+maxnut@users.noreply.github.com>
Co-authored-by: Pololak <108807351+Pololak@users.noreply.github.com>
Co-authored-by: BlueBlock6 <66493630+blueblock6@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@altalk23 altalk23 altalk23 left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CallocGD @altalk23