LmeSzinc 4f4f296e44 Merge branch 'master' into dev ...

# Conflicts:
#	module/os/assets.py

2021-04-16 17:51:18 +08:00

..

campaign

Upd: [CN] SWITCH_2_EX asset

2021-03-29 22:53:26 +08:00

combat

Fix: Detection of PAUSE during the boss appear animation

2021-02-17 18:01:26 +08:00

daemon

Add: multi-server support

2020-05-25 22:05:42 +08:00

daily

Add: Option to enable or disable daily skip

2021-04-16 17:46:32 +08:00

equipment

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

exercise

Fix: Avoid entering shop after exercise (#272)

2020-12-23 16:35:20 +08:00

guild

Add: Optional restriction before joining guild operations to maximize reward and participation

2021-04-02 20:53:53 -04:00

handler

Opt: Extend handle_2x_book_setting for prep and auto menu

2021-04-09 00:36:24 -04:00

hard

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

map

Mov: 2x book check and handle setting

2021-04-02 18:26:00 -04:00

os

Fix: Page transition after OS auto search update

2021-04-13 17:50:48 +08:00

os_ash

Add: Do ash beacon attack in os_clear_map

2021-01-31 18:12:34 +08:00

os_combat

Add: Semi-auto for operation siren

2020-12-23 18:50:51 +08:00

os_handler

Fix: Missing PORT_MISSION_RED_DOT asset

2021-04-14 18:29:32 +08:00

raid

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

research

Opt: Remove duplicate methods

2020-09-17 18:26:16 +09:00

retire

Fix: [CN] Enhancement assets (#388)

2021-03-23 22:30:49 +08:00

reward

Del: assets from reward, migrate to guild

2021-01-05 19:57:56 -05:00

sos

Fix: Assets for sos signal and commission notice

2020-12-22 18:39:58 +08:00

statistics

Dev: Item statistics rework

2020-08-09 11:34:59 +08:00

template

Fix: Use normal asset instead of template

2021-04-09 10:46:42 -04:00

ui

Fix: [CN, TW, JP] OS_CHECK asset

2021-04-09 10:49:36 -04:00

war_archives

Upd: [CN] War archives entrance assets

2021-03-15 22:36:59 +08:00