LmeSzinc 772bf15f62 Merge branch 'master' into dev ...

# Conflicts:
#	module/ui/assets.py

2021-08-07 14:32:31 +08:00

..

campaign

Fix: [JP] Switch to SP/EX asset

2021-04-25 19:27:30 -04:00

combat

Upd: [JP] OPTS_INFO_D (#381)

2021-04-25 15:28:09 +08:00

daemon

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

daily

update [jp] asset DAILY_SKIP

2021-04-23 09:33:48 +08:00

equipment

Add: Flagship changing

2021-06-29 23:10:13 +08:00

exercise

Fix: [JP] assets fix after font changed

2021-04-16 02:47:31 +09:00

guild

Fix: [JP] MEOWFFICER_INFO & guild boss assets

2021-07-26 16:01:25 +08:00

handler

Fix: Handle return account info

2021-07-11 21:41:05 +08:00

hard

…

map

Fix: Re-implement hard mode detection

2021-06-10 17:46:55 +08:00

os

Fix: [JP] ZONE_SWITCH text asset

2021-07-20 14:27:09 +08:00

os_ash

Fix: [JP] ASH_ENTRANCE assets

2021-06-10 21:15:45 +08:00

os_combat

Add: [JP] assets for guild and OS

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

os_handler

Fix: [JP] update asset AUTO_SEARCH_REWARD

2021-07-08 21:29:00 +08:00

raid

Upd: [JP] raid & MEOWFFICER assets

2021-07-11 11:29:21 +08:00

research

Upd: [EN] page_research transitions same as others, now has unique titles across all reshmenu pages after last update

2021-07-15 21:58:21 -04:00

retire

Del: Replace SR_SSR_CONFIRM with popup_confirm

2021-07-04 18:17:57 +08:00

reward

Add: [CN, JP, TW] counterpart assets, config, and gui updates

2021-07-18 19:54:20 -04:00

shop

Add: [EN] shop module related assets

2021-07-10 23:05:39 -04:00

sos

Fix: Assets for sos signal and commission notice

2020-12-22 18:39:58 +08:00

statistics

Dev: Item statistics rework

2020-08-09 11:34:59 +08:00

template

Add: Siren templates in Azur Anthem SP4

2021-07-23 21:01:37 +08:00

ui

Merge branch 'master' into dev

2021-08-07 14:32:31 +08:00

war_archives

Fix: [EN] Support for Ink-Stained Steel Sakura, update module reference to local

2021-04-08 23:24:07 -04:00