yypsybs fd9777940b Merge branch 'master' into dev-minigame-for-pr ...

# Conflicts:
#	module/ui/assets.py

2023-09-01 17:58:39 +08:00

..

campaign

Add: Handle stories before event maps in chapter BD

2023-08-18 22:23:20 +08:00

coalition

Update tw assets for Frostfall (#3051)

2023-08-25 12:38:19 +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: Delay task Dorm according to number of ships in dorm (fixed #2119)

2023-01-28 18:11:28 +08:00

equipment

…

event

…

exercise

Upd: EXP_INFO_* and the exercise one

2023-05-25 21:45:19 +08:00

freebies

…

gacha

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

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

guild

Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF

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

handler

Add: handle_map_walk_speedup()

2023-08-03 22:59:37 +08:00

hard

…

map

Upd: [TW] FLEET_*_ADVICE

2023-03-11 03:56:46 +08:00

meowfficer

Fix: Check meowfficer level before enhancing (#2211)

2023-02-14 00:11:36 +08:00

minigame

Opt: Choose minigame by scroll

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

os

…

os_ash

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

os_combat

…

os_handler

Upd: [TW] OS_FLEET_LOCKED and OS_FLEET_UNLOCKED

2023-01-17 23:03:38 +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

Upd: [CN][TW] DOCK_SELECTED (#2729)

2023-06-08 16:33:31 +08:00

reward

…

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Upd: [TW] assets of shop module

2023-07-14 12:03:38 +08:00

sos

…

statistics

…

storage

…

tactical

Upd: [TW] SKILL_CONFIRM

2023-01-09 21:01:45 +08:00

template

Add: Siren templates in SP

2023-08-19 02:34:19 +08:00

ui

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

2023-09-01 17:58:39 +08:00

war_archives

…