nEEtdo0d 59445a437d Fix: Resolve merge conflicts ...

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

# Conflicts:
#	module/reward/guild.py

2021-01-04 18:24:55 -05:00

..

base

Dev: Add function drop

2020-12-04 22:25:04 +08:00

campaign

Fix: Detection of EXTRA stage

2021-01-02 17:08:54 +08:00

combat

twassetsfix

2020-12-26 12:44:06 +08:00

config

Add: Allow enable of operations

2021-01-03 15:55:16 -05:00

daemon

Add: Semi-auto for operation siren

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

daily

Fix: After daily finished, game goto BATTLE_PREPARATION randomly

2020-12-31 14:03:32 +08:00

deploy

…

device

Fix: Login failed more than 3 due to GameTooManyClickError in last login

2020-12-31 13:47:50 +08:00

equipment

Fix: On first round, often same ship is detected as new ship

2020-12-27 13:51:56 -05:00

event

Opt: Add notice if no map files satisfy EVENT_AB_CHAPTER

2020-09-27 04:00:31 +08:00

exercise

Fix: QUIT_CONFIRM in exercise

2020-12-29 17:39:59 +08:00

handler

Opt: [JP, TW] Clean up dev_tool.button_extract output

2021-01-01 15:43:59 -05:00

hard

Fix: Wrong folder to save drop screenshot after running daily hard

2020-12-03 12:09:02 +08:00

map

Add: spawn_data_loop

2021-01-01 22:18:06 +08:00

map_detection

Add: MAP_ENEMY_GENRE_DETECTION_SCALING to handle siren scaling

2020-12-31 14:29:08 +08:00

ocr

Opt: ocr.py clean up

2020-11-17 10:58:37 +09:00

os_combat

Fix: Rename GET_OS_STATUS to GET_ADAPTABILITY

2020-12-29 17:37:30 +08:00

os_handler

Opt: [JP, TW] Clean up dev_tool.button_extract output

2021-01-01 15:43:59 -05:00

raid

Added: Taiwan server support

2020-10-26 15:22:13 -03:00

research

Fix: Research reset save research_projects in stage folder not base folder

2020-12-11 22:19:12 +08:00

retire

New Enhancement assets

2020-12-29 21:46:34 +01:00

reward

Fix: Resolve merge conflicts

2021-01-04 18:24:55 -05:00

sos

Add: [TW] Campaign menu and SOS

2021-01-01 14:44:28 +08:00

statistics

Added: Taiwan server support

2020-10-26 15:22:13 -03:00

template

Add: Initial working draft of guild operations mechanism

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

ui

Opt: [JP, TW] Clean up dev_tool.button_extract output

2021-01-01 15:43:59 -05:00

war_archives

Opt: [JP, TW] Clean up dev_tool.button_extract output

2021-01-01 15:43:59 -05:00

exception.py

…

logger.py

Opt: Auto switch to root folder (#261)

2020-12-16 18:04:01 +08:00

update.py

…