LA_DI_DA f963dd0b93 Merge branch 'refs/heads/lme-alas/master' ...

# Conflicts:
#	alas.py

2024-07-18 23:11:37 +08:00

..

campaign

Merge branch 'LmeSzinc:master' into 20230309

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

coalition

Upd: [EN] Assets for page_coalition

2024-06-28 02:42:38 +08:00

combat

Upd: BATTLE_STATUS_*

2023-05-26 00:55:35 +08:00

commission

…

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

Fix: Maritime escort assets of EN mistakenly replace the CNs

2022-01-16 01:19:20 +08:00

exercise

fix: Adapt to new APIs from upstream

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

freebies

Add: Claim mail rewards

2024-07-18 22:20:50 +08:00

gacha

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

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

gg_handler

Revert "Add: scroll dock to load all ship's data for changing attribute"

2023-10-19 13:42:22 +08:00

guild

Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-09 00:19:01 +08:00

handler

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

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

hard

…

map

Fix: Same ships are black when changing hard mode flagships

2023-12-24 18:57:53 +08:00

meowfficer

Upd: Update CN assets which have been omitted

2023-11-19 21:45:25 +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

Add: Allow auto attack dossier (#2579)

2023-06-08 22:28:44 +08:00

os_combat

…

os_handler

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +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 branch 'refs/heads/lme-alas/master' into dev

2024-07-06 19:17:11 +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

…

storage

Upd: Copy static storage assets to all servers

2022-08-23 01:14:44 +08:00

tactical

Fix: Trying to handle books empty (#3753)

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

template

Add: Chapter B

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

ui

Upd: [CN] Support UI in 2024.05.21

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

ui_white

Fix: Leave memories tab (fixed #3956)

2024-07-03 22:46:41 +08:00

war_archives

Add: War Archives The Way Home in the Night

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