Merge 4a40835f71 into df24b24c44

add param names to the correct place this time!
bump version to 4.0.1
2024-11-30 03:15:38 -05:00 · 2024-11-20 18:05:21 -05:00 · 2024-11-20 23:14:30 +01:00 · 2024-11-20 22:39:54 +01:00 · 2024-11-20 21:56:51 +01:00
4 changed files with 11 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,8 @@
 # Geode Changelog

+## v4.0.1
+ * Add cutoff constructor for CCRenderTexture (#1171)
+
 ## v4.0.0
 * Make chosen display type in mod list be saved between startups (07d92a3)
 * Fix `Task::all` not returning results in order (227adb0)
--- a/2
+++ b/2
@ -1 +1 @@
-4.0.0
+4.0.1
--- a/loader/include/Geode/cocos/misc_nodes/CCRenderTexture.h
+++ b/loader/include/Geode/cocos/misc_nodes/CCRenderTexture.h
@ -61,6 +61,8 @@ class CC_DLL CCRenderTexture : public CCNode
    */
    CC_PROPERTY(CCSprite*, m_pSprite, Sprite)
 public:
+    GEODE_CUSTOM_CONSTRUCTOR_COCOS(CCRenderTexture, CCNode)
+
    /**
     * @js ctor
     */
--- a/loader/include/Geode/cocos/support/zip_support/ZipUtils.h
+++ b/loader/include/Geode/cocos/support/zip_support/ZipUtils.h
@ -155,12 +155,12 @@ namespace cocos2d
        static gd::string base64EncodeEnc(gd::string const&, gd::string);
        static gd::string base64URLDecode(gd::string const&);
        static gd::string base64URLEncode(gd::string const&);
-        static int ccDeflateMemory(unsigned char*, unsigned int, unsigned char**);
+        static int ccDeflateMemory(unsigned char* data, unsigned int size, unsigned char** out);
        static int ccDeflateMemoryWithHint(unsigned char*, unsigned int, unsigned char**, unsigned int);
-        static gd::string compressString(gd::string const&, bool, int);
-        static gd::string decompressString(gd::string const&, bool, int);
-        static gd::string decompressString2(unsigned char*, bool, int, int);
-        static gd::string encryptDecrypt(gd::string const&, int);
+        static gd::string compressString(gd::string const& data, bool encrypt, int encryptionKey);
+        static gd::string decompressString(gd::string const& data, bool encrypt, int encryptionKey);
+        static gd::string decompressString2(unsigned char* data, bool encrypt, int size, int encryptionKey);
+        static gd::string encryptDecrypt(gd::string const& data, int encryptionKey);
        static gd::string encryptDecryptWKey(gd::string const&, gd::string);
        static unsigned char hexToChar(const gd::string&);
        static gd::string urlDecode(const gd::string&);
Author	SHA1	Message	Date
Justin	c250caa017	Merge `4a40835f71` into `df24b24c44`	2024-11-20 18:05:21 -05:00
dankmeme01	df24b24c44	add param names to the correct place this time! Some checks failed Build Binaries / Build Windows (push) Has been cancelled Details Build Binaries / Build macOS (push) Has been cancelled Details Build Binaries / Build Android (64-bit) (push) Has been cancelled Details Build Binaries / Build Android (32-bit) (push) Has been cancelled Details Check CHANGELOG.md / Check CHANGELOG.md (push) Has been cancelled Details Build Binaries / Publish (push) Has been cancelled Details	2024-11-20 23:14:30 +01:00
Cvolton	ed97f3b040	bump version to 4.0.1	2024-11-20 22:39:54 +01:00
Oleksandr Nemesh	aee27805e5	add cutoff constructor for CCRenderTexture (#1171 )	2024-11-20 21:56:51 +01:00
 @ -1 +1 @@
 .0.0
 .0.1