Commit Graph

722 Commits

Author SHA1 Message Date
aerinon
2f0d64103e Merge branch 'StandingItems' into DoorDevVolatile
# Conflicts:
#	Rules.py
#	source/item/FillUtil.py
2022-01-21 16:21:59 -07:00
aerinon
e76bc92e42 Fix bombbag bug 2022-01-21 16:15:51 -07:00
aerinon
5211b305e6 Re-worked settings for pottery lottery
Fixed multiworld support for lottery
2022-01-21 16:10:33 -07:00
aerinon
d0f38ec659 Setup release notes and version 2022-01-13 17:11:37 -07:00
aerinon
b55583c524 Merge branch 'DoorDevUnstable' into DoorDev
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-01-13 15:23:49 -07:00
aerinon
bcf1ce297c Bunch of logic fixes for various pots
Vanilla fill support for potsanity
Fix for playthrough error
2022-01-07 14:46:25 -07:00
aerinon
f9c1219785 Merge branch 'DoorDevVolatile' into StandingItems
# Conflicts:
#	Rom.py
#	data/base2current.bps
2022-01-06 16:09:42 -07:00
aerinon
fab5f5bb70 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-01-06 16:06:51 -07:00
codemann8
596c26a462 Merged in DR v0.5.1.7 2022-01-06 02:23:24 -06:00
aerinon
45bb92151f -Fix for Inverted Mode: Dark Lake Hylia shop sells a blue potion
-Fix for Ijwu's enemizer: Boss door in Thieves' Town no longer closes after the maiden hint
-AllowAccidentalMajorGlitches set for no logic
2022-01-04 22:10:42 -07:00
aerinon
515f6dafed Standing Items refinement - starting testing no keydrops and pot shuffle
Fairly substantial change to Crossed Sector distribution due to so many pots making it fail
2022-01-04 15:48:27 -07:00
e2187e6581 Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle 2022-01-04 00:27:20 -08:00
683bea7af4 Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle 2022-01-01 15:41:50 -08:00
b99fd4a820 Allow using _ in startinventory argument 2021-12-20 21:52:54 -08:00
aerinon
b2f2565271 Standing Items initial commit 2021-12-16 16:02:11 -07:00
codemann8
07a956a3a4 Fixed issue with logic not correctly placing Blue potion in Dark Lake Shop 2021-12-16 16:17:51 -06:00
codemann8
d2dc33638e Merged in DR v0.5.1.6 2021-12-07 04:51:43 -06:00
aerinon
74155ec5ae Version and release note update 2021-12-06 15:28:19 -07:00
061b8975f9 Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle 2021-11-29 00:20:15 -08:00
codemann8
6506f6d077 Minor tweak to Big Bomb Shop showing up in spoiler 2021-11-24 00:47:46 -06:00
aerinon
ba8f15b6e0 Clean up and vanilla fill improvements 2021-11-15 16:22:50 -07:00
codemann8
9db079fbbe Fixed Mystery filename to not spoil OWR 2021-11-09 18:57:45 -06:00
1b0c3db38f Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle 2021-11-08 00:23:30 -08:00
codemann8
f0d128d9a0 Moved special Big Bomb pathing to Pyramid Crack 2021-11-05 16:27:31 -05:00
codemann8
87f0cdd3fd Initial red bomb pathing 2021-11-05 12:28:16 -05:00
codemann8
8a495e1b81 Merged in DR v0.5.1.5 2021-11-02 18:14:17 -05:00
aerinon
61f659a511 Initial fill changes
Merge branch 'Bias' into DoorDevVolatile

# Conflicts:
#	Rom.py
2021-11-02 16:03:21 -06:00
aerinon
4131896f93 Release notes for restricted boss item 2021-11-02 15:40:15 -06:00
aerinon
3369528596 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	Rom.py
#	data/base2current.bps
2021-11-02 15:31:14 -06:00
aerinon
90f7016f49 Update release notes and version
Remove tileset fix (I like the other more visually)
2021-11-02 15:25:34 -06:00
Catobat
01e4c2bff7 Include bottle refills in spoiler 2021-11-01 17:58:01 +01:00
codemann8
fe358e921a Added missing Starting Equipment section in spoiler log 2021-10-31 19:47:57 -05:00
b8304c4c76 Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle 2021-10-30 13:58:45 -07:00
aerinon
e78f9218f5 Merge branch 'Ambrosia' into DoorDevVolatile
# Conflicts:
#	BaseClasses.py
#	CLI.py
#	Main.py
2021-10-29 15:26:51 -06:00
codemann8
a965e854a7 Changed spoiler output to occur in stages rather than once at the end 2021-10-28 00:21:46 -05:00
codemann8
08ab32537b Implemented Whirlpool Shuffle 2021-10-27 01:19:01 -05:00
codemann8
4c4c188413 Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffleDev 2021-10-21 21:45:50 -05:00
aerinon
9b5e6c8beb Updated baserom and release notes 2021-10-21 16:49:05 -06:00
aerinon
593355f839 Quadrant glitch mistake reversion
Fix for inverted diggable portals
2021-10-21 16:34:27 -06:00
aerinon
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
codemann8
600ea25003 Initial check-in for ER rewrite 2021-10-14 22:13:47 -05:00
0c9270bdb0 Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle 2021-10-07 15:28:16 -07:00
aerinon
28b87428cc Changed bias named. Added districting 2021-10-05 13:58:30 -06:00
070b463952 Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle 2021-10-02 21:18:15 -07:00
codemann8
2c21d95e57 Minor filename output change 2021-10-02 20:00:37 -05:00
codemann8
21525b6d18 Removal of OW world code in copy_world, in prep for ER rewrite 2021-10-02 13:46:32 -05:00
aerinon
035621e420 Rupee bow forbids certain lobbies in HC in standard
Allow a lobby in keydrop shuffle
Key rule fix when bk isn't possible
Added controller awareness to world traversal
2021-09-28 14:57:17 -06:00
d733eca0f8 Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle 2021-09-21 12:37:57 -07:00
codemann8
ecacba55a4 Merged in DR v0.5.1.2 2021-09-17 11:12:05 -05:00
aerinon
ee545b3543 Merge branch 'Ambrosia' into Bias 2021-09-16 16:15:10 -06:00