From c2b67e04ce15081987f00902dd8c4aa027877ba7 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 00:54:08 -0500 Subject: [PATCH 01/12] Add GodotIcon --- .gitmodules | 3 +++ addons/godoticon | 1 + 2 files changed, 4 insertions(+) create mode 160000 addons/godoticon diff --git a/.gitmodules b/.gitmodules index 924584b..b7c0e0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "addons/sdg-print"] path = addons/sdg-print url = https://github.com/SdgGames/sdg-print +[submodule "addons/godoticon"] + path = addons/godoticon + url = https://github.com/SdgGames/godoticon diff --git a/addons/godoticon b/addons/godoticon new file mode 160000 index 0000000..dec0e52 --- /dev/null +++ b/addons/godoticon @@ -0,0 +1 @@ +Subproject commit dec0e520f5eb54b7f38ecfb4b25d300432980c21 -- GitLab From f8c110a3b8982749434c459f15611f6a812f2c58 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:16:19 -0500 Subject: [PATCH 02/12] Add new icons --- game.gd => Game/game.gd | 0 game.tscn => Game/game.tscn | 2 +- icon.svg | 1 - icon/icon.svg | 205 ++++++++++++++++++++++++ icon.svg.import => icon/icon.svg.import | 8 +- icon/icon_128.png | Bin 0 -> 10396 bytes icon/icon_128.png.import | 34 ++++ icon/icon_16.png | Bin 0 -> 806 bytes icon/icon_16.png.import | 34 ++++ icon/icon_256.png | Bin 0 -> 21442 bytes icon/icon_256.png.import | 34 ++++ icon/icon_32.png | Bin 0 -> 1875 bytes icon/icon_32.png.import | 34 ++++ icon/icon_64.png | Bin 0 -> 4534 bytes icon/icon_64.png.import | 34 ++++ project.godot | 13 +- 16 files changed, 391 insertions(+), 8 deletions(-) rename game.gd => Game/game.gd (100%) rename game.tscn => Game/game.tscn (85%) delete mode 100644 icon.svg create mode 100644 icon/icon.svg rename icon.svg.import => icon/icon.svg.import (74%) create mode 100644 icon/icon_128.png create mode 100644 icon/icon_128.png.import create mode 100644 icon/icon_16.png create mode 100644 icon/icon_16.png.import create mode 100644 icon/icon_256.png create mode 100644 icon/icon_256.png.import create mode 100644 icon/icon_32.png create mode 100644 icon/icon_32.png.import create mode 100644 icon/icon_64.png create mode 100644 icon/icon_64.png.import diff --git a/game.gd b/Game/game.gd similarity index 100% rename from game.gd rename to Game/game.gd diff --git a/game.tscn b/Game/game.tscn similarity index 85% rename from game.tscn rename to Game/game.tscn index 8f9618a..852c961 100644 --- a/game.tscn +++ b/Game/game.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dkdinvtxg00hn"] -[ext_resource type="Script" path="res://game.gd" id="1_3tn46"] +[ext_resource type="Script" path="res://Game/game.gd" id="1_3tn46"] [node name="Game" type="Node"] script = ExtResource("1_3tn46") diff --git a/icon.svg b/icon.svg deleted file mode 100644 index adc26df..0000000 --- a/icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/icon/icon.svg b/icon/icon.svg new file mode 100644 index 0000000..320e3b0 --- /dev/null +++ b/icon/icon.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon.svg.import b/icon/icon.svg.import similarity index 74% rename from icon.svg.import rename to icon/icon.svg.import index 37fc300..545f57a 100644 --- a/icon.svg.import +++ b/icon/icon.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dv4efoeuhe54h" -path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" +uid="uid://b31na4u8s8md4" +path="res://.godot/imported/icon.svg-305b672091780d093b892ba8652d7193.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://icon.svg" -dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] +source_file="res://icon/icon.svg" +dest_files=["res://.godot/imported/icon.svg-305b672091780d093b892ba8652d7193.ctex"] [params] diff --git a/icon/icon_128.png b/icon/icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..83c5fe51719ad32cf10566bfb3e3975802b2f4dc GIT binary patch literal 10396 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+I14-?iy0W$WI&ivKKj5! z1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_!7(87ZLn`LHom*ZL z5_;>$e&d;wJlM7MJbgre2VMctF@^|@0NC-IDhqPtR~Z< z4gre=S2i>VR54FIN~ReZpPcK%`2BCK{rnn(LyKKI$? zx#jtb8eNC#g`7BeKL}jlS;23@64V&wV5-1)VfP=#88QFzn9UnbANYPi^MOf$jKx}w zF5Q^@sxldM@0b)?JQy!EjGl2<>3vc%YrIdXa|e z)ZD{+AEYZXIC0os;IH7T;Q8t1#w^%)ZSE|F{h7SV(g)vZU--M)D>Rvri%~X6K#WmZ z)YXvn*1mwnyRY+V@GH6~Cny<+{oJsa^MP);svGfLEM2abtsdss_0${Vq4{^wZwP(Jp-!HDmVS9(8ezkP6z z(9v)8{Y>=?`}Wb6CUV0$S(P`jPsePlF5hTd>^u;&lgYUQp_wgSpTfe zdFCI^3f3R5>I7RBlq_#lYI(sf!))g|E9WB1&xh)6hmIZJV_(xScY1TBDZj~y`&T3) zm}CT~CXVD7JqIO>CYs)uUa_D*YoalwScClY{2u_$Pki=~e z7&vAAp|Y<=cZ3-?WPc5A*#0(`a^d|qCfXwPWn_f6Hi~O)V zz^QoTe&fupMN`;fHqURV>7Cn-BqD6--;&gvYH>R@b%z< zTTh$hUV6`9tI==q;Ey`1#W|aSL-C7K$ISy)4;+^~R$FrB9nahB7244YE+yTsWx4j3 zS!i|0zSy`9rdLeTEduYk6c1f9Zg*v95#VRo-SB*(kbDU1d1-%JmhfjkX!lM~g(f))xbE99@-sud_=6mUvWc>5r%<>6ZPl^^TxT;2a(Wra+~ zy8CUy&liNdS7a~xpBwCGa)ITCAIHZEk97~6POvy|2r9Nz$o~*}smdL_{hL?zimWg1 zt*`#k*#CONpYK}(KSa!`zaH4h*TFiCQ}Ld#Q_CC6)+I@bErOPgMq)SDw)QT`m~rRM z|M#X}lYQ)S%HL#}Y&0usglD@v)Un;@*No zNpYV3OwFfu7jE-mafp(xNQ`*8ZuKOM1*RLkIRcGmh_d@KvqFCUkqAj9w3^Lu%AbInX%u4Kei z!*G7-D(&!yHk z`{)7D$BTXLyFWZRuW_p*tJRae=fs>?-t=*KFtiA;CGZ;k_%v_tPrg~9yl;LV%j6&9e$DBxt%_T_c^-E-xxk3Sta8>X?9ZTY?9axH;&B2K+*Y-Jzo z&N+JdRxGP8xV5M$BVmugqM*Nh_n8vr--tX^d*N-rOvU%jN7=4=W>+zQjo7O*9x!A+` zYTx~BoLln6_Iz8RAQX|yzb&wLzwLqh6AN?eVvkI9&py;scEOr;5tD(`aa+cdrV5%L z-)+2VAGXgfe~FrhqQR}uH9aLS79H{`_)zlx!M5d0B_~1y>pwpCUd4Jq?xb-e!|}hd z;ZJT){VEYtE4J^A?(=t7cO^RZ9iH5F>b$P>J==Zn)Ggu#JYL(poX9i(YfFampSQ06 z_x%p3U}bo+dFBiMl!>cu=WYLP@3^j?d&bM%iLYHHH<^A>jJPI!?ypeVwst8kw&{7f z?{~$@mvR0wh<x%bk7|o^O&%USG$_bZyh@Mu;{2?<>AAd`|tj}^F8o;adFXu6xUM;tc;89Wh`U7 zrhJ|Mw`2defAQK5CMVLrZklySl&c~3b$zpf`{z0O4b%S}|6H+$@m>}``@AW?oFcbG zeOKr?w|2p@Ztfc?t=IRjeelTB;k1{@FQ!ZHUmpK--c0Mcc#{v0fip*7-)XN!%h+c) z3y39FC4c1K@O;(x;@;HvbdDjh&WHj<$5&6_vd(_WL@zdw%+z*?k#~o;l<1W7Rl*x~sznb&QoL@X4 z`j^-GpK258?(gzFpt?k0%jflH8Sb!zG3*o-&#igSa)9BBkkb@v+o!<{Z?eCp2`0_9 z|1I>#pY`;nf8RJXzCL-r?5oZBaQ}wLRJT3C+Y`S%EYd1vDc!;xwIXYkwd;w84?KPz zeRbuFZM6iOQse$<;S2W2IWWEwY!i6b-#4{BZgpe*GSB5cqVkOL=k3_^Z6DXY(Qm&a z>TAAkcg;H%lc1Xs;cE`~JxSTof6s04#D87YEo>QTEgvM6W9KpKah_50_q5;Pvs@yp zmt_37dpJQ`z3%_r=_yOrCHFl@<2>{0oclwY>F1@MygCxKYWACR{2u=^=6$~$sx7%x zM5X7z{F=F6v>2Q^?wwG*mALQ*ll1xUn0ME875>k9|5>WHgulD|p<{K$^+obEB6`x- zmb$iW47+x@kawl{oR2o4rY{!Gsawc;i(Ap^htaMLPp4xK1x6wG>agKT5wwwP?1zrCq&f(s;zHn9-rzp#emPU>R?E;6C z({4rc8wkGNuJ*#D`o+8F-mS0pFTcyVBIbPj-Yf3m%Z_jFC|4^ue>`>0vZOzI#TnQi zpOz~SX4w6|g2(aG&*|+K8H{7EUHiG^=3aqJ=F?J3G{fZhbni+(Y@!*@o#@St& z-(Am$u%$fcxGm#&Q*MELV%M9wHec2)V!OophF_5N#L;x~S`h=~8p({80w_AI}yBRzZV^)x=xc0T-bME%^2QnTK(|Y=4dA6?F>HhhP$GVhM zu?N<_<5}!vjpRa}%(=*L(nH$b{QncnXd#h(1(dti5uUy0{#{qwL3 zcU%v?y1`^MGu3GMhCu1kth|nQ$JR%Ch<}y;*1GH;R|k_(gYScT%sgr?m-nsHxO?~i z|C;b0v8l^anH_Uq%@DZPEBRJy`f&x07ZX0)G{iEr2$Zg<2;t#kj!Ayyov^}m!-IhR zhKueU`Fz-9Ezf4_lc_JiH>4=KvqYR|Hd@#mLL-0|DCz-$~s+H>GbpSQa!I(#l;rQNe@!~ksNKz|KkJOwZ69cQr6VP@^883 zNIdzoJec7UXYJ z3_s`2tA1x0dQ~TG&kXbW|7_>Yw;8QoEID_2_}d~ulV41q4sAc`VkjWn=wofvX|SUq zUWTtU`NNKt46SJuIg=aj%wW?Ij=#99*Xpvv>Z_BcU7PwtD|F_kljdK1HdU2v?{tXQ zx_&QlcgMD0J^jIG zYwIo^RmVjv8OvOyToteWlT}fFaPjNyhKKhhet6D5G$~cv(__VvRlL^vd;b{qFDrdM zGnY-r>~h-hvC2mO?KczGMI|4c zHmEJsa$~=8SxH=^?GAtX1?M-FHYTt8`wxFx?KVv(+Hq?ZquNi#e|EoX&&_&NsUNOf zJG*gTVDH1Nb2yT+uRq_ue!pPB?^jn>A5Zt5ZmjNp+Dbp{g39k2M~Mz5saF%MOIm9B zv@SKwSz7$iNAAzFXxYvGKI(1F3N=%@Jh!EVC2ikl^JP9#?pglEp-I~E)8@vrJl8uo z$JXrHnp*k2b{4X!lhu5GoL#;C;cyewr7v$wdYCRC_Vo z@V;rDAMPsLIrjfy^w%fX-=CY~FUIz_>hbYjHS62m+cNVHti4@st1s2t)>7fF{^F+| zkMuvD{Cz*e0&b^oj5zV)emi5E@Sl~<)mf8GpFjBc)p73}{cqU~#V2}#6`x-1`_R{& zRR2b8OWeZL!^d=HndM5oI(>h7&b>V|Ig{NAt7gocrMGv=NiI|IgKICmmoEzAZc)wH zSuQ#MyFA~klM)sW{=YfQ{^I6lb=@eF^lO6UzeCpZ-j;C`)lEF{emUc|>s} z{LCJU+^QA&wf8?CI(_-)i;9+Z<`vNuEC&{-^6)KS`xtQ6^^Bd>I@Pxq`<5)bH+$>l z@4~iKUlydTomCTc%;w!1qx`~#7h75s*%r(_?NU5Z^4a_=hFLKg+ivd&7ZDTNlzg0T z-`{W1US3yzUp0~9Rd(xt-27ho?w{md?e}~i+2^ul&TKDHdeOVh=r8wyL&6`9eRTPk z{+>}uNo(3(fBU~vw8PgeDC|_w)zW(O^?E#iXz|}?yWj6iKH4S9BWEKq`Q(vRp{pzY z{d~SMK0bEN?YFnLXWm|B`ug{@UA=!z#Sez+cdl&i2z8fWS z9=-}aZ)5)R=T8ZqSMw8|pPRcfZm-s(H+PdaE-dGqp3$hF7V)+3@bj7G%MTkRIorFIN4KAuDtPIv zpO;R-1F1h1w|(5)+O8Xgt)BYkP0puJcQ)(9?08`57#9_FYL;pCoxYbPR+lba>geRm zO^HrSRQ&z@{qY2Y3(I_^dDxgQFZWMBH^=hH)2E4>Z?1^lZ6>VlS2E4M-~ofx+&;71 zTL~t=`gThiJ<+VH`@k69ox1PHBLViMOxI;@zW>$wN$Y=I%rnMY0vG2k)efuH-CX%O zjf;yb*rmc z{qLxF{Et6=fq{a>&(AI0ut8vL*y#%ko#&Ru?5~^a+AS6s71b5DKK;pwiC0!UlvB;$ zeDlYr)B1O}{AFZjGe|upaS}%iqboy|wl8g>S;b!kW5YYl6h}*V4krh}0ra z-EXed$D8T%4U>=YELyx+((utbqhB|Y`#=7CKL7L6>G45Jy+r3#K9lT!AHFtfs&@Fg z3K@M3jSo`l6DCY}aMkL>>C?(am&*V6PS=aoFo?Wa&s)b;^yszGj7DRt2NH^X9Cjtn zhm~JGUEks3akg@f0X3W$ojo?g~_v*2Gw>&(kcDnb^k9Q*#ZwixKFajOy8KkuLQu|C=8 zyq)j&{qDQHJ%6`s^v)tx?`b-P)@GHTQg)TTepcqQ{PM+pwZ9j*zO7iiWy_SE#m|eL z_idRodGcgQ!z7ldwbwFbUwo}vzAfKqCMd2yn_pcO+C5R(J?sT*?dP-qA06-IzWF2B z<9LITg4=S9E?8*T5XU z_{-)F!A>UX37a3jVf%l1!_6F>*j-nW^%f}Q?zg$MCDZxc+X;GNTa>0hw~+r47V>=m zxA|RTW$LK7IOh>g%tm?QV+~R(4O&6XY zb)_To^0J+K6SJ02I_ww|BeOmK{<9k!lTEVKwsW37cTUaD?%wLs1=FVKMsF&AA9v>2 z1fOg3!bP4M?Pzaa>y*bOdS!R^#t5cO|L0e|TB)#2&BSNE-Q7&t8#!i^CQbTrb$y*^ zz}%H9SHAfAD}bXx^5+`Ha>fYWo+XcXs_FuxqJGKC|6YFmHFMpAR8L>uqbXdSq5(WL zPk;2UzP7*BD1X2G<(d0B`ug~8t(yPe+a&Lf#e?nkN=k=r8!S1RTD$Et=k3qOYI{ut zpLp(O2nn0X7;^mR-}*b9{r&tI3)dV>IFPh4q4<8nL9R6=PdHfoch?JE(&lKmnd7$l zs*tpFx8L*niY~Xs3tcm|-u$1jCsl4GN3WZ+iwg@UC+EFAi&_sXU&nsR?kew;PQfiV zb5vARF6^x?4_hDi_WF(#1BpXI|4JVmV4S8CdFG_B`;L;AMmN?xc`BZ~vFf(p9k;-V zos)vTzcaNu)o@UtaeHLpUcIIn8Ol<*ESj1pO)_t_2`bO$-kEoKL!$Gy_xIz!>FSBE z4LiLh^K!-ez2EoPY8!vZzs{V;v_PXPlEaXHMpJFmiL}jy&(265>y~K4^KO%p##f2D z&l;Mo!O!(KzkMM1>r32;%g*hemY4sN+Vr#Cs`OQYfkeo9;|niKdgSfzWs8U!efu2W zwP?p*qx|hp_BV>h@Mmm|nx-3l?8?euN%OopyRIp>PdJtGJK*qC?Qn^2PZET@^$W9> zv_4^E*>|zotM2cL&N;U}9H~0^LEi7fOYzekeSCFM7p+QPt@u{y;^Gppzpl3G>#L(D zCMxgUyF}{2<4x?gS87}X{giB*&;7fcw6WmB1IH38S$~_4Ew3`JU%GT@!WV|t*4Cb1 zPxUiA^!~pKciJR&gCl40BU=`xg$$Y6xh-lJH@yBRD`uT;$u0NZW zd}T$Tj7`Ob=>A03ZQ5N$yWVidm)-L@)zaEEjeCI8Ar)ov8=cGtEyvKQnh@#EFv=EiXrH$vF7)^YgoUPXby%1<&@pyC+Va z`o!^$W6I%ne&f&l#u3*}``qnPJH6%vud>W+Hx&lci8lovP3(RoyZ>I#oA;k4R13y3 z|H-I2o%P|nyN*xwN7kskds15x&u5q*+|1Y=s=9{wjrc%7U zQl^Jej0%5lIxeQ!dO&;Mx`&sqF4s7vm9l5SWwxD#&UtUA&YJZq#7{|C*-)zY%gf8{ zD}$Fa8RXxyQBqd!?B<>qZmF-|-+8`2t;krrKRiwJaBj-?z5JGa`3`x1cOCmzx%%%N z%|BH?`0B1+aXTNi)JMwRY=z#P6)QAKtYqbDJ}|m1p13l2`K8_E`8;gRo6AjS`j}*0 z>A1Z;f4Zq;?g35LK%2!eZ$qBEuH~H0cSZ2*tQj*pZsvgE=+7hZ{Rw}5e3Y>)YI%Bk z`sIzu?$6H6^`386yQA{*^)|bIpKpiPIhTGm?XR)=F8ukDPmJ~K!}tGv@(XyiIYQ^o z&f@mv^QyXb7C*nV%vbu^`T6Hp1}~Q|PUCTI=PQkpzq&g7dqhZcO_~0*^4=odWY@q= zEdtREb`AGFUORsDXyVqWmseMdYlp2-Fg2aZDXg}mwM11_b>i&V-gR|#2M+Siuld9| zd-Jv8gbkj{w(RitG&peS-O?rJf6n0Rw~1QWGHKl$n@XYCXWiCDZSCml0yWQgWGp7k zwJuj`QLwk4KhL&$Q{rJZ9yaI5*K0&h1c{`2S6&Zze1C33$kHztFJ6q$5lc!=zWDlU z&aEw-GmX=$zJ9m=aDe&9@#B-{&h`EO@9*CqH{a#l+|;@~?T`4(y*gKRf443O^Jtec z_#LP{S*_1~%|ELJ0XuY~w_Vs#n7lnBz5USidGpTAv#qZ9{dW7xVE1>QR$tBP?CB|S zQJOhXv*Gm8L*G3Er+oGhK2-GloUC5l9*?bAS64)B)d~y@v{TnHk>b6(yFC5hpPyNE ztHb-`?a#FoCRctJ)b4LB`I=NP^TL&5OOC0{t4*8X{$p2^ju`j+x?h@icb9*UTvqk< z)r%6V8Ho+M>|yRTc~y^k`A=|mjZmV3M6VXL@}+M}YPq8aA-a^BN)6qS{m&&{>| z{IFgA)7R_q$y=jxPt28YGs(QP-y`HCrvu^;9&F4 zl9xi+*Viqr`}->;CFR1#WcTOa!`4O}?Gn|F*j<*p^B;5gy7>L)HY6TiF-ze1qC@ z>y$ z*m^zgaE8gG62sYH_iH=ug_NED{#$sqT9dq#?OFbnhj-4Me!fT2xTCZ4;p2Y$vcBv4 zemt9PwX6}q~kzkhlD{e2*TnKL_2rYu@<;_UZWj+zx3 zUH-fG>#S;HV7IiioZYBCp>l_^Ltm(?tE-HC-5h3iz6sN&xm8tJS(m*@IM~E0A}(&6 zbHjj(i))5qGTZjNyNePJw;egY`}uO4@^>mC`)N$X;FZ>srOly-Jj>&={JC)MX4Nimu@bLPp3%I+FEIy%<= z2~O{#|8bkf?q}X##Zd6hpiD$w(v6pm*=%+%pRCn|t=ZvxvQ|gFy}kYN#zy7b+uKq< zKRYX9QPA+~>+9hCb+v24w4a}w`}oXE<1M+jr!AjfcS|z%b?++k;*7cyz0ka>fG|M@ z1`b)!T7bIu;k);K{3Tbh_Uv5|v&ISH@%_nXj}>ffd+*y+{{G(CPft%<7CvHGxpJk7 zx_a`)h#wEzPwSs)cI*qRQ z{Equf3<@n094SHPqL{*M9Ro#*ii_t~Ic?9od*St0zw=37UtP_-x5x78>hLWK-^Z@H zYvI;B`Si-t)b%k{Pt?PtZFabvo^Kr?DS2SgQ|ZvzMb8#G#(2Hz@m;*m`sCTOs_N?P z(&l*rf`SiA)~t=)y=~FQyW&R=7`O)RNx!er?#0Q_AdqBcz$f}UTdLPBDJdyHo z57xK6@rt?Ef5mop-;z7B65e?$|J~ab^WvN6m({D&YwiEXY+rher6{}nSo-c=_Qw^1`5^#(du9PzxTB zBg+cbR(Tgq-c?|`aq6q>ccrK6$EW@M^)=_lhDJ5tSr;~^`-5V9n(n2{=kCicI;E%_ z5pWIEO4SaJVqjt}jzCYmE+- zE?yjE?A6owUZwWa6VI^qaj`Q$-jzOjVz1mT?XIAgK1__D09N9=(R!!q*!q+IKYeNG z>EW>|c_DD&)2dAw8y1>B6%L$re!)fkPqSZM{`qS4RTEFoCqE}1Hh7t2@G@Dk z{po3GMPFZqnm*ob?lo~`tz4jps={rH2O%w8i=J>QRx$i;jQV#ab8D2Qrsl&hFE9W3 zJpaFnmDMao=QaUh;loX=+&|uIKHs!R-D1PSg(33CTeZtIbhH*ZHnVNXP`v&?)Q#QT zwtT{|^8AQ~)hEpD6OMZX6a{K^6}fUuY>O!jn(Xz)F(4+!r?Aj)e*Hg7sou7_zrQZ7 z2vpvdclXru`So%lwg(SBJw4q}syAeHSTDPLjew%dfzn;q-dgSJm$RMa+|FlM{w~Hu zsyBY-k-Z5_>lk81TtE6agm5-JV+#~{s#BExOor)%Rai`nPhg;6_VsnC-`?DO@wH0L zXU2iEv&|*V^FZayqvi9Nyyum_y=5vSEX*ibF?0I#=ec@!_5J4AoLm#Rd4^S~ma3|% z&rBoM)mKlwxw-k|sZ)!#Y%#ge9^dok+ik6`Psy&WSB0+RZ0TAQBkoklycVg;(-@ebbL_KD2)zz8o2AZ0jYr{?-?H13xvtwiY z*ByQD&GYXq@t<$ECGYO6GiQ7@ZQ7(|y{~#Phvd{7{((~#Ec?b=WtHR__^DN(wo$+F z9*Y9YgLUdPUoN`4xVr9q$=NNgpZ4HDW8F*6>+52Rxfz1}XMtC7F4Fg5%OOZNm-mF?DQabiw6Zf@f4LMo00PwqwTE?awfzCq$4 z7Ct$f6F)va*8ZYCWy+KtPj$RJJT$`D3vRrx{{C)h_4ju^GmTn%rOmBa5BmR(OB}K*G?x)JejT?1hc3g1wFHmVM6OfjE-Lt&B=e-k$kdV-e zySqU{m1|;l3QayKvO+Ch&g{vn7XF6&t*cJ!dsl4JbX#ZR#>dGN(eOo_#dc?XV4$F@ ztE*1rCYIS}-PXtL&A7M6GJ1PnsnxWu?(Vx^SQcOOaCBtk7S}7e^*;G{-_rw)%;)~p zE7p8asQop);rSJ}Pb}RV*dw*OHu3IE{Q7>Py^V_J#qREIO-)TjZSC%xo70&M%HBk* zi`{+f>}>P9RSbLM-ha{E^WhNplqpj_+^c@SG4t}Wgd6XlCOYl=y18N5!@3^=$K(!( zR_A}1Cy*prWLf3kWTRtIu;$Xu?fLTUe6ow;_Exs_&k%^%FcVdqKy7*tjvlo{!8jEh-h*szMUx~B-GK@cPzssX={|GuCA)S zet%Qbg=gv8gIm75*c)+iQEx#(JVyhwqD%M#e-Hgd^9r*7ZBq zvm9s?SY-Mk-hpk?Zl1qGFS*WnKP6cL)QK@Y=n^=@utd3?oz=r_U*X1<_2nCs4sTf8$bG;oWzyNV3ukQLRJFHe)aVvi zWOjk|Mc)7H4w06m6n;V1r)RyTgR;$)*9vn7HQ&$rfBWHyU4M(8rt34@6L7lXJZlQS zVzQ_-^VY^J2hk-#k_Ycf920tSSl3mpb0^~yrRhiKyQFzp%JJQ=+3_IdO1F0 zDyzitkLS--=RA+NeNJt&?)U4STW(}#=BcMO#?IJ0d+!a`AM9E^N)s-vc(9yC3 zRlA!c6y-cxUubEzB)hdtT73CT?!LTl>BTzRoA*`kzHu&Q|L*4xf7Z^wfAsT}mc)#` zT}K}=@Fiat_O*&O_o_8cm9c-&ZNO9iXTBnj^XdsYc1MLK<$j&CGh9W#%=?%8)FnYe zI*(M0LgTYav&CHZbVgM?E|ii>C@{X;|KVNYgoA-|^u)R)*D!qGoR@$1#5%F6-8-30 zWln$o#BiK{BHy(p{>P863N~BB->u2CpPs#POROW4dWGKt^2x8~*7{HvyBv-g_jr9HCAczI*(!kw27-8ZiLo3Q@F zmHD9#Q`~~qKI#)+V$45t=FE#XZY*2=@q(9qpRd1vc2?G<9knxp=ZEWha$S^Ku$JM~ z>({EDN`1+NGTxJ1tmaNr>3q7*@wLd(;FTdO*R6ZE^5@UWt+}1`c{>r-gIMg^KwOxNhxac&&%K3nC$*)DKk5(W5TP~lewnf+h}UB z`t>)bhESf z3cj8~~~`;SJ2>rLtD>zg%aj!paDw{PEOt-8OX>bClaC}(HqwEO#NKmD}X zQT26|ar(I#bLYk$Nw3i7In4Erd6kw}w{@Yw`9--~Z9Ctu-SgT1_4EJC|Gs};#(Ft1 RgMop8!PC{xWt~$(696EnfC>Nr literal 0 HcmV?d00001 diff --git a/icon/icon_16.png.import b/icon/icon_16.png.import new file mode 100644 index 0000000..fdd7a6a --- /dev/null +++ b/icon/icon_16.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3kya3ay6sj8j" +path="res://.godot/imported/icon_16.png-9a88273f0fdae14e83722888485425c5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon/icon_16.png" +dest_files=["res://.godot/imported/icon_16.png-9a88273f0fdae14e83722888485425c5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/icon/icon_256.png b/icon/icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..4c2a051ec4ef1e1e2a618cf3bf19e3263c91e767 GIT binary patch literal 21442 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 literal 0 HcmV?d00001 diff --git a/icon/icon_256.png.import b/icon/icon_256.png.import new file mode 100644 index 0000000..5a61a86 --- /dev/null +++ b/icon/icon_256.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xesxabnthe5w" +path="res://.godot/imported/icon_256.png-725d87b0722774dce29a52cc6858a9bf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon/icon_256.png" +dest_files=["res://.godot/imported/icon_256.png-725d87b0722774dce29a52cc6858a9bf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/icon/icon_32.png b/icon/icon_32.png new file mode 100644 index 0000000000000000000000000000000000000000..1d795d566c3025df074f9cf9fcb223e49e05ae47 GIT binary patch literal 1875 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9FLZ6M6};=z7> z1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<|39(cMqhD5Z^ogV8G z{ams^US9qHdvoIq22*=B;V#cchJ~K)hn#M=@GZ)TUs@79%Vl@O_SlfiyL>0_QeC^P z^rr99yFPDye@$N5TQ>D&MlQ$NS(>R6czFZ7q!b!k5_paz9{JPUd-mqhjl5=U3-(S@ zt$+XhpUv~%wf4;dO>a9^t;#%*xj?Fb;iiMv(y1-8gDXrwFnn*2d!Vd%ckm3l)w z!`fA=#PYZuLa$mq;0lmGujtrxUF+JdtJk*v|0i1U{cA;>3{#ZTMss$K+MksRbn+w? z6tT~Ey0z@B--^@M{%fmQ{Il8fp?Al+)C26RR*4;FBDT;zwr6m2Pn+JmNRw%2VGxV4{G|H;d@^XD=+v&DRG;c;q6eR<($ ztp>;0dS~4w%k#Jb`Ty8)DQt1@I}-KpDW8heLoee$TV$lZy%Ja-%g(!iqjn~vtD6IB z+5wG&>;CvMGQ@?2ZcX^hF-P%S7JEfK1J8lmzYiL4+yCL)^GoZCA9J^Zasr>^`4)wk z3DdW#Ht&~w^7c+jN-ZrFW$?UY9&!79oRYzfgDdNgn3f;i+rvgma;sj0c+ZXQEeSlEoYb5ry3 z`1apFf9aBtTtEBbiybPS6*h9yrcGO6TQW(s7f+N$TyeUU{)H^#nf7IBeL>@~q zTByOLt*y=Q<8K{PBSWJD!~Xl{4;^CaTBLB=Xp+i84K8kOZWVQPXhIL6|4W1oVh>sHlCTqHtCbfZ@xU8k1|UqO3Ot~J9+x_<9~mD3meceh%*^#7;^M|8CM|dKmM>Y7;=JHm`Mn26cXBV0=V+RHg42URqHU$w%+uSeEI&;) zU;O9P>C-3ApHD9-nX+ku@q6j_ z%#wPSsvv=NOl}G`%Ebq?A~*{&elY$2w`4|o-`t)bYU=8juUt9ueE%LW;L8PoBej@s#RKC+}wp0G81cK zr)oZYv)|#`;ddSn{{P}xqMD(y#`>Jv<}3+~-;B1CrDiSLxNFy`A3rP(A3j`CTKceP z=dA`e#TI=o1(v{uIKlVZqSjuyawQ-x&Mz}lbLY;gofE8{E1muk71Z_2DwQ?pr%)6>-%et&=8|ALL3T~bPF(e~}r-@VJ5Hf`FW*xCcyP961Y z&!?AI%?)JmTV7m}kl?_Y)o{o`;lPa>5fwi^RPAMHb~G|JR!*<;^W&?nt=+PH`{hfQ zoU*gEm6erQm>N$QG3?WB>ClYcRyS*A!}f;BE?)kzIcCz;-{1Al>B`$~%_O1x_<-w! z-Vbx~r4wX57^@g>`uN;kp}{q4*~UG49^QP;7S*u5Md01qNA_X~vL0FmT(wy;FBS{g raXz~!zo`7;{O9uAiqEzSf3FXAiQQG^#UIGPz`)??>gTe~DWM4f#dTh7 literal 0 HcmV?d00001 diff --git a/icon/icon_32.png.import b/icon/icon_32.png.import new file mode 100644 index 0000000..2026fa7 --- /dev/null +++ b/icon/icon_32.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csq256dwcqo71" +path="res://.godot/imported/icon_32.png-360c5e82de26f3e18ed7a1d99cefade4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon/icon_32.png" +dest_files=["res://.godot/imported/icon_32.png-360c5e82de26f3e18ed7a1d99cefade4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/icon/icon_64.png b/icon/icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..d1b48ede8c365da86290ac6b101e0e4c4a7366f6 GIT binary patch literal 4534 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 literal 0 HcmV?d00001 diff --git a/icon/icon_64.png.import b/icon/icon_64.png.import new file mode 100644 index 0000000..fccdf53 --- /dev/null +++ b/icon/icon_64.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ibdflrgwcv8c" +path="res://.godot/imported/icon_64.png-8b81ba0bc25a001564678869cd5c053c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon/icon_64.png" +dest_files=["res://.godot/imported/icon_64.png-8b81ba0bc25a001564678869cd5c053c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/project.godot b/project.godot index cafd1b5..003084e 100644 --- a/project.godot +++ b/project.godot @@ -12,9 +12,9 @@ config_version=5 config/name="Template" config/tags=PackedStringArray("library") -run/main_scene="res://game.tscn" +run/main_scene="res://Game/game.tscn" config/features=PackedStringArray("4.2", "Forward Plus") -config/icon="res://icon.svg" +config/icon="res://icon/icon.svg" [autoload] @@ -31,6 +31,15 @@ window/size/viewport_height=900 enabled=PackedStringArray("res://addons/fps_counter/plugin.cfg", "res://addons/godot-console/console/plugin.cfg", "res://addons/sdg-print/plugin.cfg", "res://addons/gdUnit4/plugin.cfg") +[file_customization] + +folder_colors={ +"res://Game/": "blue", +"res://addons/": "gray", +"res://icon/": "purple", +"res://test/": "gray" +} + [filesystem] import/blender/enabled=false -- GitLab From 760f13d8a6779a0666d25b600450e9856e01c56c Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:42:00 -0500 Subject: [PATCH 03/12] Add CI step to replace icon for Windows --- .gitlab-ci.yml | 12 ++++++++++++ icon/icon_48.png | Bin 0 -> 3216 bytes icon/icon_48.png.import | 34 ++++++++++++++++++++++++++++++++++ icon/readme.md | 20 ++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 icon/icon_48.png create mode 100644 icon/icon_48.png.import create mode 100644 icon/readme.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad55a50..1b64127 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,12 @@ build_internal:windows-debug: <<: *build-internal except: - main + script: + - *build-internal + # Generate an icon from the provided set of png images. Replace the Godot icon with ours. + - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png + #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe build_internal:mac-debug: stage: build @@ -157,6 +163,12 @@ build_release:windows-release: BUILD_FOLDER: "windows-release" EXPORT_MODE: "--export-release" <<: *build-release + script: + - *build-release + # Generate an icon from the provided set of png images. Replace the Godot icon with ours. + - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png + #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_RELEASE.exe build_release:mac-release: stage: build diff --git a/icon/icon_48.png b/icon/icon_48.png new file mode 100644 index 0000000000000000000000000000000000000000..cd1be97a31431097c5f058d6bb4b6586c44f49bf GIT binary patch literal 3216 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 E0IO3JkpKVy literal 0 HcmV?d00001 diff --git a/icon/icon_48.png.import b/icon/icon_48.png.import new file mode 100644 index 0000000..78b774e --- /dev/null +++ b/icon/icon_48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clvfcjmwfyulc" +path="res://.godot/imported/icon_48.png-54429ef63e259cab63cbc9e50a865476.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon/icon_48.png" +dest_files=["res://.godot/imported/icon_48.png-54429ef63e259cab63cbc9e50a865476.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/icon/readme.md b/icon/readme.md new file mode 100644 index 0000000..861d224 --- /dev/null +++ b/icon/readme.md @@ -0,0 +1,20 @@ +# How to have less files. +These icons are automatically built into an icon file using the scripts in the `godoticon` addon. + +If you don't want this many icon files in your project, you can replace the command in the `gitlab-ci.yml` file to just use a single icon. Look for this part of the file: + +``` +# Generate an icon from the provided set of png images. Replace the Godot icon with ours. +- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png +# Alternative command. Use this if you prefer to only maintain the 256 size image. +#- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png +- godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe +``` + +Replace the `CreateIcon.gd` command with the version using a single input file. Note that there are two jobs that need to be updated: `build_internal:windows-debug` and `build_release:windows-release` + +Additionally, you can remove the `.svg` file and just use a single 256 pixel `.png` file for everything. In that case, switch the `CreateIcon.gd` line to the following: +``` +godot -s .\addons\godoticon\CreateIcon.gd icon.ico icon.png +``` +This assumes that the icon is at the project root and is named `icon.png`. Point Godot to the same file for the simplest setup. \ No newline at end of file -- GitLab From d6b032ece3895dab4de60ee0a693bbf6ef981167 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:47:11 -0500 Subject: [PATCH 04/12] Don't call script anchor. This will probably fail --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b64127..32d0af5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,8 @@ cache: # ================================================================================================================ # Job Dependencies # ================================================================================================================ +# =+=+=+=+=+=+=+= BUILD COMMON SCRIPT STEPS =+=+=+=+=+=+=+= + # =+=+=+=+=+=+=+= BUILD COMMON =+=+=+=+=+=+=+= .build-internal: &build-internal image: $BUILD_IMAGE @@ -115,7 +117,6 @@ build_internal:windows-debug: except: - main script: - - *build-internal # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. @@ -164,7 +165,6 @@ build_release:windows-release: EXPORT_MODE: "--export-release" <<: *build-release script: - - *build-release # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. -- GitLab From 265687f5a0489d217c717ac8d2be17d626961fce Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:51:02 -0500 Subject: [PATCH 05/12] Skip tests for now --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32d0af5..cb51470 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ include: VersionInfo.yml stages: - import-assets - - test +# - test - build - pack - deploy @@ -26,11 +26,7 @@ cache: # Job Dependencies # ================================================================================================================ # =+=+=+=+=+=+=+= BUILD COMMON SCRIPT STEPS =+=+=+=+=+=+=+= - -# =+=+=+=+=+=+=+= BUILD COMMON =+=+=+=+=+=+=+= -.build-internal: &build-internal - image: $BUILD_IMAGE - script: +.shared-steps: &build-internal-script - mkdir -v -p build/$BUILD_FOLDER - echo godot -v --headless $EXPORT_MODE "$BUILD_TARGET" build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION # TODO: Remove the retry mechanism when I figure out what's causing it to fail the first time every time. @@ -41,6 +37,11 @@ cache: fi - ls build/$BUILD_FOLDER - test -f build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION || (echo "$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION is missing!" && exit 1) + +# =+=+=+=+=+=+=+= BUILD COMMON =+=+=+=+=+=+=+= +.build-internal: &build-internal + image: $BUILD_IMAGE + script: artifacts: name: $EXPORT_NAME_INTERNAL paths: -- GitLab From 680ae9001621b085ebbcc702c275026dffd53c85 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:52:09 -0500 Subject: [PATCH 06/12] Internal script --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb51470..a789532 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ cache: # Job Dependencies # ================================================================================================================ # =+=+=+=+=+=+=+= BUILD COMMON SCRIPT STEPS =+=+=+=+=+=+=+= -.shared-steps: &build-internal-script +.build-internal-script: &build-internal-script - mkdir -v -p build/$BUILD_FOLDER - echo godot -v --headless $EXPORT_MODE "$BUILD_TARGET" build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION # TODO: Remove the retry mechanism when I figure out what's causing it to fail the first time every time. @@ -42,6 +42,7 @@ cache: .build-internal: &build-internal image: $BUILD_IMAGE script: + - *build-internal-script artifacts: name: $EXPORT_NAME_INTERNAL paths: -- GitLab From 0989d72770b9bc543715d785a1ab20e67e4f5704 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:53:12 -0500 Subject: [PATCH 07/12] Skip tests --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a789532..afd2490 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -200,19 +200,19 @@ build_release:web-release: <<: *build-web # =+=+=+=+=+=+=+= TEST JOBS =+=+=+=+=+=+=+= -gdunit4: - image: $TEST_IMAGE - stage: test - script: - - ls -la; ls .godot # Cache test. - - chmod u+x ./addons/gdUnit4/runtest.sh - - xvfb-run --auto-servernum ./addons/gdUnit4/runtest.sh -a test --audio-driver Dummy --display-driver x11 --rendering-driver opengl3 --screen 0 --continue --verbose - artifacts: - when: always - paths: - - ./reports/report_1/results.xml - reports: - junit: ./reports/report_1/results.xml +# gdunit4: +# image: $TEST_IMAGE +# stage: test +# script: +# - ls -la; ls .godot # Cache test. +# - chmod u+x ./addons/gdUnit4/runtest.sh +# - xvfb-run --auto-servernum ./addons/gdUnit4/runtest.sh -a test --audio-driver Dummy --display-driver x11 --rendering-driver opengl3 --screen 0 --continue --verbose +# artifacts: +# when: always +# paths: +# - ./reports/report_1/results.xml +# reports: +# junit: ./reports/report_1/results.xml # =+=+=+=+=+=+=+= PACK JOBS =+=+=+=+=+=+=+= # Contain all of the builds in a single artifact so we don't have to download all the things! -- GitLab From bbc189401aac5a15de07b188621bfba701da107a Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 01:57:05 -0500 Subject: [PATCH 08/12] Headless --- .gitlab-ci.yml | 12 ++++++------ icon/readme.md | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afd2490..25ac9e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,9 +120,9 @@ build_internal:windows-debug: - main script: # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png - #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. - - godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe + - godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png + #- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe build_internal:mac-debug: stage: build @@ -168,9 +168,9 @@ build_release:windows-release: <<: *build-release script: # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - - godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png - #- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. - - godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_RELEASE.exe + - godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png + #- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_RELEASE.exe build_release:mac-release: stage: build diff --git a/icon/readme.md b/icon/readme.md index 861d224..773746a 100644 --- a/icon/readme.md +++ b/icon/readme.md @@ -5,16 +5,16 @@ If you don't want this many icon files in your project, you can replace the comm ``` # Generate an icon from the provided set of png images. Replace the Godot icon with ours. -- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png +- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png # Alternative command. Use this if you prefer to only maintain the 256 size image. -#- godot -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png -- godot -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe +#- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png +- godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe ``` Replace the `CreateIcon.gd` command with the version using a single input file. Note that there are two jobs that need to be updated: `build_internal:windows-debug` and `build_release:windows-release` Additionally, you can remove the `.svg` file and just use a single 256 pixel `.png` file for everything. In that case, switch the `CreateIcon.gd` line to the following: ``` -godot -s .\addons\godoticon\CreateIcon.gd icon.ico icon.png +godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico icon.png ``` This assumes that the icon is at the project root and is named `icon.png`. Point Godot to the same file for the simplest setup. \ No newline at end of file -- GitLab From 5b3efa42b0f057f188090ce8075021e91c3d2928 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 02:02:06 -0500 Subject: [PATCH 09/12] Build-internal should be building now --- .gitlab-ci.yml | 15 +++++++++------ icon/readme.md | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25ac9e6..1307823 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,8 @@ cache: - ls build/$BUILD_FOLDER - test -f build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION || (echo "$EXPORT_NAME_INTERNAL$BUILD_FILE_EXTENSION is missing!" && exit 1) + + # =+=+=+=+=+=+=+= BUILD COMMON =+=+=+=+=+=+=+= .build-internal: &build-internal image: $BUILD_IMAGE @@ -119,10 +121,11 @@ build_internal:windows-debug: except: - main script: + - *build-internal-script # Script block overwrites build-internal, so we need to call this manually here. # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - - godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png - #- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. - - godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe + - godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_16.png ./icon/icon_32.png ./icon/icon_48.png ./icon/icon_64.png ./icon/icon_128.png ./icon/icon_256.png + #- godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot --headless -s ./addons/godoticon/ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe build_internal:mac-debug: stage: build @@ -168,9 +171,9 @@ build_release:windows-release: <<: *build-release script: # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - - godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png - #- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. - - godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_RELEASE.exe + - godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_16.png ./icon/icon_32.png ./icon/icon_48.png ./icon/icon_64.png ./icon/icon_128.png ./icon/icon_256.png + #- godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - godot --headless -s ./addons/godoticon/ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_RELEASE.exe build_release:mac-release: stage: build diff --git a/icon/readme.md b/icon/readme.md index 773746a..e6117ab 100644 --- a/icon/readme.md +++ b/icon/readme.md @@ -5,16 +5,16 @@ If you don't want this many icon files in your project, you can replace the comm ``` # Generate an icon from the provided set of png images. Replace the Godot icon with ours. -- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_16.png .\icon\icon_32.png .\icon\icon_48.png .\icon\icon_64.png .\icon\icon_128.png .\icon\icon_256.png +- godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_16.png ./icon/icon_32.png ./icon/icon_48.png ./icon/icon_64.png ./icon/icon_128.png ./icon/icon_256.png # Alternative command. Use this if you prefer to only maintain the 256 size image. -#- godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico .\icon\icon_256.png -- godot --headless -s .\addons\godoticon\ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe +#- godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_256.png +- godot --headless -s ./addons/godoticon/ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe ``` Replace the `CreateIcon.gd` command with the version using a single input file. Note that there are two jobs that need to be updated: `build_internal:windows-debug` and `build_release:windows-release` Additionally, you can remove the `.svg` file and just use a single 256 pixel `.png` file for everything. In that case, switch the `CreateIcon.gd` line to the following: ``` -godot --headless -s .\addons\godoticon\CreateIcon.gd icon.ico icon.png +godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico icon.png ``` This assumes that the icon is at the project root and is named `icon.png`. Point Godot to the same file for the simplest setup. \ No newline at end of file -- GitLab From 0dca4a45210a0e84e660ccfba64ebe8ced72445d Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 24 Jun 2024 02:06:58 -0500 Subject: [PATCH 10/12] More logging stuff --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1307823..f32e42a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,7 +124,9 @@ build_internal:windows-debug: - *build-internal-script # Script block overwrites build-internal, so we need to call this manually here. # Generate an icon from the provided set of png images. Replace the Godot icon with ours. - godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_16.png ./icon/icon_32.png ./icon/icon_48.png ./icon/icon_64.png ./icon/icon_128.png ./icon/icon_256.png + - ls #- godot --headless -s ./addons/godoticon/CreateIcon.gd icon.ico ./icon/icon_256.png - Alternative command. Use this if you prefer to only maintain the 256 size image. + - echo godot --headless -s ./addons/godoticon/ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe - godot --headless -s ./addons/godoticon/ReplaceIcon.gd icon.ico build/$BUILD_FOLDER/$EXPORT_NAME_INTERNAL.exe build_internal:mac-debug: -- GitLab From cc64d5106f4fed1fcfcfcaa006c4ef8d21b80906 Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 2 Sep 2024 15:47:36 -0500 Subject: [PATCH 11/12] Switch to 4.3 - should hopefully fix the icon issue --- .gitignore | 1 + VersionInfo.yml | 2 +- project.godot | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4709183..f89d046 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Godot 4+ specific ignores .godot/ +.vscode/ \ No newline at end of file diff --git a/VersionInfo.yml b/VersionInfo.yml index ae2ef65..c3e86e3 100644 --- a/VersionInfo.yml +++ b/VersionInfo.yml @@ -7,4 +7,4 @@ variables: # Stable is used for any major update that is not a game launch # Unstable is incremented for every other release RELEASE_NUMBER: "0.0.0" - GODOT_VERSION: "4.2.2" + GODOT_VERSION: "4.3" diff --git a/project.godot b/project.godot index 003084e..f462d93 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Template" config/tags=PackedStringArray("library") run/main_scene="res://Game/game.tscn" -config/features=PackedStringArray("4.2", "Forward Plus") +config/features=PackedStringArray("4.3", "Forward Plus") config/icon="res://icon/icon.svg" [autoload] @@ -53,21 +53,21 @@ ui/toolbar/run_overall=true console_toggle={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":96,"physical_keycode":0,"key_label":0,"unicode":96,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":96,"physical_keycode":0,"key_label":0,"unicode":96,"location":0,"echo":false,"script":null) ] } console_autocomplete={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } console_history_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } console_history_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } -- GitLab From cfb70e186550ee2e38a5f8f1e3850e732242d6fe Mon Sep 17 00:00:00 2001 From: Matthew S Date: Mon, 2 Sep 2024 15:50:22 -0500 Subject: [PATCH 12/12] Update addons for 4.3 conversion --- addons/gdUnit4 | 2 +- addons/godot-console | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/gdUnit4 b/addons/gdUnit4 index fae9ee3..3c7a658 160000 --- a/addons/gdUnit4 +++ b/addons/gdUnit4 @@ -1 +1 @@ -Subproject commit fae9ee372807d394582da11f36038d21b0b3cfff +Subproject commit 3c7a658f3f3f4e99abf572baec614cb8550c0d28 diff --git a/addons/godot-console b/addons/godot-console index c8ce18d..cd42c8d 160000 --- a/addons/godot-console +++ b/addons/godot-console @@ -1 +1 @@ -Subproject commit c8ce18d3755043e901e936ff50e9f8e264a4a22d +Subproject commit cd42c8dc3a5c131f7fd697a3f1ecec2e2760a8b9 -- GitLab