Merge branch 'main' into breaking_changes

# Conflicts: # BaseClasses.py
2021-03-06 05:27:16 +01:00
parent 2cb6ec2a70 94b25112cd
commit 567954a17f
9 changed files with 142 additions and 75 deletions
--- a/Utils.py
+++ b/Utils.py
@@ -188,6 +188,7 @@ def get_default_options() -> dict:
                "players": 0,
                "weights_file_path": "weights.yaml",
                "meta_file_path": "meta.yaml",
+                "pre_roll": False,
                "player_name": "",
                "create_spoiler": 1,
                "zip_roms": 0,