Sarge-117
|
347154c4d1
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 22:31:21 -07:00 |
|
briaguya
|
6439c45f26
|
Merge pull request #1402 from garrettjoecox/beans-obtainability-fix
Fix for beans obtainability
|
2022-09-03 20:04:11 -04:00 |
|
briaguya
|
e55ec29d66
|
Merge pull request #1396 from garrettjoecox/item-tracker-notes
Persist item tracker notes
|
2022-09-03 18:40:32 -04: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 |
|
Sarge-117
|
9b841c428a
|
Merge pull request #11 from aMannus/rando-magical-arrows
Incorporate magic arrows in rando settings
|
2022-09-03 14:05:49 -07:00 |
|
Sarge-117
|
4c6aeb9fb0
|
Merge branch 'rando-enhanced-magic-arrows' into rando-magical-arrows
|
2022-09-03 14:05:37 -07:00 |
|
aMannus
|
70ab1406e1
|
Incorporate magic arrows in rando settings
|
2022-09-03 22:56:09 +02:00 |
|
Garrett Cox
|
77a5d03019
|
Hook into file delete and clear notes
|
2022-09-03 15:46:33 -05:00 |
|
Garrett Cox
|
72660e2cfd
|
Fix for beans obtainability
|
2022-09-03 15:28:59 -05:00 |
|
Sarge-117
|
2b540df7ea
|
Update logic Cvar name
|
2022-09-03 12:57:46 -07: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 |
|
briaguya
|
8e49f0465c
|
Merge pull request #1399 from aMannus/rando-bombchu-drops
Rando: Add Bombchu Drops
|
2022-09-03 15:03:30 -04:00 |
|
Sarge-117
|
e1da7bf9af
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 11:58:38 -07:00 |
|
aMannus
|
6cd8d6ca3a
|
Clean up bool
|
2022-09-03 20:48:00 +02:00 |
|
aMannus
|
8d033c6766
|
Update settings.cpp
|
2022-09-03 20:29:45 +02:00 |
|
Sarge-117
|
0151294648
|
Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
|
2022-09-03 11:24:17 -07:00 |
|
aMannus
|
ae0ccb9cca
|
Missing break
|
2022-09-03 20:18:54 +02:00 |
|
aMannus
|
274242e0d7
|
Implement rando bombchu drops
|
2022-09-03 20:17:12 +02:00 |
|
briaguya
|
cbc181bc0a
|
Merge pull request #1392 from lilDavid/re-add_progressive_chus
Reimplement progressive Bombchus + fix bowling Bombchu prize
|
2022-09-03 14:13:17 -04:00 |
|
Sarge-117
|
a397b07ec4
|
Update location access logic
Including MQ locations in Spirit and GC now
|
2022-09-03 10:37:14 -07:00 |
|
briaguya
|
98dbbfda13
|
Merge pull request #1395 from leggettc18/starting-bgs
Fixes Link starting with BGS
|
2022-09-03 13:36:12 -04:00 |
|
briaguya
|
1f7122025f
|
Merge pull request #1394 from leggettc18/leggettc18/issue1390
Rando-next: Fixes Enemy Drops giving a blue rupee
|
2022-09-03 13:33:19 -04:00 |
|
Sarge-117
|
bb04e9d97d
|
Restore checkboxes to enhancements menu
These got lost in the merge
|
2022-09-03 09:57:35 -07:00 |
|
Sarge-117
|
43372155f2
|
Fix mistake from merge
oops
|
2022-09-03 09:39:42 -07:00 |
|
Sarge-117
|
05f7b65d28
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 09:30:14 -07:00 |
|
Garrett Cox
|
b92b1eaee6
|
Use SohImGui::RequestCvarSaveOnNextTick
|
2022-09-03 09:33:54 -05:00 |
|
Garrett Cox
|
90bf5988ee
|
Adjust Hooks include
|
2022-09-03 09:30:53 -05:00 |
|
Garrett Cox
|
8be6f6e441
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes
|
2022-09-03 09:19:14 -05:00 |
|
Garrett Cox
|
ed8966054c
|
Persist item tracker notes
|
2022-09-03 09:15:05 -05:00 |
|
Christopher Leggett
|
e079c254f1
|
Fixes Link starting with BGS
|
2022-09-03 09:39:03 -04:00 |
|
Christopher Leggett
|
5421ad27c9
|
Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
|
2022-09-03 09:24:37 -04:00 |
|
lil David
|
f5fae6df32
|
Reimplement progressive Bombchus
|
2022-09-03 08:11:51 -05: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
|
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 |
|