xhqss ab99aca4c1 Merge branch 'master' into master_morealas ...

# Conflicts:
#	module/webui/app.py

2024-11-23 00:11:04 +08:00

..

auto_login

Add: one click login

2023-12-22 21:06:25 +08:00

base

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

2024-10-25 12:01:29 +08:00

campaign

Merge branch 'master' into master_morealas

2024-11-23 00:11:04 +08:00

coalition

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

2024-10-25 12:01:29 +08:00

combat

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

2024-10-25 12:01:29 +08:00

combat_ui

Add: JP iridescent fantasy ui quit button (#4369)

2024-11-12 11:26:48 +08:00

commission

upd: [JP] commission ocr

2024-10-20 21:58:34 +08:00

config

Merge branch 'master' into master_morealas

2024-11-23 00:11:04 +08:00

daemon

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

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

daily

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

device

Merge branch 'refs/heads/0O0o0oOoO00/master' into dev

2024-10-27 18:34:32 +08:00

dorm

upd: [JP] dorm assets

2024-10-16 12:48:21 +08:00

equipment

Fix: shit in Daily

2024-07-20 15:30:59 +08:00

event

…

exercise

Fix: Exercise Merge Shit

2024-10-28 02:33:21 +08:00

extract_account

Add: switch account

2023-12-20 22:26:36 +08:00

freebies

Jp font 20241011 (#4272)

2024-10-12 14:29:01 +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

Merge branch 'refs/heads/0O0o0oOoO00/master' into dev

2024-08-17 22:33:23 +08:00

guild

Upd: [TW] EXP_INFO_CF (#4164)

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

handler

Merge branch 'master' into master_morealas

2024-11-23 00:11:04 +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-20 15:30:44 +08:00

log_res

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

2024-07-20 15:31:37 +08:00

map

Merge branch 'refs/heads/0O0o0oOoO00/master' into dev

2024-08-31 11:33:21 +08:00

map_detection

Add: Map config MAP_SIREN_HAS_BOSS_ICON

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

meowfficer

Upd:Adds the Meowfficer maximum level option for enhance (#4267)

2024-10-12 00:45:56 +08:00

meta_reward

Fix: dossier reward receive (#4242)

2024-10-01 17:35:36 +08:00

minigame

upd: [JP] COIN_HOLDER in minigame

2024-10-30 12:18:09 +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 'master_lme'

2024-11-15 17:14:11 +08:00

os_ash

Merge branch 'master' into master_morealas

2024-11-15 17:16:21 +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 'master_lme'

2024-11-15 17:14:11 +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-10-25 12:01:29 +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 'master_lme'

2024-11-15 17:14:11 +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 'master' into master_morealas

2024-11-15 17:16:21 +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

Upd: [JP] assets of storage module (#4276)

2024-10-13 15:44:44 +08:00

submodule

Add: fake module PIL for webui (#4374)

2024-11-19 12:37:59 +08:00

tactical

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

template

Add: Chapter T

2024-11-22 21:25:41 +08:00

ui

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

ui_white

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

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

war_archives

Upd: war archives entrance

2024-10-20 21:58:34 +08:00

webui

Merge branch 'master' into master_morealas

2024-11-23 00:11:04 +08:00

exception.py

Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev

2024-07-06 19:23:57 +08:00

logger.py

…

logger.pyi

…

server_checker.py

Fix: incorrect place of exit when server is under maintenance

2023-11-20 22:40:22 +08:00