Garrett Cox
51e203eec0
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-13 00:07:58 -05:00
Garrett Cox
098407487a
Fix some issues with ice traps
2022-09-12 23:45:22 -05:00
Garrett Cox
cda28c402a
Fix dungeon reward stone rotation and add particles
2022-09-12 23:10:15 -05:00
Garrett Cox
c9359ab3ef
Simplify logic around shopsanity and fix some issues
2022-09-12 22:31:45 -05:00
Garrett Cox
14fbbea39a
Fix for custom draw methods overriding sold out sign
2022-09-12 16:46:54 -05:00
Garrett Cox
457356d74c
Allow buying tunics as child when shopsanity is on
2022-09-12 15:54:24 -05:00
briaguya
09ab2dc24c
Merge pull request #1335 from Sarge-117/rando-enhanced-magic-arrows
...
Rando: Enhanced Magic Arrows
2022-09-12 16:45:47 -04:00
Sarge-117
4db2f44f7b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-11 11:32:50 -07:00
Garrett Cox
4c7424f848
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-10 10:16:02 -05:00
briaguya
1eb6235ddc
Merge pull request #1456 from leggettc18/leggettc18/issue1437
...
Fixes Ice Trap as starting item.
2022-09-09 21:46:40 -04:00
Christopher Leggett
944d5344dc
Applies fix to Song from Impa as well.
2022-09-09 19:20:20 -04:00
Christopher Leggett
cfc24b16ca
crash on pause menu on linux (only in appimage)
...
Fixes #1437
2022-09-09 19:20:20 -04:00
Sarge-117
aee6445a45
Fix merge error
2022-09-08 22:22:31 -07:00
Sarge-117
0f0c438b1b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-08 22:04:30 -07:00
briaguya
19b8e12933
Merge pull request #1449 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-09-09 00:16:36 -04:00
Garrett Cox
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
Sarge-117
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
lilDavid
9686a7ca4c
Add Items submenu to Enhancements > Gameplay ( #1410 )
2022-09-08 22:57:09 -04:00
GaryOderNichts
e80e3440e1
wiiu: package SoH as a homebrew bundle ( #1427 )
2022-09-08 22:55:55 -04:00
Kenix3
4cda92462a
Lowers severity of resource manager logging.
2022-09-08 20:25:44 -04:00
Kenix3
4a0269b3b1
Increment version
2022-09-08 19:10:03 -04:00
louist103
4d81c28738
boxes ( #1428 )
2022-09-08 19:05:16 -04:00
Sarge-117
5e0382384b
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-07 22:12:36 -07:00
briaguya
2c693d2f22
Merge pull request #1433 from garrettjoecox/use-3drando-item-names
...
Use 3drando item table for parsing spoiler names
2022-09-07 23:41:43 -04:00
briaguya
956c04cfc4
Merge pull request #1436 from leggettc18/better_icon_hash
...
Randomizer: Better Icon Hashes
2022-09-07 23:22:21 -04:00
Christopher Leggett
32c0af27a8
Hopefully makes Jenkins happy
2022-09-07 22:51:43 -04:00
Christopher Leggett
90cc2fa361
Changes filename format to icon indexes separated by dashes
2022-09-07 22:22:16 -04:00
Christopher Leggett
cb0f4ffd97
Prevents leading 0s added to hash from being in file name
2022-09-07 21:30:33 -04:00
Christopher Leggett
bba59509f3
Removes some unused functions and variables in spoiler_log.cpp
2022-09-07 21:23:41 -04:00
Christopher Leggett
e3d174cc9b
Uses the hash instead of seed for spoilerfile name and icons.
2022-09-07 21:19:16 -04:00
Christopher Leggett
1763eda169
Implements a larger array of Sprites for the Icon Hash.
2022-09-07 20:23:22 -04:00
Garrett Cox
d94be06208
Fix localized item names for shopsanity
2022-09-07 12:08:29 -05:00
Garrett Cox
558f97741f
Merge branch 'use-3drando-item-names' of github.com:garrettjoecox/OOT into shopsanity
2022-09-07 11:58:07 -05:00
Garrett Cox
248b4d4d75
Fix issues with rendering songs
2022-09-07 11:11:44 -05:00
Garrett Cox
d928335dd2
Respect custom draw functions
2022-09-07 09:56:30 -05:00
Garrett Cox
85bb09c70b
Remove log
2022-09-06 21:24:05 -05:00
Garrett Cox
f366e1d56e
Add missing newline
2022-09-06 21:19:43 -05:00
Garrett Cox
4dd9c99c11
Use another nested method instead of one at the top level to fetch the table
2022-09-06 21:17:55 -05:00
Garrett Cox
f47f27c19e
Use 3drando item table for parsing spoiler names
2022-09-06 19:42:01 -05:00
Sarge-117
cfc5d1d4e3
Fix merge error
...
Didn't mean to have Zhora changes in here yet
2022-09-06 14:05:29 -07:00
Sarge-117
d96feaf4a4
Tidy up chain platform cutscene check
2022-09-06 14:00:09 -07:00
Garrett Cox
5b4ce49688
Base whats in the bazaar shop on entranceIndex instead of age
2022-09-06 15:59:09 -05:00
Sarge-117
100d83151e
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-06 12:43:13 -07:00
Sarge-117
9e6defe1b5
Fix merge mistake
2022-09-06 12:21:06 -07:00
Garrett Cox
d02114a9d8
Handle shop items in SaveManager
2022-09-06 13:36:56 -05:00
Garrett Cox
b02ab9185d
Rename randomizerMerchantPrices to merchantPrices
2022-09-06 13:32:59 -05:00
Garrett Cox
b2f4d5e95a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-06 13:30:49 -05:00
Sarge-117
99b9531cfd
Merge branch 'zhora-magic-arrows' into rando-enhanced-magic-arrows
2022-09-06 11:10:46 -07:00
Sarge-117
37acd52016
Clarify var names and comments
2022-09-06 11:05:52 -07:00
Sarge-117
5991be8256
Remove !=0 from cvar check
2022-09-06 10:57:08 -07:00
