Zuosizhu 4d4d2377dc Merge branch 'master_lme' ...

# Conflicts:
#	module/device/method/droidcast.py

2023-09-28 18:09:13 +08:00

..

campaign

Merge branch 'master_lme'

2023-08-19 09:23:28 +08:00

coalition

Upd: [EN][JP] COALITION_REWARD_CONFIRM

2023-03-24 14:08:05 +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

Fix: Handle DORM_FURNITURE_CONFIRM (#2262)

2023-02-21 23:55:13 +08:00

equipment

Fix: Delete unused ui action; Rename button

2022-08-06 16:40:47 +08:00

event

Fix: Maritime escort assets of EN mistakenly replace the CNs

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

exercise

Merge branch 'master_lme'

2023-05-26 00:26:23 +08:00

freebies

Upd: [EN] Another MAIL_EMPTY

2023-01-01 17:04:39 +08:00

gacha

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

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

gg_handler

Feature: Auto restart in unsafe situations when GG is on

2023-01-21 05:06:56 +08:00

guild

Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF

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

handler

Fix: Handle STORY_CLOSE after B3

2023-09-15 21:37:56 +08:00

hard

…

map

Merge branch 'master_lme'

2023-03-11 16:21:26 +08:00

meowfficer

Fix: Check meowfficer level before enhancing (#2211)

2023-02-14 00:11:36 +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

Opt: Standardize difficulties to normal/hard

2022-12-23 20:59:11 +08:00

raid

Fix: add RAID_REWARDS.png to fix raid reward problem (#2829)

2023-07-02 15:38:44 +08:00

research

Fix: get_research_series() (#2975)

2023-08-06 17:40:43 +08:00

retire

Merge branch 'LmeSzinc:master' into 20230309

2023-06-08 21:43:02 +08:00

reward

Mov: reward mail support to separate module

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

shipyard

Upd: [CN][TW] SHIPYARD_LEVEL_NOT_ENOUGH_FATE

2023-02-11 16:41:16 +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

Refactor: statistics module

2021-12-01 23:44:59 +08:00

storage

Upd: Copy static storage assets to all servers

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

tactical

Fix: [EN] Unable to detect META skill list

2022-09-25 02:39:45 +08:00

template

Merge pull request #2996 from guoh064/meta_reward

2023-09-25 18:29:46 +08:00

ui

Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

2023-07-14 10:59:13 +08:00

war_archives

add war_archive: Inverted orthant (#3089)

2023-09-08 01:14:18 +08:00