mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 10:52:19 -05:00
Code Issues Projects Releases Wiki Activity

Bump latest LUS and Fix ship menu bar icon (#3935)

Browse Source 
* fix ship menu bar icon

* update cmake in wiiu/switch

* different cmake install

* wrong arch
This commit is contained in:
Archez 2024-02-13 20:55:33 -05:00 committed by GitHub
parent 8a14fea94c
commit c1eb0a8970
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/generate-builds.yml vendored
View File

@ -221,6 +221,9 @@ jobs:
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y ninja-build sudo apt-get install -y ninja-build
sudo apt-get remove -y cmake
wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
- name: Fix dubious ownership error - name: Fix dubious ownership error
if: ${{ vars.LINUX_RUNNER }} if: ${{ vars.LINUX_RUNNER }}
run: git config --global --add safe.directory '*' run: git config --global --add safe.directory '*'
@ -264,6 +267,9 @@ jobs:
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y ninja-build sudo apt-get install -y ninja-build
sudo apt-get remove -y cmake
wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true

2
libultraship

@ -1 +1 @@
Subproject commit 825bd1275bc26a8532f07a887db5141cd635df13 Subproject commit d5a39635a118f814613c0fdd1601f80c809a742d

4
soh/soh/SohMenuBar.cpp
View File

@ -111,11 +111,11 @@ namespace SohGui {
void DrawMenuBarIcon() { void DrawMenuBarIcon() {
static bool gameIconLoaded = false; static bool gameIconLoaded = false;
if (!gameIconLoaded) { if (!gameIconLoaded) {
LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTexture("Game_Icon", "textures/icons/gIcon.png"); LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Game_Icon", "textures/icons/gIcon.png");
gameIconLoaded = true; gameIconLoaded = true;
} }
if (LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Game_Icon")) { if (LUS::Context::GetInstance()->GetWindow()->GetGui()->HasTextureByName("Game_Icon")) {
#ifdef __SWITCH__ #ifdef __SWITCH__
ImVec2 iconSize = ImVec2(20.0f, 20.0f); ImVec2 iconSize = ImVec2(20.0f, 20.0f);
float posScale = 1.0f; float posScale = 1.0f;