# HG changeset patch # User Wuzzy <Wuzzy2@mail.ru> # Date 1533605094 -7200 # Node ID 2bdbef3f534c2e3deef7b5112ea8cbdd76e0ac19 # Parent 10e256704181dff93c19bb1994251a5ff0975594 Fix visible seam between Sky.png and SkyL.png of Olympics theme diff -r 10e256704181 -r 2bdbef3f534c share/hedgewars/Data/Themes/Olympics/Sky.png Binary file share/hedgewars/Data/Themes/Olympics/Sky.png has changed diff -r 10e256704181 -r 2bdbef3f534c share/hedgewars/Data/Themes/Olympics/Sky.svg --- a/share/hedgewars/Data/Themes/Olympics/Sky.svg Tue Aug 07 02:40:13 2018 +0200 +++ b/share/hedgewars/Data/Themes/Olympics/Sky.svg Tue Aug 07 03:24:54 2018 +0200 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -7,19 +6,10 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46" - width="2048" + version="1.0" height="1024" - version="1.0" - sodipodi:docname="Sky.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/usr/share/games/hedgewars/Data/Themes/Olympics/Sky.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + width="2048" + id="svg2"> <metadata id="metadata7"> <rdf:RDF> @@ -28,107 +18,73 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> <defs id="defs5"> <linearGradient - inkscape:collect="always" id="linearGradient3159"> <stop - style="stop-color:#b1bed8;stop-opacity:1;" + id="stop3161" offset="0" - id="stop3161" /> + style="stop-color:#b1bed8;stop-opacity:1;" /> <stop - style="stop-color:#dbe1ed;stop-opacity:1" + id="stop3163" offset="1" - id="stop3163" /> + style="stop-color:#dbe1ed;stop-opacity:1" /> </linearGradient> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective9" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3159" - id="linearGradient3165" - x1="1042.5674" + gradientUnits="userSpaceOnUse" + y2="763.78711" + x2="1042.5674" y1="44.014645" - x2="1042.5674" - y2="763.78711" - gradientUnits="userSpaceOnUse" /> + x1="1042.5674" + id="linearGradient3165" + xlink:href="#linearGradient3159" /> <filter - inkscape:collect="always" id="filter3296"> <feGaussianBlur - inkscape:collect="always" - stdDeviation="19.58669" - id="feGaussianBlur3298" /> + id="feGaussianBlur3298" + stdDeviation="19.58669" /> </filter> </defs> - <sodipodi:namedview - inkscape:window-height="825" - inkscape:window-width="1440" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="0.19231371" - inkscape:cx="1062.3156" - inkscape:cy="667.67611" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="layer2" /> <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="main" - style="display:inline"> + style="display:inline" + id="Sky"> <rect - style="opacity:1;fill:url(#linearGradient3165);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect2387" - width="2048" - height="1024" + y="0" x="0" - y="0" /> - <path - transform="matrix(1.4181621,0,0,1.4181621,-112.10268,55.601968)" - d="M 665.50809,579.10236 A 283.1167,283.1167 0 1 1 99.274689,579.10236 A 283.1167,283.1167 0 1 1 665.50809,579.10236 z" - sodipodi:ry="283.1167" - sodipodi:rx="283.1167" - sodipodi:cy="579.10236" - sodipodi:cx="382.39139" - id="path3194" - style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3296);enable-background:accumulate" - sodipodi:type="arc" /> + height="1024" + width="2048" + id="sky" + style="opacity:1;fill:url(#linearGradient3165);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <g + transform="translate(52.616155)" + id="SunGroup"> + <circle + r="283.1167" + cy="579.10236" + cx="382.39139" + transform="matrix(1.4181621,0,0,1.4181621,-112.10268,55.601968)" + id="Sunshine" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3296);enable-background:accumulate" /> + <circle + r="283.1167" + cy="579.10236" + cx="382.39139" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f9f8e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="Sun" + transform="matrix(1.2178383,0,0,1.2178383,-35.500582,171.60996)" /> + </g> <path - sodipodi:type="arc" - style="opacity:1;fill:#f9f8e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3192" - sodipodi:cx="382.39139" - sodipodi:cy="579.10236" - sodipodi:rx="283.1167" - sodipodi:ry="283.1167" - d="M 665.50809,579.10236 A 283.1167,283.1167 0 1 1 99.274689,579.10236 A 283.1167,283.1167 0 1 1 665.50809,579.10236 z" - transform="matrix(1.2178383,0,0,1.2178383,-35.500582,171.60996)" /> + id="hills2" + d="M 0,733.17706 C 106.46437,733.17706 186.98085,657.77942 340.58085,657.77942 C 494.18085,657.77942 628.76125,782.57551 726.82924,782.57551 C 824.89724,782.57551 969.78754,719.7456 1084.0566,714.33609 C 1173.9359,710.08119 1328.312,826.58331 1466.1207,826.18276 C 1603.9294,825.78221 1680.6311,714.27025 1787.6247,714.27025 C 1894.6183,714.27025 1972.4613,733.17706 2048,733.17706 L 2048,1070.7985 L 0,1070.7985 L 0,733.17706 z" + style="fill:#d3cfb7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - style="fill:#d3cfb7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 0,733.17706 C 106.46437,733.17706 186.98085,657.77942 340.58085,657.77942 C 494.18085,657.77942 628.76125,782.57551 726.82924,782.57551 C 824.89724,782.57551 969.78754,719.7456 1084.0566,714.33609 C 1173.9359,710.08119 1328.312,826.58331 1466.1207,826.18276 C 1603.9294,825.78221 1680.6311,714.27025 1787.6247,714.27025 C 1894.6183,714.27025 1972.4613,733.17706 2048,733.17706 L 2048,1070.7985 L 0,1070.7985 L 0,733.17706 z" - id="rect3187" - sodipodi:nodetypes="czzszzcccc" /> - <path - style="fill:#cfccb0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="hills1" d="M 387.375 704.5625 C 233.775 704.5625 153.27688 779.96876 46.8125 779.96875 C -28.7262 779.96875 -106.5689 761.0625 -213.5625 761.0625 C -233.35416 761.0625 -252.10758 764.87187 -270.40625 771.09375 L -270.40625 1117.5938 L 46.8125 1117.5938 L 2094.8125 1117.5938 L 2094.8125 779.96875 C 2019.2738 779.96875 1941.4311 761.0625 1834.4375 761.0625 C 1727.4439 761.0625 1650.7151 872.56818 1512.9062 872.96875 C 1375.0975 873.3693 1220.723 756.87009 1130.8438 761.125 C 1016.5747 766.53451 871.69297 829.37503 773.625 829.375 C 675.55701 829.375 540.975 704.56252 387.375 704.5625 z " - id="path3300" /> + style="fill:#cfccb0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> diff -r 10e256704181 -r 2bdbef3f534c share/hedgewars/Data/Themes/Olympics/SkyL.png Binary file share/hedgewars/Data/Themes/Olympics/SkyL.png has changed diff -r 10e256704181 -r 2bdbef3f534c share/hedgewars/Data/Themes/Olympics/SkyL.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/hedgewars/Data/Themes/Olympics/SkyL.svg Tue Aug 07 03:24:54 2018 +0200 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" + height="1024" + width="2048" + id="svg2"> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs5"> + <linearGradient + id="linearGradient3159"> + <stop + id="stop3161" + offset="0" + style="stop-color:#b1bed8;stop-opacity:1;" /> + <stop + id="stop3163" + offset="1" + style="stop-color:#dbe1ed;stop-opacity:1" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="763.78711" + x2="1042.5674" + y1="44.014645" + x1="1042.5674" + id="linearGradient3165" + xlink:href="#linearGradient3159" /> + <filter + id="filter3296"> + <feGaussianBlur + id="feGaussianBlur3298" + stdDeviation="19.58669" /> + </filter> + </defs> + <g + style="display:inline" + id="Sky"> + <rect + y="0" + x="0" + height="1024" + width="2048" + id="sky" + style="opacity:1;fill:url(#linearGradient3165);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + id="hills2" + d="M 0,733.17706 C 106.46437,733.17706 186.98085,657.77942 340.58085,657.77942 C 494.18085,657.77942 628.76125,782.57551 726.82924,782.57551 C 824.89724,782.57551 969.78754,719.7456 1084.0566,714.33609 C 1173.9359,710.08119 1328.312,826.58331 1466.1207,826.18276 C 1603.9294,825.78221 1680.6311,714.27025 1787.6247,714.27025 C 1894.6183,714.27025 1972.4613,733.17706 2048,733.17706 L 2048,1070.7985 L 0,1070.7985 L 0,733.17706 z" + style="fill:#d3cfb7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + id="hills1" + d="M 387.375 704.5625 C 233.775 704.5625 153.27688 779.96876 46.8125 779.96875 C -28.7262 779.96875 -106.5689 761.0625 -213.5625 761.0625 C -233.35416 761.0625 -252.10758 764.87187 -270.40625 771.09375 L -270.40625 1117.5938 L 46.8125 1117.5938 L 2094.8125 1117.5938 L 2094.8125 779.96875 C 2019.2738 779.96875 1941.4311 761.0625 1834.4375 761.0625 C 1727.4439 761.0625 1650.7151 872.56818 1512.9062 872.96875 C 1375.0975 873.3693 1220.723 756.87009 1130.8438 761.125 C 1016.5747 766.53451 871.69297 829.37503 773.625 829.375 C 675.55701 829.375 540.975 704.56252 387.375 704.5625 z " + style="fill:#cfccb0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> +</svg>