diff --git a/cmake/headerimage.bmp b/cmake/headerimage.bmp index 625680c3..6251fa9d 100644 Binary files a/cmake/headerimage.bmp and b/cmake/headerimage.bmp differ diff --git a/cmake/leftimage.bmp b/cmake/leftimage.bmp index aea76267..7001ecf6 100644 Binary files a/cmake/leftimage.bmp and b/cmake/leftimage.bmp differ diff --git a/cockatrice/resources/appicon.icns b/cockatrice/resources/appicon.icns index f521035e..c6a01999 100644 Binary files a/cockatrice/resources/appicon.icns and b/cockatrice/resources/appicon.icns differ diff --git a/cockatrice/resources/appicon.ico b/cockatrice/resources/appicon.ico index 4cf839bc..d00b552e 100644 Binary files a/cockatrice/resources/appicon.ico and b/cockatrice/resources/appicon.ico differ diff --git a/cockatrice/resources/back.svg b/cockatrice/resources/back.svg index c94b3dd4..99741a24 100644 --- a/cockatrice/resources/back.svg +++ b/cockatrice/resources/back.svg @@ -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"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cockatrice/resources/cockatrice.png b/cockatrice/resources/cockatrice.png index 200d2480..3816009b 100644 Binary files a/cockatrice/resources/cockatrice.png and b/cockatrice/resources/cockatrice.png differ diff --git a/cockatrice/resources/cockatrice.svg b/cockatrice/resources/cockatrice.svg index 26360bcc..d2e22da3 100644 --- a/cockatrice/resources/cockatrice.svg +++ b/cockatrice/resources/cockatrice.svg @@ -1,4 +1,6 @@ + + + sodipodi:docname="cockatrice.svg"> + inkscape:current-layer="g3026" /> + offset="0" /> + offset="1" /> + offset="0" /> + offset="1" /> + x2="149.76308" + y2="362.14203" + id="linearGradient4005" + xlink:href="#linearGradient3999" + gradientUnits="userSpaceOnUse" /> + x2="146.34395" + y2="70.021851" + id="linearGradient4015" + xlink:href="#linearGradient4009" + gradientUnits="userSpaceOnUse" /> + color-interpolation-filters="sRGB" + id="filter4089"> + + + + + + + + + + + + + in2="SourceGraphic" + in="flood" /> + stdDeviation="8" + in="composite" /> - - - - - - - - - - - - - - - - - - - + in="SourceGraphic" /> - - - - - + id="filter4089-4" + inkscape:label="Drop Shadow" + style="color-interpolation-filters:sRGB;"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + flood-opacity="0.5" /> - - - - - - - - - - - - + in2="SourceGraphic" + in="flood" /> + stdDeviation="8" + in="composite" /> + dy="10" + dx="-10" /> + operator="over" + in2="offset" + in="SourceGraphic" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -595,205 +204,179 @@ + id="g3026"> + clip-path="none" + inkscape:export-xdpi="91.459999" + inkscape:export-ydpi="91.459999"> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 145.9375 270.70508 C 144.96853 270.55463 143.84316 270.71753 142.36328 271.16602 C 140.8834 271.6145 139.04978 272.34788 136.66406 273.33398 C 132.23863 275.16314 127.0447 277.44952 125.12305 278.41406 C 123.44338 279.25716 121.5016 280.56385 119.98047 281.78711 C 119.2199 282.39874 118.56505 282.98902 118.09961 283.49023 C 117.63416 283.99145 117.35938 284.40241 117.35938 284.65625 C 117.35938 284.92479 119.36878 285.9662 121.82422 286.96875 C 124.27966 287.97128 126.98578 289.28099 127.83984 289.88086 C 128.4784 290.32938 129.27517 290.59812 130.24805 290.67969 C 131.22092 290.76125 132.37115 290.65664 133.71484 290.36328 C 135.05853 290.06992 136.59666 289.5864 138.34766 288.91016 C 140.09865 288.23391 142.06106 287.36398 144.25586 286.29688 C 146.5026 285.20452 148.75719 284.21215 150.57812 283.49219 C 152.39906 282.77222 153.78666 282.32617 154.30273 282.32617 C 155.26112 282.32617 155.89006 282.05734 156.09961 281.67969 C 156.20439 281.49086 156.20302 281.2751 156.08789 281.05078 C 155.97276 280.82646 155.74354 280.59357 155.38672 280.37305 C 154.95023 280.10327 153.17942 277.96836 151.45117 275.62891 C 150.31921 274.09663 149.42526 272.94156 148.57227 272.13086 C 147.71927 271.32016 146.90647 270.85553 145.9375 270.70508 z " + id="path17078" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 145.9375 270.70508 C 146.90647 270.85553 147.71927 271.32016 148.57227 272.13086 C 149.42526 272.94156 150.31921 274.09663 151.45117 275.62891 C 153.17942 277.96836 154.95023 280.10327 155.38672 280.37305 C 155.74354 280.59357 155.97276 280.82646 156.08789 281.05078 C 156.20302 281.2751 156.20439 281.49086 156.09961 281.67969 C 155.89006 282.05734 155.26112 282.32617 154.30273 282.32617 C 153.78666 282.32617 152.39906 282.77222 150.57812 283.49219 C 148.75719 284.21215 146.5026 285.20452 144.25586 286.29688 C 142.06106 287.36398 140.09865 288.23391 138.34766 288.91016 C 136.59666 289.5864 135.05853 290.06992 133.71484 290.36328 C 132.37115 290.65664 131.22092 290.76125 130.24805 290.67969 C 129.27517 290.59812 128.4784 290.32938 127.83984 289.88086 C 126.98578 289.28099 124.27966 287.97128 121.82422 286.96875 C 119.36878 285.9662 117.35938 284.92479 117.35938 284.65625 C 117.35938 284.40241 117.63416 283.99145 118.09961 283.49023 C 118.56505 282.98902 119.2199 282.39874 119.98047 281.78711 C 121.5016 280.56385 123.44338 279.25716 125.12305 278.41406 C 127.0447 277.44952 132.23863 275.16314 136.66406 273.33398 C 139.04978 272.34788 140.8834 271.6145 142.36328 271.16602 C 143.84316 270.71753 144.96853 270.55463 145.9375 270.70508 z " + id="path17076" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 146.58203 238.53906 L 144.97461 240.75977 C 142.45634 244.24172 140.76536 246.4684 139.18164 248.24414 C 137.59793 250.01988 136.12283 251.3451 134.03711 253.02539 C 131.50523 255.06511 127.15381 258.08849 124.36719 259.74414 C 121.58057 261.3998 117.04019 264.41906 114.27734 266.45312 C 112.07061 268.07779 110.86085 269.02115 110.37109 269.63086 C 110.12622 269.93571 110.06039 270.15715 110.14062 270.33789 C 110.22086 270.51863 110.44727 270.65968 110.7832 270.80273 C 111.44438 271.08427 112.62945 271.22802 114.14844 271.25195 C 115.66742 271.27589 117.51986 271.17882 119.51758 270.98242 C 121.5153 270.78602 123.65849 270.48884 125.75586 270.10938 C 127.85323 269.72991 129.90472 269.26941 131.72266 268.74414 C 133.64431 268.18892 136.19808 267.29331 138.76367 266.29883 C 141.32927 265.30435 143.90597 264.2095 145.87695 263.25586 C 147.93323 262.26096 149.55734 261.41062 150.83594 260.5918 C 152.11453 259.77297 153.04795 258.98739 153.72461 258.11914 C 154.40127 257.25089 154.82181 256.30136 155.07227 255.1582 C 155.32272 254.01504 155.4043 252.67677 155.4043 251.0332 C 155.4043 249.80037 155.27775 248.65206 155.02344 247.58398 C 154.76912 246.51591 154.38648 245.52946 153.875 244.62109 C 153.36352 243.71273 152.72265 242.88261 151.95117 242.12891 C 151.17969 241.37521 150.27651 240.69783 149.24219 240.09375 L 146.58203 238.53906 z " + id="path17074" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 169.59375 3.1191406 L 157.44141 3.1191406 C 157.62702 3.9434004 157.81968 4.739295 157.91406 5.7988281 C 158.046 7.2799717 158.10114 9.0269776 158.10547 11.134766 C 158.11192 14.334109 158.18077 16.393762 158.38477 17.8125 C 158.58876 19.231238 158.92769 20.009626 159.47266 20.646484 C 159.84423 21.080702 160.30984 21.473577 160.76172 21.759766 C 161.2136 22.045955 161.6508 22.224609 161.96484 22.224609 C 162.36067 22.224609 162.75802 22.114716 163.15039 21.904297 C 163.54276 21.693878 163.93054 21.383634 164.31055 20.982422 C 165.07056 20.179997 165.796 19.014256 166.45312 17.566406 C 167.11025 16.118556 167.69867 14.387447 168.18164 12.451172 C 168.66461 10.514897 169.04368 8.3731689 169.28125 6.1054688 L 169.59375 3.1191406 z " + id="path17072" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 297.14258 94.369141 L 297.14258 52.150391 C 297.14258 24.986839 275.27206 3.1191406 248.10352 3.1191406 L 171.27734 3.1191406 L 171.58008 3.5898438 C 172.12133 4.4292645 172.50973 5.2407817 172.73438 6.0996094 C 172.95902 6.9584371 173.01998 7.8642843 172.91211 8.8945312 C 172.80423 9.9247782 172.52663 11.079915 172.07031 12.433594 C 171.614 13.787272 170.97888 15.3408 170.1582 17.169922 C 168.87505 20.029806 167.82617 22.511836 167.82617 22.685547 C 167.82617 22.859252 169.14664 23 170.75977 23 C 171.70972 23 172.5563 22.902073 173.33008 22.683594 C 174.10385 22.465114 174.80492 22.126693 175.45898 21.648438 C 176.11305 21.170182 176.7197 20.552766 177.31055 19.773438 C 177.90139 18.994109 178.47645 18.053338 179.06055 16.931641 C 179.58208 15.930089 180.05872 15.176384 180.4082 14.769531 C 180.58294 14.566105 180.72584 14.449837 180.82617 14.431641 C 180.9265 14.413444 180.9833 14.494143 180.98828 14.685547 C 181.00266 15.236251 180.82891 15.973617 180.50586 16.828125 C 180.18281 17.682633 179.71225 18.654197 179.13086 19.673828 C 177.96809 21.713091 176.36609 23.942867 174.64453 25.810547 C 172.9043 27.698464 171.67025 29.43393 171.90234 29.666016 C 172.13256 29.896232 173.91575 29.724777 175.91406 29.380859 C 177.91237 29.036942 180.12599 28.520409 181.21875 28.0625 C 181.66905 27.873808 182.00257 27.810216 182.21875 27.857422 C 182.43493 27.904628 182.53395 28.062012 182.51758 28.320312 C 182.48484 28.836913 181.98869 29.750738 181.03516 30.962891 C 180.47108 31.680004 179.78624 32.224765 178.83203 32.662109 C 177.87782 33.099454 176.65395 33.431231 175.01758 33.722656 C 172.54055 34.16381 170.6287 34.592417 169.23438 35.097656 C 168.53721 35.350276 167.96951 35.622971 167.52539 35.923828 C 167.08127 36.224685 166.76142 36.555209 166.55859 36.925781 C 166.35577 37.296353 166.27017 37.706205 166.29688 38.167969 C 166.32358 38.629733 166.46254 39.142363 166.70703 39.716797 C 167.19601 40.865664 168.10888 42.261825 169.39844 43.990234 C 170.73093 45.776173 172.06666 48.235092 173.08203 50.609375 C 173.58972 51.796517 174.01719 52.961308 174.32422 54.011719 C 174.63125 55.062129 174.81829 55.998188 174.84375 56.722656 C 174.85692 57.096964 175.16821 57.676779 175.75781 58.441406 C 176.34742 59.206034 177.21493 60.15532 178.33984 61.269531 C 180.58967 63.497954 183.86933 66.385231 188.01367 69.767578 C 192.85188 73.716195 196.63626 77.062853 199.34961 79.789062 C 200.70629 81.152167 201.79507 82.359939 202.61328 83.410156 C 203.43149 84.460374 203.979 85.353465 204.25391 86.085938 C 204.69468 87.260278 204.92846 88.220703 204.77344 88.220703 C 204.6185 88.220703 202.22399 87.158878 199.45117 85.861328 C 197.61809 85.003527 195.88657 84.305269 194.19922 83.757812 C 192.51187 83.210356 190.86734 82.813661 189.20898 82.558594 C 187.55062 82.303527 185.87892 82.189616 184.13281 82.208984 C 182.38671 82.228352 180.56777 82.380401 178.61719 82.65625 C 175.10316 83.153196 172.11249 83.674645 171.97266 83.814453 C 171.71489 84.07223 172.4631 86.518865 173.63672 89.619141 C 174.81034 92.719416 176.40972 96.473667 177.85156 99.34375 C 179.17962 101.98733 179.88703 103.47711 180.10938 104.35547 C 180.22055 104.79465 180.20968 105.0808 180.0957 105.28125 C 179.98173 105.4817 179.76392 105.59658 179.45898 105.69336 C 178.91319 105.86659 178.59852 106.10108 178.47461 106.54102 C 178.3507 106.98095 178.41719 107.62594 178.63281 108.625 C 178.97197 110.1965 179.00635 112.66637 178.83984 114.74219 C 178.75659 115.7801 178.62399 116.72018 178.45312 117.40039 C 178.28226 118.0806 178.07441 118.5 177.8418 118.5 C 177.64978 118.5 177.47421 118.29734 177.34766 117.9707 C 177.2211 117.64406 177.14258 117.1948 177.14258 116.69922 C 177.14258 116.20364 176.6452 114.75334 175.8418 112.81836 C 175.03839 110.88337 173.9299 108.4637 172.71094 106.02344 C 170.83565 102.26928 169.48389 99.803365 167.93359 97.599609 C 166.3833 95.395854 164.63495 93.454095 161.96289 90.744141 C 160.22602 88.98264 158.53288 87.381696 157.20508 86.220703 C 155.87728 85.05971 154.91444 84.337891 154.63672 84.337891 C 154.38422 84.337891 154.20195 84.556883 154.0918 85.068359 C 153.98165 85.579836 153.94358 86.384804 153.98047 87.556641 C 154.05424 89.900315 154.42715 93.713371 155.11719 99.591797 C 155.32983 101.40331 155.40791 102.41439 155.24219 103.0332 C 155.15932 103.34261 155.0153 103.55258 154.79688 103.7168 C 154.57845 103.88102 154.28561 103.99811 153.9043 104.11914 C 153.40967 104.27613 152.84997 104.29013 152.24609 104.16992 C 151.64222 104.04971 150.99251 103.7967 150.31641 103.41992 C 148.96419 102.66636 147.50499 101.41974 146.08594 99.763672 C 145.47158 99.046702 144.73362 98.452489 143.92969 97.994141 C 143.12575 97.535792 142.25525 97.214065 141.375 97.037109 C 140.49475 96.860154 139.60502 96.829824 138.76172 96.957031 C 137.91841 97.084239 137.12279 97.368124 136.42969 97.822266 C 135.88075 98.181937 135.25055 98.913681 134.66016 99.833984 C 134.06977 100.75429 133.51967 101.86339 133.125 102.97461 C 132.74676 104.03958 132.37952 104.89092 131.99414 105.55078 C 131.60876 106.21065 131.20351 106.67968 130.74609 106.97656 C 130.28867 107.27345 129.7799 107.39897 129.18555 107.375 C 128.59119 107.35103 127.91142 107.17771 127.11523 106.875 C 126.1447 106.506 125.29558 106.24661 124.56445 106.10547 C 123.83332 105.96433 123.22054 105.93964 122.72852 106.03906 C 122.23649 106.13849 121.86455 106.36214 121.61133 106.71484 C 121.3581 107.06755 121.22371 107.54927 121.20898 108.16797 C 121.17954 109.40537 121.6261 111.18875 122.54883 113.56641 C 123.47156 115.94407 124.87165 118.91748 126.74414 122.53711 C 127.5611 124.1163 128.22852 126.27124 128.22852 127.32617 C 128.22852 128.00604 128.43005 128.60883 128.875 129.19336 C 129.31995 129.77789 130.00901 130.34327 130.98633 130.94727 C 131.92685 131.52855 132.72548 132.12197 133.38867 132.73242 C 134.05186 133.34288 134.57905 133.97058 134.97266 134.62305 C 135.36626 135.27552 135.62604 135.95283 135.75781 136.66016 C 135.88958 137.36748 135.8938 138.10584 135.77148 138.88086 C 135.6839 139.43582 135.64394 139.9011 135.6875 140.3418 C 135.73106 140.78249 135.85741 141.19811 136.10156 141.6543 C 136.58987 142.56667 137.54847 143.63972 139.25586 145.39258 C 140.29575 146.46017 141.16028 147.4781 141.85156 148.46094 C 142.54284 149.44378 143.06159 150.39069 143.41406 151.31445 C 143.76654 152.23822 143.95115 153.13894 143.97461 154.0293 C 143.99807 154.91966 143.8602 155.80096 143.56445 156.68359 C 143.41175 157.13932 143.31478 157.52058 143.29883 157.87891 C 143.28287 158.23723 143.34767 158.57277 143.51562 158.93555 C 143.85153 159.66109 144.60257 160.49711 145.95703 161.85156 L 149.04688 164.93945 L 149.3125 173.0918 C 149.43875 176.94824 149.53917 179.03069 149.89648 180.54883 C 150.07514 181.3079 150.31906 181.92717 150.66211 182.55469 C 151.00516 183.18221 151.44687 183.81919 152.02539 184.61719 C 153.37053 186.47259 154.80197 187.99023 155.20508 187.99023 C 155.60818 187.99023 158.68443 184.32171 162.04297 179.83789 C 164.85431 176.08462 168.04298 172.2953 171.53711 168.5332 C 175.03124 164.77111 178.83256 161.03719 182.86523 157.39648 C 186.89791 153.75578 191.16285 150.20746 195.58984 146.81836 C 200.01683 143.42926 204.60418 140.19868 209.28125 137.19141 C 212.12854 135.36064 215.60241 133.31886 219.63281 131.09961 C 223.66322 128.88036 228.25133 126.48369 233.33008 123.94336 C 243.48758 118.8627 255.60616 113.20661 269.14844 107.24609 C 279.36896 102.74764 288.30743 98.66087 296.17578 94.867188 C 296.54486 94.689238 296.77818 94.545814 297.14258 94.369141 z " + id="path17070" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 246.15234 297.31055 L 248.10352 297.31055 C 275.27206 297.31055 297.14258 275.4409 297.14258 248.27734 L 297.14258 106.26953 C 295.12773 107.37505 293.91008 108.18691 291.08398 109.64258 C 284.05026 113.26552 273.73846 118.36689 256.33789 126.91016 C 247.04118 131.47464 239.00989 135.58566 231.93359 139.44531 C 224.8573 143.30496 218.73679 146.91361 213.26172 150.4707 C 207.78665 154.0278 202.95592 157.53263 198.46289 161.18945 C 193.96986 164.84627 189.81377 168.65368 185.68359 172.8125 C 183.44872 175.06288 181.4141 177.21518 179.51562 179.35156 C 177.61715 181.48794 175.85483 183.60925 174.16211 185.80078 C 172.46939 187.99231 170.84615 190.25408 169.22852 192.66992 C 167.61088 195.08576 165.99936 197.65554 164.32617 200.46484 C 161.54541 205.13372 158.22605 210.08072 156.94922 211.45703 C 156.16261 212.30493 155.55617 213.24465 155.13281 214.26172 C 154.70945 215.27879 154.46859 216.37225 154.41016 217.52539 C 154.35173 218.67853 154.47503 219.89233 154.7832 221.14844 C 155.09138 222.40454 155.58331 223.70333 156.25977 225.0293 C 157.16484 226.8034 157.61931 227.72077 157.62695 228.13672 C 157.63077 228.34469 157.52278 228.42562 157.30469 228.42773 C 157.0866 228.42985 156.75868 228.35291 156.32031 228.23828 C 155.83688 228.11186 155.3991 228.1243 155.01172 228.25781 C 154.62434 228.39133 154.28689 228.6455 154 228.99805 C 153.42623 229.70315 153.05723 230.80477 152.91211 232.14062 C 152.76699 233.47648 152.84499 235.04611 153.16406 236.68555 C 153.48313 238.32498 154.04448 240.03457 154.86328 241.65039 C 155.78536 243.47004 156.61844 244.84373 157.35156 245.77148 C 158.08468 246.69923 158.71792 247.18082 159.23438 247.21484 C 159.4926 247.23186 159.72106 247.13645 159.91992 246.92969 C 160.11879 246.72293 160.28779 246.40537 160.42383 245.97461 C 160.69591 245.11308 160.83789 243.80382 160.83789 242.04492 C 160.83789 240.47671 160.95315 238.99594 161.18359 237.60742 C 161.41403 236.2189 161.75949 234.92138 162.21875 233.7168 C 162.67801 232.51222 163.25104 231.40116 163.9375 230.38477 C 164.62396 229.36837 165.42389 228.44702 166.33594 227.62305 C 167.23261 226.81295 168.03618 226.19352 168.78711 225.75977 C 169.53804 225.32601 170.23652 225.07869 170.92188 225.01367 C 171.60723 224.94866 172.28051 225.06521 172.98047 225.36133 C 173.68042 225.65745 174.40644 226.1316 175.20117 226.78125 L 177.53125 228.68555 L 173.89453 228.55273 C 173.07806 228.52276 172.3259 228.56391 171.63672 228.67773 C 170.94754 228.79156 170.32137 228.97813 169.75586 229.24219 C 169.19035 229.50624 168.68571 229.84685 168.24023 230.26758 C 167.79476 230.6883 167.40914 231.1896 167.08008 231.77344 C 166.42196 232.9411 165.99159 234.44011 165.77734 236.29883 C 165.56309 238.15755 165.56503 240.37529 165.76562 242.97656 C 166.02819 246.38131 166.40064 249.3245 166.59375 249.51758 C 166.78683 249.71065 169.75215 248.78618 173.18359 247.46289 C 175.28517 246.65244 177.16574 246.04334 178.85547 245.63281 C 180.5452 245.22228 182.04368 245.01107 183.37695 245 C 184.71022 244.98893 185.87992 245.17652 186.91211 245.56445 C 187.9443 245.95239 188.83852 246.5397 189.625 247.32617 C 190.87325 248.57442 191.89453 249.97371 191.89453 250.43359 C 191.89453 250.69763 191.8981 250.89423 191.8418 251.02148 C 191.7855 251.14874 191.67078 251.20578 191.43164 251.18555 C 190.95335 251.14507 189.98262 250.7982 188.01367 250.10352 C 186.79401 249.67319 185.61209 249.35672 184.46875 249.15234 C 183.32541 248.94796 182.22031 248.85686 181.15234 248.87891 C 180.08438 248.90095 179.05406 249.0362 178.06055 249.28516 C 177.06703 249.53411 176.10946 249.89669 175.18945 250.37305 C 174.26944 250.8494 173.3865 251.43834 172.53906 252.14258 C 171.69163 252.84681 170.87932 253.66506 170.10352 254.59766 C 169.32771 255.53026 168.58791 256.57878 167.88281 257.74023 C 167.17771 258.90168 166.50839 260.17757 165.87305 261.56836 C 165.36946 262.67071 164.86779 264.12378 164.41211 265.7168 C 163.95643 267.30981 163.54667 269.04163 163.22266 270.69727 C 162.89865 272.3529 162.66131 273.93243 162.55273 275.22266 C 162.44416 276.51288 162.46367 277.51495 162.6543 278.01172 C 162.82084 278.44571 163.16166 278.8408 163.65039 279.19141 C 164.13912 279.54202 164.77694 279.84715 165.53711 280.09766 C 167.05745 280.59867 169.06954 280.88256 171.37109 280.88281 C 172.8071 280.88296 174.67751 280.56303 177.38867 279.80664 C 180.09983 279.05025 183.65056 277.85729 188.45117 276.11719 C 195.68269 273.49591 204.78633 270.52383 208.67969 269.51172 C 211.38901 268.8074 214.05737 268.25704 216.66016 267.85547 C 219.26294 267.4539 221.79891 267.20042 224.24219 267.08984 C 226.68546 266.97927 229.03678 267.01103 231.26758 267.17969 C 233.49838 267.34835 235.60886 267.6537 237.57422 268.08984 C 239.53958 268.52599 241.35891 269.09328 243.00586 269.78516 C 244.65281 270.47703 246.12873 271.29462 247.4043 272.23047 C 248.67986 273.16632 249.75621 274.2206 250.60742 275.38867 C 251.45864 276.55674 252.08314 277.83803 252.45703 279.22656 C 252.73592 280.2623 252.8022 281.43608 252.67969 282.71289 C 252.55718 283.9897 252.24697 285.36958 251.77148 286.81445 C 251.296 288.25933 250.65503 289.77061 249.875 291.31055 C 249.09497 292.85049 248.17483 294.41846 247.13867 295.98047 C 246.84091 296.42934 246.46868 296.86373 246.15234 297.31055 z " + id="path17068" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 2.8984375 172.30469 L 2.8984375 223.83398 C 3.9098853 222.87927 4.9005021 221.90405 5.984375 221.02148 C 7.6367524 219.67601 9.3737748 218.41455 11.195312 217.23633 C 13.01685 216.05811 14.922357 214.96264 16.914062 213.95117 C 18.905768 212.9397 20.983603 212.01125 23.146484 211.16602 C 25.309366 210.32078 27.557513 209.55841 29.892578 208.87891 C 32.227644 208.1994 34.647993 207.60218 37.15625 207.08789 C 39.664507 206.5736 42.260903 206.14256 44.943359 205.79297 C 46.060249 205.64741 47.029139 205.44007 47.691406 205.22461 C 48.353674 205.00915 48.709736 204.78486 48.597656 204.60352 C 48.373506 204.24081 45.027049 202.31258 41.162109 200.31641 C 38.182984 198.77775 35.24 197.12566 32.341797 195.36914 C 29.443594 193.61262 26.589586 191.74983 23.785156 189.78711 C 20.980726 187.82439 18.227102 185.76272 15.529297 183.60547 C 12.831491 181.44822 10.189658 179.19559 7.6113281 176.85547 C 5.9994905 175.39255 4.4595018 173.83537 2.8984375 172.30469 z " + id="path17066" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 132.29102 3.1191406 L 51.939453 3.1191406 C 24.770911 3.1191406 2.8984375 24.986839 2.8984375 52.150391 L 2.8984375 73.580078 C 6.9764251 76.949409 11.100092 80.366564 15.068359 83.546875 C 20.635956 88.008946 25.845065 92.074977 29.992188 95.158203 C 32.189182 96.791583 34.233539 98.425179 36.146484 100.09375 C 38.059429 101.76232 39.841354 103.4658 41.513672 105.24219 C 43.18599 107.01857 44.749496 108.86739 46.224609 110.82422 C 47.699723 112.78104 49.086871 114.84675 50.408203 117.05664 C 51.729535 119.26653 52.984339 121.62067 54.195312 124.15625 C 55.406286 126.69183 56.572759 129.40791 57.716797 132.3418 C 58.860834 135.27568 59.982991 138.42721 61.103516 141.83203 C 62.22404 145.23685 63.343941 148.89537 64.484375 152.84375 C 66.730105 160.61886 68.726821 167.09313 70.580078 172.48242 C 72.433335 177.87172 74.142955 182.17666 75.8125 185.60938 C 76.647272 187.32573 77.470841 188.82317 78.298828 190.13086 C 79.126815 191.43855 79.959343 192.55513 80.806641 193.50781 C 81.653938 194.46049 82.517454 195.24907 83.410156 195.90039 C 84.302858 196.55171 85.223298 197.06708 86.1875 197.4707 C 87.14068 197.86971 88.044217 198.10612 88.935547 198.16602 C 89.826876 198.22591 90.706419 198.10867 91.615234 197.80273 C 92.52405 197.4968 93.461159 197.00119 94.466797 196.30273 C 95.472435 195.60427 96.546718 194.70363 97.728516 193.58594 C 99.433943 191.97302 100.88088 190.20744 102.06836 188.29688 C 103.25584 186.38631 104.18496 184.32942 104.85156 182.13086 C 105.51817 179.9323 105.9236 177.59213 106.06641 175.11523 C 106.20921 172.63833 106.089 170.02488 105.70508 167.2793 C 105.43691 165.36154 105.15754 163.6673 104.79102 161.94141 C 104.42449 160.21552 103.97076 158.45923 103.35156 156.41602 C 102.11317 152.32958 100.21402 147.09843 97.039062 138.6875 C 94.056923 130.78743 90.750453 121.35437 89.689453 117.72461 C 89.089106 115.67079 88.591031 113.50342 88.203125 111.30078 C 87.815219 109.09814 87.536682 106.85896 87.373047 104.66602 C 87.209411 102.47307 87.159959 100.32551 87.232422 98.300781 C 87.304885 96.276054 87.499923 94.375729 87.820312 92.677734 C 88.191535 90.710348 88.464593 88.856754 88.640625 87.144531 C 88.816657 85.432308 88.895391 83.861328 88.876953 82.458984 C 88.858516 81.056641 88.743437 79.822905 88.53125 78.785156 C 88.319063 77.747408 88.008733 76.905547 87.603516 76.287109 C 87.196246 75.665535 86.913469 75.105883 86.765625 74.554688 C 86.617781 74.003492 86.605844 73.460562 86.742188 72.873047 C 86.878531 72.285531 87.162128 71.652409 87.607422 70.921875 C 88.052715 70.191341 88.658495 69.363063 89.4375 68.382812 C 90.100965 67.547947 90.606656 66.869669 90.962891 66.263672 C 91.319125 65.657675 91.527024 65.123668 91.597656 64.580078 C 91.668288 64.036489 91.601547 63.483579 91.408203 62.835938 C 91.214859 62.188296 90.894677 61.445497 90.458984 60.527344 L 89.181641 57.835938 L 92.011719 55.501953 C 93.051454 54.644912 93.759265 53.909865 94.207031 53.181641 C 94.654797 52.453416 94.841797 51.732386 94.841797 50.898438 C 94.841797 50.170755 95.052093 49.391168 95.527344 48.498047 C 96.002595 47.604926 96.743614 46.597716 97.804688 45.416016 C 99.926835 43.052615 103.33207 39.988979 108.46094 35.732422 C 110.45264 34.079457 112.24613 32.490598 113.81836 30.996094 C 115.39059 29.50159 116.74029 28.100555 117.83984 26.826172 C 118.93939 25.551789 119.78961 24.402759 120.36328 23.410156 C 120.93695 22.417554 121.23393 21.582757 121.22852 20.933594 C 121.22252 20.219318 121.14632 19.635491 120.97461 19.169922 C 120.8029 18.704353 120.53699 18.357281 120.1543 18.111328 C 119.7716 17.865375 119.27177 17.721443 118.63281 17.666016 C 117.99385 17.610588 117.21395 17.642039 116.27344 17.748047 C 115.29054 17.858834 114.39782 17.881645 113.75 17.828125 C 113.10218 17.774605 112.70117 17.645117 112.70117 17.453125 C 112.70117 17.196887 113.14093 16.736479 113.82812 16.189453 C 114.51532 15.642427 115.44924 15.009453 116.43555 14.408203 C 117.42186 13.806954 118.46006 13.237267 119.35742 12.818359 C 120.25478 12.399452 121.0113 12.130859 121.43164 12.130859 C 122.01006 12.130859 122.65875 12.263644 123.33594 12.501953 C 124.01313 12.740262 124.71955 13.084825 125.4082 13.507812 C 126.7855 14.353788 128.09682 15.514437 128.99609 16.777344 C 129.79855 17.904289 130.58985 18.616298 131.32422 18.943359 C 131.6914 19.10689 132.04555 19.174904 132.37891 19.150391 C 132.71226 19.125877 133.02418 19.009293 133.3125 18.804688 C 133.88915 18.395476 134.36603 17.632657 134.69531 16.550781 C 135.0246 15.468906 135.20693 14.067882 135.19922 12.376953 C 135.19384 11.196972 135.05865 10.020102 134.80664 8.875 C 134.55464 7.7298976 134.18675 6.6156185 133.71289 5.5605469 C 133.32218 4.6906203 132.81719 3.8936572 132.29102 3.1191406 z " + id="path17064" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0" + d="M 153.55273 3.1191406 L 142.39844 3.1191406 C 142.82436 3.6707875 143.23944 4.2338187 143.58008 4.8789062 C 144.00733 5.6880274 144.36739 6.569645 144.66016 7.5253906 C 145.24568 9.4368819 145.56201 11.641256 145.60742 14.136719 C 145.65712 16.869966 145.93475 19.109906 146.22461 19.113281 C 146.51449 19.116581 147.96463 17.974463 149.44727 16.576172 C 150.50126 15.582128 151.36171 14.411711 152.02344 13.083984 C 152.68517 11.756258 153.14864 10.270919 153.41211 8.6464844 C 153.67558 7.0220493 153.73844 5.2591713 153.59766 3.375 C 153.59165 3.294561 153.55949 3.2000179 153.55273 3.1191406 z " + id="path17062" + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> - - - - - - - + transform="matrix(0.99103064,0,0,0.98943856,1.2668213,1.9022887)" + id="layer5" + style="display:inline;fill:#ffffff;fill-opacity:1" + clip-path="none"> + id="g3342" + transform="matrix(1.0090505,0,0,1.0106742,411.46737,-30.548174)" + style="fill:#ffffff;fill-opacity:1"> + style="display:none;fill:#ffffff;fill-opacity:1" + id="layer1-27" + inkscape:label="Button"> + + + + inkscape:label="Schatten" + id="layer2-2" + transform="translate(-706.77969,-20.338983)"> + id="g3350" + transform="translate(-6.9915273,131.5678)" + style="fill:#ffffff"> - - - - - + style="display:inline;fill:#ffffff" + inkscape:label="Schatten" + id="layer2-5" + transform="translate(-3.8135597,-59.110169)" + inkscape:transform-center-x="5.7203391" + inkscape:transform-center-y="-59.745764" /> + + + diff --git a/cockatrice/resources/hand.svg b/cockatrice/resources/hand.svg index 11113d0f..2ae2619c 100644 --- a/cockatrice/resources/hand.svg +++ b/cockatrice/resources/hand.svg @@ -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"> + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:window-maximized="1" /> @@ -176,7 +175,7 @@ image/svg+xml - + @@ -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)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/servatrice/resources/servatrice.png b/servatrice/resources/servatrice.png index 7d701ef0..723c01b1 100644 Binary files a/servatrice/resources/servatrice.png and b/servatrice/resources/servatrice.png differ diff --git a/servatrice/resources/servatrice.svg b/servatrice/resources/servatrice.svg index 580a04be..f4c9f492 100644 --- a/servatrice/resources/servatrice.svg +++ b/servatrice/resources/servatrice.svg @@ -14,9 +14,8 @@ width="300" height="300" id="svg2" - inkscape:version="0.48.5 r10040" - sodipodi:docname="cockatrice.svg" - inkscape:export-filename="C:\Users\Matt\Desktop\servatrice logo\cockatrice.png" + inkscape:version="0.91 r13725" + sodipodi:docname="servatrice.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + inkscape:current-layer="svg2" /> - + + + + + + + + + + transform="matrix(1.0090505,0,0,1.0106742,-1.2782867,-1.9225941)" /> - - + inkscape:transform-center-y="-59.745764" /> + + +