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 into main

Browse source
This commit is contained in:
HJfod 2023-08-06 22:52:31 +03:00
commit 656b58b7bf
6 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View file

@ -147,11 +147,18 @@ jobs:
dest: geode-${{ steps.ref.outputs.hash }}-win.zip
# TODO change in 2.0.0
- name: Zip Resources
- name: Zip Windows Resources
uses: vimtor/action-zip@v1.1
with:
files: geode-win/resources
dest: resources.zip
dest: resources-win.zip
# This is basically a hack because of line endings. Blame windows.
- name: Zip MacOS Resources
uses: vimtor/action-zip@v1.1
with:
files: geode-mac/resources
dest: resources-mac.zip
- name: Update Nightly Release
uses: andelf/nightly-release@main
@ -167,4 +174,5 @@ jobs:
./geode-installer-${{ steps.ref.outputs.hash }}-win.exe
./geode-${{ steps.ref.outputs.hash }}-mac.zip
./geode-${{ steps.ref.outputs.hash }}-win.zip
./resources.zip
./resources-win.zip
./resources-mac.zip

6
.github/workflows/draft.yml vendored
View file

@ -28,7 +28,8 @@ jobs:
mv dev/geode-installer-*-win.exe geode-installer-v${{ steps.ref.outputs.version }}-win.exe
mv dev/geode-*-mac.zip geode-v${{ steps.ref.outputs.version }}-mac.zip
mv dev/geode-*-win.zip geode-v${{ steps.ref.outputs.version }}-win.zip
mv dev/resources.zip resources.zip
mv dev/resources-win.zip resources-win.zip
mv dev/resources-mac.zip resources-mac.zip
- name: Create Draft Release
uses: softprops/action-gh-release@v1
@ -48,4 +49,5 @@ jobs:
./geode-installer-v${{ steps.ref.outputs.version }}-win.exe
./geode-v${{ steps.ref.outputs.version }}-mac.zip
./geode-v${{ steps.ref.outputs.version }}-win.zip
./resources.zip
./resources-win.zip
./resources-mac.zip

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Geode Changelog
## v1.1.0
* Fix json library not actually being dynamically exported/imported (5f65d97)
* Update TulipHook, gets rid of keystone dependency and adds stdcall support (efcbf58, 7b90903)
* Make resources.zip platform dependent (e41784e)
## v1.0.3
* Fix mod changelogs only showing Geode's own changelog (2945422)
* Fix some filesystem functions for Geode running under wine (7a83354)

9
CMakeLists.txt
View file

@ -96,18 +96,15 @@ 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#4369d05")
CPMAddPackage("gh:geode-sdk/TulipHook#f77ccbe")
set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)
# Silence warnings from dependencies
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-Wno-everything SUPPORTS_W_NO_EVERYTHING)
if (SUPPORTS_W_NO_EVERYTHING)
if (TARGET capstone-static)
target_compile_options(capstone-static PRIVATE -Wno-everything)
endif()
if (TARGET keystone)
target_compile_options(keystone PRIVATE -Wno-everything)
if (TARGET capstone)
target_compile_options(capstone PRIVATE -Wno-everything)
endif()
endif()

4
loader/include/Geode/cocos/platform/win32/CCControllerState.h vendored
View file

@ -12,8 +12,8 @@ class CC_DLL CCControllerState
public:
DWORD m_packetNumber;
WORD m_buttons;
byte m_leftTrigger;
byte m_rightTrigger;
unsigned char m_leftTrigger;
unsigned char m_rightTrigger;
short m_thumbLX;
short m_thumbLY;
short m_thumbRX;

4
loader/src/loader/LoaderImpl.cpp
View file

@ -577,7 +577,7 @@ void Loader::Impl::downloadLoaderResources(bool useLatestRelease) {
.json()
.then([this](json::Value const& json) {
this->tryDownloadLoaderResources(fmt::format(
"https://github.com/geode-sdk/geode/releases/download/{}/resources.zip",
"https://github.com/geode-sdk/geode/releases/download/{}/resources-" GEODE_PLATFORM_SHORT_IDENTIFIER ".zip",
this->getVersion().toString()
), true);
})
@ -605,7 +605,7 @@ void Loader::Impl::downloadLoaderResources(bool useLatestRelease) {
// find release asset
for (auto asset : root.needs("assets").iterate()) {
auto obj = asset.obj();
if (obj.needs("name").template get<std::string>() == "resources.zip") {
if (obj.needs("name").template get<std::string>() == "resources-" GEODE_PLATFORM_SHORT_IDENTIFIER ".zip") {
this->tryDownloadLoaderResources(
obj.needs("browser_download_url").template get<std::string>(),
false