342 Commits

Author SHA1 Message Date
W1NDes
bb5997bb9e Merge remote-tracking branch 'upstream/master' into dev 2026-04-04 22:19:42 +08:00
heipen
5cf249c8e7
Merge pull request #5595 from Heipen/ui_update
Upd: Battle UI ElvenVine
2026-04-03 22:44:37 +08:00
W1NDes
f5e99ba472 Merge remote-tracking branch 'upstream/master' into dev 2026-03-13 00:31:23 +08:00
guoh064
3f9e7edf4e Add: hide_in_upper_left option for combat manual 2026-03-12 18:46:50 +08:00
guoh064
5611dce94b Upd: asset COMBAT_AUTO 2026-03-12 18:46:50 +08:00
W1NDes
b6585b1fe8 Merge remote-tracking branch 'upstream/master' into dev 2026-03-06 02:39:38 +08:00
heipen
dbc5fe42e8
Upd: Battle UI SpringInn (#5541) 2026-03-04 12:32:12 +08:00
W1NDes
42ca63c840 Merge remote-tracking branch 'upstream/master' into dev 2026-02-14 17:33:29 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
W1NDes
063c06e950 Merge remote-tracking branch 'upstream/master' into dev 2026-01-29 20:51:12 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
W1NDes
5c3d0c73d1 Merge remote-tracking branch 'upstream/master' into dev 2026-01-08 01:01:33 +08:00
LmeSzinc
6ae47a39e4 Upd: [TW] TEMPLATE_COMBAT_LOADING 2026-01-04 02:29:43 +08:00
LmeSzinc
99de5e0d34 Upd: Battle UI MaidCafe 2026-01-01 23:36:25 +08:00
W1NDes
086ddfd02c Merge branch 'pr-5395' into dev 2025-12-19 12:01:59 +08:00
LmeSzinc
c36586f8c5 Upd: TEMPLATE_COMBAT_LOADING 2025-12-19 02:48:11 +08:00
LmeSzinc
4a21f2e4e7 Fix: fallback interval set if is_combat_loading() not detected 2025-12-19 02:37:12 +08:00
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
W1NDes
84180c679b Merge remote-tracking branch 'upstream/master' into dev 2025-10-24 01:32:49 +08:00
LmeSzinc
8d040e9345 Opt: Reuse screenshots in combat_status 2025-10-24 00:21:41 +08:00
W1NDes
369b4919e7 Merge remote-tracking branch 'upstream/master' into dev 2025-09-27 21:30:06 +08:00
LmeSzinc
4f6ab60db7 Upd: Battle UI Ninja 2025-09-27 00:56:18 +08:00
W1NDes
5702327145 Merge remote-tracking branch 'upstream/master' 2025-08-10 18:03:35 +08:00
LmeSzinc
b23a7d6ea1 Upd: [TW] ALCHEMIST_MATERIAL_CONFIRM 2025-08-10 18:01:55 +08:00
W1NDes
f6a47c3e44 Merge remote-tracking branch 'upstream/master' 2025-07-26 03:30:17 +08:00
LmeSzinc
f793b47008 Upd: [JP] ALCHEMIST_MATERIAL_CONFIRM 2025-07-26 02:39:53 +08:00
W1NDes
7d12adabd3 Merge remote-tracking branch 'upstream/master' 2025-07-25 02:04:37 +08:00
LmeSzinc
77f362f8bd Upd: [EN] ALCHEMIST_MATERIAL_CONFIRM 2025-07-25 02:01:42 +08:00
LmeSzinc
4bd51e41f8 Upd: button extract (fixed #4975) 2025-07-25 01:54:40 +08:00
W1NDes
55763c31e6 Merge remote-tracking branch 'upstream/master' 2025-07-05 00:17:21 +08:00
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
POLARme
13fbddfd7b Merge remote-tracking branch 'upstream/master' 2025-05-22 09:50:28 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00
POLARme
c24847fdd6 Merge remote-tracking branch 'upstream/master' 2025-05-19 03:55:10 +08:00
LmeSzinc
ef61702057 Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798) 2025-05-18 16:16:05 +08:00
LmeSzinc
1d617abb20 Fix: Sync bunch of popup handlers to all combat 2025-05-15 15:42:54 +08:00
POLAR me
3d98811716 Merge remote-tracking branch 'upstream/master' 2025-04-11 02:32:39 +08:00
LmeSzinc
18c7480e58 Upd: Battle UI Devil 2025-04-09 22:51:08 +08:00
POLAR me
45fcb697d5 Merge remote-tracking branch 'upstream/master' 2025-03-29 02:41:15 +08:00
LmeSzinc
eaf008f555 Upd: Battle UI Nurse 2025-03-29 00:47:51 +08:00
POLARme
0cb75e9ef0
Merge pull request #74 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-02-28 06:12:20 +08:00
LmeSzinc
86ce8f8c47 Upd: Battle UI Pharaoh
- TODO: [EN][JP][TW] Add Quit_Pharaoh
2025-02-28 00:22:02 +08:00
POLARme
53f23789d9
Merge pull request #68 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-02-07 06:29:00 +08:00
LmeSzinc
655b2fb361 Upd: Assets for battle UI Holy Light 2025-02-06 23:01:04 +08:00
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +08:00
LmeSzinc
c711584fa6 Opt: Reduce one extra screenshot call after retirement in auto search 2025-01-17 12:41:39 +08:00
POLAR me
ad6617c1af Merge remote-tracking branch 'upstream/master' 2025-01-12 00:37:38 +08:00
LmeSzinc
156a988cf5 Fix: Skip using emergency repair if all HP is 0 (#4501) 2025-01-10 02:39:46 +08:00
POLAR me
1531be5ded Merge branch 'master' into _master 2024-12-28 14:10:41 +08:00