c04548f98f
initialize icon size on item tracker
2022-08-10 04:32:08 -04:00
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
...
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
7f62802aef
Man I really had to split that up into three commits.. Fix from removing LACS setting
2022-08-10 01:19:21 -05:00
8abfa4821f
Anotha one (removing LACS stuff)
2022-08-10 01:17:19 -05:00
ec7e3d350a
Remove LACS settings for ganons key for now
2022-08-10 01:15:00 -05:00
e766d00812
Merge pull request #1073 from lilDavid/trade_quest_shuffle
...
Add adult trade quest shuffle
2022-08-10 01:59:19 -04:00
3509327a5c
Merge pull request #1119 from PurpleHato/RandoItemTrackerV2
...
Rando item tracker v2
2022-08-10 01:49:04 -04:00
0c4add7e0b
Merge pull request #1125 from HarbourMasters/develop-zhora
...
zhora -> rando-next to fix a crash
2022-08-09 22:52:22 -04:00
96c2033361
fix linux release mode crash ( #1124 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-09 22:50:25 -04:00
5751b5c278
debugconsole now uses console output functions.
2022-08-09 22:34:16 -04:00
c7ccd6dbff
LUS Cleanup: Strips out the logging system created for the console
...
Properly routes SPDLog to the console.
Creates an API to be able to send command responses back to the console.
Cleans up the console UI, hiding options when not needed.
Removes stdout console sink for Windows.
2022-08-09 22:34:16 -04:00
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle
2022-08-09 20:40:00 -05:00
12d45685b9
Move files in with other rando files
2022-08-09 19:57:40 -05:00
5c0939d4fd
DEL: GTG disaplying a boss key
2022-08-09 19:00:44 +02:00
fc9aaf7c25
DEL: Boss Key on BOTW and Boss/Small key on ICE Cavern
2022-08-09 18:53:53 +02:00
4f1d667ec5
TWEAK: Uncessecary new line
2022-08-09 18:44:27 +02:00
5bbce43f19
TWEAK: added back but disabled personal notes for now
2022-08-09 18:28:03 +02:00
3f8b060fad
TWEAK: Window posiiton
2022-08-09 17:59:52 +02:00
fa393bff48
ADD: Item Tracker V2
2022-08-09 17:54:28 +02:00
08366c51b6
Correct mixed indentation styles
2022-08-09 10:17:38 -05:00
1aeefa3c7e
Merge pull request #1111 from leggettc18/rando-skull-message-fix
...
Fixes skulltula messages for custom items.
2022-08-09 08:54:41 -04:00
608f493c5b
Update descriptions and defaults
2022-08-09 07:53:15 -05:00
7a5acb0a2a
Fixes placement
2022-08-09 08:36:20 -04:00
20bbf85f00
Sets player getItemId before other messagebox instance.
2022-08-09 07:26:17 -04:00
0b722eebd4
Merge branch 'develop-zhora' into zhora-rando-next-merge
2022-08-09 08:44:05 +02:00
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
6f7b38539b
Moves setting of getItemId into a rando save if block.
2022-08-09 01:56:47 -04:00
95918e0cb2
Fixes skulltula messages for custom items.
2022-08-09 01:42:47 -04:00
bbce60e71c
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-09 00:01:46 -05:00
3472e83250
Use new custom message system, skulltula drops still broken text
2022-08-09 00:00:30 -05:00
e8c4378d17
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 22:47:29 -05:00
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
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
8410a79b26
Merge branch 'rando-next' into zhora-to-next
2022-08-08 22:27:04 -04:00
816fac6c06
Merge branch 'develop-zhora' into zhora-to-next
2022-08-08 22:23:06 -04:00
317de33a8b
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-08 21:43:04 -04:00
fa090c51f6
Merge pull request #831 from leggettc18/custom-messages
...
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
e63d84bd7d
Adapts this branch for cmake building.
2022-08-08 21:14:29 -04:00
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
0e10b59307
Update z_kaleido_item.c ( #1046 )
2022-08-08 19:58:01 -04:00
4bf4ad3359
Update z_en_ru1.c ( #1042 )
2022-08-08 19:56:56 -04:00
f80ba4102a
Add instant boomerang recall ( #1006 )
2022-08-08 19:55:07 -04:00
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
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
a0ac945b4e
Make logic consistent across z_parameter & z_sram
2022-08-08 14:18:15 -05:00
8f55dd0624
Add support for shuffling maps and compasses
2022-08-08 14:07:02 -05:00
cb97c2a205
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-08 12:08:06 -05:00
34b8d7d5f8
Handle impa giving a key if skip zelda is on
2022-08-08 11:09:06 -05:00
9afbe42720
Use -O2 for Release config builds ( #1083 )
2022-08-08 12:01:45 +02:00
f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora
...
quick zhora to rando next
2022-08-07 21:41:31 -04:00
briaguya