From a6f07dad9a28d1ac59942d8bebecbc71db7ec0a5 Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Tue, 20 Dec 2022 14:50:01 -0700 Subject: [PATCH] New UI theme and menu tweaks Added new button assets and reskinned the default UI theme. Pause menu has its own theme also. --- ...1.png-dddfdcb3808573045e2ed3a829fa36a6.md5 | 3 + ....png-dddfdcb3808573045e2ed3a829fa36a6.stex | Bin 0 -> 2774 bytes ...3.png-671c9cb8368e44c810a563d955c96ff9.md5 | 3 + ....png-671c9cb8368e44c810a563d955c96ff9.stex | Bin 0 -> 1766 bytes ...3.png-1fe9ecf7f1047c83be8d154f21e0324f.md5 | 3 + ....png-1fe9ecf7f1047c83be8d154f21e0324f.stex | Bin 0 -> 616 bytes ...3.png-bdd5ce03dfb4b19f3445e11943f8091a.md5 | 3 + ....png-bdd5ce03dfb4b19f3445e11943f8091a.stex | Bin 0 -> 616 bytes godot/assets/Button01.png | 3 + godot/assets/Button01.png.import | 35 +++++++++++ godot/assets/Button03.png | 3 + godot/assets/Button03.png.import | 35 +++++++++++ godot/assets/Button13.png | 3 + godot/assets/Button13.png.import | 35 +++++++++++ godot/assets/title_theme.tres | 6 -- godot/assets/ui_theme.tres | 34 ++++++++++- godot/assets/ui_theme_PauseScreen.tres | 37 ++++++++++++ .../timelines/timeline-1667668097.json | 4 +- .../timelines/timeline-1667693704.json | 22 +------ godot/screens/EndScreen.tscn | 48 ++++++++++----- godot/screens/PauseScreen.gd | 2 +- godot/screens/PauseScreen.tscn | 57 +++++++++--------- godot/screens/TitleScreen.tscn | 14 ++--- godot/screens/death.gd | 2 +- godot/screens/title.gd | 10 +-- 25 files changed, 275 insertions(+), 87 deletions(-) create mode 100644 godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.md5 create mode 100644 godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.stex create mode 100644 godot/.import/Button03.png-671c9cb8368e44c810a563d955c96ff9.md5 create mode 100644 godot/.import/Button03.png-671c9cb8368e44c810a563d955c96ff9.stex create mode 100644 godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.md5 create mode 100644 godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.stex create mode 100644 godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.md5 create mode 100644 godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.stex create mode 100644 godot/assets/Button01.png create mode 100644 godot/assets/Button01.png.import create mode 100644 godot/assets/Button03.png create mode 100644 godot/assets/Button03.png.import create mode 100644 godot/assets/Button13.png create mode 100644 godot/assets/Button13.png.import delete mode 100644 godot/assets/title_theme.tres create mode 100644 godot/assets/ui_theme_PauseScreen.tres diff --git a/godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.md5 b/godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.md5 new file mode 100644 index 0000000..a69bf20 --- /dev/null +++ b/godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.md5 @@ -0,0 +1,3 @@ +source_md5="e7ff8adad983ccaebd137d5a088e219f" +dest_md5="6dbb8b0b7e49465e444af4d54fd0dc08" + diff --git a/godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.stex b/godot/.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.stex new file mode 100644 index 0000000000000000000000000000000000000000..7176f57957b6cd9761ea351d4e3e43c0a1e1bf23 GIT binary patch literal 2774 zcmXYzYc!M#7svNA7Y4&H#1I+Gdt8!6MdYY4Zli`K9HeAKheEGgPSi2aK?tEiato2< zNOTcKnS>N7A<89;kd#U)_t%Gat^MEY_ieBJ-)rx+ZLOS~F9U$ix^U|Ppo$~wxn2^$ z)tbq1w6n3P{6D*JOxQ*1yfsTGA=^2_v|7`8eStxJS`dy}h#j#QFedUY1^y%@tlAoO zSO`ck93MDP(`&^;!uJvzgw(v8SZv8M&_ITGaWE2`tl(E>}mk~hX zI_0JH51k(z8ajTzd{KkNSE$Lx6UE#9#cK0@P5ktPks;4jVew?x{_Dp}-;bFuomu@# zVmu`v9b(@v=eZZZ6$O;Jr`efLA^lYhQa!^x2Gphy(CxcSUFTeU!#c!Vw@jYYmQq6 zFI3;y5yRWqE5w6cbJys2hyM#-C3`F_P6~Ku)(dcFiziP`U->*%s%Cf-H$41q>7)7@ zPNz)MDK?}H^Yp5A?3fP1PH4g6GK$$o0UZZ+ZK-EYDh0;i}NLI-!I_-QkVH*QaYXb%T0c$%=hO~E|LMi=H z+{MwZ>fcTGjo$PK-x)~KzgE!cUupT}&7o8EZIi+WH=-g2CVz~_uDv_5@?vdl&uY2q zki6hI?=w*pxOH-NHU@c9M7!h3*cMJhsJ5*#LN^>2*>DPTvoS^Zb_En7S53(3f{ zhIwpQ7l}&oP>7P+YP7^)wH?dAWyboD9qnQZ%=7Z~d?NVcz1pL{B))gO+f@0FHe5EC z%y0NKV%FHdG<#@%mgo9IX-yy=`ardj=yzqJYrE@`Pc@59E!q6I3ad{>tM4QP6sk+f z`|FjtP=hnRThbY$h2J-On`THxn>mT2hBEufgNTwZal@A(|6>Dl=d?T1eN!Jz^kz=5 zL&FD_9v)x*<=gv$_XqODWqf%RUD4wH{C&w*hc8hVTBWocxnCF zt_ms|5-355GsI5ZZq9EiqA?-?HGK8w?pqIcuQf^T?gGneWXYOIR*6?YVfOM|2y|aN+ zQ@|_hXrP*&iWLDh+y8~_we+ZZqx%>D3i-7ugwVAr0rh`428MVqt1LRlU5%!M}a!;itI9 z1 zglPiI*fPm!8;eeN#X?$#n%ARF=fU?z8=QJ?O530VX-S+>XNR0twv0*suf|jdL499= zSZgk2`gCYd-Egwlj8afIY26OlG*qHGAmBE;pA(4&0=Oh{1Kv0{3xwbCciV$7uQPI; zChe_F!~!V<7)EoLWQK?0BMgpvQ;K|kv6sYtM1Iq+7W>v8r%4B`bDfy)P!e8h{3|grr*v zX#SxVd`0gTNa~mn>PRPNCZzx|OwAOvFxBhR%9d41%axT3cDv430aOiN2rV^Fmvp`K z6HN{{bAWMxR(5(Ot9Y9<7old4$mvh3(r##zcJSWb z_wFDK+!TG-&uI{LO`W9uGRI2_pfimLL>;_`24el@hr?D7*6uCrsgr-(g;oXfZS(IUXH6Nlrd@ zaAQ@azSE77+I|G`c5NLCKwwA6H~r4V5BUZQUq3ct$Vxb@Fg^GbMn*>HXy9*zMJ?^f z6Q7?jV>If)Tu({ud;E#HqXpfeU@{C4?ydf$U9|k+$4hbY5#H*vENuhs!smO5$Uugn zhIdnaCK@avnoR%p7R+7Bo*np+veVbRH9h}l-leCT;`iTDjv6grxaoVXy_5IA1C8gMlVD;lPJF-8XH>89n6wr&Qk0q}`0Ooc z{clRSJ~`_G&r#8kBa_>TC9()m)xlgDyv_b|j`Xk8%i$PK>3a2*Li2JoC!I;>B8jGz5L3rRa|E^=niNur2 zS6eu+?Zw#@QBJw;pg5deDQLgoF|=GG>c4fip|xG|y5iRQ#a$W+m6TD*inCqk|F96MJaHV(CXfy59@tx%sFR$+-6`yAkNXiB8U50>+T)rF-F%w56n2sB9awQpb zL_V}n^^j3ELmEq`qvfAgV|3Z0Ybh4=zeN!jKe~;k7$u`HN_93ZsdS(Y6h%mPa*m*@ZQCMAx&LbKlF@Z{-y?9GjFiYB z(ukCd1K1QNB(~5_L1TAluhy!60#*Xlk)MEy4cO7ka$DM`cY>BI=;>i6qo+%-CFtmZ zRFg89CdecJ8d)015CHTw*-X&{GC+WA5=6#L)k9^&S+E9Wd3_p{(h3umjR|H}q5(!W zrv~L^HdU79{;$+zATY8^4O2SmCHI|{_}f28P$(+JMlKsF$59x@bwiod&<6e=Iqu%T zPa-F*g1uJVkJK7C54kJu0$cz{jU{LR5)BEUfdnn|k$+T9+m+x6t_6?qLVV39?M6Lx zoU0Wp%At%o%n2aO31Xle)TUXfG!4e1@vc=Zwe7GYR(|!32Y!SNbG%u9-4Q`8-dJte zXRkN=um5U;25S1){DwRdKm!vK4djr>o4NrKG$eoq6680Kn;^Gp9aa0)?AP|n@Z2~T z=F}3Gz3f|0`4l#8)!)`oA6uRBSZfl0!TS(vIAOOFc3absm|24Hh6x475^P3-{DuUR z8;Y%ib$!5_xmCLXzwvl%>AXHB zw$R5GZ|N&g_zGO<7hXat&&rCHdBAnnK@DeMOQB7#TDN(d{V>;fh?8wwtqP=0 zZR-HXu-&)x6?+QWxXAB+E!zh=w!Hx$l$yi=Ye1j7%{zc?KNU)mqG%1r>1OuH^st~~ zo7>btNhsB^;BIX9sVTbP0A1@9HFU584H~0m4?D>Ny2cLZqH8qE%BF!Ss@83596;9r za1f!A(z1raO$@ND*TkSJLM(C-%h70Fv4JMGOYmgs<99(=s3HLhf)Qgt!JubuQfCc% ziiECl1cAU2DIhaHboRI@I%d!`04(TO(7~A;N-=%YK!MbQK;Tl#E(cUe{o;*kHQ@>m z!%UlC0Gb9k^AG5X5StVsM#0bxE(Ny&zV2O`{2jdS+uvsiWu4d&EKNu(~o0%=>SU^V;aK5{p54uQ=we?Kc@)4lOlx;_F#0}t5+~i=x z)K7TdbE--;lLZ|BO^gpf)A>?#g;Er38Yt4%Q!JD!5FvIzS00gA1c>D=TEe0wd2KyC zkOFRXsY9xXcgQ#&{HUqEeRBY_ZUfc~wDr(7Z^gWh1s#M^zydmG>mfuc5}Oo>O^U=K zv9So_F>;#*B5P`5kr5r<%i%m`T=Aq|j5UU+Nb#N&P>O Isxk@!0OyY*)c^nh literal 0 HcmV?d00001 diff --git a/godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.md5 b/godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.md5 new file mode 100644 index 0000000..357ed3a --- /dev/null +++ b/godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.md5 @@ -0,0 +1,3 @@ +source_md5="ba0985dcbd463264ca1cf17ce3944c3a" +dest_md5="6e0c635700173b07a640dabfcc871b9c" + diff --git a/godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.stex b/godot/.import/Button13.png-1fe9ecf7f1047c83be8d154f21e0324f.stex new file mode 100644 index 0000000000000000000000000000000000000000..7634ff13f0d63c01ef31506720c6b87958128591 GIT binary patch literal 616 zcmV-u0+;hGRlbNpFt$Llyij3h}?Q`LMn5cnT~gFjNY(?*gc zDQfQH$Bv!$ z@!mHSOU2TtF*HiEz*qa41O+m*DREQH>-sSVMtGqP2lNoy44+mS24LB?Z90l=+qP|2 z?4)elw(SPz|1=z zkU}P1gDjOPLZQgzML4XKtZ!^W-dL9?!{LkbKu{&xVzJn8S*$IQDi}CFi~7}K29pDs z$q=jk(X-Q-Pa~vrd62nup~e?GJz0o*wKM@AvVf-b#urYG=Mx?skxGF~CF(qh`QxLx zq+3rQks*@^dUtZ}=x{dWGNAD|$au8Dm6|;~sHL4o6b1_!gEBhPwS)b7HRmuP5s;B4 zN3L4m|DS1O@>Yu(vc;OuG-m$)rlu>|g57R|YquA&mFcO!-^s~lxl|m2Tr8EFlas$c zW5dJUR=Wea-Rcexk9|Myjt)lp{T|$Ye`Iv9`~3B`H!%)>V(;zi{qyDZ1ODsF=Q{vn Cks=QO literal 0 HcmV?d00001 diff --git a/godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.md5 b/godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.md5 new file mode 100644 index 0000000..357ed3a --- /dev/null +++ b/godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.md5 @@ -0,0 +1,3 @@ +source_md5="ba0985dcbd463264ca1cf17ce3944c3a" +dest_md5="6e0c635700173b07a640dabfcc871b9c" + diff --git a/godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.stex b/godot/.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.stex new file mode 100644 index 0000000000000000000000000000000000000000..7634ff13f0d63c01ef31506720c6b87958128591 GIT binary patch literal 616 zcmV-u0+;hGRlbNpFt$Llyij3h}?Q`LMn5cnT~gFjNY(?*gc zDQfQH$Bv!$ z@!mHSOU2TtF*HiEz*qa41O+m*DREQH>-sSVMtGqP2lNoy44+mS24LB?Z90l=+qP|2 z?4)elw(SPz|1=z zkU}P1gDjOPLZQgzML4XKtZ!^W-dL9?!{LkbKu{&xVzJn8S*$IQDi}CFi~7}K29pDs z$q=jk(X-Q-Pa~vrd62nup~e?GJz0o*wKM@AvVf-b#urYG=Mx?skxGF~CF(qh`QxLx zq+3rQks*@^dUtZ}=x{dWGNAD|$au8Dm6|;~sHL4o6b1_!gEBhPwS)b7HRmuP5s;B4 zN3L4m|DS1O@>Yu(vc;OuG-m$)rlu>|g57R|YquA&mFcO!-^s~lxl|m2Tr8EFlas$c zW5dJUR=Wea-Rcexk9|Myjt)lp{T|$Ye`Iv9`~3B`H!%)>V(;zi{qyDZ1ODsF=Q{vn Cks=QO literal 0 HcmV?d00001 diff --git a/godot/assets/Button01.png b/godot/assets/Button01.png new file mode 100644 index 0000000..a30ffe6 --- /dev/null +++ b/godot/assets/Button01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a73a77161dd45c21af80cf75bf7db58b04d5b0a2ca1a4448c072a17212d4e99e +size 5938 diff --git a/godot/assets/Button01.png.import b/godot/assets/Button01.png.import new file mode 100644 index 0000000..77c334b --- /dev/null +++ b/godot/assets/Button01.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Button01.png" +dest_files=[ "res://.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/godot/assets/Button03.png b/godot/assets/Button03.png new file mode 100644 index 0000000..5e21eac --- /dev/null +++ b/godot/assets/Button03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84cb047729abc1c1caeddb71d9f9663737496819b1c22c6b98429cfcd03104e8 +size 11973 diff --git a/godot/assets/Button03.png.import b/godot/assets/Button03.png.import new file mode 100644 index 0000000..99d45e7 --- /dev/null +++ b/godot/assets/Button03.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Button03.png-671c9cb8368e44c810a563d955c96ff9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Button03.png" +dest_files=[ "res://.import/Button03.png-671c9cb8368e44c810a563d955c96ff9.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/godot/assets/Button13.png b/godot/assets/Button13.png new file mode 100644 index 0000000..3a8c940 --- /dev/null +++ b/godot/assets/Button13.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bea827265b828e22d64063c33583ae88e99b3551f8ccafb581f38c37a78caba7 +size 2773 diff --git a/godot/assets/Button13.png.import b/godot/assets/Button13.png.import new file mode 100644 index 0000000..b97aa8b --- /dev/null +++ b/godot/assets/Button13.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Button13.png" +dest_files=[ "res://.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/godot/assets/title_theme.tres b/godot/assets/title_theme.tres deleted file mode 100644 index bcc0b2b..0000000 --- a/godot/assets/title_theme.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="Theme" load_steps=2 format=2] - -[ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=1] - -[resource] -default_font = ExtResource( 1 ) diff --git a/godot/assets/ui_theme.tres b/godot/assets/ui_theme.tres index bcc0b2b..7173239 100644 --- a/godot/assets/ui_theme.tres +++ b/godot/assets/ui_theme.tres @@ -1,6 +1,38 @@ -[gd_resource type="Theme" load_steps=2 format=2] +[gd_resource type="Theme" load_steps=8 format=2] [ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=1] +[ext_resource path="res://assets/Button01.png" type="Texture" id=2] +[ext_resource path="res://assets/Button03.png" type="Texture" id=3] + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 3 ) +region_rect = Rect2( 0, 0, 152, 40 ) +modulate_color = Color( 0.41954, 0.740249, 0.761719, 1 ) + +[sub_resource type="StyleBoxTexture" id=2] +texture = ExtResource( 3 ) +region_rect = Rect2( 0, 0, 152, 40 ) +modulate_color = Color( 0.6, 0.6, 0.6, 1 ) + +[sub_resource type="StyleBoxTexture" id=3] +texture = ExtResource( 2 ) +region_rect = Rect2( 0, 0, 152, 40 ) + +[sub_resource type="StyleBoxTexture" id=4] +texture = ExtResource( 3 ) +region_rect = Rect2( 0, 0, 152, 40 ) +modulate_color = Color( 0, 0, 0, 1 ) [resource] default_font = ExtResource( 1 ) +Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Button/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 ) +Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) +Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/constants/hseparation = 2 +Button/styles/disabled = null +Button/styles/focus = SubResource( 1 ) +Button/styles/hover = SubResource( 2 ) +Button/styles/normal = SubResource( 3 ) +Button/styles/pressed = SubResource( 4 ) diff --git a/godot/assets/ui_theme_PauseScreen.tres b/godot/assets/ui_theme_PauseScreen.tres new file mode 100644 index 0000000..be03a43 --- /dev/null +++ b/godot/assets/ui_theme_PauseScreen.tres @@ -0,0 +1,37 @@ +[gd_resource type="Theme" load_steps=7 format=2] + +[ext_resource path="res://assets/Button13.png" type="Texture" id=1] +[ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=2] + +[sub_resource type="StyleBoxTexture" id=4] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 105, 21 ) + +[sub_resource type="StyleBoxTexture" id=2] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 105, 21 ) +modulate_color = Color( 0.439216, 0.223529, 0.223529, 1 ) + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 105, 21 ) +modulate_color = Color( 0.52549, 0.403922, 0.403922, 1 ) + +[sub_resource type="StyleBoxTexture" id=3] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 105, 21 ) +modulate_color = Color( 0.266667, 0.266667, 0.266667, 1 ) + +[resource] +Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Button/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 ) +Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) +Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/constants/hseparation = 2 +Button/fonts/font = ExtResource( 2 ) +Button/styles/disabled = null +Button/styles/focus = SubResource( 4 ) +Button/styles/hover = SubResource( 2 ) +Button/styles/normal = SubResource( 1 ) +Button/styles/pressed = SubResource( 3 ) diff --git a/godot/dialogic/timelines/timeline-1667668097.json b/godot/dialogic/timelines/timeline-1667668097.json index c82ba03..f870e01 100644 --- a/godot/dialogic/timelines/timeline-1667668097.json +++ b/godot/dialogic/timelines/timeline-1667668097.json @@ -81,7 +81,7 @@ "set_value": "true" }, { - "change_scene": "res://test_with_all.tscn", + "change_scene": "res://tests/test_player_locomotion.tscn", "event_id": "dialogic_041" }, { @@ -98,7 +98,7 @@ "value": "true" }, { - "change_scene": "res://test_with_all.tscn", + "change_scene": "res://tests/test_player_locomotion.tscn", "event_id": "dialogic_041" }, { diff --git a/godot/dialogic/timelines/timeline-1667693704.json b/godot/dialogic/timelines/timeline-1667693704.json index 62160e7..2222a9d 100644 --- a/godot/dialogic/timelines/timeline-1667693704.json +++ b/godot/dialogic/timelines/timeline-1667693704.json @@ -10,13 +10,13 @@ "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "Gravity Pixel Font courtesy of John Watson and Sunfire Interactive." + "text": "User interface elements courtesy of John Watson, Wenrexa, and Sunfire Interactive." }, { "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "Background images courtesy of Bacteri." + "text": "Overlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com" }, { "character": "", @@ -24,24 +24,6 @@ "portrait": "", "text": "Sounds courtesy of Dryoma and VOiD1 Gaming." }, - { - "character": "", - "event_id": "dialogic_001", - "portrait": "", - "text": "Overlays courtesy of ZimaJeKKT." - }, - { - "character": "", - "event_id": "dialogic_001", - "portrait": "", - "text": "All photos of people from thispersondoesnotexist.com." - }, - { - "character": "", - "event_id": "dialogic_001", - "portrait": "", - "text": "Stock photos from www.hippopx.com." - }, { "event_id": "dialogic_022", "transition_duration": 0 diff --git a/godot/screens/EndScreen.tscn b/godot/screens/EndScreen.tscn index 38d8234..0edc8b1 100644 --- a/godot/screens/EndScreen.tscn +++ b/godot/screens/EndScreen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://assets/audio/human-impact-on-ground-6982.mp3" type="AudioStream" id=1] [ext_resource path="res://assets/Background_space.png" type="Texture" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://screens/death.gd" type="Script" id=4] [ext_resource path="res://assets/ui_theme.tres" type="Theme" id=5] [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=7] [node name="EndScreen" type="Control"] anchor_right = 1.0 @@ -21,32 +22,33 @@ stretch_mode = 1 [node name="Menu" type="VBoxContainer" parent="."] anchor_left = 0.5 -anchor_top = 1.0 +anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 1.0 -margin_left = -133.0 -margin_top = -253.0 -margin_right = 134.0 -margin_bottom = -53.0 +anchor_bottom = 0.5 +margin_left = -104.0 +margin_top = 46.0 +margin_right = 104.0 +margin_bottom = 244.0 +theme = ExtResource( 5 ) [node name="RetryButton" type="Button" parent="Menu"] -margin_right = 267.0 -margin_bottom = 42.0 +margin_right = 208.0 +margin_bottom = 36.0 focus_neighbour_bottom = NodePath("../MenuButton") text = "Retry" [node name="MenuButton" type="Button" parent="Menu"] -margin_top = 46.0 -margin_right = 267.0 -margin_bottom = 88.0 +margin_top = 40.0 +margin_right = 208.0 +margin_bottom = 76.0 focus_neighbour_top = NodePath("../RetryButton") focus_neighbour_bottom = NodePath("../QuitButton") text = "Main Menu" [node name="QuitButton" type="Button" parent="Menu"] -margin_top = 92.0 -margin_right = 267.0 -margin_bottom = 134.0 +margin_top = 80.0 +margin_right = 208.0 +margin_bottom = 116.0 focus_neighbour_top = NodePath("../MenuButton") focus_neighbour_bottom = NodePath("../PlayButton") text = "Quit" @@ -72,6 +74,22 @@ stream = ExtResource( 3 ) [node name="shader" parent="." instance=ExtResource( 6 )] +[node name="Title" type="Label" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -342.0 +margin_top = -135.0 +margin_right = 342.0 +margin_bottom = -71.0 +custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_colors/font_outline_modulate = Color( 0, 0, 0, 1 ) +custom_constants/shadow_offset_x = 10 +custom_fonts/font = ExtResource( 7 ) +text = "MEAT MADNESS" +align = 1 + [connection signal="pressed" from="Menu/RetryButton" to="." method="_on_RetryButton_pressed"] [connection signal="pressed" from="Menu/MenuButton" to="." method="_on_MenuButton_pressed"] [connection signal="pressed" from="Menu/QuitButton" to="." method="_on_QuitButton_pressed"] diff --git a/godot/screens/PauseScreen.gd b/godot/screens/PauseScreen.gd index c9c5f21..f6eddac 100644 --- a/godot/screens/PauseScreen.gd +++ b/godot/screens/PauseScreen.gd @@ -28,7 +28,7 @@ func _on_ResumeButton_pressed(): func _on_MainMenuButton_pressed(): get_tree().paused = false - var _a = get_tree().change_scene("res://Screens/TitleScreen.tscn") + var _a = get_tree().change_scene("res://screens/TitleScreen.tscn") func _on_ControlsButton_pressed(): diff --git a/godot/screens/PauseScreen.tscn b/godot/screens/PauseScreen.tscn index 9eed2fb..2c94dfe 100644 --- a/godot/screens/PauseScreen.tscn +++ b/godot/screens/PauseScreen.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://assets/blackbackground.png" type="Texture" id=1] [ext_resource path="res://assets/ui_theme.tres" type="Theme" id=2] [ext_resource path="res://screens/PauseScreen.gd" type="Script" id=3] +[ext_resource path="res://assets/ui_theme_PauseScreen.tres" type="Theme" id=4] [node name="PauseScreen" type="Control"] pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 +theme = ExtResource( 4 ) script = ExtResource( 3 ) [node name="pauseBackground" type="TextureRect" parent="."] @@ -19,52 +21,47 @@ stretch_mode = 1 [node name="CenterContainer" type="CenterContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +theme = ExtResource( 2 ) [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] -margin_left = 312.0 -margin_top = 146.0 -margin_right = 712.0 -margin_bottom = 454.0 -theme = ExtResource( 2 ) +margin_left = 408.0 +margin_top = 193.0 +margin_right = 616.0 +margin_bottom = 407.0 +theme = ExtResource( 4 ) custom_constants/separation = 10 -[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"] -margin_right = 400.0 -margin_bottom = 36.0 -text = "Paused" -align = 1 - [node name="Spacer" type="Control" parent="CenterContainer/VBoxContainer"] -margin_top = 46.0 -margin_right = 400.0 -margin_bottom = 76.0 +margin_right = 208.0 +margin_bottom = 30.0 rect_min_size = Vector2( 1, 30 ) [node name="ResumeButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 86.0 -margin_right = 400.0 -margin_bottom = 136.0 -rect_min_size = Vector2( 400, 50 ) +margin_top = 40.0 +margin_right = 208.0 +margin_bottom = 76.0 +rect_min_size = Vector2( 208, 36 ) text = "Resume" [node name="MainMenuButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 146.0 -margin_right = 400.0 -margin_bottom = 196.0 -rect_min_size = Vector2( 400, 50 ) +margin_top = 86.0 +margin_right = 208.0 +margin_bottom = 122.0 +rect_min_size = Vector2( 208, 36 ) text = "Main Menu" [node name="ControlsButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 206.0 -margin_right = 400.0 -margin_bottom = 248.0 +margin_top = 132.0 +margin_right = 208.0 +margin_bottom = 168.0 +rect_min_size = Vector2( 208, 36 ) text = "Controls" [node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 258.0 -margin_right = 400.0 -margin_bottom = 308.0 -rect_min_size = Vector2( 400, 50 ) +margin_top = 178.0 +margin_right = 208.0 +margin_bottom = 214.0 +rect_min_size = Vector2( 208, 36 ) text = "Quit" [connection signal="pressed" from="CenterContainer/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"] diff --git a/godot/screens/TitleScreen.tscn b/godot/screens/TitleScreen.tscn index 1419e48..b87de02 100644 --- a/godot/screens/TitleScreen.tscn +++ b/godot/screens/TitleScreen.tscn @@ -49,25 +49,25 @@ custom_constants/separation = 10 [node name="PlayButton" type="Button" parent="ButtonContainer"] margin_right = 208.0 -margin_bottom = 42.0 +margin_bottom = 36.0 text = "Play" [node name="Credits" type="Button" parent="ButtonContainer"] -margin_top = 52.0 +margin_top = 46.0 margin_right = 208.0 -margin_bottom = 94.0 +margin_bottom = 82.0 text = "Credits" [node name="Controls" type="Button" parent="ButtonContainer"] -margin_top = 104.0 +margin_top = 92.0 margin_right = 208.0 -margin_bottom = 146.0 +margin_bottom = 128.0 text = "Controls" [node name="QuitButton" type="Button" parent="ButtonContainer"] -margin_top = 156.0 +margin_top = 138.0 margin_right = 208.0 -margin_bottom = 198.0 +margin_bottom = 174.0 text = "Quit" [node name="BlackoutScreen" type="CanvasLayer" parent="."] diff --git a/godot/screens/death.gd b/godot/screens/death.gd index 181fdd7..a5aea6f 100644 --- a/godot/screens/death.gd +++ b/godot/screens/death.gd @@ -9,7 +9,7 @@ func _on_RetryButton_pressed(): pass # Replace with function body. func _on_MenuButton_pressed(): - var _err = get_tree().change_scene("res://screens/title.tscn") + var _err = get_tree().change_scene("res://screens/TitleScreen.tscn") func _on_QuitButton_pressed(): get_tree().quit() diff --git a/godot/screens/title.gd b/godot/screens/title.gd index 9a6d475..45fe2f1 100644 --- a/godot/screens/title.gd +++ b/godot/screens/title.gd @@ -10,12 +10,14 @@ func _on_PlayButton_pressed(): $BlackoutScreen.visible = true func _on_Credits_pressed(): - pass # Replace with function body. - + var dialog = Dialogic.start("credits") + add_child(dialog) + dialog.connect("tree_exiting", self, "controls_done") func _on_Controls_pressed(): - pass # Replace with function body. - + var dialog = Dialogic.start("controls") + add_child(dialog) + dialog.connect("tree_exiting", self, "controls_done") func _on_QuitButton_pressed(): get_tree().quit()