feat: remesh package credits

ItsSim · Jan 24, 2024 · 6d7a8cf · 6d7a8cf
1 parent 76cafba
commit 6d7a8cf
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 4 deletions.
diff --git a/src/fsolauncher-ui/fsolauncher.css b/src/fsolauncher-ui/fsolauncher.css
@@ -74,6 +74,16 @@ body #about-page .alt-content-small {
   display: none;
 }
 
+body #about-page ul.columns {
+  column-count: 3;
+  margin-top: -20px;
+  text-align: left;
+}
+
+body #about-page ul.columns li {
+  list-style: none;
+} 
+
 #launcher #sidebar {
   float: left;
   width: 230px;
@@ -242,7 +252,7 @@ div.error {
   background-color: #f1c40f;
 }
 
-div.page p {
+div.page p, div.page .readable-font {
   padding: 20px;
   font-family: 'Munged';
   font-size: 14px;

diff --git a/src/fsolauncher-ui/fsolauncher.pug b/src/fsolauncher-ui/fsolauncher.pug
@@ -323,6 +323,15 @@ html(class=PLATFORM + ' ' + LANGCODE)
                 strong #{ABOUT_FAQ_5_H1}
                 p !{ABOUT_FAQ_5_TEXT}.
                 p(style='margin-top:-20px') !{ABOUT_FAQ_GITHUB}
+
+              block faq 
+                strong #{ABOUT_FAQ_6_H1}
+                p #{ABOUT_FAQ_6_TEXT}
+                ul.columns.readable-font
+                  each link in REMESH_PACKAGE_CREDITS
+                    li 
+                      a(href=link.url, target="_blank")= link.name
+
         #simitone-page.page(style='display:none')
           h1.jumbotron
             span #{SIMITONE_H1}

diff --git a/src/fsolauncher-ui/remesh-package-credits.json b/src/fsolauncher-ui/remesh-package-credits.json
@@ -0,0 +1,114 @@
+[
+  {
+    "name": "Alessandro Needs A Server",
+    "url": "http://forum.freeso.org/members/alessandro-needs-a-server.1121/"
+  },
+  {
+    "name": "Andrew AOG",
+    "url": "http://forum.freeso.org/members/andrew-aog.5315/"
+  },
+  {
+    "name": "Arctic",
+    "url": "http://forum.freeso.org/members/arctic.5511/"
+  },
+  {
+    "name": "BrandonSJ96",
+    "url": "http://forum.freeso.org/members/brandonsj96.2866/"
+  },
+  {
+    "name": "Chaul",
+    "url": "http://forum.freeso.org/members/chaul.4651/"
+  },
+  {
+    "name": "Christopher",
+    "url": "http://forum.freeso.org/members/christopher.676/"
+  },
+  {
+    "name": "Deak",
+    "url": "http://forum.freeso.org/members/deak.5111/"
+  },
+  {
+    "name": "Deausoit",
+    "url": "http://forum.freeso.org/members/deausoit.5331/"
+  },
+  {
+    "name": "Desiderius",
+    "url": "http://forum.freeso.org/members/desiderius.4730/"
+  },
+  {
+    "name": "farfadet46",
+    "url": "http://forum.freeso.org/members/farfadet46.5229/"
+  },
+  {
+    "name": "fadga",
+    "url": "http://forum.freeso.org/members/fadga.5873/"
+  },
+  {
+    "name": "GhostieGrimm",
+    "url": "http://forum.freeso.org/members/ghostiegrimm.5758/"
+  },
+  {
+    "name": "Ice Cool",
+    "url": "http://forum.freeso.org/members/ice-cool.3889/"
+  },
+  {
+    "name": "Joe",
+    "url": "http://forum.freeso.org/members/jdsp18.5694/"
+  },
+  {
+    "name": "JWofles",
+    "url": "http://forum.freeso.org/members/jwofles.126/"
+  },
+  {
+    "name": "Lazy Duchess",
+    "url": "http://forum.freeso.org/members/lazy-duchess.5376/"
+  },
+  {
+    "name": "Lenny",
+    "url": "http://forum.freeso.org/members/lenny.4606/"
+  },
+  {
+    "name": "Melika",
+    "url": "http://forum.freeso.org/members/melika.3964/"
+  },
+  {
+    "name": "Moretta",
+    "url": "http://forum.freeso.org/members/moretta.5129/"
+  },
+  {
+    "name": "mrpenguinb",
+    "url": "http://forum.freeso.org/members/mrpenguinb.879/"
+  },
+  {
+    "name": "Mixa97sr",
+    "url": "http://forum.freeso.org/members/mixa97sr.321/"
+  },
+  {
+    "name": "NoCarbs",
+    "url": "https://forum.freeso.org/members/nocarbs.6570/"
+  },
+  {
+    "name": "Raeven",
+    "url": "http://forum.freeso.org/members/raeven.2158/"
+  },
+  {
+    "name": "RHY3756547",
+    "url": "http://forum.freeso.org/members/rhy3756547.128/"
+  },
+  {
+    "name": "Sindle",
+    "url": "http://forum.freeso.org/members/sindle.679/"
+  },
+  {
+    "name": "Sp0nge80b",
+    "url": "http://forum.freeso.org/members/sp0nge80b.4204/"
+  },
+  {
+    "name": "TheHappyPlantSim",
+    "url": "http://forum.freeso.org/members/thehappyplantsim.4464/"
+  },
+  {
+    "name": "TheMarshmallowBear",
+    "url": "http://forum.freeso.org/members/themarshmallowbear.639/"
+  }
+]
diff --git a/src/fsolauncher-ui/uitext.json b/src/fsolauncher-ui/uitext.json
@@ -13,6 +13,8 @@
     "ABOUT_FAQ_4_TEXT": "Right-click the Play button.",
     "ABOUT_FAQ_5_H1": "Need help?",
     "ABOUT_FAQ_5_TEXT": "DM us on <a href='https://twitter.com/FreeSOGame' target='_blank'>Twitter</a> or join <a href='https://discord.gg/xveESFj' target='_blank'>Discord</a>",
+    "ABOUT_FAQ_6_H1": "Remesh Package Credits",
+    "ABOUT_FAQ_6_TEXT": "Contains 3D art created by the following members of the community:",
     "ABOUT_FAQ_GITHUB": "For launcher technical issues, <a target='_blank' href='https://github.com/ItsSim/fsolauncher/issues'>submit a GitHub issue</a> to the repository.",
     "ABOUT_INTERNET": "Internet connection required to update",
     "ABOUT_LAUNCHER_VERSION": "Launcher Version",

diff --git a/src/main.js b/src/main.js
@@ -124,7 +124,8 @@ setLocale( code, {
   PLATFORM: process.platform,
   SENTRY: require( './sentry.config' ).browserLoader,
   LANGCODE: code,
-  DEFAULT_REFRESH_RATE: 60
+  DEFAULT_REFRESH_RATE: 60,
+  REMESH_PACKAGE_CREDITS: require( './fsolauncher-ui/remesh-package-credits.json' )
 } );
 
 /** @type {Electron.BrowserWindowConstructorOptions} */
@@ -176,10 +177,10 @@ function createWindow() {
   window.setMenu( null );
 
   // Allow the user to open devTools if Debug=1 in FSOLauncher.ini
-  if ( userSettings.Launcher.Debug == '1' && ! isTestMode ) {
+  //if ( userSettings.Launcher.Debug == '1' && ! isTestMode ) {
     console.info( 'debug mode enabled' );
     window.openDevTools( { mode: 'detach' } );
-  }
+  //}
 
   window.loadURL( `file://${__dirname}/fsolauncher-ui/fsolauncher.pug` );
   window.on( 'restore', _e => window.setSize( width, height ) );