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

..

1.first-two-days-anon-meets-fang.rpy

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

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

2.fourth-day-of-school.rpy

…

3.showing-up-at-band-practice-and-giving-feedback.rpy

…

4.anon-needs-help-during-music-period.rpy

adding fixes to merge

2021-06-18 21:36:38 -05:00

5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

adding fixes to merge

2021-06-18 21:36:38 -05:00

6.anon-helps-fang-find-a-venue-for-band.rpy

adding fixes to merge

2021-06-18 21:36:38 -05:00

7.concert-day.rpy

…

8.anon-and-fang-study-together.rpy

changed files to accomidate asset changes

2021-06-20 00:25:26 -05:00

9.anons'-dirty-laundry-gets-put-up-to-air.rpy

…

10.an-excellent-reason-to-start-abusing-mod-powers.rpy

…

11.school-assignment-and-route-lock.rpy

added missed wing label

2021-06-18 22:05:42 -05:00

11A.fang-desperately-wants-to-win-prom-night.rpy

…

11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy

…

11C.anon-gets-fangs'-pronouns-right,-but-she-tells-him-she's-okay-with-being-called-a-girl.rpy

…

11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy

…

12A.music-museum-date.rpy

…

12B.band-fang-likes-concert.rpy

…

12C.anon-fang-lovey-dovey.rpy

…

12D.aquarium.rpy

…

13A.fang-loses-it-after-losing-prom-queen.rpy

…

13B.fang-breaks-up-with-anon.rpy

…

13C.fang-and-anon-go-to-beach-and-prom.rpy

…

13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

changed files to accomidate asset changes

2021-06-20 00:25:26 -05:00

14A.KO_OP-ending.rpy

changed files to accomidate asset changes

2021-06-20 00:25:26 -05:00

14B.bad-ending.rpy

…

14C.good-ending.rpy

changed files to accomidate asset changes

2021-06-20 00:25:26 -05:00

14D.gold-ending.rpy

changed files to accomidate asset changes

2021-06-20 00:25:26 -05:00