Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-10-25 20:31:20 +08:00

parent f02a4bca37 787d5ab571

commit 7630b492e9

20 changed files with 330 additions and 27 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/tw/equipment/EQUIPMENT_CLOSE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.4 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/tw/equipment/EQUIPMENT_OPEN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.5 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/tw/handler/SUBMARINE_MOVE_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/SUBMARINE_MOVE_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_UNAVAILABLE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 8.7 KiB