1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-06-26 00:24:44 -04:00

Huge overhual

- We'll now using Godot's native UI elements along with a custom theme and fonts.
- Changing to the character's clothes is now done by referencing the instanced node instead of the game screen. You no longer have to blindly guess where to put the placeholders from in clothes scene because the placeholders are already there for changing.
- Classic mode now has it's own copy of the character node. This was the reason for the original setup.
- Disabled some debug warnings
- Window is now resizable and will respect aspect ratio
- Credits screen
- Global menu, WIP
This commit is contained in:
Anthony Wilcox 2019-05-05 16:15:34 -04:00
parent 023f6ec90e
commit 2b0755bf34
33 changed files with 1175 additions and 667 deletions

View file

@ -0,0 +1,89 @@
<?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#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg831"
width="1683.426"
height="1171.9679"
viewBox="0 0 1683.426 1171.9679"
sodipodi:docname="dressup_panel.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata837">
<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="defs835" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1001"
id="namedview833"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:pagecheckerboard="true"
inkscape:zoom="0.44781783"
inkscape:cx="1261.9232"
inkscape:cy="301.48018"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="layer2"
showguides="true"
inkscape:guide-bbox="true" />
<g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="Original"
transform="translate(1762.2585,775.39852)"
style="display:inline"
sodipodi:insensitive="true" />
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Re-Ink"
transform="translate(1059.7076,648.11462)">
<rect
style="opacity:1;fill:#0033ff;fill-opacity:1;stroke:none;stroke-width:9.89647961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1405"
width="1683.426"
height="1171.9679"
x="-1059.7076"
y="-648.11462"
ry="0" />
<rect
style="opacity:1;fill:#0099ff;fill-opacity:1;stroke:none;stroke-width:7.53709316;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1403"
width="1643.3362"
height="1106.3516"
x="-1039.0758"
y="-612.34576"
ry="31.943781" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/dressup_panel.svg-32ea153065247fc0395a2e1e29e6c510.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/dressup_panel.svg"
dest_files=[ "res://.import/dressup_panel.svg-32ea153065247fc0395a2e1e29e6c510.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View file

@ -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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="14.999983pt"
height="14.999971pt"
viewBox="0 0 14.999983 14.999971"
preserveAspectRatio="xMidYMid meet"
id="svg8"
sodipodi:docname="exit_symbol.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata14">
<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="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1001"
id="namedview10"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="5.6568543"
inkscape:cx="48.959773"
inkscape:cy="24.135628"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg8"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<g
transform="matrix(0.00144523,0,0,-0.00153995,-1.7505945,17.356021)"
id="g6"
style="fill:#ffffff;stroke:none">
<path
d="m 6080,11255 c -171,-35 -306,-109 -435,-239 -100,-101 -158,-193 -199,-316 -36,-108 -46,-186 -46,-357 v -153 h 2355 c 1694,0 2369,-3 2407,-11 167,-35 301,-170 337,-337 16,-76 16,-6808 0,-6884 -36,-167 -171,-302 -337,-337 -38,-8 -713,-11 -2407,-11 H 5400 v -152 c 0,-172 10,-250 46,-358 41,-122 99,-214 199,-316 133,-134 278,-211 459,-243 41,-8 807,-11 2393,-11 2569,0 2395,-4 2563,61 107,41 192,100 290,199 126,127 201,275 229,450 15,91 15,8229 0,8320 -55,348 -329,629 -677,696 -106,20 -4721,19 -4822,-1 z"
id="path2"
style="fill:#ffffff"
inkscape:connector-curvature="0" />
<path
d="m 5825,8954 c -44,-14 -78,-43 -289,-252 -266,-265 -286,-292 -286,-397 0,-37 8,-76 19,-101 13,-28 204,-227 646,-670 l 628,-629 -2574,-5 -2574,-5 -41,-22 c -56,-30 -119,-103 -133,-155 -9,-31 -11,-143 -9,-383 3,-328 4,-341 25,-381 25,-48 83,-101 129,-120 28,-12 446,-14 2604,-14 1413,0 2570,-3 2570,-7 0,-4 -281,-289 -625,-633 -478,-479 -629,-636 -644,-670 -27,-60 -27,-150 0,-210 29,-64 454,-491 523,-525 64,-32 157,-34 219,-5 31,15 363,341 1218,1197 1160,1162 1176,1179 1208,1251 30,66 33,80 30,150 -5,97 -35,161 -123,263 -35,41 -563,572 -1172,1181 -783,781 -1122,1112 -1153,1128 -57,29 -133,34 -196,14 z"
id="path4"
style="fill:#ffffff"
inkscape:connector-curvature="0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/exit_symbol.svg-73dc57ed97dd06b8f096295150b1975b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/exit_symbol.svg"
dest_files=[ "res://.import/exit_symbol.svg-73dc57ed97dd06b8f096295150b1975b.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View file

@ -1,60 +1,19 @@
<?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#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg815"
width="39"
height="33"
viewBox="0 0 39 33"
sodipodi:docname="pants_icon.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata821">
<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="defs819" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1001"
id="namedview817"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="6.1212121"
inkscape:cx="19.5"
inkscape:cy="-9.6386138"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg815" />
<path
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95784992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 6.7807842,28.813088 C 11.813842,20.992324 14.832232,3.8938042 15.52896,3.7756987 18.419201,3.2857617 25.626539,3.4616814 29.908997,2.036699 c 1.688171,-0.5617374 1.488754,15.799088 1.655879,24.486997 0.06138,3.190086 -9.314144,4.364655 -8.802321,1.221999 0.644048,-3.954547 0.348605,-12.407998 0.348605,-12.407998 0,0 -5.477233,7.547529 -6.667106,13.583 -0.302555,1.534666 -11.5352913,2.801285 -9.6632698,-0.107604 z"
id="path2567"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssssscss" />
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="672.000000pt" height="1280.000000pt" viewBox="0 0 672.000000 1280.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,1280.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M1180 12794 c0 -60 -91 -1511 -130 -2084 -235 -3415 -538 -6344
-1032 -9967 -12 -90 -19 -165 -16 -169 4 -3 120 -26 260 -50 139 -24 509 -89
823 -144 314 -55 802 -140 1085 -190 685 -120 709 -124 716 -118 2 3 9 273 14
599 30 1885 143 3931 405 7379 30 393 68 900 85 1125 17 226 35 419 40 430 7
17 9 16 9 -10 1 -16 8 -116 16 -220 37 -493 77 -1386 145 -3295 20 -544 26
-715 70 -1905 63 -1692 122 -2939 180 -3810 11 -165 20 -315 20 -332 0 -29 3
-33 26 -33 14 0 193 31 397 70 442 82 1117 208 1717 320 772 144 710 130 710
154 0 12 -29 181 -65 376 -688 3786 -1094 7463 -1261 11425 -8 209 -16 381
-17 381 -2 2 -841 17 -2982 54 -313 5 -715 13 -892 16 -184 4 -323 3 -323 -2z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

View file

@ -0,0 +1,44 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="1101.000000pt" height="1280.000000pt" viewBox="0 0 1101.000000 1280.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,1280.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M6445 12541 c-15 -25 -94 -54 -184 -67 -53 -8 -163 -34 -246 -59
-384 -113 -467 -126 -830 -130 -203 -3 -326 0 -410 10 -66 8 -203 21 -305 29
-159 14 -193 14 -243 2 -64 -15 -122 -51 -182 -112 -28 -29 -52 -43 -80 -48
-75 -13 -140 -38 -225 -87 -47 -27 -128 -66 -180 -88 -52 -21 -122 -51 -155
-66 -33 -14 -100 -43 -150 -62 -49 -20 -119 -50 -155 -69 -36 -18 -122 -55
-192 -83 -145 -58 -358 -156 -598 -276 -91 -45 -214 -102 -274 -125 -59 -23
-163 -70 -230 -105 -66 -34 -139 -68 -161 -75 -22 -7 -67 -28 -100 -48 -73
-43 -269 -206 -326 -270 -180 -205 -296 -509 -358 -939 -12 -78 -45 -261 -76
-405 -57 -276 -87 -433 -130 -685 -18 -108 -32 -163 -50 -195 -19 -33 -25 -57
-25 -108 0 -77 -20 -156 -50 -205 -18 -28 -24 -59 -30 -138 -6 -82 -13 -112
-34 -154 -22 -42 -28 -67 -30 -140 -3 -77 -17 -167 -56 -373 -6 -29 -18 -78
-27 -107 -10 -33 -13 -56 -7 -62 5 -4 43 -17 84 -29 173 -49 395 -83 830 -126
467 -47 603 -56 850 -56 222 0 249 -2 288 -20 117 -53 133 -84 133 -258 0 -70
-7 -183 -15 -252 -37 -313 -41 -413 -39 -960 0 -300 5 -586 10 -636 6 -62 4
-126 -4 -200 -11 -99 -36 -430 -63 -849 -6 -88 -22 -286 -36 -440 -14 -154
-30 -356 -35 -449 -5 -94 -12 -179 -15 -189 -3 -11 -10 -180 -15 -376 -4 -196
-13 -426 -20 -511 -9 -118 -9 -214 0 -405 8 -180 9 -271 1 -325 -6 -41 -15
-163 -20 -270 -7 -145 -15 -213 -30 -265 -26 -92 -26 -141 0 -155 28 -15 275
-47 504 -65 105 -9 241 -20 301 -25 197 -18 967 -63 1290 -75 154 -6 569 -30
685 -40 311 -26 1216 -71 1745 -87 610 -18 1007 -17 1110 5 157 34 222 83 245
182 29 125 4 530 -45 745 -50 217 -49 203 -25 275 26 77 25 46 17 625 -9 717
-31 1094 -78 1296 -30 131 -31 147 -25 269 8 177 -10 822 -29 1025 -20 217
-52 471 -74 591 -13 72 -16 112 -9 155 4 33 7 124 6 204 l-2 145 36 82 c70
156 108 343 108 529 0 88 5 127 25 193 33 112 43 171 55 340 11 138 13 148 47
208 32 58 37 80 62 253 14 104 29 191 32 194 7 7 22 -27 73 -159 39 -102 55
-164 56 -216 0 -19 7 -56 16 -81 14 -43 18 -47 57 -54 66 -11 429 -8 567 5
475 45 1011 161 1585 342 88 28 166 56 173 62 17 14 8 66 -23 126 -30 60 -135
484 -135 547 0 36 -8 62 -30 99 -60 102 -80 150 -80 193 0 47 -32 135 -61 167
-32 36 -59 109 -59 160 0 51 -29 127 -69 182 -11 15 -74 190 -139 388 -109
330 -134 402 -209 610 -14 39 -61 154 -104 256 -44 103 -104 259 -134 347
-147 434 -328 767 -496 912 -35 30 -121 110 -191 177 -77 75 -138 125 -155
129 -41 9 -355 115 -378 127 -11 5 -80 31 -155 57 -74 26 -189 68 -255 94
-181 71 -309 117 -661 236 -176 60 -351 120 -388 134 -81 31 -242 72 -316 82
-30 4 -87 19 -126 35 -88 34 -139 45 -149 30z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/shirt_icon.svg-7b696f9c6cc160cdbf6b29c4ffa97174.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/shirt_icon.svg"
dest_files=[ "res://.import/shirt_icon.svg-7b696f9c6cc160cdbf6b29c4ffa97174.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0