From de82e3f913aa6e7a1ba9bc1436d466bde08e0423 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 17 Mar 2024 13:24:30 -0500 Subject: [PATCH] Add artists to Credits screen. Modify Scrolling behavior of ScrollableWindowComponents so you can click in the scroll region to move the scrollbar, not just the scrollbar itself. Release Build 8155. --- .../ScrollableWindowComponent.h | 29 ++++-- Adventures in Lestoria/TODO.txt | 5 +- Adventures in Lestoria/Version.h | 2 +- .../AdventuresInLestoria_LibraryCapsule.png | Bin 0 -> 72752 bytes .../AdventuresInLestoria_LibraryHero.png | Bin 0 -> 92896 bytes .../AdventuresInLestoria_LibraryLogo.png | Bin 0 -> 33401 bytes .../assets/BlueSlime_120.png | Bin 0 -> 893 bytes .../assets/GreenSlime_120.jpg | Bin 0 -> 3647 bytes .../assets/GreenSlime_120.png | Bin 0 -> 901 bytes Adventures in Lestoria/assets/LinuxIcons.zip | Bin 0 -> 39304 bytes .../assets/RedSlime_120.jpg | Bin 0 -> 3747 bytes .../assets/RedSlime_120.png | Bin 0 -> 923 bytes .../assets/config/credits.txt | 98 +++++++++--------- .../assets/title_icon_128.png | Bin 0 -> 11713 bytes .../assets/title_icon_16.png | Bin 0 -> 4620 bytes .../assets/title_icon_16.tga | Bin 0 -> 811 bytes .../assets/title_icon_184.jpg | Bin 0 -> 17114 bytes .../assets/title_icon_256.png | Bin 0 -> 18287 bytes .../assets/title_icon_64.png | Bin 0 -> 7825 bytes .../assets/title_icon_96.png | Bin 0 -> 9730 bytes x64/Release/Adventures in Lestoria.exe | Bin 3427840 -> 3428352 bytes 21 files changed, 76 insertions(+), 58 deletions(-) create mode 100644 Adventures in Lestoria/assets/AdventuresInLestoria_LibraryCapsule.png create mode 100644 Adventures in Lestoria/assets/AdventuresInLestoria_LibraryHero.png create mode 100644 Adventures in Lestoria/assets/AdventuresInLestoria_LibraryLogo.png create mode 100644 Adventures in Lestoria/assets/BlueSlime_120.png create mode 100644 Adventures in Lestoria/assets/GreenSlime_120.jpg create mode 100644 Adventures in Lestoria/assets/GreenSlime_120.png create mode 100644 Adventures in Lestoria/assets/LinuxIcons.zip create mode 100644 Adventures in Lestoria/assets/RedSlime_120.jpg create mode 100644 Adventures in Lestoria/assets/RedSlime_120.png create mode 100644 Adventures in Lestoria/assets/title_icon_128.png create mode 100644 Adventures in Lestoria/assets/title_icon_16.png create mode 100644 Adventures in Lestoria/assets/title_icon_16.tga create mode 100644 Adventures in Lestoria/assets/title_icon_184.jpg create mode 100644 Adventures in Lestoria/assets/title_icon_256.png create mode 100644 Adventures in Lestoria/assets/title_icon_64.png create mode 100644 Adventures in Lestoria/assets/title_icon_96.png diff --git a/Adventures in Lestoria/ScrollableWindowComponent.h b/Adventures in Lestoria/ScrollableWindowComponent.h index 24786692..5980369a 100644 --- a/Adventures in Lestoria/ScrollableWindowComponent.h +++ b/Adventures in Lestoria/ScrollableWindowComponent.h @@ -186,10 +186,23 @@ protected: bool mouseOverScrollbar=geom2d::overlaps(geom2d::rect(windowAbsPos+vf2d{rect.size.x-12,scrollBarTop+12},{12,scrollBarHeight}),game->GetMousePos()); + auto ScrollToClickedPosition=[&](){ + float spaceBetweenTopAndBottomArrows=rect.size.y-24; + float viewHeight=rect.size.y; + + float totalContentHeight=bounds.size.y; + if(totalContentHeight==0)totalContentHeight=1; + float scrollBarScale=(spaceBetweenTopAndBottomArrows/totalContentHeight); + //The scroll amount moves centered on the position the mouse is at. + float newScrollbarTop=(game->GetMousePos().y-windowAbsPos.y-12)-scrollBarHeight/2; + SetScrollAmount({GetScrollAmount().x,(-newScrollbarTop+1)/scrollBarScale}); + }; + if(mouseOverScrollbar||scrollBarSelected){ scrollBarHoverTime=std::min(scrollBarHoverTime+game->GetElapsedTime(),"ThemeGlobal.HighlightTime"_F); if(game->GetMouse(0).bPressed&&!geom2d::contains(rect,bounds)){ scrollBarSelected=true; + Menu::menus[parentMenu]->alreadyClicked=true; } if(game->GetMouse(0).bReleased){ scrollBarSelected=false; @@ -197,18 +210,16 @@ protected: } if(scrollBarSelected){ Menu::scrolling=true; - float spaceBetweenTopAndBottomArrows=rect.size.y-24; - float viewHeight=rect.size.y; - - float totalContentHeight=bounds.size.y; - if(totalContentHeight==0)totalContentHeight=1; - float scrollBarScale=(spaceBetweenTopAndBottomArrows/totalContentHeight); - //The scroll amount moves centered on the position the mouse is at. - float newScrollbarTop=(game->GetMousePos().y-windowAbsPos.y-12)-scrollBarHeight/2; - SetScrollAmount({GetScrollAmount().x,(-newScrollbarTop+1)/scrollBarScale}); + ScrollToClickedPosition(); } }else{ scrollBarHoverTime=std::max(scrollBarHoverTime-game->GetElapsedTime(),0.f); + //It's possible to still scroll by clicking outside the scrollbar but in the scroll region. + if(game->GetMouse(0).bHeld&&!geom2d::contains(rect,bounds)&& + geom2d::overlaps(geom2d::rect(windowAbsPos+vf2d{rect.size.x-12.f,12.f},{12.f,rect.size.y-12.f}),game->GetMousePos())){ + ScrollToClickedPosition(); + Menu::menus[parentMenu]->alreadyClicked=true; + } } if(game->GetMouseWheel()!=0){ diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index ada871f3..27ddf9dd 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -8,4 +8,7 @@ Materials for initial craft seems to be wrong? need to recheck do we need a minimap? (maybe with fog of war?) Maybe polling that once testing with more people. should gemstones dropp from boss stages aswell? (Maybe lower droprate?) -Toggle for displaying error messages \ No newline at end of file +Toggle for displaying error messages + +Equip Gear using Start menu tutorial +Steam Controller SDK \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 2ffe284c..433834bc 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8151 +#define VERSION_BUILD 8155 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/AdventuresInLestoria_LibraryCapsule.png b/Adventures in Lestoria/assets/AdventuresInLestoria_LibraryCapsule.png new file mode 100644 index 0000000000000000000000000000000000000000..acde09fbbc76a03ed59b70c14ecbea455baaa926 GIT binary patch literal 72752 zcmeFYby(AF+c=H|79s{HNDC@3a9q;jbzwcj<94@ZUb)DDQ*BRGBwKVS2o@P2tMMXvX@PVQ> z71dD#Dyn0_C#fkT2)yQP%G;W+u7SI@r5C%iD;x}Qv}Jeqakgc*^@f0{sJtg4AHkeX zaGcyD-10qsT=8~a06IrvVNHhDvr!N-_|PU~faS;#k+`kG#FLek=}adLpU5 z!UZ0rrwO|lvhy*XuhZgeVO8>@uR@JkLGvBPCUK+Nw$%@&-*%yquxx@Rf=*$}>&;lq zZFrt&z)7yp1rO{36qT?|az-+AzV8UR+T&q!MK8K^i^ZJn2E%+Z&{}eNBbpAX2HVnI z1)+kS_g-*{7r$)Q756_O9L{~MXE5fHu;OL5pc}WjRUX4r+sf^0=r%}>t5?ZS4yqHH zkEF+XeBZbexJyNKBp9Ngp!HBe;V=hQH~SsQ*0U}eXFR6cDnqAunPE?pzi# zcrjQQYsINRa-lnT^;I)ol}G<_#I-X83eRSLwAg)btOY~B6Y8hip6oN?_FqvQZM@S6 z!OgUzrsR(7^}kKP5=V`JA2bJ3O#!aQgHcbym&RRRjya93M)pa4)n2%zK*@f6{dJI#LE)dnoBt*HDP1m&A7r@gzov$UX~ zmzS4-m#6^T)lN`YN=iylNJLOX1VEVqaPx6;xAX=$xp5tW_yt4J*3H@#;_MEAJFy?a zw6ubIxXW^KQl7K_g&)jWUHxC+o!owNfx-_#Z%b!EVF4jQ7)jcIo)jRz5&Fj! zZn_kk7Sy(NgL}AI+bVh5I=OTG3BtzuU+bMcTpfRsV`D97>u3w3Om(B|D*U%C?>|)6 z`qzp>7T7^x&OcXCnEkhz?hx?5ne{i^4xjua=TAf^%l`%UZ?pfR{pV!LEOm8hMYy%c zA$kuLWjPP`m$rdhLu{mfeiRcC6%r8nX}*+>9@HegGDrHzObKv+~r*xJ%o3T!1M z@dv1fPHyg&PS&=EpeVovAQU*FU`tUepb!uM6qXPH0L5*D09FzdIM%{ou&B6*q=-21 zPY{}}5QI{t~(At)OPC?N?UE1;;b6+qNdNE`r^5*Gnj2@8n;z?LE+QbOWj2@z4@ zpV-(~ODn@&VU`qeLSUA5wt~)1c0V5+GFugB^XgR-%7w^X!rx1|6T5&=pJ ziAoEL>k3Ori-}7EB>_TW(n5dChuc8FKL1~{56y@D_AjA7fVffi_xU;W%cgW}U4DK0 z_0prj~JQbNl1@6g@gV0SM|SKGUG6h2aTMN!b7ykfuk zTU59HKHtmU_D~KKmH~u>0YW0WLPFA_qS8PiPQm{L^2EU6w${QT0AZk&4FG6qB?+(u zTU!DoB}Ks^Ha3<(Nn7i`qx=7pJfQBOUWiGHi2QGm2ebl<+So{n0jw!D0008TDc-;q zYz+_<6|%Oq6}J_ZwEm@&|I&^B3Gzflq=kh4H^>tbvk{fB789lT6ADp4VX!SgN(3kj zu(FYow34t9m9!MM`k#}YDB#eZ#ic1GE&9KroM51Y6j<0&93U)ZDFgtD*xFE(6Kn$z zk+2jN22)JWS{V30P2MkeCH0r|ZVMis)_-}L+k*d>FZwm%kK>(Uv%khDVFM)!5&Tye z^4pjxn)d(l-)|rI|8fg<_Wx}1-{S9o*!3TF{kJ&q-cKwgB z>-4`18MaQ8?8A#vra0jE)I%w8P+O_qSERf@ri!K{H5!ypr<@-cx=~RHa2@_X;+-q+ zNg1SZf2giRvv7=_N>X?xq&0^!bk$wSz+C|jJIsfvekN(QHtb#ycYF53Bu)RxIYuff zcB+SpcXhodR?t3mton#~pCz>Z?ntu%%Er(lf`eM{!Vw$p6^jdB&OUsgaP&G@DXLk8_AKbA6#=pf*gb*fMPxL^r^D z+2H97(iqBL{*o*KO&B5j?|&RI?k?2HN9ka8_M30uTyRe(-=@uDx!*sEw&k0eVeA|3 zhpP;&SJI*}+XFkUz&0nBz;0K5Lc^*@S}@fyi{9*LY@fW(H?VbtFv-d1wP!sI-Q=~} zmesksIqC3;(oqH^dRLsZMM~e*KaSP;=GCuUNIzf58Lvx1m`uH5f;ZQZWx>u#W z_r-=^dNR`v3$5)q!r``hy?Xb<1adyi3#UvXafQ%SAyjY52#Wh@zJV~jPE@*J9A%Q} zc=vIOE5S#?!MXMoM#rp?k31eUU>Jn#D7pK}W4c*R9h;TNG6r;*a+)c-fBbMucHvS^ z0}-ps%qL%8%d3|2}{xB$Y zgs!miOAfY+lW2$BErT@A8hFi%yjmA2#K1v8?d{|2KNxRO*XcQlV%O9&(9w76?dQ#HtOFP) z*85G47~o9?HH^7214j9qV+i|QfYhe?L?3*KlrWLXKY|>dfP9?!maD;zy>+EmFYv6k z-^k11iM-_L+WNfSIHMB#UOirUKEo(eI7&?a^*#xAM^U|jd!H}}84uy|UjVs+|uglt`4 z)k(H$cMG<-mA9s6=&*7M)qaUh_ge+>r!FdV*O0@qO6Q9S759sPFD#Bwxb(5*DCPB+ ziVBr?IMu^kzVhEIj2$%T$GP_7U3?3o2`ms(Fb>|ZzFYC_RT-pgb`N!Kjsu^V*vT<^ z22#miSanPR{{|25$PV~8{@l$})nkUXta&bdCN-U$OvhAG-xRIB<@VA393c_gx5@-# znZZfFV+;oB2lc&rzS&R9NogQZQHB0pS`U|I1wu!_59xRpE6YA_bf1wyzKpU>n^HXqo z{NZoxnUrKI8FN{jcnzt{p)StEw?QkY@$#3Mjydn*SJ#omun|yeoJvq`LjLx1F&0s+ zA?;_??y&ZuFc=$*|6a9GK$%DSh0XrL4dRAZxI+ybPtly>BMudwYAhuPY#~0^J|*|L zp`WMth)L^`8BQ)}d5Ix>#oFFz0cB=m|I^;6kFy*iMkW1|XYN187Jdryj$fsz;K%gI z)CRZqGPZlXJKQN}8iX6V*zG?UcaWxkWFnEEc?w0`)R$0j1ZWY>^p9>WwBmz_hE^G-;m>b1DYRCcb#Mm z{Q6bI!X98Y#`|gp$wAP4!@I||L zq#VpU+fcqZ1_T%sSx;?Udm$UZ!SXJPNF&;7GURG{MgwnO0j4Q#iAyO?f8w_iL~}_U zWPHOz-IzN+s(GdCh*(#hxMxidwZ^l^^ZU+y)tMH5(Yxf3ntf}=b2gw|S#5UA4~3rH zx3@kg9+@+~j=B8ecw3ZgGVkkCqjHMXgXfv7E1C|%9dshKdVv5gtLzeQz)>;&*g~zB z_TsC#g`!t$