Commit Graph

1506 Commits

Author SHA1 Message Date
Christopher Leggett 2bbd618599 Cleans up another if statement in item00 2022-08-21 15:35:10 -04:00
Christopher Leggett e5bca727ac Cleans up an if statement for item00. 2022-08-21 15:22:18 -04:00
Christopher Leggett e1b403a31b Removes unused Randomizer_GetItemIdFromGetItemId. 2022-08-21 15:14:50 -04:00
Garrett Cox b3307883c7 Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp 2022-08-21 13:32:01 -05:00
Garrett Cox 3aa82eaaf1 Support only enabling while paused, better align dungeon name text 2022-08-21 12:59:40 -05:00
briaguya 196e2acd3a Merge pull request #1267 from leggettc18/skullsanity-saveeditor-fix
Stops syncing GS Flags with GS Token Count with Skullsanity on
2022-08-21 10:37:46 -04:00
Sarge-117 7066536249 Add #define, fix conflicting delcaration
Also re-ordered randomizer.cpp a bit to have the text array above CreateNaviRandoMessages()
2022-08-20 22:17:02 -07:00
Christopher Leggett fc963cf44c Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-20 18:01:23 -04:00
Christopher Leggett 4dff1443a6 Fixes rendering of treasure chest game items. 2022-08-20 18:00:44 -04:00
Christopher Leggett 7d2170c82b Stops syncing GS Flags with GS Token Count with Skullsanity on. 2022-08-20 17:25:06 -04:00
Garrett Cox 341ac29fa5 Various tweaks, added button combo and re-added notes 2022-08-20 14:36:38 -05:00
Sarge-117 3adb17c55d Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-20 11:23:10 -07:00
Sarge-117 ccce87cb89 Change int to u8
Jenkins plz
2022-08-20 11:16:46 -07:00
briaguya 9c92139eca Merge pull request #1265 from leggettc18/frog-hint-fix
Adds Frog Reward hints from 3dsrando.
2022-08-20 13:52:45 -04:00
Christopher Leggett 4f2f72b941 Adds Frog Reward hints from 3dsrando.
Fixes the intermittent crash when generating a seed rando-next started
having.
2022-08-20 13:07:53 -04:00
Sarge-117 6fc3c8cf77 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-20 00:13:56 -07:00
Christopher Leggett 2c410a5857 Fixes ice traps again. 2022-08-19 21:42:59 -04:00
Christopher Leggett cec1c7dc07 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-19 20:06:39 -04:00
Christopher Leggett a2a8832a35 Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-19 20:06:15 -04:00
briaguya ad8179287e Fix controller nav on WiiU (#1258)
Co-authored-by: briaguya <briaguya@alice>
2022-08-20 02:03:28 +02:00
Christopher Leggett a67c6b9e67 Fixes vanilla ice traps and randomized ice smoke 2022-08-19 19:36:44 -04:00
Christopher Leggett 4e2707aefc Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework 2022-08-19 18:51:00 -04:00
briaguya 28bbaf6c45 Merge pull request #1249 from briaguya-ai/exclude-all-locations
add ability to exclude any location
2022-08-19 16:44:24 -04:00
Garrett Cox 02049fb9e1 Another big push, mostly done 2022-08-19 14:38:12 -05:00
briaguya 708c9a00f4 formatting cleanup 2022-08-19 13:18:48 -04:00
briaguya 1c52b58917 remove var leftover from debugging 2022-08-19 13:17:05 -04:00
briaguya 3b951efac2 rename columns, use excluded locations 2022-08-19 12:54:27 -04:00
briaguya c1455cedea fix broken seed parsing 2022-08-19 10:56:26 -04:00
briaguya db7e1bf332 trying to figure stuff out 2022-08-19 10:36:54 -04:00
briaguya 0971b9aa78 only toggle menu with controller when controller nav enabled (#1043) 2022-08-19 15:46:11 +02:00
briaguya 0eee085981 save/load locations to a string cvar 2022-08-19 09:30:17 -04:00
aMannus 1c785560c4 Changed tooltip 2022-08-19 14:49:30 +02:00
aMannus 1ff006fa9e Fixed newline 2022-08-19 14:45:55 +02:00
aMannus 596d4cd392 More names 2022-08-19 14:45:18 +02:00
aMannus 7639c0f2ed Moved code to randomizer.cpp, fixes special chars 2022-08-19 14:41:20 +02:00
briaguya 815f5a9101 don't filter on right 2022-08-19 06:38:39 -04:00
briaguya f818380079 fix performance issues 2022-08-19 06:30:52 -04:00
Garrett Cox 252f5fe68a Initial work towards cleaning up item tracker 2022-08-19 03:59:06 -05:00
briaguya 7f62d00200 fix double scrollbar issue 2022-08-19 04:53:35 -04:00
Sarge-117 64b7dac91b Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-18 22:13:51 -07:00
Christopher Leggett 3db2ce7085 Updates Zora's Sapphire Cutscene to use GetItemEntry 2022-08-18 22:06:28 -04:00
Christopher Leggett 35c2781efb Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next 2022-08-18 21:49:45 -04:00
briaguya 11a8dc85ee filter on one side, trees on both 2022-08-18 15:50:25 -04:00
briaguya fb3320c3ed use macro for rco 2022-08-18 15:15:34 -04:00
briaguya 7fdb194dad refactor location visibility filtering 2022-08-18 14:11:22 -04:00
qurious-pixel 9bc6aac81e MacOS OTR (#973) 2022-08-18 19:40:41 +02:00
briaguya dd9acbbb43 use ordered map to help arrange checks in imgui 2022-08-18 12:19:57 -04:00
lilDavid 170b759572 Make Bombchus buyable without a wallet 2022-08-18 10:38:49 -05:00
briaguya 5ac69e0bd8 start filtering 2022-08-18 08:48:24 -04:00
briaguya dbb4e3eefc start on tree view 2022-08-18 08:20:52 -04:00