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.

Adventures in Lestoria/ScrollableWindowComponent.h

@@ -186,17 +186,7 @@ protected:
 
         bool mouseOverScrollbar=geom2d::overlaps(geom2d::rect<float>(windowAbsPos+vf2d{rect.size.x-12,scrollBarTop+12},{12,scrollBarHeight}),game->GetMousePos());
 
-        if(mouseOverScrollbar||scrollBarSelected){
+        auto ScrollToClickedPosition=[&](){
-            scrollBarHoverTime=std::min(scrollBarHoverTime+game->GetElapsedTime(),"ThemeGlobal.HighlightTime"_F);
-            if(game->GetMouse(0).bPressed&&!geom2d::contains(rect,bounds)){
-                scrollBarSelected=true;
-            }
-            if(game->GetMouse(0).bReleased){
-                scrollBarSelected=false;
-                Menu::scrolling=false;
-            }
-            if(scrollBarSelected){
-                Menu::scrolling=true;
             float spaceBetweenTopAndBottomArrows=rect.size.y-24;
             float viewHeight=rect.size.y;
 
@@ -206,9 +196,30 @@ protected:
             //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;
+                Menu::scrolling=false;
+            }
+            if(scrollBarSelected){
+                Menu::scrolling=true;
+                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<float>(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){

Adventures in Lestoria/TODO.txt

@@ -9,3 +9,6 @@ do we need a minimap? (maybe with fog of war?) Maybe polling that once testing w
 should gemstones dropp from boss stages aswell? (Maybe lower droprate?)
 
 Toggle for displaying error messages
+
+Equip Gear using Start menu tutorial
+Steam Controller SDK

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

Adventures in Lestoria/assets/config/credits.txt

@@ -12,56 +12,60 @@ Credits
 	LINE[9]="Music Design"
 	LINE[10]="#5DE2E7A2Z#FFFFFF"
 	LINE[11]=" "
-	LINE[12]="Tools & Tech"
+	LINE[12]="Story & Background Artists"
-	LINE[13]="~~~~~~~~~~~~~~~~"
+	LINE[13]="#A70002Scarlet#FFFFFF"
-	LINE[14]="Game Engine"
+	LINE[14]="&"
-	LINE[15]="#FE9900javidx9#FFFFFF"
+	LINE[15]="#D8F4F5Killer Rabbit Media#FFFFFF"
-	LINE[16]="#FEF500olc::PixelGameEngine v.2.24#FFFFFF"
+	LINE[16]=" "
-	LINE[17]=" "
+	LINE[17]="Tools & Tech"
-	LINE[18]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License"
+	LINE[18]="~~~~~~~~~~~~~~~~"
-	LINE[19]=" "
+	LINE[19]="Game Engine"
-	LINE[20]="olcPGEX_ViewPort by Gorbit99"
+	LINE[20]="#FE9900javidx9#FFFFFF"
-	LINE[21]=" "
+	LINE[21]="#FEF500olc::PixelGameEngine v.2.25#FFFFFF"
-	LINE[22]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License"
+	LINE[22]=" "
-	LINE[23]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
+	LINE[23]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License"
 	LINE[24]=" "
-	LINE[25]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved."
+	LINE[25]="olcPGEX_ViewPort by Gorbit99"
 	LINE[26]=" "
-	LINE[27]="Assets"
+	LINE[27]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License"
-	LINE[28]="~~~~~~~~~~~~~~~~"
+	LINE[28]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
-	LINE[29]="Pokemon-based Nico Yazawa sprite that started it all..."
+	LINE[29]=" "
-	LINE[30]="DeviantArt: @kirbysmith"
+	LINE[30]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved."
 	LINE[31]=" "
-	LINE[32]="ERA OF FANTASY - GRASSLANDS"
+	LINE[32]="Assets"
-	LINE[33]="X: @Namatnieks"
+	LINE[33]="~~~~~~~~~~~~~~~~"
-	LINE[34]=" "
+	LINE[34]="Pokemon-based Nico Yazawa sprite that started it all..."
-	LINE[35]="*** Minifantasy - Tiny Overworld v1.0 ***"
+	LINE[35]="DeviantArt: @kirbysmith"
-	LINE[36]="Minifantasy is an original idea by Krishna Palacio"
+	LINE[36]=" "
-	LINE[37]=" "
+	LINE[37]="ERA OF FANTASY - GRASSLANDS"
-	LINE[38]="Public Domain Font Authors"
+	LINE[38]="X: @Namatnieks"
-	LINE[39]="c64esque by andraaspar"
+	LINE[39]=" "
-	LINE[40]="Habbo by Omni"
+	LINE[40]="*** Minifantasy - Tiny Overworld v1.0 ***"
-	LINE[41]="Unknown by Anonymous"
+	LINE[41]="Minifantasy is an original idea by Krishna Palacio"
 	LINE[42]=" "
-	LINE[43]="Nb Pixel Font Bundle"
+	LINE[43]="Public Domain Font Authors"
-	LINE[44]="Nb Pixel Font Bundle 2"
+	LINE[44]="c64esque by andraaspar"
-	LINE[45]=" "
+	LINE[45]="Habbo by Omni"
-	LINE[46]=" "
+	LINE[46]="Unknown by Anonymous"
-	LINE[47]="Game License"
+	LINE[47]=" "
-	LINE[48]="~~~~~~~~~~~~~~~~"
+	LINE[48]="Nb Pixel Font Bundle"
-	LINE[49]="License (OLC-3)"
+	LINE[49]="Nb Pixel Font Bundle 2"
-	LINE[50]="~~~~~~~~~~~~~~~"
+	LINE[50]=" "
 	LINE[51]=" "
-	LINE[52]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>"
+	LINE[52]="Game License"
-	LINE[53]=" "
+	LINE[53]="~~~~~~~~~~~~~~~~"
-	LINE[54]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
+	LINE[54]="License (OLC-3)"
-	LINE[55]=" "
+	LINE[55]="~~~~~~~~~~~~~~~"
-	LINE[56]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer."
+	LINE[56]=" "
-	LINE[57]=" "
+	LINE[57]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>"
-	LINE[58]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution."
+	LINE[58]=" "
-	LINE[59]=" "
+	LINE[59]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
-	LINE[60]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
+	LINE[60]=" "
-	LINE[61]=" "
+	LINE[61]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer."
-	LINE[62]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+	LINE[62]=" "
-
+	LINE[63]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution."
+	LINE[64]=" "
+	LINE[65]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
+	LINE[66]=" "
+	LINE[67]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 }