LA_DI_DA 15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev ...

# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py

2024-09-15 18:06:15 +08:00

..

base

Adj: Only enable ShipChanger in GemsFarming

2024-07-21 04:18:53 +08:00

campaign

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-31 11:05:57 +08:00

coalition

Merge branch 'refs/heads/lme-alas/master' into dev

2024-07-06 19:17:11 +08:00

combat

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-15 18:06:15 +08:00

combat_ui

Add: Support Battle UI theme

2024-09-15 04:34:14 +08:00

commission

Fix: Handle random white background at page_main in commission receive

2024-06-05 02:49:17 +08:00

config

upd: args.json

2024-09-14 15:51:53 +08:00

daemon

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-17 21:48:52 +08:00

daily

Upd: [CN] Support UI in 2024.05.21

2024-05-23 01:16:41 +08:00

device

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-15 18:06:15 +08:00

dorm

Add: Quick collection of coins and loves in the Dorm. (#3837)

2024-07-03 22:27:22 +08:00

equipment

Fix: shit in Daily

2024-07-19 02:12:55 +08:00

event

…

exercise

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-15 18:06:15 +08:00

freebies

Fix: [JP] Handle mail empty (#4114)

2024-08-23 02:34:40 +08:00

gacha

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

game_setting

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

gg_handler

Fix: skip change ship in most situation

2024-07-26 01:26:58 +08:00

guild

Upd: [TW] EXP_INFO_CF (#4164)

2024-09-11 01:42:47 +08:00

handler

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-13 23:09:32 +08:00

hard

Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors

2024-07-18 08:58:55 +08:00

log_res

Fix: Cvl to bc/bb with common bb problem about Nevada

2024-07-20 12:56:32 +08:00

map

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-31 11:05:57 +08:00

map_detection

Add: Map config MAP_SIREN_HAS_BOSS_ICON

2024-08-16 19:19:06 +08:00

meowfficer

Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917)

2024-06-27 22:20:09 +08:00

meta_reward

…

minigame

Fix: wrong popup dealing in minigame (#4135)

2024-08-30 17:49:59 +08:00

notify

Opt: [ALAS] Lazy import onepush

2024-04-28 17:12:03 +08:00

ocr

Fix: Add atomic OCR method on client side

2024-05-09 18:51:52 +08:00

os

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-15 18:06:15 +08:00

os_ash

Merge branch 'master_lme'

2024-05-23 02:31:29 +08:00

os_combat

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

os_handler

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-31 11:05:57 +08:00

os_shop

Del: remove literal rubbish from the preset of the OS shop

2024-07-31 21:53:51 +08:00

raid

Merge branch 'LmeSzinc:master' into 20230309

2024-03-29 07:09:29 +08:00

research

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-17 21:48:52 +08:00

research_farming

Ref: use exception to switch when check ship's exp

2024-07-18 18:18:47 +08:00

retire

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-13 23:09:32 +08:00

reward

Fix: Expand search area of MISSION_MULTI and MISSION_SINGLE

2024-06-26 19:02:36 +08:00

shipyard

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

shop

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

sos

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

statistics

Del: Remove AzurStats upload

2024-08-01 22:36:23 +08:00

storage

…

submodule

Chore: [ALAS] Move func methods to the Alas class

2024-05-30 13:34:24 +08:00

tactical

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

template

Upd: Update event Ode of Everblooming Crimson(event_20240912_cn)

2024-09-13 18:38:43 +08:00

ui

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-17 21:48:52 +08:00

ui_white

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-17 21:48:52 +08:00

war_archives

Add: War Archives The Way Home in the Night

2024-03-11 22:57:37 +08:00

webui

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-09-13 23:09:32 +08:00

exception.py

Fix: set gemsfarming's ship filter to default after this task is set to campaign_main

2024-05-25 19:43:00 +08:00

logger.py

…

logger.pyi

…

server_checker.py

…