Merge branch 'dev' into chinese-tl

2023-12-17 17:56:34 +00:00 · 2023-12-17 17:56:34 +00:00 · aac7249e84
commit aac7249e84
parent 1b1bc53759 f1ee0cbcd3
6656 changed files with 66840 additions and 52308 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -9,6 +9,6 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
-[*.{py,rpy}]
+[*.{py,rpy,rpym}]
 indent_size = 4
 indent_style = space
--- a/.gitignore
+++ b/.gitignore
@ -36,12 +36,14 @@ pip-log.txt
 *.rpymc
 project.json
 .android.json
 buildinfo.py
 # Ren'py data
 game/saves/
 game/cache/
 project.json
 android.json
 *.keystore
 # Ren'py logs
 traceback.txt
--- a/android-icon_background.png
+++ b/android-icon_background.png
--- a/android-icon_foreground.png
+++ b/android-icon_foreground.png
--- a/game/characters/.gitignore
+++ b/game/characters/.gitignore
@ -0,0 +1,2 @@
 # We don't want to include PNGs in GIT
 *.png
--- a/game/characters/astoria/body/armleft/on_hips.webp
+++ b/game/characters/astoria/body/armleft/on_hips.webp
--- a/game/characters/astoria/body/armleft/on_hips_fix.webp
+++ b/game/characters/astoria/body/armleft/on_hips_fix.webp
--- a/game/characters/astoria/body/armright/on_hips.webp
+++ b/game/characters/astoria/body/armright/on_hips.webp
--- a/game/characters/astoria/body/armright/on_hips_fix.webp
+++ b/game/characters/astoria/body/armright/on_hips_fix.webp
--- a/game/characters/astoria/body/base/front.webp
+++ b/game/characters/astoria/body/base/front.webp
--- a/game/characters/astoria/body/breasts/normal.webp
+++ b/game/characters/astoria/body/breasts/normal.webp
--- a/game/characters/astoria/poses/default/bodyparts/frame/default/skin.webp
+++ b/game/characters/astoria/poses/default/bodyparts/frame/default/skin.webp
--- a/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/0.webp
+++ b/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/0.webp
--- a/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/1.webp
+++ b/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/1.webp
--- a/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/outline.webp
+++ b/game/characters/astoria/poses/default/clothes/accessory/ann_takamaki/outline.webp
--- a/game/characters/astoria/poses/default/clothes/bottom/pants_1/0.webp
+++ b/game/characters/astoria/poses/default/clothes/bottom/pants_1/0.webp
--- a/game/characters/astoria/poses/default/clothes/bottom/pants_1/1.webp
+++ b/game/characters/astoria/poses/default/clothes/bottom/pants_1/1.webp
--- a/game/characters/astoria/poses/default/clothes/bottom/pants_1/armfix.webp
+++ b/game/characters/astoria/poses/default/clothes/bottom/pants_1/armfix.webp
--- a/game/characters/astoria/poses/default/clothes/bottom/pants_1/extra.webp
+++ b/game/characters/astoria/poses/default/clothes/bottom/pants_1/extra.webp
--- a/game/characters/astoria/poses/default/clothes/bottom/pants_1/outline.webp
+++ b/game/characters/astoria/poses/default/clothes/bottom/pants_1/outline.webp
--- a/Show More
+++ b/Show More
		`@ -0,0 +1,2 @@`
							`# We don't want to include PNGs in GIT`
							`*.png`