merge Patch7 into master #192

Merged
nutbuster merged 202 commits from Patch7 into master 2022-10-29 05:53:44 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit fec34826ba - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 KiB

View File

@ -401,7 +401,7 @@ image trevor neutral flip = im.Flip("trishfam/trevor neutral.png", horizontal=Tr
image trevor awe flip = im.Flip("trishfam/trevor awe.png", horizontal=True)
# scene flips
image moes pizza mirrored = im.Flip("backgrounds/moes pizza.jpg", horizontal=True)
image moes pizza mirrored = im.Flip("images/backgrounds/moes pizza.jpg", horizontal=True)
# vfx
image black = "#000"
@ -857,10 +857,10 @@ image fanganonhug = "images/fang/fullbody/fanganonhug.png"
image anon smiley = "images/anon/base set/anon face happy.png"
#additional CGs
image gold_fang_home_prom_stars = "images/cgs/stair3.png"
image good_fang_home_prom_stars = "images/cgs/stair2.png"
image other_fang_home_prom_stars = "images/cgs/stair1.png"
image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.png"
image gold_fang_home_prom_stars = "images/cgs/stair3.jpg"
image good_fang_home_prom_stars = "images/cgs/stair2.jpg"
image other_fang_home_prom_stars = "images/cgs/stair1.jpg"
image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.jpg"
#sepia effect for flashbacks
image grainf0 = "images/other/grain/frame_00.png"