Commit Graph

1123 Commits

Author SHA1 Message Date
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
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
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
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 0eee085981 save/load locations to a string cvar 2022-08-19 09:30:17 -04: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
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
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
briaguya dd9acbbb43 use ordered map to help arrange checks in imgui 2022-08-18 12:19:57 -04: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
briaguya 3816ed11a4 add area names, fix kak bazaar 2022-08-18 08:20:35 -04:00
briaguya a7d4aa8042 add areas to rcos 2022-08-18 07:37:24 -04:00
briaguya 289a6e5a82 start on RC object stuff 2022-08-18 06:15:02 -04:00
briaguya 2e9cb4c426 Merge pull request #1246 from leggettc18/ruto-sapphire-fix
Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.
2022-08-18 03:52:06 -04:00
Sarge-117 bb6135fd2b Spacing 2022-08-17 22:07:51 -07:00
Christopher Leggett 7ee281182a Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.
Repalces the model for Zora's Sapphire with the Dungeon Reward for JabuJabu's Belly when you find it in the miniboss room.
2022-08-17 21:43:52 -04:00
Sarge-117 d56e712d07 spacing 2022-08-17 11:27:17 -07:00
Sarge-117 584f9d16f0 Fix line break 2022-08-17 11:26:07 -07:00
Sarge-117 6862e400f5 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-17 11:11:00 -07:00
Sarge-117 2c144c3aa6 Fix typo, fix Master Sword text 2022-08-17 11:10:37 -07:00
Sarge-117 907871915d fix question mark 2022-08-17 11:07:03 -07:00
Sarge-117 600c4ca3d1 Merge pull request #10 from PurpleHato/randi-french-navi-tips
ADD: BAGUETTE
2022-08-17 11:02:51 -07:00
PurpleHato 3fb582a02b ADD: BAGUETTE 2022-08-17 20:00:20 +02:00
briaguya ae8c7cb509 add excluded locations set 2022-08-17 11:08:11 -04:00
briaguya 11cc040710 add rcs to itemlocations in 3drando 2022-08-17 10:45:33 -04:00
briaguya 5605542452 start playing with imgui filters 2022-08-17 09:03:27 -04: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
Kenix3 6723f4c7c2 Archive.createArchive error now passes in the error to SPDLOG. 2022-08-16 23:30:20 -04:00
Kenix3 f9621dcc17 Cleans up Window class. 2022-08-16 23:30:20 -04:00
Kenix3 10ce3c88fb Remove TestApp from LUS 2022-08-16 23:30:20 -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
Kenix3 ea92a2e123 Makes data in OverlayCommand private. 2022-08-16 22:45:33 -04:00
Kenix3 b43eb2d0bd Renames Camera Stick to Right Stick 2022-08-16 22:45:33 -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