Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/device/emulator.py

...

This commit is contained in:

LmeSzinc

2022-09-02 00:13:11 +08:00

parent 59b94395c9 2540f6fd1f

commit f1ef87ca50

20 changed files with 83 additions and 44 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/jp/ui/MAIN_GOTO_CAMPAIGN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/MAIN_GOTO_CAMPAIGN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 9.3 KiB