nEEtdo0d 55a9d73131 Fix: Resolve merge conflicts, remove deprecated methods ...

Merge remote-tracking branch 'remotes/origin/revised_guild_reward' into guild_reward

# Conflicts:
#	module/reward/assets.py
#	module/reward/guild.py

2021-01-04 17:47:35 -05:00

..

campaign

Upd: [CN] Update campaign mode switch 2

2020-12-31 21:57:13 +08:00

combat

Add: [EN] added Counterattack Within the Fjord event to EN server

2020-10-02 12:56:22 -03:00

daemon

Add: multi-server support

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

daily

Fix: fix daily locked due low commander level

2020-07-19 19:19:46 -03: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

handler

Add: Semi-auto operation siren additional assets

2020-12-27 10:32:42 -05:00

hard

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

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

map

Fix: Assets for campaign mode switching

2020-12-22 19:21:39 +08:00

os_combat

Add: Semi-auto for operation siren

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

os_handler

Opt: Rename GET_OS_STATUS to GET_ADAPTABILITY

2020-12-28 17:23:38 +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

Add: [CN] update FILTER_EXTRA_NO_LIMIT_*

2020-11-27 19:38:39 +08:00

reward

Fix: Resolve merge conflicts, remove deprecated methods

2021-01-04 17:47:35 -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

Add: Initial working draft of guild operations mechanism

2021-01-01 18:47:57 -05:00

ui

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

2020-12-29 10:05:34 -05:00

war_archives

Add: RGB check timer in war archives campaign to handle reward approriately

2020-11-19 17:45:33 -05:00