Commit Graph

41 Commits

Author SHA1 Message Date
aerinon
90f1629f0e Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py
2023-08-04 11:33:31 -06:00
aerinon
5da0836d9f Fixed logic with mirror in west dark world 2023-06-16 09:15:06 -06:00
aerinon
503be6aa91 Enemizer refinement 2023-05-19 08:53:01 -06:00
aerinon
d5e69b28f2 Fix for Non-ER Inverted Experimental (Aga and GT weren't logically swapped)
Fix for customizer setting crystals to 0 for either GT/Ganon
2023-04-14 15:23:38 -06:00
aerinon
4af9419461 GUI cleanup
Fix Chest Game prize display
2023-04-07 16:01:08 -06:00
aerinon
50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
aerinon
09550cd546 Minor fix 2023-04-04 16:53:45 -06:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
aerinon
f4524d8a87 Fix Snitch Lady (West) location on map 2023-03-13 16:28:11 -06:00
aerinon
affd7568cb Minor adjustments to world model refactor 2023-03-09 16:48:14 -07:00
aerinon
1a1c60f84a Merge branch 'SynthesisOWRMerge' of github.com:codemann8/ALttPDoorRandomizer into codemann8-SynthesisOWRMerge
# Conflicts:
#	Rules.py
#	source/overworld/EntranceShuffle2.py
2023-03-09 11:29:03 -07:00
aerinon
a75b36e2eb ER2 Minor issues 2023-03-01 16:23:03 -07:00
aerinon
2b8b9156d9 Minor randomization consistency 2023-02-17 10:03:37 -07:00
aerinon
fb13785abc Minor standard generation fix
Minor ER + Partitioned fix
2023-02-06 13:46:25 -07:00
aerinon
7c75053cc1 Fix for vanilla mire key logic 2023-01-30 15:32:26 -07:00
aerinon
4547a0a43b Logic fix for sanc mirror route
Minor updates to customizer
Minor update to new ER (seed duplication issue)
2023-01-18 08:02:32 -07:00
aerinon
9ca3d179f9 Fix for randomization replication issue 2023-01-06 15:01:24 -07:00
aerinon
c2da20207b Fix for experimental inverted + vanilla ER 2023-01-03 16:10:32 -07:00
codemann8
118adabeb1 Changing mirror exits to be dynamically created 2022-12-30 06:17:54 -06:00
codemann8
c6d0df5f4f Modeling Fairy Ascension Mirror Spot more correctly 2022-12-29 23:46:15 -06:00
codemann8
6240061a65 Final fixes and reorganization to Inverted Region merging 2022-12-16 18:26:05 -06:00
codemann8
55a91f8d17 Merged in DRUnstable v1.2.0.1 2022-12-16 18:18:07 -06:00
codemann8
2d26954422 Final fixes and reorganization to Inverted Region merging 2022-12-15 17:26:02 -06:00
codemann8
86c8fd37e7 Reorganized and renamed regions, rules, and lists 2022-12-14 05:36:36 -06:00
codemann8
f8bba4176b Reorganized and renamed regions, rules, and lists 2022-12-14 04:12:17 -06:00
codemann8
8e08f336d0 Merging Regions and Rulesets 2022-12-13 01:40:44 -06:00
aerinon
f0ad711e78 Fix inverted Lean/Lite ER 2022-12-09 16:44:26 -07:00
codemann8
5ac01f4f35 Merged Inverted/Open ER code and data 2022-12-07 22:16:55 -06:00
codemann8
52edfcdddb Merged Inverted/Open ER code and data 2022-12-07 22:05:48 -06:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
aerinon
fa75d2b4e9 Possible fix for standing items weirdness
Generation fix for Bumper Cave
Chaos door type fix
Minor fix for universal keys
Relaase notes update
2022-11-10 14:14:54 -07:00
aerinon
bd619ff2ef Bumper cave fixes for ES2 2022-10-27 15:48:04 -06:00
aerinon
1167f2b1ba Bumper cave fix for new entrance shuffle 2022-10-27 15:23:58 -06:00
aerinon
6b369b68b7 Update lite/lean with pottery options. Houses and caves with pots are shuffled in the ER pool if the pottery setting turns that on. 2022-08-24 13:29:14 -06:00
aerinon
b2ae92a451 Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct
2022-08-11 15:37:19 -06:00
aerinon
64048ba58d Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py

Also fixed a bug with lite/lean
2022-06-22 10:53:06 -06:00
Catobat
24e919c4a7 Fix Insanity 2022-06-13 20:51:11 +02:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
b5684cbf7d Minor bug with ER customization 2022-03-29 12:13:19 -06:00
aerinon
5e07e49798 Fix documentation and example
Fix msu_resume issue
Fix empty locations
Throw error on unknown items
2022-03-25 08:43:11 -06:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00