diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist | 4 | ||||
| -rw-r--r-- | misc/dist/linux/godot.6 | 9 | ||||
| -rw-r--r-- | misc/dist/linux/org.godotengine.Godot.appdata.xml (renamed from misc/dist/linux/godot.appdata.xml) | 4 | ||||
| -rw-r--r-- | misc/dist/linux/org.godotengine.Godot.desktop (renamed from misc/dist/linux/godot.desktop) | 5 | ||||
| -rw-r--r-- | misc/dist/linux/org.godotengine.Godot.xml | 8 | ||||
| -rwxr-xr-x | misc/travis/clang-format.sh | 2 |
6 files changed, 25 insertions, 7 deletions
diff --git a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist index 70932c1943..6907ae4a9d 100644 --- a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist +++ b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist @@ -41,11 +41,15 @@ <array> <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> </array> <key>UISupportedInterfaceOrientations~ipad</key> <array> <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> </array> $additional_plist_content </dict> diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6 index 64495d817e..50cb420e4e 100644 --- a/misc/dist/linux/godot.6 +++ b/misc/dist/linux/godot.6 @@ -1,4 +1,4 @@ -.TH GODOT "6" "February 2018" "godot 3.1" "Games" +.TH GODOT "6" "Februaryot 2018" "godot 3.1" "Games" .SH NAME godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor .SH SYNOPSIS @@ -127,6 +127,9 @@ Print the frames per second to the stdout. \fB\-s\fR, \fB\-\-script\fR <script> Run a script. .TP +\fB\-\-check\-only\fR +Only parse for errors and quit (use with --script). +.TP \fB\-\-export\fR <target> Export the project using the given export target. Export only main pack if path ends with .pck or .zip. .TP @@ -146,7 +149,7 @@ Build the scripting solutions (e.g. for C# projects). Generate JSON dump of the Godot API for GDNative bindings. .TP \fB\-\-test\fR <test> -Run a unit test ('string', 'containers', 'math', 'render', 'multimesh', 'gui', 'io', 'shaderlang', 'physics', 'oa_hash_map'). +Run a unit test ('string', 'math', 'physics', 'physics_2d', 'render', 'oa_hash_map', 'gui', 'io', 'shaderlang', 'gd_tokenizer', 'gd_parser', 'gd_compiler', 'gd_bytecode', 'image', 'ordered_hash_map'). .SH FILES XDG_DATA_CONFIG/godot/ or ~/.config/godot/ .RS @@ -156,7 +159,7 @@ XDG_DATA_HOME/godot/ or ~/.local/share/godot/ .RS Contains the default configuration and user data folders for Godot\-made games (\fIuser://\fR path), as well as export templates. .RE -XDG_DATA_CACHE/godot or ~/.cache/godot/ +XDG_DATA_CACHE/godot/ or ~/.cache/godot/ .RS Cache folder for generated thumbnails and scene previews, as well as temporary location for downloads. .RE diff --git a/misc/dist/linux/godot.appdata.xml b/misc/dist/linux/org.godotengine.Godot.appdata.xml index a381556025..9f3f9e34af 100644 --- a/misc/dist/linux/godot.appdata.xml +++ b/misc/dist/linux/org.godotengine.Godot.appdata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017-2018 Rémi Verschelde <akien@godotengine.org> --> <component type="desktop"> - <id>godot.desktop</id> + <id>org.godotengine.Godot</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MIT</project_license> <name>Godot Engine</name> <summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary> + <launchable type="desktop-id">org.godotengine.Godot.desktop</launchable> <description> <p> Godot is an advanced, feature-packed, multi-platform 2D and 3D game @@ -26,6 +27,7 @@ </screenshots> <url type="homepage">https://godotengine.org</url> <url type="bugtracker">https://github.com/godotengine/godot/issues</url> + <url type="faq">http://docs.godotengine.org/en/latest/about/faq.html</url> <url type="help">http://docs.godotengine.org</url> <url type="donation">https://godotengine.org/donate</url> <url type="translate">https://hosted.weblate.org/projects/godot-engine/godot</url> diff --git a/misc/dist/linux/godot.desktop b/misc/dist/linux/org.godotengine.Godot.desktop index 974352b117..c8b99207f8 100644 --- a/misc/dist/linux/godot.desktop +++ b/misc/dist/linux/org.godotengine.Godot.desktop @@ -1,9 +1,10 @@ [Desktop Entry] Name=Godot Engine GenericName=Libre game engine -Comment=Multi-platform 2D and 3D game engine with a feature rich editor -Exec=godot -p +Comment=Multi-platform 2D and 3D game engine with a feature-rich editor +Exec=godot %f Icon=godot Terminal=false Type=Application +MimeType=application/x-godot-project; Categories=Development;IDE; diff --git a/misc/dist/linux/org.godotengine.Godot.xml b/misc/dist/linux/org.godotengine.Godot.xml new file mode 100644 index 0000000000..0572e4e54e --- /dev/null +++ b/misc/dist/linux/org.godotengine.Godot.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> + <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/x-godot-project"> + <comment>Godot Engine project</comment> + <icon name="godot" /> + <glob pattern="*.godot" weight="100" /> + </mime-type> +</mime-info> diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index d1e37cc10e..5463998720 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -1,6 +1,6 @@ #!/bin/sh -CLANG_FORMAT=clang-format-5.0 +CLANG_FORMAT=clang-format-6.0 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then # Check the whole commit range against $TRAVIS_BRANCH, the base merge branch |