Commit Graph

985 Commits

Author SHA1 Message Date
aMannus
36dd0f669e Fixed woopsie 2022-08-10 21:54:16 +02:00
aMannus
e259e87588 ADD: Enable Glitch-Useful Cutscenes option to rando 2022-08-10 21:51:10 +02:00
briaguya
aba8da5257
Merge pull request #1137 from lilDavid/fix_trade_shuffle_save_editor
Fix adult trade shuffle in save editor
2022-08-10 12:36:32 -04:00
briaguya
b420ad88c4
Merge pull request #1136 from briaguya-ai/make-array-big-enough-for-all-the-checks
make array big enough for all the checks
2022-08-10 12:07:58 -04:00
lilDavid
fc08229a46 Save editor: Link adult trade item slot and flags 2022-08-10 11:00:49 -05:00
briaguya
d74220d3ac don't give link's pocket garbage 2022-08-10 11:55:47 -04:00
briaguya
f5d7955547 ensure itemlocations is big enough for every check 2022-08-10 11:39:10 -04:00
briaguya
d535d0be9a make array big enough for all the checks 2022-08-10 11:21:10 -04:00
briaguya
35f69f6fd6
Merge pull request #1132 from briaguya-ai/complete-mask-quest
complete mask quest
2022-08-10 06:41:11 -04:00
briaguya
d523ba5127 complete mask quest 2022-08-10 06:28:10 -04:00
briaguya
2dbdbea3d2
Merge pull request #1130 from briaguya-ai/initialize-tracker-item-size
initialize icon size on item tracker
2022-08-10 04:43:20 -04:00
briaguya
c04548f98f initialize icon size on item tracker 2022-08-10 04:32:08 -04:00
briaguya
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity
Keysanity + Shuffle Compasses & Maps
2022-08-10 02:28:14 -04:00
Garrett Cox
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
Garrett Cox
8abfa4821f Anotha one (removing LACS stuff) 2022-08-10 01:17:19 -05:00
Garrett Cox
ec7e3d350a Remove LACS settings for ganons key for now 2022-08-10 01:15:00 -05:00
briaguya
e766d00812
Merge pull request #1073 from lilDavid/trade_quest_shuffle
Add adult trade quest shuffle
2022-08-10 01:59:19 -04:00
briaguya
3509327a5c
Merge pull request #1119 from PurpleHato/RandoItemTrackerV2
Rando item tracker v2
2022-08-10 01:49:04 -04:00
briaguya
0c4add7e0b
Merge pull request #1125 from HarbourMasters/develop-zhora
zhora -> rando-next to fix a crash
2022-08-09 22:52:22 -04:00
briaguya
96c2033361
fix linux release mode crash (#1124)
Co-authored-by: briaguya <briaguya@alice>
2022-08-09 22:50:25 -04:00
Kenix3
7b11509010 Fixes missed Switch specific invocation of old Console logging macros. 2022-08-09 22:34:16 -04:00
Kenix3
a4804d7290 No longer passing in C strings to SendInfoMessage formatted overload. 2022-08-09 22:34:16 -04:00
Kenix3
5751b5c278 debugconsole now uses console output functions. 2022-08-09 22:34:16 -04:00
Kenix3
f97f9ae422 Sets default value of ConsoleLine channel to "Console" 2022-08-09 22:34:16 -04:00
Kenix3
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
Kenix3
1f351418e1 Removes a couple printf in favour of SPDLOG calls. 2022-08-09 22:34:16 -04:00
lilDavid
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle 2022-08-09 20:40:00 -05:00
lilDavid
12d45685b9 Move files in with other rando files 2022-08-09 19:57:40 -05:00
PurpleHato
5c0939d4fd DEL: GTG disaplying a boss key 2022-08-09 19:00:44 +02:00
PurpleHato
fc9aaf7c25 DEL: Boss Key on BOTW and Boss/Small key on ICE Cavern 2022-08-09 18:53:53 +02:00
PurpleHato
4f1d667ec5 TWEAK: Uncessecary new line 2022-08-09 18:44:27 +02:00
PurpleHato
5bbce43f19 TWEAK: added back but disabled personal notes for now 2022-08-09 18:28:03 +02:00
PurpleHato
3f8b060fad TWEAK: Window posiiton 2022-08-09 17:59:52 +02:00
PurpleHato
fa393bff48 ADD: Item Tracker V2 2022-08-09 17:54:28 +02:00
lilDavid
08366c51b6 Correct mixed indentation styles 2022-08-09 10:17:38 -05:00
briaguya
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
Garrett Cox
608f493c5b Update descriptions and defaults 2022-08-09 07:53:15 -05:00
Christopher Leggett
7a5acb0a2a
Fixes placement 2022-08-09 08:36:20 -04:00
Christopher Leggett
20bbf85f00
Sets player getItemId before other messagebox instance. 2022-08-09 07:26:17 -04:00
briaguya
6db0d94e92
Merge pull request #1112 from aMannus/zhora-rando-next-merge
zhora->rando-next merge
2022-08-09 02:56:46 -04:00
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
Christopher Leggett
6f7b38539b
Moves setting of getItemId into a rando save if block. 2022-08-09 01:56:47 -04:00
Christopher Leggett
95918e0cb2
Fixes skulltula messages for custom items. 2022-08-09 01:42:47 -04:00
Garrett Cox
bbce60e71c Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-09 00:01:46 -05:00
Garrett Cox
3472e83250 Use new custom message system, skulltula drops still broken text 2022-08-09 00:00:30 -05: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
Garrett Cox
e8c4378d17 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 22:47:29 -05: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