Merge branch 'dev' into chinese-tl
This commit is contained in:
commit
aac7249e84
@ -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
2
.gitignore
vendored
@ -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)
BIN
android-icon_background.png
(Stored with Git LFS)
Binary file not shown.
BIN
android-icon_foreground.png
(Stored with Git LFS)
BIN
android-icon_foreground.png
(Stored with Git LFS)
Binary file not shown.
2
game/characters/.gitignore
vendored
Normal file
2
game/characters/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
# We don't want to include PNGs in GIT
|
||||
*.png
|
BIN
game/characters/astoria/body/armleft/on_hips.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/armleft/on_hips.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/body/armleft/on_hips_fix.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/armleft/on_hips_fix.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/body/armright/on_hips.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/armright/on_hips.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/body/armright/on_hips_fix.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/armright/on_hips_fix.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/body/base/front.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/base/front.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/body/breasts/normal.webp
(Stored with Git LFS)
BIN
game/characters/astoria/body/breasts/normal.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/characters/astoria/poses/default/bodyparts/frame/default/skin.webp
(Stored with Git LFS)
Normal file
BIN
game/characters/astoria/poses/default/bodyparts/frame/default/skin.webp
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
game/characters/astoria/poses/default/clothes/bottom/pants_1/armfix.webp
(Stored with Git LFS)
Normal file
BIN
game/characters/astoria/poses/default/clothes/bottom/pants_1/armfix.webp
(Stored with Git LFS)
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user