diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5e6496aadbeea4378afc5930f5af8c965704b15..5f70f978e6d1f2486c44d69d73a6ba81fd60d7a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: # precompiled / assets # the URLs are the same as inside the game, change both if updating WEBGL_NAME: "WebGL art assets" - WEBGL_URL: "https://mega.nz/folder/rtAzEYTS#5a5KO_rqq_BB8eqtOuhEow" + WEBGL_URL: "https://mega.nz/folder/Sgp0lQbY#L1iG-jMQUeztUFuFqj-ryw" RENDER_NAME: "Rendered imagepack (outdated)" RENDER_URL: "https://mega.nz/file/upoAlBaZ#EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0" diff --git a/src/art/artJS.js b/src/art/artJS.js index 111d10bb3c3f5612863d3301ad3e4d2f1040a92b..18dca6a59ca16691d5a677cba856838a2e85a221 100644 --- a/src/art/artJS.js +++ b/src/art/artJS.js @@ -151,9 +151,6 @@ App.Art.errorHandler = function(event, message) { case 3: App.Art.webglErrorMessage = "Version mismatch.\nUpdate the assets using the link in Game Options."; break; - case 4: // temporary option - App.Art.webglErrorMessage = "Could not find art assets.\nOlder versions need to be updated using\nthe download link in Game Options."; - break; } // fire event to art elements @@ -204,7 +201,7 @@ App.Art.webglInitialize = function() { let load = document.createElement("script"); load.onload = function() { // but only if version is correct - if (App.Art.version === "1.3") { + if (App.Art.version === "1.4") { document.head.appendChild(script); } else { App.Art.errorHandler("engineFailed", 3); @@ -212,7 +209,7 @@ App.Art.webglInitialize = function() { } }; load.onerror = function() { - App.Art.errorHandler("engineFailed", 4); // temporary display different message until next update + App.Art.errorHandler("engineFailed", 2); LoadScreen.unlock(loadLockID); }; load.src = "resources/webgl/load.js"; diff --git a/src/gui/options/options.js b/src/gui/options/options.js index d35bea0cc9243b28ec2a2fa94de88a6ff52e7437..be283c46d8bc1698bb0f2974063768ef5d5d76ca 100644 --- a/src/gui/options/options.js +++ b/src/gui/options/options.js @@ -1078,7 +1078,7 @@ App.UI.artOptions = function() { const art = App.UI.DOM.appendNewElement("span", el); art.style.position = "relative"; - art.style.zIndex = "-1"; + art.style.zIndex = "1"; App.Events.drawEventArt(art, BaseSlave()); options.addOption("Images are", "seeImages") @@ -1114,7 +1114,7 @@ App.UI.artOptions = function() { options.addOption("Clothing erection bulges are", "showClothingErection") .addValue("Enabled", true).on().addValue("Disabled", false).off(); } else if (V.imageChoice === 4) { - options.addComment(`<a href='https://mega.nz/folder/rtAzEYTS#5a5KO_rqq_BB8eqtOuhEow' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is. + options.addComment(`<a href='https://mega.nz/folder/Sgp0lQbY#L1iG-jMQUeztUFuFqj-ryw' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is. Then <b>refresh</b> the page. Create the resources folder if it does not exist. <span class="warning">(Android/MacOS not supported)</span>`);