Commit Graph

1622 Commits

Author SHA1 Message Date
compiling
9852352027 Temp 2021-04-21 18:40:54 +10:00
compiling
30baec65af Merge remote-tracking branch 'remotes/origin/Dev-owg' into DoorDevUnstable 2021-04-18 14:28:29 +10:00
compiling
b6fe468164 Import inverted pyramid fairy rules from Entrance Rando 2021-04-18 13:25:04 +10:00
compiling
7a255a008e Fix moved locations in copy_world routine. 2021-04-18 13:25:04 +10:00
compiling
72d980394c Add setting code to logs 2021-04-18 13:25:04 +10:00
aerinon
960b8de237 Merge pull request #104 from StructuralMike/DoorDevUnstable
gui startinginventory with Magic Cape
2021-03-22 11:33:14 -06:00
StructuralMike
9b06c6d947 Magic Cape in the GUI --> Cape 2021-03-19 09:19:41 +01:00
StructuralMike
83aa2cb006 Merge pull request #2 from aerinon/DoorDevUnstable
Door dev unstable
2021-03-18 23:18:56 +01:00
aerinon
46d891f401 Update release notes 2021-03-18 13:55:24 -06:00
aerinon
bb9977d410 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable 2021-03-18 13:53:33 -06:00
aerinon
906134800b Fixed the error with TFH counter turned on for wrong modes
Updated pip requirements for MultiClient
Fixed Big bomb rules for Inverted (merge mistake)
2021-03-18 13:53:19 -06:00
StructuralMike
b20127163a Merge pull request #1 from aerinon/DoorDevUnstable
Door dev unstable
2021-03-18 17:16:16 +01:00
StructuralMike
5b37b32c8d Revert "Revert "Update .gitignore""
This reverts commit 5073b9e630.
2021-03-18 16:33:25 +01:00
StructuralMike
5073b9e630 Revert "Update .gitignore"
This reverts commit f95270587f.
2021-03-18 16:19:42 +01:00
Mike A. Trethewey
4c9fc3464b Ubuntu is on Focal now 2021-03-18 00:42:17 -07:00
Mike A. Trethewey
b4c5346b9c Update CI 2021-03-18 00:32:25 -07:00
Mike A. Trethewey
e48a69d9e9 Extrapolate requirements file 2021-03-17 23:58:20 -07:00
Mike A. Trethewey
d6a433e467 Add pathing intelligence 2021-03-17 17:50:51 -07:00
randall.rupper
27ed4ecd04 Small Shopsanity price adjustments
Fixed a subtle error with shop shields and progressive shields - should result in more successful generation
2021-03-17 14:37:39 -06:00
randall.rupper
7b9deb2190 Merge branch 'DoorDevUnstable' of https://github.com/Fouton/ALttPDoorRandomizer into Fouton-DoorDevUnstable
some refinements too

# Conflicts:
#	ItemList.py
2021-03-16 15:15:48 -06:00
randall.rupper
3c81e377e5 Fix for intensity 3 inverted lobbies if lobbies are chosen to be vanilla
Flooded pots not actually able to be flooded in some potshuffles
2021-03-16 14:23:52 -06:00
randall.rupper
7ef186134a Merge branch 'StructuralMike-TFH-fix' into DoorDevUnstable 2021-03-16 14:14:35 -06:00
StructuralMike
40119b3a5f Retro-Standard can't have bow on uncle
I don't know if the best solution is to exclude the bow from the options, or to have uncle give bow + arrows. I think the former is better as buying your arrow is part of retro.
2021-03-16 17:34:08 +01:00
StructuralMike
6bf3479e08 TFH playthrough fix
copy_world overwrites Murahdahla's logic and either needs to be reset through set_rules to work properly.
2021-03-16 14:15:56 +01:00
StructuralMike
9f00862e04 Merge branch 'DoorDevUnstable' of https://github.com/Aerinon/ALttPDoorRandomizer into DoorDevUnstable 2021-03-16 13:27:07 +01:00
StructuralMike
f95270587f Update .gitignore 2021-03-16 13:26:21 +01:00
Mike A. Trethewey
ed2813c85e Make local install a little smarter 2021-03-16 00:58:09 -07:00
Mike A. Trethewey
61980e859d What's a script name? 2021-03-15 22:22:59 -07:00
Mike A. Trethewey
f769ada8eb Markdown is hard 2021-03-15 22:19:28 -07:00
Mike A. Trethewey
3a370eb9f9 Update BUILDING.md 2021-03-15 22:17:33 -07:00
Mike A. Trethewey
da62fe98ba Update build instructions 2021-03-15 22:15:19 -07:00
Fouton
c47090ce61 Add files via upload 2021-03-12 22:15:27 -05:00
Fouton
1aa770e33a Add files via upload 2021-03-12 21:58:19 -05:00
Fouton
6526d1b877 Add files via upload 2021-03-12 21:48:51 -05:00
Fouton
05413011a9 Add files via upload 2021-03-12 21:46:54 -05:00
Fouton
d62b11742b Add files via upload 2021-03-12 21:45:27 -05:00
Fouton
08a5e2f27f Add files via upload 2021-03-12 21:22:35 -05:00
aerinon
749b94fa9f Merge pull request #97 from krelbel/chaosfix
Fix chaos boss/enemy shuffle
2021-03-12 16:33:48 -07:00
Fouton
2e07fc2dd0 Add files via upload 2021-03-12 16:57:42 -05:00
Fouton
0865288581 Add files via upload 2021-03-12 16:53:08 -05:00
Fouton
2a1eb07d73 Add files via upload 2021-03-12 16:51:16 -05:00
Fouton
1e63d3957d TFH Futures 2021-03-12 16:41:58 -05:00
Fouton
8d933b82de TFH Futures 2021-03-12 16:41:35 -05:00
krelbel
5210bbe4e0 Fix chaos boss/enemy shuffle
Update BaseClasses.py to make make_code()'s byte 6 handle "chaos" boss/enemy shuffle the same as "random".
2021-03-09 22:10:30 -08:00
randall.rupper
fd7728235d Fix for multiworld progression balancing with shopsanity off 2021-03-09 16:14:16 -07:00
randall.rupper
9a2474f8ca Merge branch 'DoorDevUnstable' of https://github.com/compiling/ALttPEntranceRandomizer into compiling-DoorDevUnstable 2021-03-09 13:40:52 -07:00
compiling
ef08bf33d5 Reset Skull Pinball logical state between generation attempts. 2021-03-06 12:26:58 +11:00
StructuralMike
25d24dc15f Update .gitignore 2021-03-05 21:04:30 +01:00
Mike A. Trethewey
7e3080d78b Merge pull request #3 from aerinon/DoorDevUnstable
Update from Aerinon
2021-03-05 10:32:27 -08:00
randall.rupper
dc5cd2b744 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2021-03-05 10:43:05 -07:00