diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/html/default.html | 2 | ||||
| -rw-r--r-- | misc/dist/linux/godot.6 | 17 | ||||
| -rwxr-xr-x | misc/dist/osx_tools.app/Contents/Info.plist | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/misc/dist/html/default.html b/misc/dist/html/default.html index 0f78fc640e..a1a4e89d02 100644 --- a/misc/dist/html/default.html +++ b/misc/dist/html/default.html @@ -350,7 +350,7 @@ $GODOT_HEAD_INCLUDE }; function printError(text) { - if (!text.startsWith('**ERROR**: ')) { + if (!String.prototype.trim.call(text).startsWith('**ERROR**: ')) { text = '**ERROR**: ' + text; } print(text); diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6 index 946fa6c913..22836e03ed 100644 --- a/misc/dist/linux/godot.6 +++ b/misc/dist/linux/godot.6 @@ -1,4 +1,4 @@ -.TH GODOT "6" "September 2017" "godot 3.0-alpha" "Games" +.TH GODOT "6" "January 2018" "godot 3.0" "Games" .SH NAME godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor .SH SYNOPSIS @@ -37,6 +37,9 @@ Use a specific locale (<locale> being a two\-letter code). \fB\-\-path\fR <directory> Path to a project (<directory> must contain a 'project.godot' file). .TP +\fB\-u\fR, \fB\-\-upwards\fR +Scan folders upwards for project.godot file. +.TP \fB\-\-main\-pack\fR <file> Path to a pack (.pck) file to load. .TP @@ -133,17 +136,17 @@ Generate JSON dump of the Godot API for GDNative bindings. \fB\-\-test\fR <test> Run a unit test ('string', 'containers', 'math', 'render', 'multimesh', 'gui', 'io', 'shaderlang', 'physics', 'oa_hash_map'). .SH FILES -~/.godot/ +XDG_DATA_CONFIG/godot/ or ~/.config/godot/ .RS -User\-specific configuration and cache folder, contains persistent editor and game configuration and saved files, temporary metadata, etc. +User\-specific configuration folder, contains persistent editor settings, script and text editor templates and projects metadata. .RE -~/.godot/app_userdata/ +XDG_DATA_HOME/godot/ or ~/.local/share/godot/ .RS -Contains the default configuration and user data folders for Godot\-made games (\fIuser://\fR path). +Contains the default configuration and user data folders for Godot\-made games (\fIuser://\fR path), as well as export templates. .RE -~/.godot/templates/ +XDG_DATA_CACHE/godot or ~/.cache/godot/ .RS -Installation folder for "export templates", compiled binaries of the engine to deploy on the many supported platforms. +Cache folder for generated thumbnails and scene previews, as well as temporary location for downloads. .RE /usr/share/doc/godot/ .RS diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 895eda14db..828a40206d 100755 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.0-dev</string> + <string>3.0</string> <key>CFBundleSignature</key> <string>godot</string> <key>CFBundleVersion</key> - <string>3.0-dev</string> + <string>3.0</string> <key>NSHumanReadableCopyright</key> <string>© 2007-2018 Juan Linietsky, Ariel Manzur.</string> <key>LSMinimumSystemVersion</key> |