briaguya
975a854054
Merge branch 'develop-zhora' into z-to-rando-next
2022-09-03 03:47:09 -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
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
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
f6fd116adb
Cast randoGet for ganons boss key
2022-09-02 20:19:28 -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
PurpleHato
f69d9697e9
Struct instead of ImVec + basic comportment for all case
2022-09-03 01:30:47 +02: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
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
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
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
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
ee2f38ad91
Renaming of some randomizer item/check/get methods
2022-09-02 10:34:20 -05:00
Garrett Cox
c7a7059db4
Minor adjustments from feedback and rename CanObtain to ItemObtainability
2022-09-02 09:38:41 -05:00
Garrett Cox
676f8945ab
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes
2022-09-02 09:15:31 -05:00
Christopher Leggett
812a1e7970
Added return statement in IsVanillaItem before keys.
2022-09-01 17:50:12 -04:00
briaguya
f391505b0e
Merge pull request #1344 from aMannus/more-random-rupee-names
...
Rando: German and more English random rupee names
2022-09-01 15:18:29 -04:00
aMannus
2f6e070223
Merge branch 'rando-next' into rando-settings-menu-even-moar-changes
2022-09-01 20:26:29 +02:00
aMannus
38dca43b3f
Name changes and small layout changes
2022-09-01 20:25:10 +02:00
aMannus
1e13879c6b
Removed name
2022-09-01 19:43:08 +02:00
briaguya
26c41079bd
Merge pull request #1362 from lilDavid/rando_biggoron_fix
...
Randomizer: Fix Biggoron checks
2022-09-01 12:50:37 -04:00
briaguya
a55eb572db
fix keysanity related build issue
2022-09-01 12:06:41 -04:00
briaguya
5a009590fc
Merge remote-tracking branch 'origin/develop-zhora' into ztorn
2022-09-01 12:06:25 -04:00
lil David
c84654b202
Always check n64ddFlag before bgsFlag
...
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
2022-09-01 09:23:08 -05:00
lil David
0a744cde01
Clarify comments
2022-09-01 08:11:17 -05:00
lil David
ea9db56914
Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic
2022-09-01 07:59:09 -05:00
aMannus
354905fb7d
Added 1 more name
2022-09-01 11:06:05 +02:00
lilDavid
cfaed3ded0
Make Biggoron ignore whether you have BGS in rando
2022-08-31 22:07:34 -05:00
louist103
584a4ad818
Linux crash handler ( #1209 )
...
* crash handler linux
* cleanups
* missing underscore
* more cleanups
* cleanups
* 32 bit
2022-08-31 22:59:38 -04:00
Sarge-117
75e5330263
Add German
2022-08-31 17:23:16 -07:00
briaguya
1f12caa5c9
fix oot ice trap check optimization issues
2022-08-31 18:15:09 -04:00
briaguya
32c36eb5c4
Merge pull request #1355 from leggettc18/rando-next-chest-fixes
...
Randomizer: Fixes a few bugs related to chests.
2022-08-31 16:15:46 -04:00
Christopher Leggett
042d6f3865
Fixes a few bugs related to chests.
2022-08-31 10:57:59 -04:00
Christopher Leggett
bf505dba5c
Fixes keys, maps, and compasses on develop-zhora rando ( #1338 )
...
* Fixes keys, maps, and compasses on develop-zhora rando.
* Adds randotodo comment as a note to adapt for the keysanity situation.
2022-08-31 15:25:58 +02:00
Christopher Leggett
776219fb52
Backports a fix for sheik checks from rando-next ( #1340 )
...
* Fixes some Sheik checks I had accidentally set the wrong flag for.
* Removes duplicate switch case from cherry-pick
2022-08-31 15:25:47 +02:00
aMannus
3502cea422
Renamed tabs
2022-08-31 10:10:28 +02:00
aMannus
c10693d281
Merge branch 'rando-next' into rando-settings-menu-even-moar-changes
2022-08-31 10:02:13 +02:00
Sarge-117
55fa913c78
Couple more
...
Just need German for these
Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
2022-08-30 15:24:44 -07:00
Sarge-117
d9ad01174b
Merge remote-tracking branch 'upstream/rando-next' into update-navi-hints-rando
2022-08-30 14:22:11 -07:00
Sarge-117
b803c77f58
Add French translation
...
Thanks to PurpleHato
2022-08-30 14:22:02 -07:00
Christopher Leggett
60257b98a4
Oops. Missed closing bracket.
2022-08-30 11:21:29 -04:00
Christopher Leggett
3856d1b0a7
Fixed small key case that was behind an else and shouldn't have been
2022-08-30 11:00:47 -04:00
Sarge-117
f4e53c54b5
Correct German spellings, add 2 more hints
2022-08-29 18:17:23 -07:00
Christopher Leggett
99674ff88c
Readds missing workaround for spirit temple and ganon's castle keys.
2022-08-29 19:19:01 -04:00
Garrett Cox
c7207d2e0a
Move obtainability check up higher
2022-08-29 17:42:48 -05:00
Garrett Cox
8c6774fa35
More small changes
2022-08-29 16:00:47 -05:00
Garrett Cox
ded7ccab3f
Minor fixes
2022-08-29 15:35:37 -05:00
Garrett Cox
5961c33ba9
Rename GetItemFromGet and move obtainability checks to a separate function
2022-08-29 15:26:27 -05:00
aMannus
1161873044
Moar names
2022-08-29 21:51:42 +02:00
Christopher Leggett
51dbee365a
Oops part 2
2022-08-29 01:04:13 -04:00
Christopher Leggett
f44c588a2c
Oops
2022-08-29 01:03:21 -04:00
Christopher Leggett
a84262dbf7
Bit of cleanup
2022-08-29 00:11:10 -04:00
Christopher Leggett
0a27714b8e
Adds missing case for RSK_GERUDO_KEYS from spoilerfile parsing.
2022-08-29 00:09:44 -04:00
Christopher Leggett
35d651f06e
When shuffled to Own Dungeon or below, give vanilla keys, maps, and compasses.
2022-08-28 23:54:13 -04:00
Christopher Leggett
760eaa4d97
Adds randotodo comment as a note to adapt for the keysanity situation.
2022-08-28 23:14:42 -04:00
Christopher Leggett
0de1cd96b1
Fixes keys, maps, and compasses on develop-zhora rando.
2022-08-28 23:14:29 -04:00
aMannus
fdc0aa9ab4
Code Cleanup
2022-08-28 21:07:18 +02:00
aMannus
2456473f49
Merge fix
2022-08-28 20:21:32 +02:00
aMannus
1c59995feb
Merge branch 'rando-next' into rando-settings-menu-even-moar-changes
2022-08-28 20:19:19 +02:00
aMannus
77f4472902
Redone layout tabs/columns
2022-08-28 19:40:46 +02:00
briaguya
6d4288c2a5
Merge pull request #1331 from leggettc18/ganon-trials
...
Reimplements selecting different amounts of Ganon's Trials.
2022-08-28 11:48:34 -04:00
Christopher Leggett
9c43f7225b
Adds captilization to French spoilerfile strings.
2022-08-27 18:45:21 -04:00
Christopher Leggett
fafd90482b
Refactor of some old rando code to use new functions.
2022-08-27 18:42:36 -04:00
Christopher Leggett
6aaef2179b
More Cleanup
2022-08-27 18:26:25 -04:00
Christopher Leggett
404a637ebd
Removes added function that went unused.
2022-08-27 15:56:11 -04:00
Christopher Leggett
dbd8909d26
Forgot to limit slider from 1-6 rather than 0-6
2022-08-27 15:53:57 -04:00
Christopher Leggett
4d8bfa97c0
UI Changes (dropdown and slider rather than checkbox and slider)
2022-08-27 15:51:14 -04:00
Christopher Leggett
3d8b8066da
More comment cleanup
2022-08-27 14:33:38 -04:00
Christopher Leggett
ff0ef4a6b4
ImGui/Commented out code cleanup.
2022-08-27 14:27:02 -04:00
Christopher Leggett
1bf8423f75
Reimplements selecting different amounts of Ganon's Trials.
2022-08-27 14:19:37 -04:00
Christopher Leggett
928a39fe9e
More Cleanup
2022-08-27 09:30:49 -04:00
Christopher Leggett
a572c11f4f
Fixes ice trap gidata not getting cleared after trap is sprung. ( #1322 )
2022-08-27 09:27:20 +02:00
Christopher Leggett
bf1b327a95
Cleanup and Documentation
2022-08-27 02:50:44 -04:00
Christopher Leggett
7fbb381db7
Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.
2022-08-27 02:25:13 -04:00
Christopher Leggett
62aeac51b9
ACTUALLY fixes adult trade items on save init this time.
2022-08-26 22:14:49 -04:00
Christopher Leggett
9f47099232
Properly handles starting link with adult trade items.
2022-08-26 21:17:12 -04:00
Christopher Leggett
05136c13b7
Fixes Link getting Song as pocket item ( #1326 )
2022-08-27 02:46:19 +02:00
aMannus
637f089485
some stuff
2022-08-27 00:42:54 +02:00
aMannus
83abf57766
Add skull token to links pocket
2022-08-26 23:51:36 +02:00
aMannus
4ebcc83161
Code styling
2022-08-26 15:13:34 +02:00
aMannus
9e6d61d7ec
Incompatible checkboxes
2022-08-26 11:13:11 +02:00
aMannus
b43f77caba
Columns in childs & code style changes
2022-08-26 09:56:34 +02:00
Christopher Leggett
53531c4481
Cleanup
2022-08-26 01:17:51 -04:00
Christopher Leggett
9148fa5aec
Adds custom particles to Freestanding Bean Pack item.
2022-08-25 20:48:28 -04:00
Christopher Leggett
4a51ab3187
Fixes bug where Bean Pack was also granting blue potion
2022-08-25 20:42:34 -04:00
Christopher Leggett
71e7fb9d70
Merge rando-next and rename scrub message table to merchant message table
2022-08-25 18:02:00 -04:00
Christopher Leggett
e9fa231ae6
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack
2022-08-25 17:45:41 -04:00
briaguya
0107699a6b
more formatting
2022-08-25 17:29:09 -04:00
