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

..

campaign

Merge remote-tracking branch 'refs/remotes/Lme/master' into dev

2024-07-26 08:04:44 +08:00

coalition

Upd: [JP] Assets for page_coalition

2024-06-28 12:16:25 +08:00

combat

Add: Support Battle UI theme

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

combat_ui

Add: Support Battle UI theme

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

commission

Upd: [EN][JP] Assets in page_reward

2024-05-22 01:15:18 +08:00

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +08:00

dorm

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

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

equipment

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

event

Upd: [JP] ESCORT_* assets

2022-01-16 15:19:02 +08:00

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

Fix: Error caused by empty build queue (#2816)

2023-06-30 15:32:41 +08:00

guild

Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-10 01:39:23 +08:00

handler

Fix: mob move optimization

2024-06-03 00:04:42 +08:00

hard

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

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

map

Add: Switch mode in map preparation

2024-07-26 02:20:15 +08:00

meowfficer

Upd: [JP] Meowfficer assets (#3291)

2023-11-19 18:55:51 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Opt: Choose minigame by scroll

2023-08-08 00:03:41 +08:00

os

Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)

2022-10-04 00:25:42 -04:00

os_ash

Upd: BEACON_REWARD to handle poor english on buttons (#2109)

2023-01-13 23:45:41 +08:00

os_combat

Add: [JP] assets for guild and OS

2021-02-10 18:38:20 +09:00

os_handler

Fix: current ap blocked by info bar (#4100)

2024-08-20 02:25:44 +08:00

os_shop

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

raid

Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL

2024-03-29 03:21:10 +08:00

research

Upd: Detect research series 7

2024-07-12 00:07:25 +08:00

retire

Merge Lme/Master into dev

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

reward

Mov: reward mail support to separate module

2022-10-16 01:01:15 -04:00

shipyard

Upd: Series selecting page in shipyard

2024-07-12 00:31:34 +08:00

shop

fix: shop confirm amount buttom (#3001)

2023-08-11 19:05:52 +08:00

sos

Fix: [EN] Confirm button in SOS signal search list

2022-12-07 01:38:57 +08:00

statistics

Upd: [JP] CAMPAIGN_BONUS asset

2022-01-16 15:19:02 +08:00

storage

Upd: Replace MATERIAL_CHECK.png with different version

2022-12-10 19:51:43 +08:00

tactical

Fix: Trying to handle books empty (#3753)

2024-06-11 23:38:43 +08:00

template

Upd: Update event Ode of Everblooming Crimson(event_20240912_cn)

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

ui

Upd: [CN] Support UI in 2024.05.21

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

ui_white

Fix: unrecognized ui page after empty mail receive (#4039)

2024-07-28 13:32:03 +08:00

war_archives

Smaller templates to prevent weird stuck

2022-10-17 01:04:21 +08:00