Merge branch 'dev' into chinese-tl

This commit is contained in:
LoafyLemon 2023-12-17 17:56:34 +00:00
commit aac7249e84
6656 changed files with 66840 additions and 52308 deletions

View File

@ -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

2
.gitignore vendored
View File

@ -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

BIN
android-icon_background.png (Stored with Git LFS)

Binary file not shown.

BIN
android-icon_foreground.png (Stored with Git LFS)

Binary file not shown.

2
game/characters/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
# We don't want to include PNGs in GIT
*.png

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More