Commit Graph

1633 Commits

Author SHA1 Message Date
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
431231f2be
Merge pull request #1388 from briaguya-ai/z-to-rando-next
zhora -> rando-next
2022-09-03 06:10:09 -04:00
briaguya
007540fb39 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 05:55:40 -04:00
aMannus
f1dc980de8 Fixed autobreak after ImGui cleanup 2022-09-03 05:52:01 -04:00
briaguya
ea4e0652e7 bring back new rando dropdown 2022-09-03 04:41:43 -04:00
briaguya
3a6d7fcfd0 and make it build 2022-09-03 04:23:25 -04:00
briaguya
975a854054 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 03:47:09 -04:00
briaguya
db6eeb79ee
Merge pull request #1387 from leggettc18/leggettc18/issue1366
More options for Link's Pocket and Null Global Context safe `Item_Give`
2022-09-03 03:18:50 -04:00
Christopher Leggett
350d0b91ed
Removes unneeded GiveLinkItem functions. 2022-09-03 02:47:42 -04:00
Christopher Leggett
36cc9d562c
Adds more options for Link's starting item. 2022-09-03 02:34:21 -04:00
briaguya
6daf357fd9
fix include fix build (#1385)
Co-authored-by: briaguya <briaguya@alice>
2022-09-03 02:13:20 -04:00
Christopher Leggett
2015e3a041
Converts Song from Impa to use Item_Give 2022-09-03 01:48:07 -04:00
Baoulettes
d2fa0d6485 Rando: Fix Fast File Select seed loading (#1252)
* FixRandoLoading

* better methode
2022-09-03 01:33:24 -04:00
Ada
b14fb37b81 Update libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
Co-authored-by: David Chavez <david@dcvz.io>
2022-09-03 01:33:24 -04:00
Ada
edb5261b07 Fixes ToT Fog 2022-09-03 01:33:24 -04:00
Christopher Leggett
a5804ca2b2
Makes Item_Give safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
2022-09-03 01:22:33 -04:00
louist103
8118947ab0
Windows crash handler. (#1383)
* Windows crash handler.

* Fix naming convention.
2022-09-03 01:15:43 -04:00
briaguya
50daabb794
Merge pull request #1353 from Sarge-117/update-navi-hints-rando
Rando: Navi text: Update German spellings, add some hints
2022-09-03 00:53:39 -04:00
briaguya
df8f94da70
Merge pull request #1382 from leggettc18/leggettc18/issue1365
Fixes Ganon's Castle Crash and Trials coming from old save file
2022-09-03 00:43:43 -04:00
Christopher Leggett
a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux. 2022-09-03 00:20:50 -04:00
Christopher Leggett
fba8fc2b74
Fix Ganons Trials coming from old save files. Fixes #1365 2022-09-03 00:20:07 -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
Garrett Cox
96ccdd6527 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 21:15:41 -05:00
briaguya
adcb29fc86
Merge pull request #1379 from garrettjoecox/GetItem-renaming
Get item renaming
2022-09-02 22:14:12 -04:00
Garrett Cox
b9a545fffa Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 20:19:57 -05:00
Garrett Cox
f6fd116adb Cast randoGet for ganons boss key 2022-09-02 20:19:28 -05:00
Garrett Cox
680495ab2b Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 20:08:06 -05:00
Garrett Cox
e0b0776e02 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming 2022-09-02 20:07:34 -05:00
Garrett Cox
abfeb24ba8 Attempt to fix odd build issue 2022-09-02 20:06:37 -05:00
PurpleHato
f69d9697e9 Struct instead of ImVec + basic comportment for all case 2022-09-03 01:30:47 +02:00
Garrett Cox
b98442cc9f Move shopsanity option in GUI 2022-09-02 18:07:43 -05:00
briaguya
c1894f108f
Merge pull request #1380 from leggettc18/rando-next-key-fix
Fixes Ganon's Boss Key setting discrepancy
2022-09-02 18:33:47 -04:00
Garrett Cox
e53ec33d85 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 17:27:07 -05:00
Garrett Cox
25ed66439e Fix repeatable purchases and bottles rendering incorrectly 2022-09-02 17:23:37 -05:00
briaguya
34d99441d6
Merge pull request #1321 from aMannus/rando-settings-menu-even-moar-changes
Rando: Even more randomizer settings menu changes
2022-09-02 17:00:52 -04:00
PurpleHato
2ead2557f0 combobox title rename + no number tracking 2022-09-02 22:41:05 +02:00
Garrett Cox
d1dac2a2ee Add obtainability checks correctly 2022-09-02 15:22:09 -05:00
PurpleHato
069f7c98a6 Enum + combo box 2022-09-02 22:07:05 +02:00
Christopher Leggett
0cdcc27e53
Fixes Ganon's Boss Key shuffled while regular boss Keys aren't. 2022-09-02 15:45:55 -04:00
Garrett Cox
0277db578f Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 14:33:32 -05:00
Garrett Cox
0c65a05ca8 Revert changes to GetItemFromGet 2022-09-02 14:32:25 -05:00
Garrett Cox
a95edd25de Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming 2022-09-02 14:18:18 -05:00
Garrett Cox
1aa33a7940 Remove comments in OTRGlobals 2022-09-02 14:17:45 -05:00
Garrett Cox
1659f1f386 Re-add GetItemObtainabilityFromRandomizerCheck 2022-09-02 14:00:10 -05:00
Garrett Cox
42858bf15e Add shopsanity condition around shop changes 2022-09-02 13:27:59 -05:00
Garrett Cox
7a22763e55 Fix an issue with textId and with giving items with fanfare 2022-09-02 12:39:08 -05:00
Christopher Leggett
64aca78450
Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities (#1360)
* Reorders switch statement to prevent some code that shouldn't execute.

* Potentially fixes bottleable entities crash

* Solves lack of ItemEntry for GI_MAX

* Adds comment clarifying new GetItemEntry
2022-09-02 19:19:12 +02:00
Garrett Cox
3aa0674c18 Handle bazaar as both child and adult 2022-09-02 12:07:30 -05:00
Garrett Cox
d60a82d67a Use randomizerInf 2022-09-02 11:47:57 -05:00