Merge remote-tracking branch 'origin/master' into shop_core_v2

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-12-31 22:48:36 -05:00

parent 87a4137859 d15fbbac79

commit 6395528ad0

47 changed files with 1113 additions and 75 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

BIN

assets/cn/os_handler/OS_GAME_TIPS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.3 KiB

BIN

assets/cn/template/TEMPLATE_SIREN_Lover.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB