Commit Graph

20 Commits

Author SHA1 Message Date
briaguya
978ddcc5a6
Merge pull request #1471 from HarbourMasters/develop-zhora
zhora -> rando-next
2022-09-14 10:58:59 -04:00
aMannus
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
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
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
Sarge-117
db9f608177 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-05 21:41:18 -07: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
Sarge-117
938ecef131 Tooltip wording + line break 2022-09-03 14:27:27 -07:00
Sarge-117
27e58842b0 Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
2022-09-03 14:10:39 -07:00
aMannus
70ab1406e1 Incorporate magic arrows in rando settings 2022-09-03 22:56:09 +02:00
Sarge-117
a260f680d1
Merge branch 'rando-next' into rando-enhanced-magic-arrows 2022-09-03 12:17:23 -07:00
briaguya
d90145da47
Merge pull request #1391 from aMannus/rando-skip-scarecrow
Rando: Add Skip Scarecrow's Song option
2022-09-03 15:04:58 -04:00
aMannus
274242e0d7 Implement rando bombchu drops 2022-09-03 20:17:12 +02:00
Sarge-117
bb04e9d97d Restore checkboxes to enhancements menu
These got lost in the merge
2022-09-03 09:57:35 -07:00
aMannus
8d2f63419f Implement Skip Scarecrow's Song 2022-09-03 14:40:41 +02:00
aMannus
3aefd4c519 gSaveContext access in GameMenuBar.cpp 2022-09-03 12:47:32 +02:00
briaguya
ea4e0652e7 bring back new rando dropdown 2022-09-03 04:41:43 -04:00
David Chavez
0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS (#1310)
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
2022-09-03 00:00:04 -04:00