7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
This commit is contained in:
altalk23 2023-04-12 11:44:35 +03:00
commit 1aba5ca6dc
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -79,7 +79,7 @@ if (GEODE_DISABLE_FMT_CONSTEVAL)
target_compile_definitions(${PROJECT_NAME} INTERFACE -DFMT_CONSTEVAL=)
endif()
CPMAddPackage("gh:geode-sdk/json#cef9c64")
CPMAddPackage("gh:geode-sdk/json#b92a8af")
CPMAddPackage("gh:fmtlib/fmt#9.1.0")
CPMAddPackage("gh:gulrak/filesystem#3e5b930")

4
bindings/GeometryDash.bro
View file

@ -1891,7 +1891,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
cocos2d::CCDictionary* m_spawnedGroups;
bool m_didUpdateNormalCapacity;
bool m_isDualMode;
int m_unk2AC;
int m_activeEnterEffect;
bool m_activeDualTouch;
int m_attemptClickCount;
int m_lastVisibleSection;
@ -4676,7 +4676,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate {
void flipGravity(bool, bool) = mac 0x21c090, win 0x1f59d0;
void flipMod() = mac 0x21a4c0;
void getActiveMode() = mac 0x22b950, win 0x1f5df0;
void getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870;
float getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870;
void getOldPosition(float) = mac 0x21a830;
void getSecondColor() = mac 0x22cee0;
void gravityDown() = mac 0x22e930;

6
loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h vendored
View file

@ -15,10 +15,8 @@ RT_ADD(
typedef enum
{
// this one might not actually exist in gd itself
HJ_ADD(
KEY_What = -0x01,
KEY_None = 0x00,
)
KEY_Unknown = -0x01,
KEY_None = 0x00,
KEY_Backspace = 0x08,
KEY_Tab = 0x09,
KEY_Clear = 0x0C,

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

@ -160,6 +160,8 @@ namespace geode {
return T();
}
bool hasSavedValue(std::string const& key);
template <class T>
T getSavedValue(std::string const& key) {
auto& saved = this->getSaveContainer();

6
loader/src/loader/Mod.cpp
View file

@ -190,4 +190,8 @@ char const* Mod::expandSpriteName(char const* name) {
ModJson Mod::getRuntimeInfo() const {
return m_impl->getRuntimeInfo();
}
}
bool Mod::hasSavedValue(std::string const& key) {
return this->getSaveContainer().contains(key);
}