Merge pull request #1024 from tooomm/icon_works

Icon works
This commit is contained in:
ctrlaltca 2015-05-02 18:32:28 +02:00
commit 53f63e2801
15 changed files with 1010 additions and 724 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 177 KiB

View file

@ -18,7 +18,6 @@
sodipodi:docname="back.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\cockatrice\resources\back_new.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View file

@ -18,7 +18,6 @@
sodipodi:docname="hand.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\cockatrice\resources\hand_new.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 143 KiB

View file

@ -14,13 +14,12 @@
height="300"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
inkscape:version="0.91 r13725"
sodipodi:docname="oracle.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
inkscape:export-xdpi="14.527113"
inkscape:export-ydpi="14.527113"
inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\oracle\resources\oracle.png">
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
@ -154,20 +153,20 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.054421"
inkscape:cx="55.310155"
inkscape:cx="-86.473819"
inkscape:cy="81.705663"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="725"
inkscape:window-x="413"
inkscape:window-y="244"
inkscape:window-height="961"
inkscape:window-x="-8"
inkscape:window-y="-8"
fit-margin-left="44.18"
fit-margin-right="44.18"
fit-margin-top="0"
fit-margin-bottom="0"
inkscape:window-maximized="0" />
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
@ -176,7 +175,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -234,7 +233,7 @@
sodipodi:cy="76.534889"
sodipodi:rx="2.8846545"
sodipodi:ry="2.8846545"
d="m -93.751271,76.534889 c 0,1.593151 -1.291504,2.884655 -2.884654,2.884655 -1.593151,0 -2.884655,-1.291504 -2.884655,-2.884655 0,-1.59315 1.291504,-2.884654 2.884655,-2.884654 1.59315,0 2.884654,1.291504 2.884654,2.884654 z"
d="m -93.751271,76.534889 a 2.8846545,2.8846545 0 0 1 -2.884654,2.884655 2.8846545,2.8846545 0 0 1 -2.884655,-2.884655 2.8846545,2.8846545 0 0 1 2.884655,-2.884654 2.8846545,2.8846545 0 0 1 2.884654,2.884654 z"
transform="matrix(0.87199948,0,0,0.87199948,105.71762,211.63685)" />
<path
sodipodi:type="arc"
@ -244,7 +243,7 @@
sodipodi:cy="38.493507"
sodipodi:rx="1.4573514"
sodipodi:ry="1.1418424"
d="m -23.467867,38.493507 c 0,0.630623 -0.652479,1.141843 -1.457352,1.141843 -0.804873,0 -1.457351,-0.51122 -1.457351,-1.141843 0,-0.630622 0.652478,-1.141842 1.457351,-1.141842 0.804873,0 1.457352,0.51122 1.457352,1.141842 z"
d="m -23.467867,38.493507 a 1.4573514,1.1418424 0 0 1 -1.457352,1.141843 1.4573514,1.1418424 0 0 1 -1.457351,-1.141843 1.4573514,1.1418424 0 0 1 1.457351,-1.141842 1.4573514,1.1418424 0 0 1 1.457352,1.141842 z"
transform="matrix(-1.1516801,0.679836,-1.0169493,-1.7297998,31.445768,362.16737)" />
<path
sodipodi:type="arc"
@ -254,7 +253,7 @@
sodipodi:cy="76.534889"
sodipodi:rx="2.8846545"
sodipodi:ry="2.8846545"
d="m -93.751271,76.534889 c 0,1.593151 -1.291504,2.884655 -2.884654,2.884655 -1.593151,0 -2.884655,-1.291504 -2.884655,-2.884655 0,-1.59315 1.291504,-2.884654 2.884655,-2.884654 1.59315,0 2.884654,1.291504 2.884654,2.884654 z"
d="m -93.751271,76.534889 a 2.8846545,2.8846545 0 0 1 -2.884654,2.884655 2.8846545,2.8846545 0 0 1 -2.884655,-2.884655 2.8846545,2.8846545 0 0 1 2.884655,-2.884654 2.8846545,2.8846545 0 0 1 2.884654,2.884654 z"
transform="matrix(0.87199948,0,0,0.87199948,277.4407,212.63361)" />
<path
sodipodi:type="arc"
@ -264,7 +263,7 @@
sodipodi:cy="38.493507"
sodipodi:rx="1.4573514"
sodipodi:ry="1.1418424"
d="m -23.467867,38.493507 c 0,0.630623 -0.652479,1.141843 -1.457352,1.141843 -0.804873,0 -1.457351,-0.51122 -1.457351,-1.141843 0,-0.630622 0.652478,-1.141842 1.457351,-1.141842 0.804873,0 1.457352,0.51122 1.457352,1.141842 z"
d="m -23.467867,38.493507 a 1.4573514,1.1418424 0 0 1 -1.457352,1.141843 1.4573514,1.1418424 0 0 1 -1.457351,-1.141843 1.4573514,1.1418424 0 0 1 1.457351,-1.141842 1.4573514,1.1418424 0 0 1 1.457352,1.141842 z"
transform="matrix(-1.1516801,0.679836,-1.0169493,-1.7297998,203.16885,363.16414)" />
<path
sodipodi:type="arc"
@ -274,7 +273,7 @@
sodipodi:cy="76.534889"
sodipodi:rx="2.8846545"
sodipodi:ry="2.8846545"
d="m -93.751271,76.534889 c 0,1.593151 -1.291504,2.884655 -2.884654,2.884655 -1.593151,0 -2.884655,-1.291504 -2.884655,-2.884655 0,-1.59315 1.291504,-2.884654 2.884655,-2.884654 1.59315,0 2.884654,1.291504 2.884654,2.884654 z"
d="m -93.751271,76.534889 a 2.8846545,2.8846545 0 0 1 -2.884654,2.884655 2.8846545,2.8846545 0 0 1 -2.884655,-2.884655 2.8846545,2.8846545 0 0 1 2.884655,-2.884654 2.8846545,2.8846545 0 0 1 2.884654,2.884654 z"
transform="matrix(0.87199948,0,0,0.87199948,277.1368,-45.343722)" />
<path
sodipodi:type="arc"
@ -284,7 +283,7 @@
sodipodi:cy="38.493507"
sodipodi:rx="1.4573514"
sodipodi:ry="1.1418424"
d="m -23.467867,38.493507 c 0,0.630623 -0.652479,1.141843 -1.457352,1.141843 -0.804873,0 -1.457351,-0.51122 -1.457351,-1.141843 0,-0.630622 0.652478,-1.141842 1.457351,-1.141842 0.804873,0 1.457352,0.51122 1.457352,1.141842 z"
d="m -23.467867,38.493507 a 1.4573514,1.1418424 0 0 1 -1.457352,1.141843 1.4573514,1.1418424 0 0 1 -1.457351,-1.141843 1.4573514,1.1418424 0 0 1 1.457351,-1.141842 1.4573514,1.1418424 0 0 1 1.457352,1.141842 z"
transform="matrix(-1.1516801,0.679836,-1.0169493,-1.7297998,202.86495,105.18681)" />
<path
sodipodi:type="arc"
@ -294,7 +293,7 @@
sodipodi:cy="76.534889"
sodipodi:rx="2.8846545"
sodipodi:ry="2.8846545"
d="m -93.751271,76.534889 c 0,1.593151 -1.291504,2.884655 -2.884654,2.884655 -1.593151,0 -2.884655,-1.291504 -2.884655,-2.884655 0,-1.59315 1.291504,-2.884654 2.884655,-2.884654 1.59315,0 2.884654,1.291504 2.884654,2.884654 z"
d="m -93.751271,76.534889 a 2.8846545,2.8846545 0 0 1 -2.884654,2.884655 2.8846545,2.8846545 0 0 1 -2.884655,-2.884655 2.8846545,2.8846545 0 0 1 2.884655,-2.884654 2.8846545,2.8846545 0 0 1 2.884654,2.884654 z"
transform="matrix(0.87199948,0,0,0.87199948,105.6435,-45.047277)" />
<path
sodipodi:type="arc"
@ -304,7 +303,7 @@
sodipodi:cy="38.493507"
sodipodi:rx="1.4573514"
sodipodi:ry="1.1418424"
d="m -23.467867,38.493507 c 0,0.630623 -0.652479,1.141843 -1.457352,1.141843 -0.804873,0 -1.457351,-0.51122 -1.457351,-1.141843 0,-0.630622 0.652478,-1.141842 1.457351,-1.141842 0.804873,0 1.457352,0.51122 1.457352,1.141842 z"
d="m -23.467867,38.493507 a 1.4573514,1.1418424 0 0 1 -1.457352,1.141843 1.4573514,1.1418424 0 0 1 -1.457351,-1.141843 1.4573514,1.1418424 0 0 1 1.457351,-1.141842 1.4573514,1.1418424 0 0 1 1.457352,1.141842 z"
transform="matrix(-1.1516801,0.679836,-1.0169493,-1.7297998,31.371657,105.48325)" />
<path
sodipodi:type="arc"
@ -314,7 +313,7 @@
sodipodi:cy="155.38211"
sodipodi:rx="69.231705"
sodipodi:ry="144.23273"
d="m -14.904053,155.38211 c 0,79.65754 -30.99609,144.23273 -69.231704,144.23273 -38.235613,0 -69.231703,-64.57519 -69.231703,-144.23273 0,-79.657535 30.99609,-144.232726 69.231703,-144.232726 38.235614,0 69.231704,64.575191 69.231704,144.232726 z"
d="M -14.904053,155.38211 A 69.231705,144.23273 0 0 1 -84.135757,299.61484 69.231705,144.23273 0 0 1 -153.36746,155.38211 69.231705,144.23273 0 0 1 -84.135757,11.149384 69.231705,144.23273 0 0 1 -14.904053,155.38211 Z"
transform="matrix(1.2631217,0,0,0.87199948,213.6725,14.244327)" />
<path
sodipodi:type="arc"
@ -324,7 +323,7 @@
sodipodi:cy="155.38211"
sodipodi:rx="69.231705"
sodipodi:ry="144.23273"
d="m -14.904053,155.38211 c 0,79.65754 -30.99609,144.23273 -69.231704,144.23273 -38.235613,0 -69.231703,-64.57519 -69.231703,-144.23273 0,-79.657535 30.99609,-144.232726 69.231703,-144.232726 38.235614,0 69.231704,64.575191 69.231704,144.232726 z"
d="M -14.904053,155.38211 A 69.231705,144.23273 0 0 1 -84.135757,299.61484 69.231705,144.23273 0 0 1 -153.36746,155.38211 69.231705,144.23273 0 0 1 -84.135757,11.149384 69.231705,144.23273 0 0 1 -14.904053,155.38211 Z"
transform="matrix(1.228342,0,0,0.85746409,211.0465,16.713831)" />
<g
style="font-size:456.36495972000000000px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Adobe Devanagari;-inkscape-font-specification:Adobe Devanagari"

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 130 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 64 KiB