284 Commits

Author SHA1 Message Date
Garrett Cox
3aa82eaaf1 Support only enabling while paused, better align dungeon name text 2022-08-21 12:59:40 -05:00
Garrett Cox
341ac29fa5 Various tweaks, added button combo and re-added notes 2022-08-20 14:36:38 -05:00
Garrett Cox
02049fb9e1 Another big push, mostly done 2022-08-19 14:38:12 -05:00
Garrett Cox
252f5fe68a Initial work towards cleaning up item tracker 2022-08-19 03:59:06 -05:00
briaguya
c933d521c3
Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix
Fix Ganon's Boss Key hints for Keysanity
2022-08-17 00:09:26 -04:00
briaguya
03151647b1
Merge pull request #1227 from HarbourMasters/develop-zhora
zhora -> rando-next
2022-08-16 23:59:11 -04:00
Kenix3
72981221ad
Merge pull request #1226 from HarbourMasters/develop-rachael
rachael -> zhora
2022-08-16 23:40:06 -04:00
Christopher Leggett
b6d6ede520
Fixes color replacement from being saved to the save file.
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
2022-08-16 23:04:14 -04:00
Christopher Leggett
ecaf0fd87a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next 2022-08-16 22:12:20 -04:00
Christopher Leggett
5a3ab9bcdc
Fixes Ganon's Boss Key hints for keysanity. 2022-08-16 22:12:06 -04:00
David Chavez
6b0338a37d
[zret] Port some documentation changes (#1164)
* zret: Documentation pass on scene/room commands #1226

* Update OTR scene

* zret: Document the lens system #1079

* zret: Misc. doc/cleanup 4 #1093

* zret: Fix misc 8 #1150

* zret: Document Distortions from z_camera and z_view #1102
2022-08-16 21:53:28 -04:00
lilDavid
46a421f933
Add window to customize specific controls (#1122) 2022-08-16 09:43:09 +02:00
briaguya
ee9ea3f2bd
add 3drando license (#1206)
Co-authored-by: briaguya <briaguya@alice>
2022-08-15 21:17:58 -04:00
Julien Lemay
8945b2ed48
Fix Save Editor Event Check Inf "A" Row flags (#1138)
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
2022-08-14 23:02:14 -04:00
briaguya
f70c1ff88a
Merge pull request #1160 from aMannus/rando-better-dupe-handling
Rando: Added more items to have dupe handling
2022-08-13 00:30:12 -04:00
briaguya
8c965b4dc7
Merge pull request #1171 from aMannus/item-tracker-improvements
Item tracker improvements
2022-08-12 23:39:00 -04:00
lilDavid
e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
aMannus
4c9f2493d7 Brought CVar naming in line with others 2022-08-12 22:51:40 +02:00
lilDavid
947a97608c Save Editor Adult Trade Shuffle bugfixes:
- Having multiple items with the collapsing header open rapidly cycles trade items
 - Unchecking any item's checkbox cycles the trade item (it should only do so if it's the one you've selected)
 - Setting the adult trade slot sets the wrong items' flags
 - Emptying the adult trade slot doesn't reset all trade items' flags
2022-08-12 15:43:08 -05:00
aMannus
3689abd01f One more small code cleanup 2022-08-12 22:39:12 +02:00
aMannus
5f2bcb39c9 Small code cleanup 2022-08-12 22:16:23 +02:00
aMannus
4d7982911e More fixes and code cleanup 2022-08-12 22:08:10 +02:00
aMannus
ff64bc42fb First pass fixes item tracker save loading 2022-08-12 18:21:28 +02:00
aMannus
aa7380fe06 Added missing double defense 2022-08-12 13:14:15 +02:00
aMannus
1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
aMannus
e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus
ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus
67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00
briaguya
b03d23f61f
Merge pull request #1152 from briaguya-ai/develop-zhora
zhora -> rando-next
2022-08-11 01:36:05 -04:00
briaguya
7ea210aa63
Merge pull request #1147 from PurpleHato/RandoItemTrackerV2
FIX: Rando Item Tracker non initialized small key were not transparent
2022-08-10 22:30:49 -04:00
PurpleHato
9ccc7908fa FIX: Rando Item Tracker non initialized small key were not transparent 2022-08-11 04:21:28 +02:00
briaguya
85ad427b99
Merge pull request #1141 from aMannus/rando-gerudo-bridge-fix
Rando: Fix gerudo card incorrectly given to link when bridge is open
2022-08-10 21:44:49 -04:00
briaguya
23b2ed7bee
Merge pull request #1146 from PurpleHato/KeysanityTranslation
ADD: French Translation for Rando Custom Messages
2022-08-10 21:25:28 -04:00
PurpleHato
d73ab42641 ADD: French Translation for Rando Custom Messages 2022-08-11 03:02:36 +02:00
briaguya
9d7df7c102
Merge pull request #1139 from aMannus/rando-dont-skip-useful-cutscenes
Rando: Add "Enable Glitch-Useful Cutscenes" option
2022-08-10 20:30:01 -04:00
briaguya
ddfa85b533
Merge pull request #1143 from PurpleHato/RandoItemTrackerV2
FIX: Key Tracker showing -1 and always transparent small keys
2022-08-10 20:23:27 -04:00
PurpleHato
212bf936f0 FIX: Key Tracker showing -1 and always transparent small keys
TWEAK: also disabled notes properly this time
2022-08-11 00:05:58 +02:00
aMannus
1947278fdf Fixes gerudo card bug with open bridge 2022-08-10 23:14:31 +02:00
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
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
d523ba5127 complete mask quest 2022-08-10 06:28:10 -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