7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into 1.4.0-dev

Browse source
This commit is contained in:
altalk23 2023-09-10 15:54:26 +03:00
commit 19ad688fcc
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -96,7 +96,7 @@ if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS)
set(TULIP_LINK_SOURCE ON)
endif()
set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
CPMAddPackage("gh:geode-sdk/TulipHook#2e4cb5a")
CPMAddPackage("gh:geode-sdk/TulipHook#3423a29")
set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)
# Silence warnings from dependencies

6
bindings/Cocos2d.bro
View file

@ -291,7 +291,7 @@ class cocos2d::CCEGLViewProtocol {
auto getScaleX() const = mac 0x29e300;
auto getScaleY() const = mac 0x29e310;
virtual auto setDesignResolutionSize(float, float, ResolutionPolicy);
auto setFrameSize(float, float) = mac 0x29d960;
virtual void setFrameSize(float, float) = mac 0x29d960;
}
[[link(win)]]
@ -318,6 +318,7 @@ class cocos2d::CCFileUtils : cocos2d::TypeInfo {
class cocos2d::CCGLProgram {
auto setUniformsForBuiltins() = mac 0x232c70;
auto use() = mac 0x231d70;
bool compileShader(unsigned int* shader, unsigned int type, const char* source);
}
[[link(win)]]
@ -891,6 +892,7 @@ class cocos2d::CCSet {
class cocos2d::CCShaderCache {
static auto sharedShaderCache() = mac 0xe6d10;
auto programForKey(const char*) = mac 0xe7d40;
void reloadDefaultShaders();
}
[[link(win)]]
@ -1277,4 +1279,4 @@ class pugi::xml_document {
~xml_document() = mac 0x393b50;
}
// clang-format on
// clang-format on

4
bindings/GeometryDash.bro
View file

@ -3045,7 +3045,9 @@ class GameManager : GManager {
void loadGround(int) = mac 0x1cc8e0, win 0xc9a50;
void reloadAll(bool, bool, bool) = mac 0x1d08a0, win 0xce950;
void reloadAllStep2() = mac 0x1d0940, win 0xce9e0, ios 0x23b1f4;
void reloadAllStep5() = mac 0x1d0b00;
void reloadAllStep3() = win 0xceb10;
void reloadAllStep4() = win 0xceb80;
void reloadAllStep5() = mac 0x1d0b00, win 0xcebf0;
void reportPercentageForLevel(int, int, bool) = mac 0x1c5b00;
void setGameVariable(const char*, bool) = mac 0x1cca80, win 0xc9b50;
void setIntGameVariable(const char*, int) = mac 0x1cd0e0, win 0xca230;

1
cmake/Platform.cmake
View file

@ -46,6 +46,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
target_link_libraries(${PROJECT_NAME} INTERFACE
"-framework Cocoa"
"-framework OpenGL"
${CURL_LIBRARIES}
${GEODE_LOADER_PATH}/include/link/libfmod.dylib
)

2
loader/include/Geode/cocos/shaders/CCGLProgram.h vendored
View file

@ -271,7 +271,7 @@ public:
*/
inline const GLuint getProgram() { return m_uProgram; }
protected:
private:
bool updateUniformLocation(GLint location, GLvoid* data, unsigned int bytes);
const char* description();
bool compileShader(GLuint * shader, GLenum type, const GLchar* source);

4
loader/src/hooks/MenuLayer.cpp
View file

@ -208,14 +208,14 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
#ifdef GEODE_IS_DESKTOP
(void) utils::file::createDirectoryAll(dirs::getGeodeDir() / "update" / "resources");
(void) utils::file::createDirectoryAll(dirs::getGeodeDir() / "update" / "resources" / "geode.loader");
createQuickPopup(
"Missing Textures",
"You appear to be missing textures, and the automatic texture fixer "
"hasn't fixed the issue.\n"
"Download <cy>resources.zip</c> from the latest release on GitHub, "
"and <cy>unzip its contents</c> into <cb>geode/update/resources</c>.\n"
"and <cy>unzip its contents</c> into <cb>geode/update/resources/geode.loader</c>.\n"
"Afterwards, <cg>restart the game</c>.\n"
"You may also continue without installing resources, but be aware that "
"you won't be able to open <cr>the Geode menu</c>.",