alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity
2,118 Commits 8 Branches 17 Tags
4f2fed48d7be409b9105104ad9886d35704c677b
Commit Graph

555 Commits

Author SHA1 Message Date
aerinon
9caea3fc85 Merge branch 'DoorDevUnstable' into Synthesis 
# Conflicts:
#	CLI.py
#	Main.py
#	Rom.py
#	data/base2current.bps
 2022-09-08 13:47:38 -06:00
aerinon
c298b392d0 Fix for rain prevented doors fouling up key doors 2022-09-07 16:53:52 -06:00
aerinon
87834986d4 Retro break up of various options 2022-09-02 13:09:39 -06:00
aerinon
af4f8e5b4b Flute mode 
And some odd fixes
 2022-09-01 13:59:26 -06:00
aerinon
7be5cc1a6b Merge branch 'Customizer' into Synthesis 
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-24 14:29:10 -06:00
aerinon
152c383233 Merge branch 'DoorDevUnstable' into Customizer 
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-24 13:38:59 -06:00
aerinon
5d419210af Fix a bank conflict with OWR 
Release notes and version bump
 2022-08-24 13:18:01 -06:00
aerinon
0d9d6f2ceb Copy world needs to copy location type 2022-08-24 13:10:57 -06:00
aerinon
32305a2202 Copy world needs to copy location type 2022-08-24 12:53:04 -06:00
aerinon
21456b5c90 Merge branch 'Customizer' into Synthesis 
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
 2022-08-11 16:06:50 -06:00
aerinon
1168273e43 Merge branch 'DoorDevUnstable' into Synthesis 
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
 2022-08-11 15:43:33 -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
32714b4c6a Fix for colorized pots in "dark desert hint" aka mire storyteller 2022-08-05 16:48:34 -06:00
aerinon
e167811d34 Merge branch 'DoorDevUnstable' into Synthesis 
# Conflicts:
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-05 14:06:01 -06:00
aerinon
09fbdc46ca Finish bomb/dash doors 
Lots of minor fixes
Fixed a few existing bugs
 2022-08-05 14:01:19 -06:00
aerinon
f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
aerinon
d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon
04fc0b442d Hotfix for enemizer and pot substitutions 2022-06-30 11:51:34 -06:00
aerinon
d488df6d18 Pot substitutions for certain items 2022-06-29 12:58:10 -06:00
aerinon
b13e15f999 Merge branch 'DecoupledDoors' into Synthesis 
# Conflicts:
#	BaseClasses.py
#	DoorShuffle.py
 2022-06-23 10:59:44 -06:00
aerinon
b426d47a0a Merge branch 'Customizer' into StandardThrone 
# Conflicts:
#	Main.py
 2022-06-23 10:38:18 -06:00
aerinon
8ec852a737 Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	Main.py
 2022-06-23 10:37:38 -06:00
aerinon
fe814005d6 Waterfall of Wishing logic exit fix revised 2022-06-23 10:36:51 -06:00
aerinon
1972500e31 Merge branch 'Customizer' into StandardThrone 
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
 2022-06-22 13:08:38 -06:00
aerinon
c487634d3d Merge branch 'DoorDevVolatile' into StandardThrone 
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-06-22 10:55:55 -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
aerinon
377989d406 Update release notes and version 2022-06-22 10:43:39 -06:00
aerinon
8d140c9bf8 Spoiler refactor 2022-06-17 14:36:51 -06:00
aerinon
8a6b05fe8f Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	Main.py
#	Rom.py
 2022-06-15 16:56:57 -06:00
aerinon
25905fe3f3 Capitalization fixes 
Highlight part of the text in red (experimental)
 2022-06-14 13:22:24 -06:00
aerinon
5dce2daa0b Standard throne room changes 2022-06-14 12:29:57 -06:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -06:00
aerinon
8fd010985f Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	DoorShuffle.py
#	ItemList.py
#	Main.py
 2022-05-24 10:09:36 -06:00
aerinon
afdb8ebac8 DungeonCompletion fixed 
Minor issue with dungeon counters fixed
 2022-05-18 15:04:20 -06:00
aerinon
a48a73bcb7 MultiClient fix for shop sram move 2022-05-13 16:09:03 -06:00
aerinon
6ab426b9f3 Fix for keydrops/enemy drops to not be repeatable 2022-05-03 13:55:39 -06:00
aerinon
ea745ff22e Hotfix for paired doors 
Also made dashable filter work
 2022-04-30 15:28:29 -06:00
aerinon
ecf6a0bd10 Version bump 
Generation fix for inverted
 2022-04-29 08:10:08 -06:00
aerinon
f93ecf9412 New baserom with various fixes for both font and multiclient issue with pottery 
Bump TFH limit to 850. It throws an error if you try to generate with too many pieces.
 2022-04-28 16:27:37 -06:00
aerinon
7dd5cc0e36 Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py
 2022-04-21 11:14:40 -06:00
aerinon
31aeb8a776 Pottery fixes for Room0127 
Added mystery flag for future use
 2022-04-21 11:03:49 -06:00
aerinon
4880f8017a Pottery fix for vanilla hera key 2022-04-20 08:51:32 -06:00
aerinon
26e8e23fce Initial work on new pottery modes 2022-04-19 13:56:39 -06:00
aerinon
69bae0f338 Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	DoorShuffle.py
 2022-03-29 13:30:49 -06:00
aerinon
8bc446fbc5 Logic refinements for Skull X Room and GT Falling Torches 2022-03-29 13:28:05 -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
27b836f16d Merge branch 'DoorDevVolatile' into Customizer 2022-03-25 08:00:30 -06:00
aerinon
901cdff47e Hammerdash + pots fixed so it won't put link in a weird state 
Freeze + hammer on enemies that drop keys (or items in dropshuffle) fixed
Inverted bug fixed
 2022-03-23 14:29:54 -06:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00