Bowie f26f6a33fd Merge branch 'Monster-Update-6' into chapter-1-choreo ...

# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy

2021-06-28 20:57:01 +01:00

..

audio

Merge branch 'Monster-Update-6' into chapter-1-choreo

2021-06-28 20:57:01 +01:00

gui

…

images

Merge branch 'Monster-Update-6' into chapter-1-choreo

2021-06-28 20:57:01 +01:00

script

Merge branch 'Monster-Update-6' into chapter-1-choreo

2021-06-28 20:57:01 +01:00

tl/None

Merge pull request 'Fixes #6 - better gitignore' (#35) from gitignore into master

2021-06-18 21:13:17 +00:00

gui.rpy

…

options.rpy

…

screens.rpy

…

script.rpy

Merge branch 'Monster-Update-6' into chapter-1-choreo

2021-06-28 20:57:01 +01:00

storyline.rpy

renpy demands a "start" label

2021-06-18 13:17:21 -05:00

utility.rpy

rework canteen opening

2021-06-21 22:03:37 +01:00