Commit Graph

1584 Commits

Author SHA1 Message Date
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
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
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
aMannus
3b844375b7
Add missing pendingFlags (#1414) 2022-09-06 11:27:26 +02:00
briaguya
8d75603e4b
Merge pull request #1425 from garrettjoecox/1471-fix-shooting-gallery-rando-check
Fix #1417
2022-09-06 01:30:37 -04:00
briaguya
d2682998c4
Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled
Fix issue when merchantPrices is empty
2022-09-06 01:05:16 -04:00
Garrett Cox
a99330a8a5 Fix #1417 2022-09-05 23:34:52 -05:00
Garrett Cox
c9c648322d Fix for a single zeroed merchantPrice entry 2022-09-05 22:30:39 -05:00
Garrett Cox
0ab4f21382 Fix issue when merchantPrices is empty 2022-09-05 22:14:39 -05:00
briaguya
885d6dc6c2
Merge pull request #1422 from garrettjoecox/scrubs-trials-persist
Add merchantPrices to save file instead of loading from active spoiler log
2022-09-05 19:41:58 -04:00
briaguya
803ef49f6d
Merge pull request #1416 from aMannus/rando-skip-mask-shop-fix
Rando: Fix Complete Mask Quest & Mask Select interaction bugs
2022-09-05 19:27:00 -04:00
briaguya
bafd016cd9
Merge pull request #1413 from aMannus/rando-key-colors-default
Rando: Enable key colors matching dungeon by default
2022-09-05 19:09:37 -04:00
Garrett Cox
96a3354d45 Remove trialsRequired persisting in save manager 2022-09-05 15:12:30 -05:00
Garrett Cox
1c13fdec5f Add trials required and merchant prices to save file instead of loading from active spoiler log 2022-09-05 14:55:34 -05:00
aMannus
fb5aff393a tooltip line break 2022-09-05 16:54:02 +02:00
aMannus
9afe3ca746 Fix gerudo keys, add disabled checkbox 2022-09-05 16:48:59 +02:00
aMannus
39852c9278 Fix Sold Out bug 2022-09-05 11:46:50 +02:00
aMannus
983ab139d5 Add another flag to skip mask shop 2022-09-05 00:35:56 +02:00
briaguya
87a78cf87c
Merge pull request #1405 from PurpleHato/TrackerAmmoFix
Rando: Item Tracker currentAndMax rework
2022-09-04 18:35:46 -04:00
aMannus
fe413fd675 Set key colors to be on by default 2022-09-04 23:09:17 +02:00
PurpleHato
a6937e9850 added hovertext for the number display 2022-09-04 21:31:50 +02:00
PurpleHato
47c7d3f061 always display XX/YY when in ammo/capacity mode 2022-09-04 20:39:56 +02:00
PurpleHato
e11ca62ee1 small tweaks and rename 2022-09-04 20:09:48 +02:00
PurpleHato
2c241d5fe8 Merge branch 'rando-next' into TrackerAmmoFix 2022-09-04 19:57:56 +02:00
PurpleHato
7a222f9d0f
Merge pull request #20 from garrettjoecox/item-tracker-count-adjustments
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
2022-09-04 19:39:01 +02:00
Garrett Cox
6bf886ecae Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options 2022-09-04 11:55:40 -05:00
briaguya
2c63321638
Merge pull request #1407 from garrettjoecox/item-tracker-notes-fix
Ensure itemTrackerNotes vector is not fully empty in InitItemTracker
2022-09-04 07:47:01 -04:00
Garrett Cox
1bbde39439 Ensure itemTrackerNotes vector is not fully empty 2022-09-04 02:06:42 -05:00
briaguya
6439c45f26
Merge pull request #1402 from garrettjoecox/beans-obtainability-fix
Fix for beans obtainability
2022-09-03 20:04:11 -04:00
PurpleHato
6dbc292ff3 Fix: changes to please new LUS 2022-09-04 01:22:15 +02:00
PurpleHato
ed96a0c272
Merge branch 'rando-next' into TrackerAmmoFix 2022-09-04 01:08:26 +02:00
PurpleHato
27f613b3f8 All color logic for all types 2022-09-04 01:03:28 +02:00
briaguya
e55ec29d66
Merge pull request #1396 from garrettjoecox/item-tracker-notes
Persist item tracker notes
2022-09-03 18:40:32 -04:00