Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2020-07-22 19:26:02 +08:00

parent 1b4fadd820 ebf305b57a

commit fa71f977c7

27 changed files with 186 additions and 167 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/handler/AMBUSH_EVADE_FAILED.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AMBUSH_EVADE_SUCCESS.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AMBUSH_EVADE_FAILED.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AMBUSH_EVADE_SUCCESS.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/MAP_WALK_OUT_OF_STEP.png

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_AMBUSH_EVADE_FAILED.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 4.9 KiB

BIN

assets/en/template/TEMPLATE_CAUGHT_BY_SIREN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.0 KiB

BIN

assets/en/template/TEMPLATE_MAP_WALK_OUT_OF_STEP.png

Binary file not shown.

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