kamihama
/
magia-assets
1
3
Fork 8
Code Issues Pull Requests Projects Releases Wiki Activity

Metadata patch #2

Merged
Neo merged 4 commits from LiviaMedeiros/magia-assets:master into master 2021-02-12 10:40:36 +00:00
Conversation 3 Commits 4 Files Changed 45 +45 -886
LiviaMedeiros commented 2021-01-27 14:46:15 +00:00
Collaborator
Copy Link
  • Fixed data corruption in story->group->chara[]->live2dParam->name and some story->group->chara[]->name values.
  • Shifted scenario version from 2 to 3 for the most perfect files to match JP ones.

Side effect: zero fractional parts are not preserved, it should be fine AFAIK.

Also scenario_4/400001-1.json in repo was prettified, but it's minified on JP server so whatever.

Readable diffs: be0ae25b90

- Fixed data corruption in `story->group->chara[]->live2dParam->name` and some `story->group->chara[]->name` values. - Shifted scenario version from `2` to `3` for the most perfect files to match JP ones. Side effect: zero fractional parts are not preserved, it should be fine AFAIK. Also `scenario_4/400001-1.json` in repo was prettified, but it's minified on JP server so whatever. Readable diffs: https://git.rayshift.io/LiviaMedeiros/magia-scenario/commit/be0ae25b902be175e22883ddb604c304081ad60a
LiviaMedeiros added 3 commits 2021-01-27 14:46:15 +00:00
Neo commented 2021-02-10 11:19:14 +00:00
Owner
Copy Link

Did you post the file in the channel too? Do I still need to merge this?

Did you post the file in the channel too? Do I still need to merge this?
LiviaMedeiros commented 2021-02-10 11:26:17 +00:00
Author
Collaborator
Copy Link

Didn't.
Yes.
Conflicted file on target branch is newer/better, do I need to update it on fork first?

Didn't. Yes. Conflicted file on target branch is newer/better, do I need to update it on fork first?
LiviaMedeiros added 1 commit 2021-02-10 21:47:48 +00:00
LiviaMedeiros commented 2021-02-10 22:13:45 +00:00
Author
Collaborator
Copy Link

Updated the fork, everything looks good.

Since there is no separate commit for conflicted file, permalinks for the record:
466a9e0ea6/patches/000/330561-4.json.patch applied patch
466a9e0ea6/valid/scenario_3/330561-4.json resulting file

Updated the fork, everything looks good. Since there is no separate commit for conflicted file, permalinks for the record: https://github.com/LiviaMedeiros/bella_spina/blob/466a9e0ea63d16b92c822e4a79c56280123dc3c8/patches/000/330561-4.json.patch applied patch https://github.com/LiviaMedeiros/bella_spina/blob/466a9e0ea63d16b92c822e4a79c56280123dc3c8/valid/scenario_3/330561-4.json resulting file
Neo merged commit 0c6cf5ebad into master 2021-02-12 10:40:36 +00:00
Neo referenced this issue from a commit 2021-05-31 23:28:48 +01:00
20210530-1 (#16)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: kamihama/magia-assets#2
No description provided.
Delete Branch "LiviaMedeiros/magia-assets:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?