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

Browse Source

# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
#	game/script/2.fourth-day-of-school.rpy
#	game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

...

This commit is contained in:

Bowie

2021-08-02 14:38:11 +01:00

parent 8647f53355 666ecea915

commit 8bd3a58d18

37 changed files with 2464 additions and 1943 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

game/images/animations/fangtail.webm → game/images/animations/fang tail.webm

BIN

game/images/cgs/d04.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 425 KiB

BIN

game/images/cgs/d04a.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 549 KiB

BIN

game/images/cgs/fangfuneral2.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 210 KiB

0

game/images/cgs/wounds1.jpg → game/images/cgs/wounds01.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 226 KiB After Width:  |  Height:  |  Size: 226 KiB

0

game/images/cgs/wounds2.jpg → game/images/cgs/wounds02.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 246 KiB After Width:  |  Height:  |  Size: 246 KiB

0

game/images/cgs/wounds3.jpg → game/images/cgs/wounds03.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 204 KiB After Width:  |  Height:  |  Size: 204 KiB

0

game/images/cgs/wounds4.jpg → game/images/cgs/wounds04.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 167 KiB After Width:  |  Height:  |  Size: 167 KiB

0

game/images/cgs/wounds5.jpg → game/images/cgs/wounds05.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 183 KiB After Width:  |  Height:  |  Size: 183 KiB

0

game/images/cgs/wounds6.jpg → game/images/cgs/wounds06.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 198 KiB After Width:  |  Height:  |  Size: 198 KiB

0

game/images/cgs/wounds7.jpg → game/images/cgs/wounds07.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 199 KiB After Width:  |  Height:  |  Size: 199 KiB

0

game/images/cgs/wounds8.jpg → game/images/cgs/wounds08.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 266 KiB After Width:  |  Height:  |  Size: 266 KiB

0

game/images/cgs/wounds9.jpg → game/images/cgs/wounds09.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 KiB After Width:  |  Height:  |  Size: 214 KiB