7 files changed, 45 insertions, 22 deletions
diff --git a/misc/dist/html/default.html b/misc/dist/html/default.html
index a1a4e89d02..4e3515a7b6 100644
--- a/misc/dist/html/default.html
+++ b/misc/dist/html/default.html
@@ -244,9 +244,6 @@ $GODOT_HEAD_INCLUDE
 			var statusMode = 'hidden';
 			var indeterminiateStatusAnimationId = 0;
 
-			setStatusMode('indeterminate');
-			engine.setCanvas(canvas);
-
 			function setStatusMode(mode) {
 
 				if (statusMode === mode || !initializing)
@@ -367,18 +364,27 @@ $GODOT_HEAD_INCLUDE
 				});
 			}
 
-			engine.startGame(BASENAME + '.pck').then(() => {
-				setStatusMode('hidden');
-				initializing = false;
-			}, err => {
+			function displayFailureNotice(err) {
+				var msg = err.message || err;
 				if (DEBUG_ENABLED) {
-					printError(err.message);
-					console.warn(err);
+					printError(msg);
 				}
-				setStatusNotice(err.message);
+				console.error(msg);
+				setStatusNotice(msg);
 				setStatusMode('notice');
 				initializing = false;
-			});
+			};
+
+			if (!Engine.isWebGLAvailable()) {
+				displayFailureNotice("WebGL not available");
+			} else {
+				setStatusMode('indeterminate');
+				engine.setCanvas(canvas);
+				engine.startGame(BASENAME + '.pck').then(() => {
+					setStatusMode('hidden');
+					initializing = false;
+				}, displayFailureNotice);
+			}
 		})();
 	//]]></script>
 </body>
diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6
index 22836e03ed..26ebe01af7 100644
--- a/misc/dist/linux/godot.6
+++ b/misc/dist/linux/godot.6
@@ -1,4 +1,4 @@
-.TH GODOT "6" "January 2018" "godot 3.0" "Games"
+.TH GODOT "6" "February 2018" "godot 3.1" "Games"
 .SH NAME
 godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
 .SH SYNOPSIS
@@ -31,6 +31,9 @@ Start the editor instead of running the scene.
 \fB\-p\fR, \fB\-\-project\-manager\fR
 Start the project manager, even if a project is auto\-detected.
 .TP
+\fB\-q\fR, \fB\-\-quit\fR
+Quit after the first iteration.
+.TP
 \fB\-l\fR, \fB\-\-language\fR <locale>
 Use a specific locale (<locale> being a two\-letter code).
 .TP
@@ -56,7 +59,7 @@ Password for remote filesystem.
 Audio driver ('PulseAudio', 'ALSA').
 .TP
 \fB\-\-video\-driver\fR <driver>
-Video driver ('GLES3').
+Video driver ('GLES3', 'GLES2').
 .SS "Display options:"
 .TP
 \fB\-f\fR, \fB\-\-fullscreen\fR
@@ -68,6 +71,9 @@ Request a maximized window.
 \fB\-w\fR, \fB\-\-windowed\fR
 Request windowed mode.
 .TP
+\fB\-t\fR, \fB\-\-always\-on\-top\fR
+Request an always\-on\-top window.
+.TP
 \fB\-\-resolution\fR <W>x<H>
 Request window resolution.
 .TP
@@ -113,6 +119,9 @@ Disable crash handler when supported by the platform code.
 .TP
 \fB\-\-fixed\-fps\fR <fps>
 Force a fixed number of frames per second. This setting disables real\-time synchronization.
+.TP
+\fB\-\-print\-fps\fR
+Print the frames per second to the stdout.
 .SS "Standalone tools:"
 .TP
 \fB\-s\fR, \fB\-\-script\fR <script>
@@ -130,6 +139,9 @@ Dump the engine API reference to the given <path> in XML format, merging if exis
 \fB\-\-no\-docbase\fR
 Disallow dumping the base types (used with \fB\-\-doctool\fR).
 .TP
+\fB\-\-build\-solutions\fR
+Build the scripting solutions (e.g. for C# projects).
+.TP
 \fB\-\-gdnative\-generate\-json\-api\fR
 Generate JSON dump of the Godot API for GDNative bindings.
 .TP
diff --git a/misc/dist/linux/godot.appdata.xml b/misc/dist/linux/godot.appdata.xml
index 907fe1f3be..a381556025 100644
--- a/misc/dist/linux/godot.appdata.xml
+++ b/misc/dist/linux/godot.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017 Rémi Verschelde <akien@godotengine.org> -->
+<!-- Copyright 2017-2018 Rémi Verschelde <akien@godotengine.org> -->
 <component type="desktop">
   <id>godot.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/misc/dist/linux/godot.desktop b/misc/dist/linux/godot.desktop
index 545c491256..974352b117 100644
--- a/misc/dist/linux/godot.desktop
+++ b/misc/dist/linux/godot.desktop
@@ -2,7 +2,7 @@
 Name=Godot Engine
 GenericName=Libre game engine
 Comment=Multi-platform 2D and 3D game engine with a feature rich editor
-Exec=godot -pm
+Exec=godot -p
 Icon=godot
 Terminal=false
 Type=Application
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format
index 8ef4e27748..016a43038b 100755
--- a/misc/hooks/pre-commit-clang-format
+++ b/misc/hooks/pre-commit-clang-format
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # git pre-commit hook that runs a clang-format stylecheck.
 # Features:
diff --git a/misc/scripts/fix_headers.py b/misc/scripts/fix_headers.py
index 809820c20f..48b9628b1f 100644
--- a/misc/scripts/fix_headers.py
+++ b/misc/scripts/fix_headers.py
@@ -92,9 +92,11 @@ while (fname != ""):
     fileread.close()
 
     # Write
-    fileread = open(fname.strip(), "wb")
-    fileread.write(text)
-    fileread.close()
+    filewrite = open(fname.strip(), "wb")
+    filewrite.write(text)
+    filewrite.close()
 
     # Next file
     fname = files.readline()
+
+files.close()
+\ No newline at end of file
diff --git a/misc/scripts/make_glwrapper.py b/misc/scripts/make_glwrapper.py
index 5694d2327e..15b66a950b 100644
--- a/misc/scripts/make_glwrapper.py
+++ b/misc/scripts/make_glwrapper.py
@@ -16,9 +16,7 @@ READ_CONSTANTS = 2
 
 read_what = READ_TYPES
 
-for x in (range(len(sys.argv) - 1)):
-    f = open(sys.argv[x + 1], "r")
-
+def read_file(f):
     while(True):
 
         line = f.readline()
@@ -86,6 +84,9 @@ for x in (range(len(sys.argv) - 1)):
             functions.append(funcdata)
             print(funcdata)
 
+for path in sys.argv[1:]:
+    with open(path, "r") as f:
+        read_file(f)
 
 # print(types)
 # print(constants)
@@ -156,6 +157,7 @@ f.write("void glWrapperInit( GLWrapperFuncPtr (*wrapperFunc)(const char*) );\n")
 f.write("#ifdef __cplusplus\n}\n#endif\n")
 
 f.write("#endif\n\n")
+f.close()
 
 f = open("glwrapper.c", "w")
 
@@ -176,3 +178,4 @@ for x in functions:
 f.write("\n\n")
 f.write("}\n")
 f.write("\n\n")
+f.close()