Christopher Leggett
3a67e2a806
Fixes potential issue with if statement.
2022-08-22 19:40:58 -04:00
Christopher Leggett
10c05892bf
Uses more descriptive type name for ItemIDs for creating custom messages.
2022-08-22 19:38:30 -04:00
Christopher Leggett
01dbfc71ad
Documents our new GiveItemEntry fuctions.
2022-08-22 19:32:42 -04:00
th-2021
d39a1a0bdf
[macos] Embed dependencies for ZAPD in bundle ( #1271 )
2022-08-22 10:43:50 +02:00
Christopher Leggett
e12fda29fe
Merge branch 'get-item-rework' into merge-fix
2022-08-22 02:03:04 -04:00
louist103
eed3942b81
Restore Gold skulltula CS from the "0.9" version ( #1217 )
...
* GS CS
* add to defaults
2022-08-21 22:11:23 -04:00
Ralphie Morell
f5112a709a
Add'l Console Commands ( #1207 )
...
* Added console commands
* Style conformance
2022-08-21 22:01:51 -04:00
PurpleHato
f6bb46a0dc
FIX: Disable Draw Distance, Miniboss music could still play in DC with Lizalfos under certain conditions ( #1170 )
...
Thanks @jbodner09 for the report 💯
2022-08-21 21:57:55 -04:00
Kenix3
51e4485966
LUS Cleanup: Merge Window and GlobalCtx2 classes. ( #1259 )
...
* Merges GlobalCtx2 and Window classes.
* Includes condition variable in File.
* add mac specific include
* sstream to get past "implicit instantiation of undefined template" error
* switch/wiiu includes
* that file doesn't exist
* more wii u globalctx2 stuff
Co-authored-by: briaguya <briaguya@alice>
2022-08-21 21:08:01 -04:00
Garrett Cox
58a60e3f44
Merge branch 'item-tracker-v3' of github.com:garrettjoecox/Shipwright into item-tracker-v3
2022-08-21 17:17:19 -05:00
Garrett Cox
f52ba103aa
Attempt to fix windows build error
2022-08-21 17:07:24 -05:00
Christopher Leggett
5298bda0e2
Merge branch 'rando-next', remote-tracking branch 'origin' into get-item-rework-rando-next
2022-08-21 16:42:15 -04:00
Christopher Leggett
1d9e52b169
Merge remote-tracking branch 'origin' into get-item-rework
2022-08-21 16:41:41 -04:00
Christopher Leggett
91cb6f2360
This should fix a bug with the Gerudo Archery minigame.
...
I wasn't able to get the bug to happen after making this change.
2022-08-21 16:40:16 -04:00
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
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
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
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
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
aMannus
e500db810b
Code cleanup + more names
2022-08-18 13:55:59 +02: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
aMannus
a2243634cd
Rand(), option to disable, attempted fix special chars
2022-08-18 11:54:02 +02: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
PurpleHato
a1cc0da6d3
TWEAK: Forgot the array size
2022-08-18 00:39:15 +02:00
PurpleHato
cca32b7a43
ADD: Baguette money
2022-08-18 00:35:54 +02:00
aMannus
589f2be0f1
More names
2022-08-18 00:09:54 +02:00
aMannus
e25fcc645b
More names, fixed translations
2022-08-17 23:57:31 +02:00
aMannus
c1cec5a44a
First fully working implementation
2022-08-17 23:30:51 +02:00
aMannus
f9766fa4a6
Initial language support and setup for randomizing
2022-08-17 22:30:21 +02:00
Christopher Leggett
a51b844a23
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-17 15:43:42 -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
PurpleHato
3fb582a02b
ADD: BAGUETTE
2022-08-17 20:00:20 +02:00
Christopher Leggett
914af77234
Fixes fanfare getItemId overlap
2022-08-17 12:23:39 -04: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
aMannus
55f71457d8
initial proof of concept
2022-08-17 16:45:19 +02:00
briaguya
5605542452
start playing with imgui filters
2022-08-17 09:03:27 -04:00
Christopher Leggett
525dcca499
Fixes some Sheik checks I had accidentally set the wrong flag for.
2022-08-17 01:07:28 -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
f9621dcc17
Cleans up Window class.
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
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
briaguya
6206cd7db0
add ActorResetFunc for courtyard guards ( #1213 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:52 -04:00
briaguya
01b7fedc35
clean up a few epochs that were missed ( #1204 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:37 -04:00
briaguya
71b1db1fb6
volvagia interpolation fix ( #1203 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:12 -04:00
Christopher Leggett
1184a35480
Fixes OoT rendering and Ice Trap checks.
2022-08-16 21:22:14 -04:00
Christopher Leggett
269a66656a
Fixes Zora's River Frog checks.
2022-08-16 20:58:11 -04:00
Christopher Leggett
3bc67ef1eb
Fixes chests by allowing for negative getItemIds
2022-08-16 20:28:24 -04:00
