Merge branch 'master' into another

b6430c75 · nanahira · 52b9ae9e · de327a66 · b6430c75 · 494aabb3
Commit b6430c75 authored Dec 07, 2018 by nanahira
52 changed files
--- a/cards.cdb
+++ b/cards.cdb
--- a/script @ 494aabb3
+++ b/script @ 494aabb3
-Subproject commit 9845ffd083503c65aed5b4660b3eb0c49b173fce
+Subproject commit 494aabb3ae598b5dd244242d695f2897aed32c70
--- a/textures/act/actB.png
+++ b/textures/act/actB.png
--- a/textures/act/actD.png
+++ b/textures/act/actD.png
--- a/textures/act/actGY.png
+++ b/textures/act/actGY.png
--- a/textures/act/actP.png
+++ b/textures/act/actP.png
--- a/textures/act/actPR.png
+++ b/textures/act/actPR.png
--- a/textures/act/actR.png
+++ b/textures/act/actR.png
--- a/textures/act/actSL.png
+++ b/textures/act/actSL.png
--- a/textures/act/actW.png
+++ b/textures/act/actW.png
--- a/textures/act/actY.png
+++ b/textures/act/actY.png
--- a/textures/attack/attackGY.png
+++ b/textures/attack/attackGY.png
--- a/textures/attack/attackNS.png
+++ b/textures/attack/attackNS.png
--- a/textures/attack/attackPR.png
+++ b/textures/attack/attackPR.png
--- a/textures/attack/attackS.png
+++ b/textures/attack/attackS.png
--- a/textures/attack/attackSB.png
+++ b/textures/attack/attackSB.png
--- a/textures/attack/attackSD.png
+++ b/textures/attack/attackSD.png
--- a/textures/attack/attackSG.png
+++ b/textures/attack/attackSG.png
--- a/textures/attack/attackSP.png
+++ b/textures/attack/attackSP.png
--- a/textures/attack/attackSR.png
+++ b/textures/attack/attackSR.png
--- a/textures/attack/attackSY.png
+++ b/textures/attack/attackSY.png
--- a/textures/bg/bgAU.jpg
+++ b/textures/bg/bgAU.jpg
--- a/textures/bg/bgBE.jpg
+++ b/textures/bg/bgBE.jpg
--- a/textures/bg/bgCE.jpg
+++ b/textures/bg/bgCE.jpg
--- a/textures/bg/bgGY.jpg
+++ b/textures/bg/bgGY.jpg
--- a/textures/bg_deck/bgHE.jpg
+++ b/textures/bg_deck/bgHE.jpg
--- a/textures/bg_deck/bgME.jpg
+++ b/textures/bg_deck/bgME.jpg
--- a/textures/bg_deck/bgR.jpg
+++ b/textures/bg_deck/bgR.jpg
--- a/textures/bg_menu/bgRE.jpg
+++ b/textures/bg_menu/bgRE.jpg
--- a/textures/bg_menu/bgSAS.jpg
+++ b/textures/bg_menu/bgSAS.jpg
--- a/textures/bg_menu/bgSTR.jpg
+++ b/textures/bg_menu/bgSTR.jpg
--- a/textures/cover/cover3STR.jpg
+++ b/textures/cover/cover3STR.jpg
--- a/textures/cover/cover3YL.jpg
+++ b/textures/cover/cover3YL.jpg
--- a/textures/cover/coverAU2.jpg
+++ b/textures/cover/coverAU2.jpg
--- a/textures/cover/coverFR2.jpg
+++ b/textures/cover/coverFR2.jpg
--- a/textures/cover/coverGY.jpg
+++ b/textures/cover/coverGY.jpg
--- a/textures/cover/coverKC.jpg
+++ b/textures/cover/coverKC.jpg
--- a/textures/cover/coverSA.jpg
+++ b/textures/cover/coverSA.jpg
--- a/textures/cover/coverSTR.jpg
+++ b/textures/cover/coverSTR.jpg
--- a/textures/cover/coverTAG.jpg
+++ b/textures/cover/coverTAG.jpg
--- a/textures/cover/coverWCS.jpg
+++ b/textures/cover/coverWCS.jpg
--- a/textures/cover/coverYL.jpg
+++ b/textures/cover/coverYL.jpg
--- a/textures/cover/coverZX.jpg
+++ b/textures/cover/coverZX.jpg
--- a/textures/cover2/cover2GY.jpg
+++ b/textures/cover2/cover2GY.jpg
--- a/textures/cover2/cover2KC.jpg
+++ b/textures/cover2/cover2KC.jpg
--- a/textures/cover2/cover2MAG.jpg
+++ b/textures/cover2/cover2MAG.jpg
--- a/textures/cover2/cover2SA.jpg
+++ b/textures/cover2/cover2SA.jpg
--- a/textures/cover2/cover2STR.jpg
+++ b/textures/cover2/cover2STR.jpg
--- a/textures/cover2/cover2WCS.jpg
+++ b/textures/cover2/cover2WCS.jpg
--- a/textures/cover2/cover2YL.jpg
+++ b/textures/cover2/cover2YL.jpg
--- a/textures/cover2/cover4STR.jpg
+++ b/textures/cover2/cover4STR.jpg
--- a/textures/cover2/cover4YL.jpg
+++ b/textures/cover2/cover4YL.jpg