diff --git a/Assets/Images/IconAccelerateFilled.svg b/Assets/Images/IconAccelerateFilled.svg new file mode 100755 index 0000000..b5afe19 --- /dev/null +++ b/Assets/Images/IconAccelerateFilled.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Images/accelerate.svg.meta b/Assets/Images/IconAccelerateFilled.svg.meta similarity index 100% rename from Assets/Images/accelerate.svg.meta rename to Assets/Images/IconAccelerateFilled.svg.meta diff --git a/Assets/Images/decelerate.svg b/Assets/Images/IconAccelerateStroke.svg old mode 100644 new mode 100755 similarity index 69% rename from Assets/Images/decelerate.svg rename to Assets/Images/IconAccelerateStroke.svg index 3154fe2..32c37a8 --- a/Assets/Images/decelerate.svg +++ b/Assets/Images/IconAccelerateStroke.svg @@ -7,8 +7,8 @@ viewBox="0 0 264.58333 264.58332" version="1.1" id="svg1087" - inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" - sodipodi:docname="decelerate.svg" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="Accelerate.Stroke.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -29,14 +29,16 @@ fit-margin-bottom="0" units="px" inkscape:zoom="0.56123737" - inkscape:cx="337.6468" + inkscape:cx="338.53769" inkscape:cy="396.44545" - inkscape:window-width="1920" - inkscape:window-height="1044" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> + inkscape:current-layer="layer1" + inkscape:showpageshadow="0" + inkscape:deskcolor="#505050" /> + + style="fill:none;fill-opacity:1;stroke:#f9f9f9;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" + d="m 301.39429,298.65887 c 0.73063,4.02423 0.73063,5.48547 9e-5,6.21618 -0.73054,0.73072 -2.19175,0.73072 -3.64132,0.73072 -1.44956,0 -2.93415,0 -3.66486,-0.73072 -0.73071,-0.73072 -0.73071,-2.19195 -5e-5,-6.21629 0.73066,-4.02433 2.19184,-10.61134 3.65307,-10.6113 1.46123,4e-5 2.92244,6.58719 3.65307,10.61141 z" + id="path7724" + inkscape:path-effect="#path-effect7728-2" + inkscape:original-d="m 302.12492,301.22205 c 1.9e-4,1.46105 1.9e-4,2.92229 0,4.38372 -1.46108,-1.8e-4 -2.92229,-1.8e-4 -4.3837,0 -1.43772,-0.0206 -2.92231,-1.8e-4 -4.38373,0 1.7e-4,-1.46144 1.7e-4,-2.92267 0,-4.38372 1.46146,-6.58759 2.92263,-13.1746 4.38373,-19.76183 1.46144,6.58723 2.92265,13.17438 4.3837,19.76183 z" + sodipodi:nodetypes="ccccccc" + inkscape:label="path7724" + transform="matrix(14.212189,0,0,14.212189,-4148.7866,-4116.5818)" /> diff --git a/Assets/Images/Shield.Path.svg.meta b/Assets/Images/IconAccelerateStroke.svg.meta old mode 100644 new mode 100755 similarity index 93% rename from Assets/Images/Shield.Path.svg.meta rename to Assets/Images/IconAccelerateStroke.svg.meta index 7fcd662..fd38c9d --- a/Assets/Images/Shield.Path.svg.meta +++ b/Assets/Images/IconAccelerateStroke.svg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9711c8847640a61d5b73846d08f009ba +guid: be41ac96f8aa14d4c843239aaa42a30d ScriptedImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,5 +50,5 @@ ScriptedImporter: y: 0 width: 0 height: 0 - spriteID: fa9a44ccf6ffb337e983e37856b3c0e7 + spriteID: b550eb1cdb1c028449b231f8ea33ccf7 PhysicsOutlines: [] diff --git a/Assets/Images/IconDecelerateFilled.svg b/Assets/Images/IconDecelerateFilled.svg new file mode 100755 index 0000000..3b8d0f9 --- /dev/null +++ b/Assets/Images/IconDecelerateFilled.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Images/decelerate.svg.meta b/Assets/Images/IconDecelerateFilled.svg.meta similarity index 100% rename from Assets/Images/decelerate.svg.meta rename to Assets/Images/IconDecelerateFilled.svg.meta diff --git a/Assets/Images/accelerate.svg b/Assets/Images/IconDecelerateStroke.svg old mode 100644 new mode 100755 similarity index 69% rename from Assets/Images/accelerate.svg rename to Assets/Images/IconDecelerateStroke.svg index af48826..38d8d8c --- a/Assets/Images/accelerate.svg +++ b/Assets/Images/IconDecelerateStroke.svg @@ -7,8 +7,8 @@ viewBox="0 0 264.58333 264.58332" version="1.1" id="svg1087" - inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" - sodipodi:docname="accelerate.svg" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="Decelerate.Stroke.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -29,14 +29,16 @@ fit-margin-bottom="0" units="px" inkscape:zoom="0.56123737" - inkscape:cx="337.6468" + inkscape:cx="338.53769" inkscape:cy="396.44545" - inkscape:window-width="1920" - inkscape:window-height="1044" - inkscape:window-x="0" - inkscape:window-y="36" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> + inkscape:current-layer="layer1" + inkscape:showpageshadow="0" + inkscape:deskcolor="#505050" /> + + style="fill:none;fill-opacity:1;stroke:#f9f9f9;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" + d="m 322.22093,294.99436 c -0.73063,-4.02423 -0.73063,-5.48547 -9e-5,-6.21618 0.73054,-0.73072 2.19175,-0.73072 3.64131,-0.73072 1.44957,0 2.93416,0 3.66487,0.73072 0.73071,0.73072 0.73071,2.19195 5e-5,6.21629 -0.73066,4.02433 -2.19184,10.61134 -3.65307,10.6113 -1.46123,-4e-5 -2.92244,-6.58719 -3.65307,-10.61141 z" + id="path11129" + inkscape:path-effect="#path-effect11133-6" + inkscape:original-d="m 321.4903,292.43118 c -1.9e-4,-1.46105 -1.9e-4,-2.92229 0,-4.38372 1.46108,1.8e-4 2.92229,1.8e-4 4.3837,0 1.43772,0.0206 2.92231,1.8e-4 4.38373,0 -1.7e-4,1.46144 -1.7e-4,2.92267 0,4.38372 -1.46146,6.58759 -2.92263,13.1746 -4.38373,19.76183 -1.46144,-6.58723 -2.92265,-13.17438 -4.3837,-19.76183 z" + sodipodi:nodetypes="ccccccc" + inkscape:label="path7724" + transform="matrix(14.212189,0,0,14.212189,-4548.6151,-4116.5817)" /> diff --git a/Assets/Images/IconDecelerateStroke.svg.meta b/Assets/Images/IconDecelerateStroke.svg.meta new file mode 100755 index 0000000..202377a --- /dev/null +++ b/Assets/Images/IconDecelerateStroke.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: b5e3025cd36850742a7c9342bb676bed +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 0 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: d53acdb624d29424f94eebb60ff99339 + PhysicsOutlines: [] diff --git a/Assets/Images/IconShieldFilled.svg b/Assets/Images/IconShieldFilled.svg new file mode 100755 index 0000000..17e6588 --- /dev/null +++ b/Assets/Images/IconShieldFilled.svg @@ -0,0 +1,770 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Images/shield.svg.meta b/Assets/Images/IconShieldFilled.svg.meta similarity index 100% rename from Assets/Images/shield.svg.meta rename to Assets/Images/IconShieldFilled.svg.meta diff --git a/Assets/Images/shield.svg b/Assets/Images/IconShieldStroke.svg old mode 100644 new mode 100755 similarity index 78% rename from Assets/Images/shield.svg rename to Assets/Images/IconShieldStroke.svg index 054377b..d3447c3 --- a/Assets/Images/shield.svg +++ b/Assets/Images/IconShieldStroke.svg @@ -7,8 +7,8 @@ viewBox="0 0 1000 1000" version="1.1" id="svg1087" - inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" - sodipodi:docname="shield.svg" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="Shield.Stroke.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -29,17 +29,25 @@ fit-margin-bottom="0" units="px" inkscape:zoom="0.56123737" - inkscape:cx="256.57593" + inkscape:cx="258.35771" inkscape:cy="613.82228" - inkscape:window-width="2556" - inkscape:window-height="1396" - inkscape:window-x="2560" - inkscape:window-y="40" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1"> + inkscape:current-layer="layer1" + inkscape:showpageshadow="0" + inkscape:deskcolor="#505050"> + id="grid1560" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" + visible="true" /> @@ -683,27 +691,88 @@ width="454.50912" height="82.573608" id="rect14097-0" /> + + + + - - - - + + + + + + diff --git a/Assets/Images/IconShieldStroke.svg.meta b/Assets/Images/IconShieldStroke.svg.meta new file mode 100755 index 0000000..d6efc3c --- /dev/null +++ b/Assets/Images/IconShieldStroke.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: e6e2e87163e4ff74da9ac5beb81bd2b1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 0 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: feb7cf03ee1b4ac46a71ff20b9bdf340 + PhysicsOutlines: [] diff --git a/Assets/Images/strafe.svg b/Assets/Images/IconStrafeFilled.svg old mode 100644 new mode 100755 similarity index 58% rename from Assets/Images/strafe.svg rename to Assets/Images/IconStrafeFilled.svg index d98ed5b..69713d2 --- a/Assets/Images/strafe.svg +++ b/Assets/Images/IconStrafeFilled.svg @@ -7,8 +7,8 @@ viewBox="0 0 1000 1000" version="1.1" id="svg1087" - inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" - sodipodi:docname="strafe.svg" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="IconStrafeFilled.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -29,17 +29,18 @@ fit-margin-bottom="0" units="px" inkscape:zoom="0.28061869" - inkscape:cx="-406.24522" - inkscape:cy="187.08662" - inkscape:window-width="2556" - inkscape:window-height="1396" - inkscape:window-x="2560" - inkscape:window-y="40" + inkscape:cx="-406.24521" + inkscape:cy="187.08661" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="layer1" showborder="true" borderlayer="true" - inkscape:showpageshadow="true" /> + inkscape:showpageshadow="true" + inkscape:deskcolor="#505050" /> + + + + + transform="matrix(52.145174,0,0,52.145174,-18009.081,-15002.377)" + style="stroke-width:1.08955"> + d="m 349.99805,295.11719 c -0.41662,0 -0.85316,-0.002 -1.27735,0.0586 -0.42418,0.0608 -0.86085,0.18304 -1.19922,0.52149 -0.33833,0.33841 -0.47461,0.84018 -0.47461,1.46093 10e-6,0.62075 0.11021,1.42577 0.32227,2.59375 0.21206,1.16798 0.52813,2.70499 0.90625,3.97657 0.18906,0.63578 0.39032,1.20292 0.62305,1.65039 0.11636,0.22373 0.23824,0.41969 0.40039,0.58789 0.16215,0.16819 0.39739,0.33397 0.70703,0.33398 0.30964,1e-5 0.54488,-0.1658 0.70703,-0.33398 0.16215,-0.16819 0.28403,-0.36417 0.40039,-0.58789 0.23273,-0.44746 0.43203,-1.01461 0.62109,-1.65039 0.37813,-1.27156 0.69419,-2.80856 0.90625,-3.97657 0.21207,-1.16801 0.32423,-1.97298 0.32422,-2.59375 0,-0.62077 -0.13621,-1.12254 -0.47461,-1.46093 -0.34045,-0.34046 -0.78003,-0.4609 -1.20703,-0.52149 -0.42699,-0.0606 -0.86854,-0.0586 -1.28515,-0.0586 z m 0,1.08984 c 0.41661,0 0.81981,0.002 1.13281,0.0469 0.31299,0.0444 0.51027,0.13332 0.58984,0.21289 0.0816,0.0816 0.1543,0.2089 0.1543,0.6914 0,0.48251 -0.0968,1.25519 -0.30469,2.40039 -0.20792,1.14521 -0.5221,2.6595 -0.8789,3.85938 -0.17841,0.59994 -0.37082,1.12228 -0.54493,1.45703 -0.056,0.10765 -0.0962,0.1534 -0.14062,0.21484 -0.0445,-0.0614 -0.0846,-0.10719 -0.14063,-0.21484 -0.17411,-0.33477 -0.36651,-0.85708 -0.54492,-1.45703 -0.35681,-1.1999 -0.67099,-2.7142 -0.8789,-3.85938 -0.20792,-1.14517 -0.30664,-1.91787 -0.30664,-2.40039 -10e-6,-0.48251 0.0747,-0.6098 0.15625,-0.6914 0.0815,-0.0816 0.27492,-0.16863 0.58398,-0.21289 0.30906,-0.0443 0.70643,-0.0469 1.12305,-0.0469 z" + id="path7805" /> + d="m 358,287.12305 c -0.30964,-10e-6 -0.54292,0.16579 -0.70508,0.33398 -0.16215,0.16819 -0.28403,0.36221 -0.40039,0.58594 -0.23273,0.44745 -0.43398,1.01656 -0.62305,1.65234 -0.37812,1.27156 -0.69418,2.8066 -0.90625,3.97461 -0.21206,1.16802 -0.32422,1.97298 -0.32421,2.59375 0,0.62077 0.13621,1.12254 0.4746,1.46094 0.34045,0.34045 0.78004,0.46089 1.20704,0.52148 0.42699,0.0606 0.86854,0.0586 1.28515,0.0586 0.41661,0 0.85512,0.002 1.2793,-0.0586 0.42418,-0.0607 0.86086,-0.18304 1.19922,-0.52148 0.33833,-0.33842 0.47461,-0.84019 0.47461,-1.46094 -10e-6,-0.62075 -0.11216,-1.42576 -0.32422,-2.59375 -0.21206,-1.16798 -0.52813,-2.70303 -0.90625,-3.97461 -0.18906,-0.63579 -0.39032,-1.20488 -0.62305,-1.65234 -0.11636,-0.22373 -0.23824,-0.41775 -0.40039,-0.58594 -0.16215,-0.16819 -0.39739,-0.33398 -0.70703,-0.33398 z m 0,1.20898 c 0.0445,0.0615 0.0846,0.10719 0.14062,0.21484 0.17412,0.33477 0.36652,0.85904 0.54493,1.45899 0.35681,1.1999 0.67099,2.71419 0.8789,3.85937 0.20792,1.14518 0.30664,1.91593 0.30664,2.39844 1e-5,0.48251 -0.0747,0.6098 -0.15625,0.69141 -0.0816,0.0816 -0.27492,0.16863 -0.58398,0.21289 -0.30906,0.0443 -0.70644,0.0469 -1.12305,0.0469 -0.41661,0 -0.81982,-0.002 -1.13281,-0.0469 -0.31299,-0.0444 -0.51027,-0.13332 -0.58984,-0.21289 -0.0816,-0.0816 -0.1543,-0.2089 -0.1543,-0.69141 0,-0.48251 0.0987,-1.25518 0.30664,-2.40039 0.20792,-1.14521 0.5221,-2.65754 0.87891,-3.85742 0.1784,-0.59994 0.37081,-1.12423 0.54492,-1.45899 0.0559,-0.10748 0.0942,-0.15341 0.13867,-0.21484 z" + id="path7811" /> + d="m 354.45117,297.75 c -0.62077,0 -1.12449,0.13621 -1.46289,0.47461 -0.34045,0.34045 -0.46089,0.78003 -0.52148,1.20703 -0.0606,0.427 -0.0566,0.86659 -0.0566,1.2832 0,0.41662 -0.004,0.85512 0.0566,1.2793 0.0607,0.42418 0.18304,0.86086 0.52148,1.19922 0.33842,0.33833 0.84214,0.47462 1.46289,0.47461 0.62075,-1e-5 1.42577,-0.11216 2.59375,-0.32422 1.16799,-0.21206 2.70303,-0.52813 3.97461,-0.90625 0.63579,-0.18906 1.20293,-0.38837 1.65039,-0.62109 0.22373,-0.11637 0.4197,-0.23825 0.58789,-0.40039 0.16819,-0.16215 0.33398,-0.39739 0.33399,-0.70704 1e-5,-0.30963 -0.1658,-0.54487 -0.33399,-0.70703 -0.16819,-0.16215 -0.36416,-0.28402 -0.58789,-0.40039 -0.44745,-0.23272 -1.01461,-0.43398 -1.65039,-0.62304 -1.27156,-0.37813 -2.80659,-0.69419 -3.97461,-0.90625 -1.16801,-0.21207 -1.97298,-0.32227 -2.59375,-0.32227 z m 0,1.08789 c 0.48251,0 1.25323,0.0987 2.39844,0.30664 1.14521,0.20793 2.6595,0.5221 3.85937,0.87891 0.59994,0.1784 1.12423,0.37081 1.45899,0.54492 0.10765,0.056 0.1534,0.0962 0.21484,0.14062 -0.0614,0.0445 -0.10719,0.0846 -0.21484,0.14063 -0.33477,0.17411 -0.85904,0.36652 -1.45899,0.54492 -1.19989,0.35681 -2.71419,0.67099 -3.85937,0.87891 -1.14518,0.20791 -1.91592,0.30468 -2.39844,0.30468 -0.48251,10e-6 -0.6098,-0.0727 -0.6914,-0.15429 -0.0816,-0.0816 -0.16864,-0.27492 -0.2129,-0.58399 -0.0443,-0.30906 -0.0469,-0.70838 -0.0469,-1.125 0,-0.41661 0.002,-0.81786 0.0469,-1.13086 0.0444,-0.31299 0.13332,-0.51027 0.2129,-0.58984 0.0816,-0.0816 0.20889,-0.15625 0.6914,-0.15625 z" + id="path7916" /> + d="m 353.55469,289.75391 c -0.62075,0 -1.42577,0.11216 -2.59375,0.32421 -1.16799,0.21206 -2.70303,0.52813 -3.97461,0.90625 -0.63579,0.18907 -1.20293,0.39033 -1.65039,0.62305 -0.22373,0.11636 -0.4197,0.23824 -0.58789,0.40039 -0.1682,0.16215 -0.33398,0.39544 -0.33399,0.70508 -1e-5,0.30964 0.1658,0.54488 0.33399,0.70703 0.16818,0.16216 0.36416,0.28403 0.58789,0.40039 0.44745,0.23273 1.01461,0.43399 1.65039,0.62305 1.27156,0.37812 2.80659,0.69418 3.97461,0.90625 1.16801,0.21206 1.97298,0.32422 2.59375,0.32422 0.62077,-1e-5 1.12449,-0.13622 1.46289,-0.47461 0.34045,-0.34045 0.46089,-0.78004 0.52148,-1.20703 0.0606,-0.427 0.0586,-0.86855 0.0586,-1.28516 0,-0.41661 0.002,-0.85511 -0.0586,-1.2793 -0.0607,-0.42418 -0.18304,-0.86085 -0.52148,-1.19921 -0.33842,-0.33834 -0.84214,-0.47462 -1.46289,-0.47461 z m 0,1.08984 c 0.48251,-10e-6 0.6098,0.0747 0.6914,0.15625 0.0816,0.0816 0.17059,0.27297 0.21485,0.58203 0.0443,0.30906 0.0469,0.70839 0.0469,1.125 0,0.41661 -0.002,0.81787 -0.0469,1.13086 -0.0444,0.31299 -0.13528,0.51027 -0.21485,0.58984 -0.0816,0.0816 -0.20889,0.15625 -0.6914,0.15625 -0.48251,10e-6 -1.25323,-0.0987 -2.39844,-0.30664 -1.14521,-0.20792 -2.6595,-0.5221 -3.85938,-0.8789 -0.59993,-0.17841 -1.12422,-0.37081 -1.45898,-0.54492 -0.10765,-0.056 -0.1534,-0.0962 -0.21484,-0.14063 0.0614,-0.0444 0.10735,-0.0828 0.21484,-0.13867 0.33477,-0.17411 0.85904,-0.36652 1.45898,-0.54492 1.1999,-0.35681 2.7142,-0.67099 3.85938,-0.87891 1.14518,-0.20792 1.91592,-0.30663 2.39844,-0.30664 z" + id="path7922" /> diff --git a/Assets/Images/strafe.svg.meta b/Assets/Images/IconStrafeFilled.svg.meta similarity index 100% rename from Assets/Images/strafe.svg.meta rename to Assets/Images/IconStrafeFilled.svg.meta diff --git a/Assets/Images/IconStrafeStroke.svg b/Assets/Images/IconStrafeStroke.svg new file mode 100755 index 0000000..a01512a --- /dev/null +++ b/Assets/Images/IconStrafeStroke.svg @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Images/IconStrafeStroke.svg.meta b/Assets/Images/IconStrafeStroke.svg.meta new file mode 100755 index 0000000..91266e4 --- /dev/null +++ b/Assets/Images/IconStrafeStroke.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: 7197c8c5f3ee52e439af16a8cff58d1c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 0 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 31333f5199f46cb4f9b2cfb87bd57ada + PhysicsOutlines: [] diff --git a/Assets/Images/Shield.Path.svg b/Assets/Images/Shield.Path.svg deleted file mode 100644 index 558478d..0000000 --- a/Assets/Images/Shield.Path.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/Images/Icons.meta b/Assets/Images/UWP Icons.meta similarity index 100% rename from Assets/Images/Icons.meta rename to Assets/Images/UWP Icons.meta diff --git a/Assets/Images/Icons/ClientIcon.142.png b/Assets/Images/UWP Icons/ClientIcon.142.png similarity index 100% rename from Assets/Images/Icons/ClientIcon.142.png rename to Assets/Images/UWP Icons/ClientIcon.142.png diff --git a/Assets/Images/Icons/ClientIcon.142.png.meta b/Assets/Images/UWP Icons/ClientIcon.142.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon.142.png.meta rename to Assets/Images/UWP Icons/ClientIcon.142.png.meta diff --git a/Assets/Images/Icons/ClientIcon.24.png b/Assets/Images/UWP Icons/ClientIcon.24.png similarity index 100% rename from Assets/Images/Icons/ClientIcon.24.png rename to Assets/Images/UWP Icons/ClientIcon.24.png diff --git a/Assets/Images/Icons/ClientIcon.24.png.meta b/Assets/Images/UWP Icons/ClientIcon.24.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon.24.png.meta rename to Assets/Images/UWP Icons/ClientIcon.24.png.meta diff --git a/Assets/Images/Icons/ClientIcon.300.png b/Assets/Images/UWP Icons/ClientIcon.300.png similarity index 100% rename from Assets/Images/Icons/ClientIcon.300.png rename to Assets/Images/UWP Icons/ClientIcon.300.png diff --git a/Assets/Images/Icons/ClientIcon.300.png.meta b/Assets/Images/UWP Icons/ClientIcon.300.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon.300.png.meta rename to Assets/Images/UWP Icons/ClientIcon.300.png.meta diff --git a/Assets/Images/Icons/ClientIcon.71.png b/Assets/Images/UWP Icons/ClientIcon.71.png similarity index 100% rename from Assets/Images/Icons/ClientIcon.71.png rename to Assets/Images/UWP Icons/ClientIcon.71.png diff --git a/Assets/Images/Icons/ClientIcon.71.png.meta b/Assets/Images/UWP Icons/ClientIcon.71.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon.71.png.meta rename to Assets/Images/UWP Icons/ClientIcon.71.png.meta diff --git a/Assets/Images/Icons/ClientIcon.png b/Assets/Images/UWP Icons/ClientIcon.png similarity index 100% rename from Assets/Images/Icons/ClientIcon.png rename to Assets/Images/UWP Icons/ClientIcon.png diff --git a/Assets/Images/Icons/ClientIcon.png.meta b/Assets/Images/UWP Icons/ClientIcon.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon.png.meta rename to Assets/Images/UWP Icons/ClientIcon.png.meta diff --git a/Assets/Images/Icons/ClientIcon256.png b/Assets/Images/UWP Icons/ClientIcon256.png similarity index 100% rename from Assets/Images/Icons/ClientIcon256.png rename to Assets/Images/UWP Icons/ClientIcon256.png diff --git a/Assets/Images/Icons/ClientIcon256.png.meta b/Assets/Images/UWP Icons/ClientIcon256.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon256.png.meta rename to Assets/Images/UWP Icons/ClientIcon256.png.meta diff --git a/Assets/Images/Icons/ClientIcon44.png b/Assets/Images/UWP Icons/ClientIcon44.png similarity index 100% rename from Assets/Images/Icons/ClientIcon44.png rename to Assets/Images/UWP Icons/ClientIcon44.png diff --git a/Assets/Images/Icons/ClientIcon44.png.meta b/Assets/Images/UWP Icons/ClientIcon44.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon44.png.meta rename to Assets/Images/UWP Icons/ClientIcon44.png.meta diff --git a/Assets/Images/Icons/ClientIcon88.png b/Assets/Images/UWP Icons/ClientIcon88.png similarity index 100% rename from Assets/Images/Icons/ClientIcon88.png rename to Assets/Images/UWP Icons/ClientIcon88.png diff --git a/Assets/Images/Icons/ClientIcon88.png.meta b/Assets/Images/UWP Icons/ClientIcon88.png.meta similarity index 100% rename from Assets/Images/Icons/ClientIcon88.png.meta rename to Assets/Images/UWP Icons/ClientIcon88.png.meta diff --git a/Assets/Images/Icons/SplashScreen.png b/Assets/Images/UWP Icons/SplashScreen.png similarity index 100% rename from Assets/Images/Icons/SplashScreen.png rename to Assets/Images/UWP Icons/SplashScreen.png diff --git a/Assets/Images/Icons/SplashScreen.png.meta b/Assets/Images/UWP Icons/SplashScreen.png.meta similarity index 100% rename from Assets/Images/Icons/SplashScreen.png.meta rename to Assets/Images/UWP Icons/SplashScreen.png.meta diff --git a/Assets/Images/Icons/StoreIcon.310.png b/Assets/Images/UWP Icons/StoreIcon.310.png similarity index 100% rename from Assets/Images/Icons/StoreIcon.310.png rename to Assets/Images/UWP Icons/StoreIcon.310.png diff --git a/Assets/Images/Icons/StoreIcon.310.png.meta b/Assets/Images/UWP Icons/StoreIcon.310.png.meta similarity index 100% rename from Assets/Images/Icons/StoreIcon.310.png.meta rename to Assets/Images/UWP Icons/StoreIcon.310.png.meta diff --git a/Assets/Images/Icons/StoreLogo.50.png b/Assets/Images/UWP Icons/StoreLogo.50.png similarity index 100% rename from Assets/Images/Icons/StoreLogo.50.png rename to Assets/Images/UWP Icons/StoreLogo.50.png diff --git a/Assets/Images/Icons/StoreLogo.50.png.meta b/Assets/Images/UWP Icons/StoreLogo.50.png.meta similarity index 100% rename from Assets/Images/Icons/StoreLogo.50.png.meta rename to Assets/Images/UWP Icons/StoreLogo.50.png.meta diff --git a/Assets/Images/Icons/WideLogo.310.png b/Assets/Images/UWP Icons/WideLogo.310.png similarity index 100% rename from Assets/Images/Icons/WideLogo.310.png rename to Assets/Images/UWP Icons/WideLogo.310.png diff --git a/Assets/Images/Icons/WideLogo.310.png.meta b/Assets/Images/UWP Icons/WideLogo.310.png.meta similarity index 100% rename from Assets/Images/Icons/WideLogo.310.png.meta rename to Assets/Images/UWP Icons/WideLogo.310.png.meta diff --git a/Assets/Images/Icons/WideLogo.620.png b/Assets/Images/UWP Icons/WideLogo.620.png similarity index 100% rename from Assets/Images/Icons/WideLogo.620.png rename to Assets/Images/UWP Icons/WideLogo.620.png diff --git a/Assets/Images/Icons/WideLogo.620.png.meta b/Assets/Images/UWP Icons/WideLogo.620.png.meta similarity index 100% rename from Assets/Images/Icons/WideLogo.620.png.meta rename to Assets/Images/UWP Icons/WideLogo.620.png.meta diff --git a/Assets/Resources/SpaceRace-Icons.ttf b/Assets/Resources/SpaceRace-Icons.ttf old mode 100644 new mode 100755 index e98dd22..ae7a7e2 Binary files a/Assets/Resources/SpaceRace-Icons.ttf and b/Assets/Resources/SpaceRace-Icons.ttf differ diff --git a/Assets/Scenes/msg_blackstar.unity b/Assets/Scenes/msg_blackstar.unity index bb0b633..2ba1220 100755 --- a/Assets/Scenes/msg_blackstar.unity +++ b/Assets/Scenes/msg_blackstar.unity @@ -329,7 +329,7 @@ PrefabInstance: objectReference: {fileID: 602427659} - target: {fileID: 5731929726813851803, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_Enabled - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder @@ -395,7 +395,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1192389867829506101, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_Enabled - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_Name @@ -478,7 +478,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 571777217} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} m_Name: @@ -535,6 +535,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5535911989893287240, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5993260185458565267, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_ActionEvents.Array.size value: 12 @@ -579,6 +583,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[11].m_ActionName value: menu/CloseMenu[/XInputControllerWindows/buttonEast] objectReference: {fileID: 0} + - target: {fileID: 7583115105922956764, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: sourceAsset + value: + objectReference: {fileID: 9197481963319205126, guid: 12f7f66e5ad4c104e84fb589592f08e3, type: 3} - target: {fileID: 8925193253056788144, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_Name value: Ship diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index c1f3075..ad035fe 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -38,6 +38,9 @@ public class Timing: MonoBehaviour { mapName = scene.name; Debug.Log("Track Sector Count - " + sectors.Length); + // just poke the timing ui cause sometimes it fires early and misses that we actually have sectors + ui.Init(); + lapService = new LapService(mapName); } diff --git a/Assets/Src/UI/Controls.uxml b/Assets/Src/UI/Controls.uxml index b88acca..750aaa6 100644 --- a/Assets/Src/UI/Controls.uxml +++ b/Assets/Src/UI/Controls.uxml @@ -21,7 +21,7 @@ - + diff --git a/Assets/Src/UI/InterfaceIcon.cs b/Assets/Src/UI/InterfaceIcon.cs index 696c13e..b6cca1a 100644 --- a/Assets/Src/UI/InterfaceIcon.cs +++ b/Assets/Src/UI/InterfaceIcon.cs @@ -9,7 +9,7 @@ public class InterfaceIcon : VisualElement { // Outputs Acceleration, Deceleration, - Strafing, + Strafe, Shield, Crosshair, @@ -33,7 +33,7 @@ public class InterfaceIcon : VisualElement { static readonly Dictionary _iconGlyphMap = new() { { Icon.Acceleration, '\u25bc' }, { Icon.Deceleration, '\u25b2' }, - { Icon.Strafing, '\u2b94' }, + { Icon.Strafe, '\u2b94' }, { Icon.Shield, '\u26c9' }, { Icon.Logo, '\u26d0' }, @@ -61,7 +61,7 @@ public class InterfaceIcon : VisualElement { Label _iconLabel; Label _detailLabel; - public InterfaceIcon() : this(Icon.Strafing) {} + public InterfaceIcon() : this(Icon.Strafe) {} public InterfaceIcon(Icon icon) { _iconLabel = new Label { diff --git a/Assets/Src/UI/TimingUI.cs b/Assets/Src/UI/TimingUI.cs index 82c2603..eeb182d 100644 --- a/Assets/Src/UI/TimingUI.cs +++ b/Assets/Src/UI/TimingUI.cs @@ -29,16 +29,26 @@ public class TimingUI : MonoBehaviour { static string[] completionMsgs = { "(⌐▨_▨)", - "^____^", - "(^ _ ^)", - "-ˏ`★ˎ`-", + "(⌐■_■)", + "(⌐▼_▼)" + // "(^_^)", }; void OnEnable() { Init(); } - void Init() { + void Start() { + Init(); + } + + public void Init() { + if (ShouldHide) { + Debug.Log("No sectors found, hiding timing."); + uiDocument.enabled = false; + return; + } + uiDocument = GetComponent(); timing = GetComponent(); @@ -65,10 +75,6 @@ public class TimingUI : MonoBehaviour { notice.AddToClassList("hidden"); } - void Start() { - if (ShouldHide) uiDocument.enabled = false; - } - void FixedUpdate() { if (timer == null || timing == null) { Debug.LogWarning("no timer"); @@ -122,8 +128,8 @@ public class TimingUI : MonoBehaviour { noticeDiff.Clear(); noticeDiff.Add(timing.CompareLap(lap).ToLabel()); - int msgIndex = UnityEngine.Random.Range(0, completionMsgs.Length); - noticeMsg.text = completionMsgs[msgIndex]; + // int msgIndex = UnityEngine.Random.Range(0, completionMsgs.Length); + // noticeMsg.text = completionMsgs[msgIndex]; noticeSectors.Clear(); foreach (SectorTime sector in lap.Sectors) { diff --git a/Assets/Src/UI/Tutorial.uxml b/Assets/Src/UI/Tutorial.uxml new file mode 100755 index 0000000..cbeb323 --- /dev/null +++ b/Assets/Src/UI/Tutorial.uxml @@ -0,0 +1,27 @@ + +