5fdb961ea4
Fix BGS softlock for shopsanity
2022-09-18 13:25:09 -05:00
526aa951cd
Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
...
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2022-09-18 09:45:18 -05:00
cf616b83ee
Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
...
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2022-09-18 09:45:09 -05:00
42edeb25a6
Replace magic numbers in message handler
2022-09-18 09:44:35 -05:00
d95e4d4994
Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
2022-09-18 09:30:51 -05:00
61b29476e3
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-16 14:51:09 -05:00
77ec3954dc
Various changes from PR feedback
2022-09-16 11:29:17 -05:00
426bdf6688
A few changes around merchant messages
2022-09-16 11:04:58 -05:00
08f9b06e90
Merge pull request #1488 from garrettjoecox/non-warp-song-render-fix
...
[#1434 ] Renders non-warp songs more consistently with warp songs
2022-09-16 11:20:54 -04:00
c2c6955b90
[ #1434 ] Renders non-warp songs more consistently with warp songs
2022-09-16 08:59:22 -05:00
7e4f2ecc20
Use EnGirlAShopItem enum instead of raw hex values
2022-09-16 08:52:25 -05:00
86cc209122
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-16 08:30:57 -05:00
1c3d7f92b6
Merge pull request #1477 from louist103/format-rando-1
...
Format hint_list.cpp
2022-09-15 09:05:19 -04:00
c6ea367856
format
2022-09-14 22:37:05 -04:00
8fa9baaaf6
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-14 12:23:47 -05:00
978ddcc5a6
Merge pull request #1471 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-14 10:58:59 -04:00
941cf65227
use strnlen for c string empty check ( #1352 )
...
* use strcmp for c string compare
* Update z_file_choose.c
Co-authored-by: briaguya <briaguya@alice>
2022-09-13 21:12:03 -04:00
e1f95a5ad9
ImGui Switch/Wii U slider fixes ( #1371 )
...
* Switch/Wii U slider fixes
* Attempt at better spacing
* Updated after ImGui merge
2022-09-13 20:47:00 -04:00
18a26b480e
Use Color_RGB8 CVars in z_message_PAL ( #1372 )
2022-09-13 20:45:51 -04:00
67bbeca809
Another fix for getting items near critters. ( #1332 )
2022-09-13 20:45:23 -04:00
eda5a6ac91
Fix blocks not being pushed all the way ( #1363 )
2022-09-13 20:38:26 -04:00
43cde7eccd
Merge pull request #1467 from HarbourMasters/develop-zhora
...
zhora -> rando-next (pdb for crash handler)
2022-09-13 11:37:14 -04:00
e646903691
Merge pull request #1442 from leggettc18/leggettc18/issue1071
...
Randomizer: Fixes Child only Gerudo Fortress PoH matching with RC_GF_CHEST
2022-09-13 11:02:05 -04:00
e73e26c54a
Merge pull request #1465 from garrettjoecox/patch-1
...
Fix amount of keys given for BotW
2022-09-13 10:31:31 -04:00
04a375aa6e
Merge pull request #1464 from garrettjoecox/tiny-fix-for-tracker-wallet
...
Fix adult wallet having its own max capacity on tracker
2022-09-13 10:31:20 -04:00
420ebf3715
Fix amount of keys given for BotW
2022-09-13 01:13:20 -05:00
717c639783
Fix adult wallet having its own max capacity
2022-09-13 00:56:26 -05:00
51e203eec0
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-13 00:07:58 -05:00
098407487a
Fix some issues with ice traps
2022-09-12 23:45:22 -05:00
cda28c402a
Fix dungeon reward stone rotation and add particles
2022-09-12 23:10:15 -05:00
c9359ab3ef
Simplify logic around shopsanity and fix some issues
2022-09-12 22:31:45 -05:00
14fbbea39a
Fix for custom draw methods overriding sold out sign
2022-09-12 16:46:54 -05:00
457356d74c
Allow buying tunics as child when shopsanity is on
2022-09-12 15:54:24 -05:00
09ab2dc24c
Merge pull request #1335 from Sarge-117/rando-enhanced-magic-arrows
...
Rando: Enhanced Magic Arrows
2022-09-12 16:45:47 -04:00
a2d4f4766d
Fixes crash handler for jenkins builds. ( #1445 )
...
* Fixes crash handler for jenkins builds.
We must include the pdb in redistributables.
* Properly selects PDB file path for inclusion
Co-authored-by: Christopher Leggett <chris@leggett.dev>
2022-09-11 23:15:10 -04:00
4db2f44f7b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-11 11:32:50 -07:00
4c7424f848
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-10 10:16:02 -05:00
1eb6235ddc
Merge pull request #1456 from leggettc18/leggettc18/issue1437
...
Fixes Ice Trap as starting item.
2022-09-09 21:46:40 -04:00
944d5344dc
Applies fix to Song from Impa as well.
2022-09-09 19:20:20 -04:00
cfc24b16ca
crash on pause menu on linux (only in appimage)
...
Fixes #1437
2022-09-09 19:20:20 -04:00
aee6445a45
Fix merge error
2022-09-08 22:22:31 -07:00
0f0c438b1b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-08 22:04:30 -07:00
19b8e12933
Merge pull request #1449 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-09 00:16:36 -04:00
74ec9f6c04
Add descriptions to save editor flags editor, and added randomizer flags ( #1386 )
...
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
2022-09-08 23:48:15 -04:00
a9f3aedf8e
Enhanced Magic Arrows (non-rando) ( #1376 )
...
* Add magic arrow enhancements, non-rando
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
* Update tooltip
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Update tooltip
* Add line break in tooltip
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Missed a couple
* Clean up chain platform cutscene check
2022-09-08 22:58:08 -04:00
9686a7ca4c
Add Items submenu to Enhancements > Gameplay ( #1410 )
2022-09-08 22:57:09 -04:00
e80e3440e1
wiiu: package SoH as a homebrew bundle ( #1427 )
2022-09-08 22:55:55 -04:00
4cda92462a
Lowers severity of resource manager logging.
2022-09-08 20:25:44 -04:00
210ed5e1c6
Merge branch 'rando-next' into leggettc18/issue1071
2022-09-08 20:07:35 -04:00
b9c7f74ef9
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into rando-next
2022-09-08 20:06:24 -04:00
Garrett Cox