briaguya
4441304dfd
support LUS not providing an array resource type/factory ( #4204 )
...
* support LUS not providing an array resource type/factory
* bump to latest upstream
2024-06-14 13:40:39 -04:00
briaguya
736dccb00b
update to latest LUS main ( #4202 )
...
Includes supporting changes from:
* https://github.com/HarbourMasters/Shipwright/pull/4197 (alt assets variable changes)
* https://github.com/HarbourMasters/Shipwright/pull/4199 (WindowBackend enum changes)
* https://github.com/HarbourMasters/Shipwright/pull/4200 (Extract gMtxClear)
---------
Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: inspectredc <inspectredc@gmail.com>
2024-06-02 15:34:53 -04:00
briaguya
b8c7c71578
allow setting device visibility in controller mapping window ( #4165 )
2024-06-02 12:13:03 -04:00
Lywx
53efc22a23
Framebuffer clear and bump LUS ( #4187 )
2024-05-27 18:33:02 -04:00
briaguya
ad0e17383e
update nightly links in readme ( #4147 )
2024-05-16 14:55:04 -04:00
Garrett Cox
baf7691fbd
Fix weirdness with item gets from chests ( #4146 )
2024-05-13 12:29:34 -05:00
Pepe20129
08ad16e750
Add path XML parser ( #4115 )
...
* Add path XML parser
* Update SetPathwaysFactory.cpp
2024-05-10 00:17:50 -05:00
Ted Newman
844413b391
Add Modifier buttons to input viewer and support individual button outline modes ( #3966 )
...
* Add Modifier buttons to input viewer and support individual button outline modes
* Clearer naming
* Remove hardcoded indent values
* clean up diff
---------
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-05-09 23:57:31 -04:00
Garrett Cox
6f7173a5c4
Split a few VB changes out into their own files ( #4123 )
2024-05-09 22:22:08 -05:00
Eric Hoey
65b18d61cf
Fix modifiers crash when obtaining underwater item ( #4110 )
...
* NULL check
* Update soh/src/overlays/actors/ovl_player_actor/z_player.c
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Update soh/src/overlays/actors/ovl_player_actor/z_player.c
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
---------
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-09 22:02:50 -05:00
Pepe20129
118cd044b5
Rando: Starting hearts ( #3974 )
...
* Initial implementation
* Re-run build
---------
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-09 21:39:22 -05:00
Eric Hoey
63bc2aff59
Frogs Ocarina Game Difficulty Options ( #3373 )
...
* Frog actor edits, menu, presets
* Block off vanilla code + comments
* fix logic + formatting
* new documentation format
* Update for CVAR changes
* Fix alignment
* Conditions cleanup
* Update soh/soh/SohMenuBar.cpp
Oops, added
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
---------
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
2024-05-09 20:55:53 -05:00
briaguya
23f9654940
update BUILDING.md ( #4128 )
2024-05-09 20:49:32 -05:00
briaguya
5530ce2e61
simplify ci ( #4129 )
2024-05-09 20:45:21 -05:00
Archez
3f67fed073
Fix some memory leaks with WrappedText and LoadArrayByNameAsVec3s ( #4144 )
...
* avoid memory leaks with WrappedText
* avoid memory leak with LoadArrayByNameAsVec3s
2024-05-09 20:39:13 -05:00
Garrett Cox
24e1d45e95
Merge pull request #4130 from Malkierian/dev-to-rando-5-6
...
develop->dev-rando 5-7
2024-05-09 20:13:34 -05:00
Malkierian
1d5a54901b
Add MSI to EnEx hook handler.
...
Resolve other review suggestions.
2024-05-09 09:45:13 -07:00
Pepper0ni
ca803099cf
Fix DistributeHints ( #4145 )
...
* fix stupid crash in DistributeHints
* replace some uint8s in loops with size
2024-05-09 07:22:39 -05:00
Malkierian
baf41161d3
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-08 22:28:29 -07:00
Archez
47b690fb1e
Bump LUS and restore guMtx in collision viewer ( #4137 )
2024-05-09 01:26:58 -04:00
Malkierian
f550bf1381
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-08 21:36:25 -07:00
Archez
cbeec006ec
Fix syotes scene path to use shared ( #4136 )
2024-05-09 00:32:29 -04:00
Malkierian
3bcf178fcc
Fix LUS ref.
2024-05-08 20:24:44 -07:00
Lywx
1231b8f9fa
Fixed macos/ios errors ( #4138 )
2024-05-08 19:30:22 -04:00
briaguya
22c9d53985
bump lus (gfx debugger fix, stormlib optimizations) ( #4135 )
2024-05-08 11:23:43 -04:00
Kenix3
3c87c1ec98
Lus window bump ( #4131 )
2024-05-08 02:25:50 -04:00
briaguya
0976198f2c
get soh working with latest lus ( #4132 )
2024-05-08 00:13:47 -04:00
Malkierian
ee1f15523c
Merge branch 'develop-rando' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-07 14:37:00 -07:00
Malkierian
cfd93f160d
Fix check tracker performance changes.
...
Move Mysterious Shuffle functionality to `hook_handlers.cpp` when applicable.
2024-05-07 13:07:33 -07:00
Pepper0ni
980b1f1a6e
Fix an infinite loop in hints and better comment hint distribution ( #4080 )
2024-05-07 12:48:00 -05:00
Pepe20129
8e520e490c
Spoiler name removal ( #3814 )
...
* Initial pass
* Rename "MK" to "Market"
* Remove more spoiler names
* Update location_list.cpp
* Replace vector with array
* Update location_list.cpp
* Re-run build
* Fix spacing
2024-05-07 08:29:17 -05:00
briaguya
52fad95a2c
support lus thread_pool changes ( #4127 )
2024-05-06 22:08:11 -04:00
Malkierian
d10b68516c
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-06 18:37:56 -07:00
Malkierian
8d3902a256
Remove unnecessary and redundant checks and references. ( #4111 )
...
Stop passing checksByArea to functions in the same namespace.
Only get value of `HideFilteredAreas` once per frame.
Gate area and check evaluations behind checks being visible and search filter size greater than 0.
Proper function capitalization.
2024-05-06 19:27:35 -05:00
Malkierian
b3d51441eb
Rando Enhancement: Mysterious Shuffled Items ( #3227 )
...
* Add rando enhancement "Mysterious Shuffled Items", which obfuscates shuffled freestanding/drawn-in-world items (PoH, tokens, shop items) with a custom question mark model (thanks Hato), and uses the "mysterious item" functionality of `GetMerchantMessage` for everything that supports it, regardless of hint status on generation.
* Reverted back to rando enhancement, but added condition for Mysterious Shuffle not being on for the gem rotation fix to apply.
* First attempt at changing to fake GetItemEntry instead of directly calling the mystery draw function. Needs more work.
* Updated CVar to reflect CVar rework values.
Added `IsCheckShuffled` as preliminary function for checking *only* if a check is shuffled, not necessarily if it is just visible on the tracker. This accounts for the difference between tokensanity and "Always Show GS On Tracker", where you don't want to obfuscate the latter.
* Bit of cleanup.
* Cross-platform building edits. If anyone has a better idea of how to handle this fake GIE, I'm all ears.
* Update to CVar macros.
* Fix freestanding item gives.
Fix mysterious item model colors.
* Fix bombchu bowling mystery.
* Remove bowling bomchus check obfuscation (unused, removed in v3).
2024-05-06 19:17:08 -05:00
Lywx
f3b948226b
Bump lus and fixed PatchGfx ( #4125 )
...
* Bump lus and fixed PatchGfx
* Bump libultraship to main
2024-05-06 19:19:15 -04:00
Malkierian
438dede792
Change "AnubixFix" back to "AnubisFix". ( #4124 )
2024-05-06 17:10:06 -05:00
Eric Hoey
27dd303a57
Limit crawl speed to modifier to 4 ( #4113 )
2024-05-06 19:10:22 +00:00
Pepper0ni
d0627dc737
fix a V2 compatibility crash ( #4119 )
...
* Attempt to fix ambiguity issues and a V2 compatibility crash
* oops
* remove explicit call as it is fixed elsewhere
2024-05-06 19:10:00 +00:00
Garrett Cox
a96fe678f8
Merge pull request #4118 from Malkierian/dev-to-rando-5-5
...
develop -> develop-rando 5-5
2024-05-06 14:09:41 -05:00
Archez
a860a7ea39
Merge pull request #4122 from Archez/merge-macready-may6
...
Merge macready -> develop
2024-05-06 14:51:24 -04:00
Malkierian
89f119c566
Fix ambiguity.
2024-05-06 11:13:30 -07:00
Adam Bird
439574d0d9
Merge remote-tracking branch 'origin/develop' into merge-macready-may6
2024-05-06 12:22:48 -04:00
Malkierian
f354460d04
Make it build.
2024-05-05 22:43:11 -07:00
Malkierian
69eebf0984
CVar cleanup.
2024-05-05 22:27:33 -07:00
Malkierian
e2b0ea5692
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-5
2024-05-05 22:05:10 -07:00
Garrett Cox
4bd0f2d2c1
Port new hook filtering patterns from 2ship ( #4117 )
2024-05-05 16:55:56 -05:00
Garrett Cox
b4a30f708f
Change GI_VB_ to VB_ ( #4116 )
2024-05-05 16:29:02 -05:00
Garrett Cox
04f9ec1b78
Merge pull request #3755 from garrettjoecox/develop-rando-changes
...
Vanilla Behavior Overhaul
2024-05-05 15:12:43 -05:00
Garrett Cox
0c69ff17c2
Fix two minor issues from merge
2024-05-05 14:46:23 -05:00
