Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More HolidaysInHyrule fixes/additions #17

Merged
merged 17 commits into from
Nov 29, 2023
Merged

More HolidaysInHyrule fixes/additions #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3ab16b7
Changed all checks for `!gPlayState` to `!GameInteractor::IsSaveLoade…
Malkierian Nov 27, 2023
717074f
Fix: Missing TextIDs for MQ PAL and change lava size (#3449)
Archez Nov 28, 2023
420bdab
Random Enemy Sizes fixes (#3452)
aMannus Nov 28, 2023
9d215b6
Separate Arrows Equip Dupe Fix (#3450)
inspectredc Nov 28, 2023
621afc9
sort patch otrs (#3430)
briaguya-ai Nov 29, 2023
02256fa
bump LUS to 1.4.0 (#3461)
briaguya-ai Nov 29, 2023
33fe877
Fix bugs dont despawn cheat to work with soil patches (#3457)
Archez Nov 29, 2023
c4f3462
Flag tracker (#3447)
Malkierian Nov 29, 2023
fdcd9a7
Race Integrity QoL (#3445)
garrettjoecox Nov 29, 2023
d523b10
Change declaration of Morpha tentacle verts to combine them all and a…
Rozelette Nov 28, 2023
dd5e72a
limit entrance discovered saving to end of operation (#3459)
Archez Nov 29, 2023
f14c390
[Vanilla Fix] Slow Down Darunia's Dance (#3438)
Malkierian Nov 29, 2023
818addf
delta bump (#3465)
briaguya-ai Nov 29, 2023
58977e7
Merge branch 'develop-macready' into christmas-tree
aMannus Nov 29, 2023
2a886a4
Default magic color, ornament hunt tracker icon, small fix
aMannus Nov 29, 2023
06cd814
Default hearts color
aMannus Nov 29, 2023
4a4a231
Scale down ornament hunt models slightly
aMannus Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(Ship VERSION 8.0.2 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Charlie" CACHE STRING "")
project(Ship VERSION 8.0.3 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Delta" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
Expand Down
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 7 files
+0 −2 .github/workflows/build-validation.yml
+5 −0 src/audio/SDLAudioPlayer.cpp
+1 −0 src/audio/SDLAudioPlayer.h
+11 −2 src/port/switch/SwitchImpl.cpp
+5 −0 src/window/gui/ConsoleWindow.cpp
+1 −0 src/window/gui/ConsoleWindow.h
+2 −1 src/window/gui/StatsWindow.cpp
140 changes: 70 additions & 70 deletions soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<Vertex Version="0">
<Vtx X="0" Y="739" Z="-173" S="495" T="-17" R="0" G="0" B="129" A="255"/>
<Vtx X="0" Y="1084" Z="-173" S="495" T="-529" R="0" G="80" B="157" A="255"/>
<Vtx X="122" Y="1084" Z="-122" S="367" T="-529" R="70" G="80" B="186" A="255"/>
<Vtx X="122" Y="739" Z="-122" S="367" T="-17" R="90" G="0" B="166" A="255"/>
<Vtx X="173" Y="1084" Z="0" S="239" T="-529" R="99" G="80" B="0" A="255"/>
<Vtx X="173" Y="739" Z="0" S="239" T="-17" R="127" G="0" B="0" A="255"/>
<Vtx X="122" Y="1084" Z="122" S="111" T="-529" R="70" G="80" B="70" A="255"/>
<Vtx X="122" Y="739" Z="122" S="111" T="-17" R="90" G="0" B="90" A="255"/>
<Vtx X="0" Y="1084" Z="173" S="-17" T="-529" R="0" G="80" B="99" A="255"/>
<Vtx X="0" Y="739" Z="173" S="-17" T="-17" R="0" G="0" B="127" A="255"/>
<Vtx X="-122" Y="1084" Z="122" S="-145" T="-529" R="186" G="80" B="70" A="255"/>
<Vtx X="-122" Y="739" Z="122" S="-145" T="-17" R="166" G="0" B="90" A="255"/>
<Vtx X="-173" Y="1084" Z="0" S="-273" T="-529" R="157" G="80" B="0" A="255"/>
<Vtx X="-173" Y="739" Z="0" S="-273" T="-17" R="129" G="0" B="0" A="255"/>
<Vtx X="-122" Y="1084" Z="-122" S="-401" T="-529" R="186" G="80" B="186" A="255"/>
<Vtx X="-122" Y="739" Z="-122" S="-401" T="-17" R="166" G="0" B="166" A="255"/>
<Vtx X="-122" Y="739" Z="-122" S="-401" T="-17" R="166" G="0" B="166" A="255"/>
<Vtx X="-122" Y="1084" Z="-122" S="-401" T="-529" R="186" G="80" B="186" A="255"/>
<Vtx X="0" Y="1084" Z="-173" S="-529" T="-529" R="0" G="80" B="157" A="255"/>
<Vtx X="0" Y="739" Z="-173" S="-529" T="-17" R="0" G="0" B="129" A="255"/>
<Vtx X="173" Y="1084" Z="0" S="-27" T="239" R="99" G="80" B="0" A="255"/>
<Vtx X="122" Y="1084" Z="-122" S="-99" T="66" R="70" G="80" B="186" A="255"/>
<Vtx X="0" Y="1084" Z="-173" S="-273" T="-6" R="0" G="80" B="157" A="255"/>
<Vtx X="-173" Y="1084" Z="0" S="-518" T="239" R="157" G="80" B="0" A="255"/>
<Vtx X="-122" Y="1084" Z="-122" S="-446" T="66" R="186" G="80" B="186" A="255"/>
<Vtx X="0" Y="1084" Z="173" S="-273" T="485" R="0" G="80" B="99" A="255"/>
<Vtx X="-122" Y="1084" Z="122" S="-446" T="413" R="186" G="80" B="70" A="255"/>
<Vtx X="122" Y="1084" Z="122" S="-99" T="413" R="70" G="80" B="70" A="255"/>
<Vtx X="-71" Y="1214" Z="25" S="367" T="495" R="27" G="229" B="121" A="255"/>
<Vtx X="-100" Y="1144" Z="25" S="495" T="495" R="38" G="0" B="121" A="255"/>
<Vtx X="-100" Y="1144" Z="-25" S="495" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-71" Y="1214" Z="-25" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-71" Y="1214" Z="-25" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-100" Y="1144" Z="-25" S="495" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-143" Y="1144" Z="0" S="495" T="-187" R="129" G="0" B="0" A="255"/>
<Vtx X="-101" Y="1244" Z="0" S="367" T="-187" R="166" G="90" B="0" A="255"/>
<Vtx X="-100" Y="1144" Z="25" S="495" T="-529" R="38" G="0" B="121" A="255"/>
<Vtx X="-71" Y="1214" Z="25" S="367" T="-529" R="27" G="229" B="121" A="255"/>
<Vtx X="0" Y="1286" Z="0" S="239" T="-187" R="0" G="127" B="0" A="255"/>
<Vtx X="0" Y="1243" Z="25" S="239" T="-529" R="0" G="218" B="121" A="255"/>
<Vtx X="101" Y="1244" Z="0" S="111" T="-187" R="90" G="90" B="0" A="255"/>
<Vtx X="71" Y="1214" Z="25" S="111" T="-529" R="229" G="229" B="121" A="255"/>
<Vtx X="143" Y="1144" Z="0" S="-17" T="-187" R="127" G="0" B="0" A="255"/>
<Vtx X="100" Y="1144" Z="25" S="-17" T="-529" R="218" G="0" B="121" A="255"/>
<Vtx X="101" Y="1043" Z="0" S="-145" T="-187" R="118" G="208" B="0" A="255"/>
<Vtx X="71" Y="1073" Z="25" S="-145" T="-529" R="218" G="15" B="120" A="255"/>
<Vtx X="71" Y="1073" Z="-25" S="-145" T="154" R="218" G="15" B="136" A="255"/>
<Vtx X="100" Y="1144" Z="-25" S="-17" T="154" R="218" G="0" B="135" A="255"/>
<Vtx X="71" Y="1073" Z="25" S="-145" T="495" R="218" G="15" B="120" A="255"/>
<Vtx X="100" Y="1144" Z="-25" S="-17" T="154" R="218" G="0" B="135" A="255"/>
<Vtx X="71" Y="1073" Z="-25" S="-145" T="154" R="218" G="15" B="136" A="255"/>
<Vtx X="100" Y="1144" Z="25" S="-17" T="495" R="218" G="0" B="121" A="255"/>
<Vtx X="71" Y="1214" Z="-25" S="111" T="154" R="229" G="229" B="135" A="255"/>
<Vtx X="71" Y="1214" Z="25" S="111" T="495" R="229" G="229" B="121" A="255"/>
<Vtx X="0" Y="1243" Z="-25" S="239" T="154" R="0" G="218" B="135" A="255"/>
<Vtx X="0" Y="1243" Z="25" S="239" T="495" R="0" G="218" B="121" A="255"/>
<Vtx X="-71" Y="1214" Z="-25" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-71" Y="1214" Z="25" S="367" T="495" R="27" G="229" B="121" A="255"/>
<Vtx X="-101" Y="1244" Z="0" S="367" T="-187" R="166" G="90" B="0" A="255"/>
<Vtx X="0" Y="1286" Z="0" S="239" T="-187" R="0" G="127" B="0" A="255"/>
<Vtx X="101" Y="1244" Z="0" S="111" T="-187" R="90" G="90" B="0" A="255"/>
<Vtx X="143" Y="1144" Z="0" S="-17" T="-187" R="127" G="0" B="0" A="255"/>
<Vtx X="-143" Y="1144" Z="0" S="-529" T="-187" R="129" G="0" B="0" A="255"/>
<Vtx X="-71" Y="1073" Z="25" S="-401" T="-529" R="38" G="15" B="120" A="255"/>
<Vtx X="-100" Y="1144" Z="25" S="-529" T="-529" R="38" G="0" B="121" A="255"/>
<Vtx X="-101" Y="1043" Z="0" S="-401" T="-187" R="138" G="208" B="0" A="255"/>
<Vtx X="-100" Y="1144" Z="-25" S="-529" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-71" Y="1073" Z="-25" S="-401" T="154" R="38" G="15" B="136" A="255"/>
<Vtx X="-100" Y="1144" Z="25" S="-529" T="495" R="38" G="0" B="121" A="255"/>
<Vtx X="-71" Y="1073" Z="25" S="-401" T="495" R="38" G="15" B="120" A="255"/>
<Vtx X="0" Y="665" Z="-155" S="495" T="-17" R="245" G="0" B="129" A="255"/>
<Vtx X="0" Y="843" Z="-155" S="495" T="-529" R="0" G="80" B="157" A="255"/>
<Vtx X="110" Y="843" Z="-110" S="367" T="-529" R="70" G="80" B="186" A="255"/>
<Vtx X="110" Y="665" Z="-110" S="367" T="-17" R="97" G="0" B="175" A="255"/>
<Vtx X="155" Y="843" Z="0" S="239" T="-529" R="99" G="80" B="0" A="255"/>
<Vtx X="155" Y="532" Z="0" S="239" T="-17" R="126" G="0" B="19" A="255"/>
<Vtx X="110" Y="843" Z="110" S="111" T="-529" R="70" G="80" B="70" A="255"/>
<Vtx X="110" Y="532" Z="110" S="111" T="-17" R="90" G="0" B="90" A="255"/>
<Vtx X="0" Y="843" Z="155" S="-17" T="-529" R="0" G="80" B="99" A="255"/>
<Vtx X="0" Y="532" Z="155" S="-17" T="-17" R="0" G="0" B="127" A="255"/>
<Vtx X="-110" Y="843" Z="110" S="-145" T="-529" R="186" G="80" B="70" A="255"/>
<Vtx X="-110" Y="532" Z="110" S="-145" T="-17" R="166" G="0" B="90" A="255"/>
<Vtx X="-155" Y="843" Z="0" S="-273" T="-529" R="157" G="80" B="0" A="255"/>
<Vtx X="-155" Y="532" Z="0" S="-273" T="-17" R="129" G="0" B="0" A="255"/>
<Vtx X="-110" Y="843" Z="-110" S="-401" T="-529" R="186" G="80" B="186" A="255"/>
<Vtx X="-110" Y="532" Z="-110" S="-401" T="-17" R="153" G="0" B="181" A="255"/>
<Vtx X="-110" Y="532" Z="-110" S="-401" T="-17" R="153" G="0" B="181" A="255"/>
<Vtx X="-110" Y="843" Z="-110" S="-401" T="-529" R="186" G="80" B="186" A="255"/>
<Vtx X="0" Y="843" Z="-155" S="-529" T="-529" R="0" G="80" B="157" A="255"/>
<Vtx X="0" Y="665" Z="-155" S="-529" T="-17" R="245" G="0" B="129" A="255"/>
<Vtx X="155" Y="843" Z="0" S="-27" T="239" R="99" G="80" B="0" A="255"/>
<Vtx X="110" Y="843" Z="-110" S="-99" T="66" R="70" G="80" B="186" A="255"/>
<Vtx X="0" Y="843" Z="-155" S="-273" T="-6" R="0" G="80" B="157" A="255"/>
<Vtx X="-155" Y="843" Z="0" S="-518" T="239" R="157" G="80" B="0" A="255"/>
<Vtx X="-110" Y="843" Z="-110" S="-446" T="66" R="186" G="80" B="186" A="255"/>
<Vtx X="0" Y="843" Z="155" S="-273" T="485" R="0" G="80" B="99" A="255"/>
<Vtx X="-110" Y="843" Z="110" S="-446" T="413" R="186" G="80" B="70" A="255"/>
<Vtx X="110" Y="843" Z="110" S="-99" T="413" R="70" G="80" B="70" A="255"/>
<Vtx X="-63" Y="959" Z="22" S="367" T="495" R="27" G="229" B="121" A="255"/>
<Vtx X="-90" Y="896" Z="22" S="495" T="495" R="38" G="0" B="121" A="255"/>
<Vtx X="-90" Y="896" Z="-22" S="495" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-63" Y="959" Z="-22" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-63" Y="959" Z="-22" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-90" Y="896" Z="-22" S="495" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-128" Y="896" Z="0" S="495" T="-187" R="129" G="0" B="0" A="255"/>
<Vtx X="-91" Y="987" Z="0" S="367" T="-187" R="166" G="90" B="0" A="255"/>
<Vtx X="-90" Y="896" Z="22" S="495" T="-529" R="38" G="0" B="121" A="255"/>
<Vtx X="-63" Y="959" Z="22" S="367" T="-529" R="27" G="229" B="121" A="255"/>
<Vtx X="0" Y="1024" Z="0" S="239" T="-187" R="0" G="127" B="0" A="255"/>
<Vtx X="0" Y="986" Z="22" S="239" T="-529" R="0" G="218" B="121" A="255"/>
<Vtx X="91" Y="987" Z="0" S="111" T="-187" R="90" G="90" B="0" A="255"/>
<Vtx X="63" Y="959" Z="22" S="111" T="-529" R="229" G="229" B="121" A="255"/>
<Vtx X="128" Y="896" Z="0" S="-17" T="-187" R="127" G="0" B="0" A="255"/>
<Vtx X="90" Y="896" Z="22" S="-17" T="-529" R="218" G="0" B="121" A="255"/>
<Vtx X="91" Y="805" Z="0" S="-145" T="-187" R="118" G="208" B="0" A="255"/>
<Vtx X="63" Y="833" Z="22" S="-145" T="-529" R="218" G="15" B="120" A="255"/>
<Vtx X="63" Y="833" Z="-22" S="-145" T="154" R="218" G="15" B="136" A="255"/>
<Vtx X="90" Y="896" Z="-22" S="-17" T="154" R="218" G="0" B="135" A="255"/>
<Vtx X="63" Y="833" Z="22" S="-145" T="495" R="218" G="15" B="120" A="255"/>
<Vtx X="90" Y="896" Z="-22" S="-17" T="154" R="218" G="0" B="135" A="255"/>
<Vtx X="63" Y="833" Z="-22" S="-145" T="154" R="218" G="15" B="136" A="255"/>
<Vtx X="90" Y="896" Z="22" S="-17" T="495" R="218" G="0" B="121" A="255"/>
<Vtx X="63" Y="959" Z="-22" S="111" T="154" R="229" G="229" B="135" A="255"/>
<Vtx X="63" Y="959" Z="22" S="111" T="495" R="229" G="229" B="121" A="255"/>
<Vtx X="0" Y="986" Z="-22" S="239" T="154" R="0" G="218" B="135" A="255"/>
<Vtx X="0" Y="986" Z="22" S="239" T="495" R="0" G="218" B="121" A="255"/>
<Vtx X="-63" Y="959" Z="-22" S="367" T="154" R="27" G="229" B="135" A="255"/>
<Vtx X="-63" Y="959" Z="22" S="367" T="495" R="27" G="229" B="121" A="255"/>
<Vtx X="-91" Y="987" Z="0" S="367" T="-187" R="166" G="90" B="0" A="255"/>
<Vtx X="0" Y="1024" Z="0" S="239" T="-187" R="0" G="127" B="0" A="255"/>
<Vtx X="91" Y="987" Z="0" S="111" T="-187" R="90" G="90" B="0" A="255"/>
<Vtx X="128" Y="896" Z="0" S="-17" T="-187" R="127" G="0" B="0" A="255"/>
<Vtx X="-128" Y="896" Z="0" S="-529" T="-187" R="129" G="0" B="0" A="255"/>
<Vtx X="-63" Y="833" Z="22" S="-401" T="-529" R="38" G="15" B="120" A="255"/>
<Vtx X="-90" Y="896" Z="22" S="-529" T="-529" R="38" G="0" B="121" A="255"/>
<Vtx X="-91" Y="805" Z="0" S="-401" T="-187" R="138" G="208" B="0" A="255"/>
<Vtx X="-90" Y="896" Z="-22" S="-529" T="154" R="38" G="0" B="135" A="255"/>
<Vtx X="-63" Y="833" Z="-22" S="-401" T="154" R="38" G="15" B="136" A="255"/>
<Vtx X="-90" Y="896" Z="22" S="-529" T="495" R="38" G="0" B="121" A="255"/>
<Vtx X="-63" Y="833" Z="22" S="-401" T="495" R="38" G="15" B="120" A="255"/>
</Vertex>
Loading
Loading