Skip to content

Commit b3f8855

Browse files
authored
Merge branch 'geode-sdk:main' into node-events
2 parents 80a043a + 98c210e commit b3f8855

66 files changed

Lines changed: 1525 additions & 775 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Geode Changelog
22

3+
## v5.5.3
4+
* Use legacy messages for detecting isDown (5d0e824)
5+
* Dont show unloaded mods in keybinds popup (f72a7cc)
6+
* Fix MDTextArea culling (#1975)
7+
* Enforce UTF-8 when calculating hashes (4cec228)
8+
9+
## v5.5.2
10+
* Fix transition breaking the Sapphire Popup
11+
12+
## v5.5.1
13+
* Fix JIT-less iOS bug
14+
15+
## v5.5.0
16+
* Add `allow-in-text-inputs` option for keybinds (d57cd23)
17+
* Add `LogFormatEvent` to allow for registering custom object formatters (d1589cb)
18+
* Add more default formatters and implement raw specifier (#1890)
19+
* Add warning popup when disabling mod with dependencies (ec2f06d)
20+
* Add check for GD version while building a mod (0d97b3f)
21+
* Implement url checks to `openLinkInBrowser`, and then add `openLinkUnsafe` as an alternative (#1971)
22+
* Allow setting Escape as a keybind (5d63661)
23+
* Fix stuck inputs bug with modifier keys (c6bae4f)
24+
* Fix mouse events being triggered when clicking the titlebar on Windows (ffd8b86)
25+
* Fix CTRL key being stuck after zooming with the trackpad on specific hardware (ba1d352)
26+
* Force web progress callbacks to be destroyed on main thread (80a912d)
27+
* Fix a crash in the Android crash handler while including a check for crash handler crashes (85ef2bf)
28+
* Fix data race in `EventCenterGlobal` which caused some event crashes (f7117da)
29+
* Fix use-after-free with a null assignment to a `WeakRef` (bb849a6)
30+
* Show generic source icon for mods not hosted on GitHub (ad76de8)
31+
* Improvements to the crash handler on macOS and iOS (04e8eeb, 0bb8fca, 27fc7fd)
32+
333
## v5.4.1
434
* Revert `CCEGLView::get` change (9cdbf5c)
535
* Fix crash when entering Geode menu without resources (000c5a1, 5b4210e)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.1
1+
5.5.3

cmake/GeodeFile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ function(package_geode_resources_now proname src dest header_dest)
395395
if (NOT FILE_NAME STREQUAL ".geode_cache" AND NOT FILE_SHOULD_TEXT_HASH EQUAL -1)
396396

397397
# create list of lines form the contens of a file
398-
file(STRINGS ${file} LINES)
398+
file(STRINGS ${file} LINES ENCODING UTF-8)
399399
list(JOIN LINES "" JOINED)
400400
# compute hash of the lines
401401
string(LENGTH "${JOINED}" FILE_SIZE)
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
!insertmacro LANGFILE_EXT German
22

33
!pragma warning disable 6030
4-
${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dieses Setup führt Sie durch die Installation von $(^NameDA).$\r$\n$\r$\nBevor Sie die Installation starten, stellen Sie sicher, dass Geometry Dash nicht rennt.$\r$\n$\r$\n$_CLICK"
5-
${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Dieses Setup führt Sie durch die Deinstallation von $(^NameDA).$\r$\n$\r$\nBevor Sie die Deinstallation starten, stellen Sie sicher, dass Geometry Dash nicht rennt.$\r$\n$\r$\n$_CLICK"
4+
${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dieses Setup führt Sie durch die Installation von $(^NameDA).$\r$\n$\r$\nBevor Sie die Installation starten, stellen Sie sicher, dass Geometry Dash geschlossen ist.$\r$\n$\r$\n$_CLICK"
5+
${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Dieses Setup führt Sie durch die Deinstallation von $(^NameDA).$\r$\n$\r$\nBevor Sie die Deinstallation starten, stellen Sie sicher, dass Geometry Dash geschlossen ist.$\r$\n$\r$\n$_CLICK"
66
!pragma warning default 6030
77

88
; installer
99

10-
${LangFileString} GEODE_TEXT_GD_MISSING "$\r$\n$\r$\nIn diesem Pfad ist Geometry Dash nicht installiert!"
11-
${LangFileString} GEODE_TEXT_GD_OLD "$\r$\n$\r$\nIhre Geometry Dash Version ist zu alt für diese Version von Geode!"
12-
${LangFileString} GEODE_TEXT_GD_RUNNING "Please close Geometry Dash before installing Geode."
13-
${LangFileString} GEODE_TEXT_MOD_LOADER_ALREADY_INSTALLED "In diesem Pfad sind andere Mods installiert!$\r$\nSie werden von Geode überschrieben. (the dll trademark)"
14-
${LangFileString} GEODE_TEXT_INSTALLING_VCREDIST "Installing VS Runtime. Check the taskbar for any new open windows..."
10+
${LangFileString} GEODE_TEXT_GD_MISSING "$\r$\n$\r$\nGeometry Dash ist in diesem Ordner nicht installiert!"
11+
${LangFileString} GEODE_TEXT_GD_OLD "$\r$\n$\r$\nIhre Geometry Dash-Version ist zu alt für diese Version von Geode!"
12+
${LangFileString} GEODE_TEXT_GD_RUNNING "Bitte schließen Sie Geometry Dash, bevor Sie Geode installieren."
13+
${LangFileString} GEODE_TEXT_MOD_LOADER_ALREADY_INSTALLED "In diesem Ordner sind andere Mods installiert!$\r$\nDiese werden von Geode überschrieben. (the dll trademark)"
14+
${LangFileString} GEODE_TEXT_INSTALLING_VCREDIST "Die VS Runtime wird installiert. Bitte achten Sie auf neue Fenster in der Taskleiste..."
1515

1616
; uninstaller
1717

18-
${LangFileString} GEODE_UNTEXT_GEODE_MISSING "In diesem Pfad ist Geode nicht installiert!"
18+
${LangFileString} GEODE_UNTEXT_GEODE_MISSING "In diesem Ordner ist Geode nicht installiert!"

installer/windows/Language Files/PolishExtra.nsh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Instalator przeprowadzi Cię prz
99

1010
${LangFileString} GEODE_TEXT_GD_MISSING "$\r$\n$\r$\nGeometry Dash nie jest zainstalowane w tym folderze!"
1111
${LangFileString} GEODE_TEXT_GD_OLD "$\r$\n$\r$\nTwoja wersja Geometry Dash jest zbyt stara dla tej wersji Geode!"
12-
${LangFileString} GEODE_TEXT_GD_RUNNING "Please close Geometry Dash before installing Geode."
12+
${LangFileString} GEODE_TEXT_GD_RUNNING "Proszę zamknąć Geometry Dash przed instalacją Geode!"
1313
${LangFileString} GEODE_TEXT_MOD_LOADER_ALREADY_INSTALLED "W tym folderze zainstalowane są inne modyfikacje!$\r$\nZostaną one zastąpione przez Geode. (the dll trademark)"
14-
${LangFileString} GEODE_TEXT_INSTALLING_VCREDIST "Installing VS Runtime. Check the taskbar for any new open windows..."
14+
${LangFileString} GEODE_TEXT_INSTALLING_VCREDIST "Instalowanie VS Runtime. Sprawdż pasek zadań dla otwartych okien"
1515

1616
; uninstaller
1717

loader/hash/hash.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ std::string calculateHash(std::span<const uint8_t> data) {
3030
std::vector<uint8_t> hash(picosha2::k_digest_size);
3131
picosha2::hash256(data.begin(), data.end(), hash);
3232
return picosha2::bytes_to_hex_string(hash.begin(), hash.end());
33-
}
33+
}

loader/include/Geode/cocos/platform/win32/CCFileUtilsWin32.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ class CC_DLL CCFileUtilsWin32 : public CCFileUtils
5555
virtual bool isFileExist(const gd::string& strFilePath);
5656
virtual bool isAbsolutePath(const gd::string& strPath);
5757

58-
virtual bool init();
59-
6058
/**
6159
* Gets full path for filename, resolution directory and search path.
6260
*

0 commit comments

Comments
 (0)