diff --git a/artwork/itch.io/screenshots/7.png b/artwork/itch.io/screenshots/7.png
index bab1b536..0df86bcc 100644
Binary files a/artwork/itch.io/screenshots/7.png and b/artwork/itch.io/screenshots/7.png differ
diff --git a/artwork/itch.io/screenshots/8.png b/artwork/itch.io/screenshots/8.png
new file mode 100644
index 00000000..1b3bbdc2
Binary files /dev/null and b/artwork/itch.io/screenshots/8.png differ
diff --git a/artwork/thirdparty/kongregate/iframe.html b/artwork/thirdparty/kongregate/iframe.html
new file mode 100644
index 00000000..6b741420
--- /dev/null
+++ b/artwork/thirdparty/kongregate/iframe.html
@@ -0,0 +1,17 @@
+
+
+
+ Iframe test
+
+
+
+
+
diff --git a/src/js/application.js b/src/js/application.js
index 1a07f049..4ef3a2bf 100644
--- a/src/js/application.js
+++ b/src/js/application.js
@@ -309,6 +309,7 @@ export class Application {
* Boots the application
*/
boot() {
+ console.log("Booting ...");
this.registerStates();
this.registerEventListeners();
diff --git a/src/js/core/config.js b/src/js/core/config.js
index 70f9ee3b..922870d8 100644
--- a/src/js/core/config.js
+++ b/src/js/core/config.js
@@ -101,7 +101,8 @@ export const globalConfig = {
// framePausesBetweenTicks: 40,
// testTranslations: true,
// enableEntityInspector: true,
- testAds: true,
+ // testAds: true,
+ disableMapOverview: true,
/* dev:end */
},
@@ -123,3 +124,8 @@ export const IS_MOBILE = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
// Automatic calculations
globalConfig.minerSpeedItemsPerSecond = globalConfig.beltSpeedItemsPerSecond / 5;
+
+if (globalConfig.debug.disableMapOverview) {
+ globalConfig.mapChunkOverviewMinZoom = 0;
+ globalConfig.mapChunkPrerenderMinZoom = 0;
+}
diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js
index 8886947b..e0152774 100644
--- a/src/js/core/input_distributor.js
+++ b/src/js/core/input_distributor.js
@@ -201,7 +201,7 @@ export class InputDistributor {
// TAB
event.keyCode === 9 ||
// F1 - F10
- (event.keyCode >= 112 && event.keyCode < 122 && !G_IS_DEV)
+ (event.keyCode >= 112 && event.keyCode < 122)
) {
event.preventDefault();
}
diff --git a/src/js/core/loader.js b/src/js/core/loader.js
index 5c8e17ec..8888ecbf 100644
--- a/src/js/core/loader.js
+++ b/src/js/core/loader.js
@@ -84,7 +84,7 @@ class LoaderImpl {
return Promise.race([
new Promise((resolve, reject) => {
- setTimeout(reject, G_IS_DEV ? 3000 : 60000);
+ setTimeout(reject, G_IS_DEV ? 500 : 10000);
}),
new Promise(resolve => {
diff --git a/src/js/platform/browser/sound.js b/src/js/platform/browser/sound.js
index 32985bb5..508dcf8c 100644
--- a/src/js/platform/browser/sound.js
+++ b/src/js/platform/browser/sound.js
@@ -23,7 +23,7 @@ class SoundSpritesContainer {
}
return (this.loadingPromise = Promise.race([
new Promise((resolve, reject) => {
- setTimeout(reject, G_IS_DEV ? 5000 : 60000);
+ setTimeout(reject, G_IS_DEV ? 500 : 5000);
}),
new Promise(resolve => {
this.howl = new Howl({
@@ -100,7 +100,7 @@ class MusicInstance extends MusicInstanceInterface {
load() {
return Promise.race([
new Promise((resolve, reject) => {
- setTimeout(reject, G_IS_DEV ? 5000 : 60000);
+ setTimeout(reject, G_IS_DEV ? 500 : 5000);
}),
new Promise((resolve, reject) => {
this.howl = new Howl({
diff --git a/src/js/platform/browser/wrapper.js b/src/js/platform/browser/wrapper.js
index fa3f80b3..a5086b1b 100644
--- a/src/js/platform/browser/wrapper.js
+++ b/src/js/platform/browser/wrapper.js
@@ -28,6 +28,15 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
this.embedProvider.iframed = true;
this.embedProvider.iogLink = false;
+ window.addEventListener(
+ "mousedown",
+ () => {
+ console.log("Firefox fix: focusing window");
+ window.focus();
+ },
+ true
+ );
+
switch (providerId) {
case "armorgames": {
this.embedProvider.id = "armorgames";