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
Garrett Cox
17aa82a2cd
Initial work towards shopsanity, not fully working but some of it is
2022-08-22 13:23:27 -05:00
lil David
58aed3dc07
Correct bombchus in logic description to only include chu shop
2022-08-22 10:41:59 -05:00
th-2021
d39a1a0bdf
[macos] Embed dependencies for ZAPD in bundle ( #1271 )
2022-08-22 10:43:50 +02:00
Garrett Cox
9f63aaae99
Initial work towards scrubsanity, got affordable prices mostly functional
...
Write and read prices from spoiler, move IdentifyScrub up to Randomizer
In a semi working state
Fix bug when going from c to cpp
Kill scrubs before they spawn if already purchased
Woopsie from rebase
Update soh/soh/OTRGlobals.cpp
2022-08-22 01:13:52 -05:00
Christopher Leggett
d17e4dc042
merge in get-item-rework-rando-next
2022-08-22 02:05:41 -04:00
Christopher Leggett
e12fda29fe
Merge branch 'get-item-rework' into merge-fix
2022-08-22 02:03:04 -04:00
InfoManiac742
f87f636828
Update BUILDING.md ( #1228 )
2022-08-21 22:14:05 -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
Christopher Leggett
de9465c22a
Fixes goofup of ImGui window from bad merge conflict resolution.
2022-08-21 21:48:01 -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
d8e7a247f4
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-21 17:04:53 -04: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
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
