starg09
/
magia-assets
forked from kamihama/magia-assets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin branch #1

Merged
starg09 merged 72 commits from kamihama/magia-assets:master into master 2021-05-03 21:18:12 +01:00
Conversation 0 Commits 72 Files Changed 1514 +4486 -3683

72 Commits

Author SHA1 Message Date
Neo 0f84e63864 Merge pull request 'Community updates' (#10) from LiviaMedeiros/magia-assets:Additions into master 
Reviewed-on: kamihama/magia-assets#10
 2021-05-03 17:32:12 +01:00
LiviaMedeiros 744fd236cc
updated event Dependence Blue 
Author: Cett
 2021-05-03 12:48:20 +08:00
LiviaMedeiros 9dabb1927e
added userName story 
TL/JSONs: Ruelin
 2021-05-03 06:37:07 +08:00
Neo f0c31c18b3 Merge pull request 'Adjustments' (#9) from LiviaMedeiros/magia-assets:Adjustments into master 
Reviewed-on: kamihama/magia-assets#9
 2021-05-02 16:22:44 +01:00
LiviaMedeiros 2079142739
adjusted another story 2021-05-02 16:48:31 +08:00
LiviaMedeiros c57f1e21b6
adjusted mirror story 2021-05-02 16:46:43 +08:00
LiviaMedeiros cb93753069
adjusted prologue 2021-05-02 16:39:17 +08:00
LiviaMedeiros 9c280ab7e3
added rerun: Another Daze 2021-05-01 23:29:03 +08:00
LiviaMedeiros 5ce9009fb8
added rerun: Rebel of a Dawnless Land 2021-05-01 23:28:10 +08:00
LiviaMedeiros 96e92d7433
added rerun: Summer Treasures 2021-05-01 23:27:02 +08:00
LiviaMedeiros 661819ff3b
added rerun: Magia Clash! 2021-05-01 23:16:04 +08:00
LiviaMedeiros 0441551b7e
added rerun: Mitama's Special Training - Tsukuyo Amane 2021-05-01 23:12:45 +08:00
LiviaMedeiros 82b4840ded
added rerun: Endless Beginnings 2021-05-01 23:10:56 +08:00
LiviaMedeiros bbe789482c
added rerun: Let's See What You're Maid Of 2021-05-01 23:10:15 +08:00
LiviaMedeiros 34f97b6d33
added missing file from rerun: The Page I Write on the Holy Night 2021-05-01 23:09:03 +08:00
LiviaMedeiros 99f8cd7438
added something from Magia Clash! 2021-05-01 23:06:10 +08:00
LiviaMedeiros f0cdd4ab37
added rerun: Cross Connection 2021-05-01 23:05:04 +08:00
LiviaMedeiros d57fa9f106
added rerun: The Maiden of Hope 2021-05-01 23:04:13 +08:00
LiviaMedeiros 8cac5a5724
added rerun: And So, The Azaleas Bloom 2021-05-01 23:02:46 +08:00
LiviaMedeiros 1e1b771031
added rerun: Summer With Mikazuki Villa 2021-05-01 23:02:00 +08:00
LiviaMedeiros 8fd3190d3a
added rerun: Reaching a Happier Height 2021-05-01 23:00:33 +08:00
LiviaMedeiros 067424e39c
added rerun: My Diary With You 2021-05-01 22:57:47 +08:00
LiviaMedeiros 107dda7e27
BOM fixes 2021-05-01 22:50:51 +08:00
LiviaMedeiros 8fa096ea09
fixed pics from Dependence Blue 2021-05-01 22:31:42 +08:00
Neo 1100df3b35 Merge pull request 'Several fixes and new event translations, updated char_list for Azaleas' new event' (#8) from starg09/magia-assets:char_list into master 
Reviewed-on: kamihama/magia-assets#8
 2021-05-01 15:14:54 +01:00
Guillermo Bianchi 8c7dd5d9a3 "Ashley's JP Horror" fixes by VirusLord 2021-05-01 02:05:38 -03:00
Guillermo Bianchi 74e6919549 "The Page I Write On This Holy Night" rerun by Vivi 
(rerun text copied to the original run's nodes) (tl by Antimony/BST)
 2021-05-01 02:05:07 -03:00
Guillermo Bianchi 9c80b75bdc Mitsune & Yuzuki Twins MGS by Cett 
Mitsune's Story made with the cooperation of Grox and considerable feedback from Reido, Ai, and others.
 2021-05-01 02:04:33 -03:00
Guillermo Bianchi 1d782ff33b Dependence Blue by Cett 
Made with the cooperation of Opalcat and ProfessorPD and feedback from various people
 2021-05-01 02:03:27 -03:00
Guillermo Bianchi ec50dec370 Halloween Castle Event by Yai (Translated by Mochi) 2021-05-01 02:02:01 -03:00
Guillermo Bianchi 85081b3c4d Otsukimi Event typo fixes by Vivi 2021-05-01 02:01:31 -03:00
Guillermo Bianchi 34c8243be0 2018 April Fools Login by Vivi 
Mitama's Photo Shoot, tl by Ruelin (there aren't actually nodes for these in the game archive but if anyone wants to view them on their own, here they are)
 2021-05-01 02:00:56 -03:00
Guillermo Bianchi 17a027d3e2 "Warming Valentine" reupload by VirusLord 
With a couple fixes
 2021-05-01 02:00:27 -03:00
Guillermo Bianchi 83b65d7554 Some more misc fixes by Vivi 
Small fixes for NY 2018 day 6, Rumors in Disguise and Tsukuyo's Xmas Costume Story
 2021-05-01 01:59:54 -03:00
Guillermo Bianchi e2588017dc "Angels on the Road" updates by Reido413 2021-05-01 01:59:11 -03:00
Guillermo Bianchi b800a226d5 Leila's Winter Costume Story by Antimony 
(original TL BigScaryThings)
 2021-05-01 01:58:38 -03:00
Guillermo Bianchi 05e00d2607 Misc fixes by Vivi 
Includes some fixes, Hikaru's MGS and CR
 2021-05-01 01:57:53 -03:00
starg09 5da9bfc330 Small typo correction in Arc 2 Prologue by VirusLord 2021-05-01 05:03:51 +01:00
starg09 4b60f4ed3b Merge branch 'master' into char_list 2021-05-01 04:57:40 +01:00
starg09 30fed264c3 Upload files to 'magica/resource/download/asset/master/resource/image_native/scene/download' 2021-05-01 04:53:52 +01:00
Neo 1f6d1ed98c Fixes, arc 2 ch 4, crimson resolve, Sunao's MSS 2021-04-04 01:07:08 +01:00
Neo 066239d513 Add: angels on road, chiharu MGS, shizuka winter costume, aoba chika MGS, yuuna kahaaru WC, hikaru MGS 2021-03-29 16:47:13 +01:00
Neo 7a609cf6aa Add: Ashley event, Jun event, Touka, Nemu SS, typo corrections, homescreen subs for felicia kyoko sayaka, mss fixes, cheese panic, tsubaki event, tsubaki matsuri haruka MGS, rumors fixes 2021-03-29 16:45:42 +01:00
Neo 6a2046fd69 Merge pull request 'Adjustments' (#6) from LiviaMedeiros/magia-assets:Adjustments into master 
Reviewed-on: kamihama/magia-assets#6
 2021-03-21 17:10:25 +00:00
LiviaMedeiros ed22333b57
adjusted Kyoko story 2021-03-21 08:34:16 +08:00
LiviaMedeiros f295d373db
adjusted Sayaka story 2021-03-21 08:32:03 +08:00
LiviaMedeiros 60d11d0965
adjusted Tsukuyo story 2021-03-21 08:18:22 +08:00
LiviaMedeiros c0c051bdda
adjusted Mitama story 2021-03-21 08:13:57 +08:00
LiviaMedeiros 1da81218fd
BOM fixes 2021-03-21 08:09:24 +08:00
LiviaMedeiros 0337c573ee
snaa 2021-04-01 12:00:00 +08:00
LiviaMedeiros 8d2caab6be
added Ashley login story 2021-03-21 05:58:55 +08:00
Neo d78ef04d62 Merge pull request 'Update char_list (Summer 2020 units rerun)' (#5) from starg09/magia-assets:char_list into master 
Reviewed-on: kamihama/magia-assets#5
 2021-03-08 07:44:00 +00:00
starg09 c0e1708379 Update char_list (Summer 2020 units rerun) 2021-03-08 03:42:01 +00:00
Neo 330c20366c Add Uwasa Aquarium, rena/kaede mss, fixes, arc 2 ch3 2021-03-06 02:05:15 +00:00
Neo 858fe55094 Fixes, Yuuna Kaharu MGS 2021-02-28 00:24:01 +00:00
Neo f90c4e2aee Add new memoria images, add 2020 Valentines Story part 1 2021-02-24 16:23:28 +00:00
Neo 8a53653d50 Add: SuSa, ShiTok, AoKa cards, Kako KCHS, CR Ao2 fix, other fixes, Sakura Kyoko CSS, Yui Tsuruno CSH, Hollow Heart fixes, Tsumugi/sakura event, SakurakoMizuMGS, Flower Blooms P2, Ashley updates 2021-02-24 16:21:00 +00:00
Neo 181819f236 Merge pull request 'scenario adjustments' (#4) from LiviaMedeiros/magia-assets:scenario-adjustments into master 
Reviewed-on: kamihama/magia-assets#4
 2021-02-24 16:01:51 +00:00
LiviaMedeiros 0253ccad78
adjusted Emiri stories 2021-02-23 19:40:45 +08:00
LiviaMedeiros 6596ab703f
adjusted Mami stories 2021-02-23 19:37:52 +08:00
LiviaMedeiros e8aceddc17
Ashley story update 2021-02-23 19:20:29 +08:00
LiviaMedeiros 55e7338c4b
BOM fixes 2021-02-23 19:13:12 +08:00
LiviaMedeiros f7531b55d1
Mitamashop linebreaks 2021-02-23 18:52:36 +08:00
Neo 0c6cf5ebad Merge pull request 'Metadata patch' (#2) from LiviaMedeiros/magia-assets:master into master 
Reviewed-on: kamihama/magia-assets#2
 2021-02-12 10:40:35 +00:00
Neo 9a0dea4b36 Merge branch 'master' of ssh://git-ssh.rayshift.io:45555/kamihama/magia-assets 2021-02-12 10:39:20 +00:00
Neo 434358204b Add arc 2 ch1/e2, fix 211, a ton of memoria images 2021-02-12 10:38:38 +00:00
LiviaMedeiros cf82f49eaf Merge remote-tracking branch 'upstream/master' 2021-02-11 05:45:39 +08:00
Neo ee26f38c3c Merge pull request 'Update char_list (The Mirror World Chocolatier rerun)' (#3) from starg09/magia-assets:char_list into master 
Reviewed-on: kamihama/magia-assets#3
 2021-02-10 11:17:51 +00:00
starg09 8d90e9b453 Update char_list (The Mirror World Chocolatier rerun) 2021-02-09 03:08:11 +00:00
LiviaMedeiros a10953669f patched some version 2021-01-27 21:38:37 +08:00
LiviaMedeiros aa4f282fd4 patched some story->group->chara[]->name 2021-01-27 21:26:01 +08:00
LiviaMedeiros 5692f53140 patched story->group->chara[]->live2dParam->name 2021-01-27 20:50:23 +08:00