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

Merge remote-tracking branch 'origin/2207' into v4

Browse source
This commit is contained in:
matcool 2024-11-10 00:43:28 -03:00
commit 4f837a0f8b
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -189,8 +189,8 @@ include(cmake/Platform.cmake)
include(cmake/GeodeFile.cmake) include(cmake/GeodeFile.cmake)
if (NOT DEFINED GEODE_GD_VERSION) if (NOT DEFINED GEODE_GD_VERSION)
set(GEODE_GD_VERSION 2.206) set(GEODE_GD_VERSION 2.2073)
set(GEODE_COMP_GD_VERSION 22060) set(GEODE_COMP_GD_VERSION 22073)
endif() endif()
target_compile_definitions( target_compile_definitions(

8
loader/include/Geode/cocos/platform/win32/CCEGLView.h vendored
View file

@ -142,7 +142,7 @@ public:
/** /**
* @note RobTop addition * @note RobTop addition
*/ */
void toggleFullScreen(bool fullscreen, bool borderless); void toggleFullScreen(bool fullscreen, bool borderless, bool fix);
/** /**
* @note RobTop addition * @note RobTop addition
@ -185,6 +185,8 @@ public:
protected: protected:
static CCEGLView* s_pEglView; static CCEGLView* s_pEglView;
// @note unknown members here
uint8_t m_unkPad[8];
bool m_bCaptured; bool m_bCaptured;
// Robtop Removal // Robtop Removal
// HWND m_hWnd; // HWND m_hWnd;
@ -203,6 +205,8 @@ protected:
int m_nRetinaFactor; int m_nRetinaFactor;
// @note RobTop Addition // @note RobTop Addition
bool m_bCursorHidden; bool m_bCursorHidden;
// @note may be before m_bCursorHidden
int m_unkSize4;
// Robtop Removal // Robtop Removal
// LPCWSTR m_menu; // LPCWSTR m_menu;
// Robtop Removal // Robtop Removal
@ -225,6 +229,8 @@ public:
// @note RobTop Addition // @note RobTop Addition
bool m_bIsBorderless; bool m_bIsBorderless;
// @note RobTop Addition // @note RobTop Addition
bool m_bIsFix;
// @note RobTop Addition
bool m_bShouldHideCursor; bool m_bShouldHideCursor;
// @note RobTop Addition // @note RobTop Addition
bool m_bCursorLocked; bool m_bCursorLocked;

BIN
loader/include/link/win64/libcocos2d.lib
View file

Binary file not shown.

4
loader/src/platform/windows/gdTimestampMap.hpp
View file

@ -32,6 +32,10 @@ static auto const& getGDVersionTimestampMap() {
{ 1704948277, "2.203" }, { 1704948277, "2.203" },
{ 1705041028, "2.204" }, { 1705041028, "2.204" },
{ 1717243515, "2.206" }, { 1717243515, "2.206" },
{ 1731098609, "2.207" },
{ 1731117052, "2.2071" },
{ 1731130219, "2.2072" },
{ 1731156923, "2.2073" },
}; };
return map; return map;
} }