diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index 2a1a4fa4..1e05667b 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -279,6 +279,34 @@ false + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + false @@ -309,6 +337,36 @@ false + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Contents.json index ee9e8b5f..1e47e034 100644 --- a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Contents.json +++ b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Contents.json @@ -1,216 +1,90 @@ { "images": [ { - "filename": "Icon-40.png", - "size": "20x20", + "idiom": "universal" + }, + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "filename": "battle_axe.png", + "scale": "3x", + "idiom": "universal" + }, + { + "idiom": "iphone" + }, + { + "scale": "1x", + "idiom": "iphone" + }, + { + "scale": "2x", + "idiom": "iphone" + }, + { + "subtype": "retina4", "scale": "2x", "idiom": "iphone" }, { - "filename": "Icon-60.png", - "size": "20x20", "scale": "3x", "idiom": "iphone" }, { - "filename": "Icon-58.png", - "size": "29x29", - "scale": "2x", - "idiom": "iphone" + "idiom": "ipad" + }, + { + "scale": "1x", + "idiom": "ipad" + }, + { + "scale": "2x", + "idiom": "ipad" + }, + { + "idiom": "watch" + }, + { + "scale": "2x", + "idiom": "watch" + }, + { + "screenWidth": "{130,145}", + "scale": "2x", + "idiom": "watch" + }, + { + "screenWidth": "{146,165}", + "scale": "2x", + "idiom": "watch" + }, + { + "idiom": "mac" + }, + { + "scale": "1x", + "idiom": "mac" + }, + { + "scale": "2x", + "idiom": "mac" + }, + { + "idiom": "car" + }, + { + "scale": "2x", + "idiom": "car" }, { - "filename": "Icon-87.png", - "size": "29x29", "scale": "3x", - "idiom": "iphone" - }, - { - "filename": "Icon-80.png", - "size": "40x40", - "scale": "2x", - "idiom": "iphone" - }, - { - "filename": "Icon-120.png", - "size": "40x40", - "scale": "3x", - "idiom": "iphone" - }, - { - "filename": "Icon-120.png", - "size": "60x60", - "scale": "2x", - "idiom": "iphone" - }, - { - "filename": "Icon-180.png", - "size": "60x60", - "scale": "3x", - "idiom": "iphone" - }, - { - "filename": "Icon-20.png", - "size": "20x20", - "scale": "1x", - "idiom": "ipad" - }, - { - "filename": "Icon-40.png", - "size": "20x20", - "scale": "2x", - "idiom": "ipad" - }, - { - "filename": "Icon-29.png", - "size": "29x29", - "scale": "1x", - "idiom": "ipad" - }, - { - "filename": "Icon-58.png", - "size": "29x29", - "scale": "2x", - "idiom": "ipad" - }, - { - "filename": "Icon-40.png", - "size": "40x40", - "scale": "1x", - "idiom": "ipad" - }, - { - "filename": "Icon-80.png", - "size": "40x40", - "scale": "2x", - "idiom": "ipad" - }, - { - "filename": "Icon-167.png", - "size": "83.5x83.5", - "scale": "2x", - "idiom": "ipad" - }, - { - "filename": "Icon-76.png", - "size": "76x76", - "scale": "1x", - "idiom": "ipad" - }, - { - "filename": "Icon-152.png", - "size": "76x76", - "scale": "2x", - "idiom": "ipad" - }, - { - "filename": "Icon-1024.png", - "size": "1024x1024", - "scale": "1x", - "idiom": "ios-marketing" - }, - { - "role": "notificationCenter", - "size": "24x24", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "notificationCenter", - "size": "27.5x27.5", - "subtype": "42mm", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "companionSettings", - "size": "29x29", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "companionSettings", - "size": "29x29", - "scale": "3x", - "idiom": "watch" - }, - { - "role": "appLauncher", - "size": "40x40", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "longLook", - "size": "44x44", - "subtype": "42mm", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "quickLook", - "size": "86x86", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" - }, - { - "role": "quickLook", - "size": "98x98", - "subtype": "42mm", - "scale": "2x", - "idiom": "watch" - }, - { - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "size": "512x512", - "scale": "2x", - "idiom": "mac" + "idiom": "car" } ], "info": { diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-1024.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-1024.png deleted file mode 100644 index 39d0c212..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-1024.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-120.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-120.png deleted file mode 100644 index fd141b57..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-120.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-152.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-152.png deleted file mode 100644 index f6b35b39..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-152.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-167.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-167.png deleted file mode 100644 index c20fea59..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-167.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-180.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-180.png deleted file mode 100644 index db6f1899..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-180.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-20.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-20.png deleted file mode 100644 index 817b245f..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-20.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-29.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-29.png deleted file mode 100644 index 89194dbf..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-29.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-40.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-40.png deleted file mode 100644 index 4fbabeff..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-40.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-58.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-58.png deleted file mode 100644 index d0faf125..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-58.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-60.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-60.png deleted file mode 100644 index c2ae3056..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-60.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-76.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-76.png deleted file mode 100644 index 9cf73877..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-76.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-80.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-80.png deleted file mode 100644 index cfc61ad6..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-80.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-87.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-87.png deleted file mode 100644 index 71fa6060..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/Icon-87.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/battle_axe.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/battle_axe.png new file mode 100644 index 00000000..23faca6e Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/battle_axe.imageset/battle_axe.png differ diff --git a/Data/Icons/convert.bat b/Data/Icons/convert.bat index 82d715fa..c9261d5d 100644 --- a/Data/Icons/convert.bat +++ b/Data/Icons/convert.bat @@ -25,7 +25,6 @@ rem call convertone.bat battle_axe battle-axe call convertone.bat click click -:nouveau rem call convertmain.bat battle_axe.png battle-axe.svg call convertone.bat d4 d4 @@ -44,5 +43,8 @@ call convertone.bat cubes cubes call convertone.bat rolling_dice_cup rolling-dice-cup +:nouveau + +call convertone.bat battle_axe battle-axe pause diff --git a/Data/Icons/convertone.bat b/Data/Icons/convertone.bat index bd3b5272..c6e18a2f 100644 --- a/Data/Icons/convertone.bat +++ b/Data/Icons/convertone.bat @@ -3,7 +3,7 @@ set ANDROID_PATH=..\..\AideDeJeu\AideDeJeu.Android\Resources\ set UWP_PATH=..\..\AideDeJeu\AideDeJeu.UWP\ set IOS_PATH=..\..\AideDeJeu\AideDeJeu.iOS\Media.xcassets\ -rem goto ios +goto ios :android