148 Commits

Author SHA1 Message Date
d2bf54ff7f Merge branch '20200717_global' into beta 2020-07-31 10:33:27 -04:00
4e3efff1af fixed quest 343 to quest 304 2020-07-31 10:53:12 +02:00
83e9fab143 Merge branch '20200717_global' into beta 2020-07-27 00:55:35 -04:00
7209c92297 Merge remote-tracking branch 'origin/20200715/divainadress' into beta 2020-07-27 00:55:19 -04:00
JohnnyZB
31452b203e memoria: diva in a dress final fix, names added 2020-07-24 08:49:01 +03:00
22e5d2efb2 Merge remote-tracking branch 'origin/20200715/divainadress' into beta 2020-07-23 13:34:38 -04:00
JohnnyZB
b81801f42a memoria: diva in a dress update 2020-07-23 09:35:15 +03:00
f453df161a final global update and enbale 2020-07-17 19:20:23 -04:00
6263966e2d Merge branch 'tl/memoria/eng/diva_in_a_dress' into beta 2020-07-15 09:43:38 -04:00
JohnnyZB
f8f8e7851f memoria: diva in a dress 2020-07-15 16:38:59 +03:00
52e1506abb Merge branch 'jp-update/june2020' into beta 2020-07-13 12:17:06 -04:00
d5fd23bdb1 update jp cache june-ish 2020 2020-07-13 12:16:52 -04:00
e4faf0f66a memoria: basa 2020: finalize 2020-05-24 15:20:05 -04:00
1cbb5a3ecf Merge branch 'tl/memoria/eng/basa_2020' into beta 2020-05-24 14:50:32 -04:00
fe2a8771d0 memoria: basa 2020: qc 2020-05-24 14:50:14 -04:00
0d129b0c42 Merge branch 'tl/memoria/eng/basa_2020' into beta 2020-05-24 14:37:43 -04:00
d8438a90c8 memoria: basa 2020: oops 2020-05-24 14:36:55 -04:00
e5a65326c6 Merge branch 'tl/memoria/eng/basa_2020' into beta 2020-05-24 14:14:24 -04:00
6b0e2ddb49 memoria: basa 2020 2020-05-24 14:13:38 -04:00
ede4ad8155 disable global for now 2020-05-24 14:13:10 -04:00
f599ce5a93 Merge remote-tracking branch 'origin/feature/global' into beta 2020-05-24 13:35:47 -04:00
06a52db84c updated jp cache 2020-05-24 19:28:01 +02:00
cf2e201e97 removed leftover russian 2020-05-17 11:36:39 +02:00
178ec9be36 quests and scenes for enm, kor, zho 2020-05-16 15:39:16 +02:00
06e0765df2 updated global translations/names 2020-05-16 13:11:17 +02:00
86385b3dfc jp update 2020-05-15 23:42:43 +02:00
41062c7b1a Merge branch 'tl/events/eng/bandori' into beta 2020-04-19 10:29:18 -04:00
fe17fecc6e events: bandori: finalize 2020-04-19 10:28:44 -04:00
9451ee830d Merge branch 'tl/events/eng/bandori' into beta 2020-04-11 12:04:09 -04:00
542b8466d9 events: bandori: qc 2020-04-11 12:03:53 -04:00
d423398c42 Merge branch 'tl/events/eng/bandori' into beta 2020-04-08 12:33:49 -04:00
8989b274f5 bandori: update names 2020-04-08 12:33:33 -04:00
33b27e418e Merge branch 'tl/events/eng/bandori' into beta 2020-04-03 16:38:08 -04:00
1a008f6d5f events: bandori: names 2020-04-03 16:37:30 -04:00
bdaa0b25dc Merge branch 'tl/events/eng/bandori' into beta 2020-04-03 15:09:26 -04:00
0147c75e90 events: bandori initial commit 2020-04-03 15:03:26 -04:00
7d8195a94e Merge branch 'tl/events/eng/mikugeah' into beta 2019-11-06 09:03:44 -05:00
ac0bfbd699 events: mikugeah: fix 3liner 2019-11-06 09:03:07 -05:00
67d2698543 events: mikugeah: qc 2019-11-06 08:27:47 -05:00
64f5b1dda2 events: mikugeah: solopy edit 2019-11-06 08:27:47 -05:00
dcb910fc9f mikugeah: partial editing pass from a long-ass time ago 2019-11-06 08:27:47 -05:00
d8dfaac2ab events: mikugeah
finally updated xduplayer so this can be pushed to gungnir
needs heavy editing
2019-11-06 08:27:47 -05:00
2fa3489e3c Merge branch 'tl/events/eng/mikugeah' into beta 2019-11-06 08:27:31 -05:00
d3eeeae17f events: mikugeah: qc 2019-11-06 08:26:59 -05:00
3517be289f enable updated jpn events 2019-10-29 13:36:04 -04:00
09069db26e enable updated jpn events 2019-10-29 13:35:48 -04:00
8c829ea74f Merge branch 'tl/events/eng/mikugeah' into beta 2019-10-26 14:34:24 -04:00
908f0aedc1 events: mikugeah: solopy edit 2019-10-26 14:34:08 -04:00
fe94d7b17a Merge branch 'tl/memoria/rus/school-at-night' into beta 2019-10-25 17:49:57 -04:00
f4d7afe20a mikugeah: partial editing pass from a long-ass time ago 2019-10-25 17:46:38 -04:00