alwaysintreble 6f9cbe7750 Merge remote-tracking branch 'Main/main' into rework_accessibility ...

# Conflicts:
#	BaseClasses.py
#	playerSettings.yaml
#	worlds/alttp/Options.py
#	worlds/alttp/Rules.py
#	worlds/alttp/test/dungeons/TestDungeon.py
#	worlds/alttp/test/inverted/TestInverted.py
#	worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py
#	worlds/alttp/test/inverted_owg/TestInvertedOWG.py
#	worlds/alttp/test/minor_glitches/TestMinor.py
#	worlds/alttp/test/owg/TestVanillaOWG.py
#	worlds/alttp/test/vanilla/TestVanilla.py
#	worlds/messenger/Options.py
#	worlds/messenger/Rules.py
#	worlds/pokemon_rb/options.py
#	worlds/pokemon_rb/rules.py

2023-10-10 17:47:40 -05:00

..

data

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

docs

Docs: Revise all docs mentioning Lua in EmuHawk (which are in English), and other misc. corrections (#1782)

2023-06-26 08:53:44 +02:00

__init__.py

Core: move option results to the World class instead of MultiWorld (#993)

2023-10-10 22:30:20 +02:00

build_color_options.py

Options: change displayname to display_name

2022-02-02 16:29:29 +01:00

Colors.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

ColorSFXOptions.py

Templates: Remove auto wordwrap, fix manual indentation, and reformat docstrings for world options in main. (#1201)

2022-11-06 08:28:16 -06:00

Cosmetics.py

OoT: Python 3.11 Compatibility fix and Minor Bug fixes (#1948)

2023-07-09 14:30:05 +02:00

crc.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

Dungeon.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

DungeonList.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Entrance.py

Core: rename world to multiworld (#931)

2022-10-31 21:41:21 -05:00

EntranceShuffle.py

oot: remove special NL exceptions in entrance randomization

2023-01-26 21:24:27 +01:00

HintList.py

oot/alttp: fix bugs found through MMBN3 testing (#1527)

2023-03-11 20:15:30 +01:00

Hints.py

LttP: extract Dungeon and Boss from core (#1787)

2023-05-20 19:57:48 +02:00

IconManip.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

ItemPool.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Items.py

OoT: Python 3.11 Compatibility fix and Minor Bug fixes (#1948)

2023-07-09 14:30:05 +02:00

JSONDump.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

LICENSE

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Location.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

LocationList.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

LogicTricks.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Messages.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

MQ.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

Music.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

N64Patch.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

ntype.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

Options.py

oot: bugfixes (#1709)

2023-04-16 01:45:31 +02:00

Patches.py

oot: bugfixes (#1709)

2023-04-16 01:45:31 +02:00

Regions.py

core: rip out RegionType and rework Region class (#814)

2023-02-14 01:06:43 +01:00

Rom.py

Setup, Launcher, Linux Support (#359)

2022-03-31 05:08:15 +02:00

RuleParser.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Rules.py

fix a bug in oot

2023-02-24 21:28:54 -06:00

SaveContext.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

SceneFlags.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Sounds.py

Ocarina of Time (#64)

2021-09-02 14:35:05 +02:00

TextBox.py

oot: bugfixes (#1709)

2023-04-16 01:45:31 +02:00

texture_util.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00

Utils.py

Ocarina of Time 7.0 (#1277)

2022-12-11 04:11:40 +01:00