2173 Commits

Author SHA1 Message Date
W1NDes
5db1b8b8ff Merge remote-tracking branch 'upstream/master' into dev 2025-12-11 16:35:04 +08:00
MikuSoft
1297908d89
Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
guoh064
fda137f62b
Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365) 2025-12-09 12:19:50 +08:00
W1NDes
761616006e Merge remote-tracking branch 'upstream/master' into dev 2025-12-01 04:46:35 +08:00
xzjjasper
d11dce42cc
Add: [TW] assets for coalition_20251127 (#5354)
* Add: [EN] assets for coalition_20251120 (#5347)

* Add: [TW] assets for coalition_20251127

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2025-12-01 00:29:57 +08:00
guoh064
83f103daa2
Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00
W1NDes
c13dcef46a Upd(Coalition): upd stage increase 2025-11-23 21:14:29 +08:00
W1NDes
bc2bbb72cc Upd(coalition): Update coalition CN assets 2025-11-23 20:17:26 +08:00
W1NDes
7ffad70b4a Merge branch 'pr-5338' into dev 2025-11-23 20:10:42 +08:00
guoh064
ba594e769a Tmp: event pt ocr for coalition_20251120 2025-11-23 02:11:05 +08:00
guoh064
a07c99fe85 Add: [JP] coalition_20251120 2025-11-23 01:42:38 +08:00
W1NDes
eccddf5ec9 Merge remote-tracking branch 'upstream/master' into dev 2025-11-21 03:35:19 +08:00
whjhs1010203
5c8fe18a57
Upd: guildshop assets (#5308)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-21 03:06:10 +08:00
whjhs1010203
a36d36c0d9
Upd: [TW]private_quarters update new_jersey (#5329)
* Upd: [TW] PRIVATE_QUARTERS update

* Upd: [TW] PRIVATE_QUARTERS update i18n

---------

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-21 03:04:07 +08:00
whjhs1010203
9563e149dc
Upd: [TW] PRIVATE_QUARTERS_CHECK (#5317)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-16 00:21:42 +08:00
W1NDes
062860370d Merge remote-tracking branch 'upstream/master' into dev 2025-11-14 14:26:42 +08:00
whjhs1010203
df6bc4b69c Upd: [tw] PRIVATE_QUARTERS 2025-11-13 17:52:00 +08:00
guoh064
1a29d642a0
Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303) 2025-11-13 17:50:50 +08:00
W1NDes
2072fb7907 Upd(smallEvent): 更新七天小任务 2025-11-13 16:38:30 +08:00
W1NDes
418211223f Merge remote-tracking branch 'upstream/master' into dev 2025-11-08 19:17:30 +08:00
sui-feng-cb
b14ab02c97 Upd: [CN] USE_DATA_KEY_NOTIFIED asset 2025-11-06 17:11:57 +08:00
sui-feng-cb
d90390202b Add: war_archives_20220915_cn 2025-11-06 17:11:47 +08:00
W1NDes
5e0f00d796 Merge remote-tracking branch 'upstream/master' into dev 2025-11-03 19:38:06 +08:00
LmeSzinc
40434b686b
Merge pull request #5174 from nEEtdo0d/pq_taihou
Add: PrivateQuarters Taihou option
2025-11-03 18:52:58 +08:00
nEEtdo0d
a64f1e9157 Add: PrivateQuarters Taihou option 2025-10-31 16:28:27 -04:00
whjhs1010203
5f83ea097f
[Upd] add guildshop bookT3_4 (#5277)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-10-30 12:40:46 +08:00
W1NDes
84180c679b Merge remote-tracking branch 'upstream/master' into dev 2025-10-24 01:32:49 +08:00
LmeSzinc
b56ab2d555 Fix: Add W15 spesific FLEET_2_IN_USE that does not intersect with info_bar 2025-10-24 01:11:52 +08:00
LmeSzinc
ebe5ca794b Fix: [TW] FLEET_2_IN_USE should not intersect with info_bar 2025-10-24 00:48:42 +08:00
W1NDes
6e1357f056 Merge remote-tracking branch 'upstream/master' into dev 2025-10-21 04:15:57 +08:00
whjhs1010203
84cb4c6b5a Upd: [TW] POPUP_CONFIRM_WHITE assets 2025-10-20 23:03:02 +08:00
whjhs1010203
ae9224f79e Upd: [TW] BATTLE_PASS assets 2025-10-20 22:20:58 +08:00
whjhs1010203
bd4852a356 Upd: [TW] supply_pack 2025-10-20 10:42:03 +08:00
whjhs1010203
cac507229f Upd: [TW] shop assets 2025-10-19 17:05:55 +08:00
W1NDes
66ef786ff2 Merge remote-tracking branch 'upstream/master' into dev 2025-10-18 02:33:40 +08:00
dragonheart107
f9c25961bb
Fix: EN commission + mission reward (#5230)
* Revert "Tmp: [EN] Temp fix for bugged UI"

This reverts commit c06773e586004c30c969ade48457630234bb566f.

* Fix: EN post maintenance UI bugs

* duplicate removal
2025-10-18 02:25:24 +08:00
W1NDes
ab7b31fb2e Merge remote-tracking branch 'upstream/master' into dev 2025-10-18 01:37:45 +08:00
LmeSzinc
f31da700a0 Del: Remove old mail module 2025-10-17 04:37:45 +08:00
LmeSzinc
c06773e586 Tmp: [EN] Temp fix for bugged UI 2025-10-17 04:13:16 +08:00
W1NDes
c54f03b29d Merge remote-tracking branch 'upstream/master' into dev 2025-10-16 20:15:54 +08:00
sui_feng
d89094b396
Add: war_archives_20231026_cn (#5221) 2025-10-16 19:46:24 +08:00
W1NDes
739001d953 Merge remote-tracking branch 'upstream/master' into dev 2025-10-16 00:20:58 +08:00
LmeSzinc
d0159db710 Upd: [JP] SUPPLY_PACK_CHECK 2025-10-14 22:05:26 +08:00
Compeador
20f4f64708
fix: shop MUNITIONS_CHECK (#5210) 2025-10-14 19:07:21 +08:00
W1NDes
084fd0f1d2 Merge remote-tracking branch 'upstream/master' into dev 2025-10-11 19:06:34 +08:00
LmeSzinc
80fe33d9c4 Upd: [JP] shop navigation assets
- TODO: update FREE_SUPPLY_PACK
2025-10-11 01:12:31 +08:00
LmeSzinc
40876858ae Upd: [TW] Neoncity assets
TODO: add NEONCITY_SWITCH_SINGLE, NEONCITY_SWITCH_MULTI (#5201)
2025-10-11 01:03:04 +08:00
nEEtdo0d
a61e93942d
Upd: [EN] UI, ShopUI, Freebies assets (#5202) 2025-10-10 21:20:18 +08:00
W1NDes
5e5412b85b Merge remote-tracking branch 'upstream/master' into dev 2025-10-09 22:32:38 +08:00