mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
912 Commits 3 Branches 36 Tags 132 MiB
Commit Graph

912 Commits

Author SHA1 Message Date
aMannus 0b722eebd4 Merge branch 'develop-zhora' into zhora-rando-next-merge 2022-08-09 08:44:05 +02:00
aMannus e4b58e5a0c
TWEAK: Layout/styling overhaul for the F1 menu (#1026) 
* First pass of UX changes

* More padding/styling/layout

* More styling

* Moar styling

* Some more styling

* Implemented padding helpers

* More styling, added closing buttons to windows

* Fixed merge conflict mistake

* Fixed new enhancements

* Hopefully fix jenkins errors

* Changed button behaviour, more styling

* Tiny code cleanup

* Change buttons from close/open to > when open

* Small button spacing fix

* Small styling changes after merge

* Small fix after merge mistake
 2022-08-09 02:16:45 -04:00
briaguya b949440fd1
Merge pull request #1108 from leggettc18/rando-custom-message-fixes 
Rando-custom-message-fixes
 2022-08-08 23:58:27 -04:00
Christopher Leggett b9e18519a2
Removes Skulltula text auto-dismiss in tokensanity 
More precisely, removes the auto-dimissal from the Skulltula
textbox when in a rando save and any token shuffle is on.
Bonus Fix: parses the Skullsanity setting from the spoilerfile,
which wasn't happening before.
 2022-08-08 23:40:02 -04:00
Christopher Leggett ffc36efe50
Reimplements FOWL ice trap text boxes. 
They got lost in the custom-messages merge. Reimplemented them
in the custom-messages system.
 2022-08-08 23:11:45 -04:00
briaguya 13329529f7
Merge pull request #1106 from briaguya-ai/zhora-to-next 
Zhora to next
 2022-08-08 22:37:22 -04:00
briaguya 8410a79b26
Merge branch 'rando-next' into zhora-to-next 2022-08-08 22:27:04 -04:00
briaguya 816fac6c06 Merge branch 'develop-zhora' into zhora-to-next 2022-08-08 22:23:06 -04:00
Kenix3 0d9c390526
Removes no longer desired commented code. (#1105) 2022-08-08 21:53:36 -04:00
Kenix3 b924831eba
Merge pull request #1104 from briaguya-ai/rachael-to-zhora 
rachael -> zhora
 2022-08-08 21:53:04 -04:00
briaguya 317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
briaguya fa090c51f6
Merge pull request #831 from leggettc18/custom-messages 
System for Creating and Storing Custom Messages
 2022-08-08 21:24:48 -04:00
Christopher Leggett e63d84bd7d
Adapts this branch for cmake building. 2022-08-08 21:14:29 -04:00
Kenix3 5581f45050
Adds instructions for Visuals Studio 2019 2022-08-08 21:01:46 -04:00
Josh Bodner b6934b34db
Re-add Windows dependencies to build instructions (#1102) 2022-08-08 20:04:55 -04:00
sholdee 5453c68399
[ci] docker improvements (#1101) 2022-08-08 19:59:43 -04:00
aMannus 4ea7f8371f
Rando: Zelda sequence fixes (#1095) 
* Fixed zelda sequence oddities

* Fixed code inconsistency

* Adressed review comments

* Adressed review comments, removed unneccesary entrance skip

* Addressed some more review comments

* tiny cleanup
 2022-08-08 19:59:06 -04:00
th-2021 c803ff65ce
fix path to ZAPD (#1092) 2022-08-08 19:58:43 -04:00
InfoManiac742 0e10b59307
Update z_kaleido_item.c (#1046) 2022-08-08 19:58:01 -04:00
InfoManiac742 4bf4ad3359
Update z_en_ru1.c (#1042) 2022-08-08 19:56:56 -04:00
lilDavid f80ba4102a
Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -04:00
KiritoDev a4334ecb02
Changed input disable to only be forced on switch (#941) 
* Changed input disable to only be forced on switch

* Inverted if

* Finally fixed validation

* Removed enhancement if its a switch build

* Input now only gets blocked when the device is not a keyboard or its on switch

* Input gets blocked when the controller view is opened

* gControlNav is enabled by default on switch

* Fixed compilation issues
 2022-08-08 19:53:43 -04:00
aMannus a8fea61bda
ADD: Enhancement presets (#926) 
* Proof of concept

* Finished default preset

* Added v1 presets

* Overhauled implementation

Function has been moved out of ImGuilmpl.cpp, and all presets have been put in their own functions so they can be applied in a cascading manner.

Also did some slight changes to the presets themselves.

* Fixed link animation settings

* Deleted unneccesary change

* Fixed missing newlines

* Moved functions back to ImGuilmpl.cpp

* Removed Ironman preset
 2022-08-08 19:52:34 -04:00
Dog 1f5d323d89
Randomizer: Skip Cutscenes (#846) 
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757

Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773

* Immediately give control back to player when talon running cutscene starts.

* Fix case of not skipping Gannon
 2022-08-08 19:48:53 -04:00
briaguya cf639b1d51
SDL/OpenGL - actually use the window resolution from the json (#1082) 
* actually use the window resolution from the json

* switch fix

Co-authored-by: briaguya <briaguya@alice>
 2022-08-08 19:46:37 -04:00
Christopher Leggett 59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-08-08 19:46:09 -04:00
David Chavez 9b33827d02
[ci] Share Generated Assets Across All Platforms (#1074) 2022-08-09 00:02:35 +02:00
David Chavez 9afbe42720
Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
Christopher Leggett 7f233de502
Fixes CMake to explicity launch python interpreter on Windows. (#1089) 2022-08-08 10:31:47 +02:00
briaguya f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora 
quick zhora to rando next
 2022-08-07 21:41:31 -04:00
th-2021 ed9378375d
[cmake] Use static libraries with vcpkg on Windows (#1079) 2022-08-07 18:23:20 +02:00
th-2021 e51e7f3d45
[cmake] Fix Switch icon (#1084) 
* Update CMakeLists.txt

* fix switch icon

* Update soh/CMakeLists.txt

* Update soh/CMakeLists.txt

Co-authored-by: David Chavez <david@dcvz.io>
 2022-08-07 16:47:16 +02:00
briaguya a03ffc90dc
Merge pull request #1081 from garrettjoecox/fixShuffleCowsUI 
Change shuffle cows to checkbox and remove extra line
 2022-08-07 04:12:29 -04:00
Garrett Cox f7267be29a Change shuffle cows to checkbox and remove extra line 2022-08-07 02:10:54 -05:00
briaguya cac6869a56
Merge pull request #1080 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-07 02:16:11 -04:00
briaguya 91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs 
Shuffle frog song rupees
 2022-08-07 02:13:24 -04:00
GaryOderNichts cb2410d9c5 Handle audio thread properly 2022-08-06 21:52:42 -04:00
qurious-pixel b2ac01bc98
[CI] Link Updated SDL2 version (#1078) 2022-08-07 03:52:22 +02:00
David Chavez 1794683d3a Ignore build.c 2022-08-06 21:06:40 -04:00
David Chavez c70e3f38b1 Enable SPD logging in libultra 2022-08-06 21:06:40 -04:00
David Chavez aadabe1ecd Better instructions for VS solutions 2022-08-06 21:06:40 -04:00
briaguya 7f58ef14ee add a command to copy the otr to the build dir 2022-08-06 21:06:21 -04:00
briaguya 8efeceb236 formatting 2022-08-06 21:05:51 -04:00
briaguya 9a126dec4e add version requirements in building.md 2022-08-06 21:05:51 -04:00
briaguya f007ca4d37
Merge pull request #1075 from briaguya-ai/clean-up-cowsanity 
Clean up cowsanity
 2022-08-06 19:07:39 -04:00
briaguya c3253fe59f add comment explaining ocarina mode setting 2022-08-06 18:23:47 -04:00
briaguya 0eb8f5c95f remove commented out lines 2022-08-06 18:15:24 -04:00
briaguya e0d6445f24 remove unused cow stuff 2022-08-06 18:14:01 -04:00
briaguya 46c3541458 seems to be working, still needs cleanup 2022-08-06 18:07:16 -04:00
th-2021 7ef3fff869
add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02:00