diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/linux/godot.6 | 2 | ||||
| -rwxr-xr-x | misc/dist/osx_template.app/Contents/Info.plist | 6 | ||||
| -rw-r--r-- | misc/dist/osx_template.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json | 7 | ||||
| -rwxr-xr-x | misc/dist/osx_tools.app/Contents/Info.plist | 4 | ||||
| -rw-r--r-- | misc/dist/osx_tools.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json | 7 | ||||
| -rw-r--r-- | misc/dist/shell/_godot.zsh-completion | 2 | ||||
| -rw-r--r-- | misc/dist/shell/godot.bash-completion | 2 | ||||
| -rw-r--r-- | misc/dist/shell/godot.fish | 91 | ||||
| -rwxr-xr-x | misc/travis/clang-format.sh | 14 |
9 files changed, 123 insertions, 12 deletions
diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6 index 00d19c5178..4140094813 100644 --- a/misc/dist/linux/godot.6 +++ b/misc/dist/linux/godot.6 @@ -59,7 +59,7 @@ Password for remote filesystem. Audio driver ('PulseAudio', 'ALSA', 'Dummy'). .TP \fB\-\-video\-driver\fR <driver> -Video driver ('GLES3', 'GLES2'). +Video driver ('Vulkan', 'GLES2'). .SS "Display options:" .TP \fB\-f\fR, \fB\-\-fullscreen\fR diff --git a/misc/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist index 696c825594..3b765e6bb8 100755 --- a/misc/dist/osx_template.app/Contents/Info.plist +++ b/misc/dist/osx_template.app/Contents/Info.plist @@ -31,13 +31,13 @@ <key>NSHumanReadableCopyright</key> <string>$copyright</string> <key>LSMinimumSystemVersion</key> - <string>10.9.0</string> + <string>10.12.0</string> <key>LSMinimumSystemVersionByArchitecture</key> <dict> <key>x86_64</key> - <string>10.9.0</string> + <string>10.12.0</string> </dict> <key>NSHighResolutionCapable</key> $highres </dict> -</plist>
\ No newline at end of file +</plist> diff --git a/misc/dist/osx_template.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json b/misc/dist/osx_template.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json new file mode 100644 index 0000000000..6bf2edb02d --- /dev/null +++ b/misc/dist/osx_template.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version" : "1.0.0", + "ICD": { + "library_path": "../../../Frameworks/libMoltenVK.dylib", + "api_version" : "1.0.0" + } +} diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 46550ba6c7..c519a232c4 100755 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -33,11 +33,11 @@ <key>NSHumanReadableCopyright</key> <string>© 2007-2020 Juan Linietsky, Ariel Manzur & Godot Engine contributors</string> <key>LSMinimumSystemVersion</key> - <string>10.9.0</string> + <string>10.12.0</string> <key>LSMinimumSystemVersionByArchitecture</key> <dict> <key>x86_64</key> - <string>10.9.0</string> + <string>10.12.0</string> </dict> <key>NSHighResolutionCapable</key> <true/> diff --git a/misc/dist/osx_tools.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json b/misc/dist/osx_tools.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json new file mode 100644 index 0000000000..6bf2edb02d --- /dev/null +++ b/misc/dist/osx_tools.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version" : "1.0.0", + "ICD": { + "library_path": "../../../Frameworks/libMoltenVK.dylib", + "api_version" : "1.0.0" + } +} diff --git a/misc/dist/shell/_godot.zsh-completion b/misc/dist/shell/_godot.zsh-completion index 4945ecbabc..1a699e50cb 100644 --- a/misc/dist/shell/_godot.zsh-completion +++ b/misc/dist/shell/_godot.zsh-completion @@ -42,7 +42,7 @@ _arguments \ '--remote-fs[use a remote filesystem]:remote filesystem address' \ '--remote-fs-password[password for remote filesystem]:remote filesystem password' \ '--audio-driver[set the audio driver]:audio driver name' \ - "--video-driver[set the video driver]:video driver name:((GLES3\:'OpenGL ES 3.0 renderer' GLES2\:'OpenGL ES 2.0 renderer'))" \ + "--video-driver[set the video driver]:video driver name:((Vulkan\:'Vulkan renderer' GLES2\:'OpenGL ES 2.0 renderer'))" \ '(-f --fullscreen)'{-f,--fullscreen}'[request fullscreen mode]' \ '(-m --maximized)'{-m,--maximized}'[request a maximized window]' \ '(-w --windowed)'{-w,--windowed}'[request windowed mode]' \ diff --git a/misc/dist/shell/godot.bash-completion b/misc/dist/shell/godot.bash-completion index 714b6758e3..99d6dc52e0 100644 --- a/misc/dist/shell/godot.bash-completion +++ b/misc/dist/shell/godot.bash-completion @@ -105,7 +105,7 @@ _complete_godot_bash() { elif [[ $prev == "--video-driver" ]]; then local IFS=$' \n\t' # shellcheck disable=SC2207 - COMPREPLY=($(compgen -W "GLES3 GLES2" -- "$cur")) + COMPREPLY=($(compgen -W "Vulkan GLES2" -- "$cur")) elif [[ $prev == "--path" || $prev == "--doctool" ]]; then local IFS=$'\n\t' # shellcheck disable=SC2207 diff --git a/misc/dist/shell/godot.fish b/misc/dist/shell/godot.fish new file mode 100644 index 0000000000..3cffcfa3b8 --- /dev/null +++ b/misc/dist/shell/godot.fish @@ -0,0 +1,91 @@ +# Fish completion for the Godot editor +# To use it, install this file in `~/.config/fish/completions` then restart your shell. +# You can also `source` this file directly in your shell startup file. +# +# Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. +# Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +function godot_video_driver_args + # Use a function instead of a fixed string to customize the argument descriptions. + echo -e "Vulkan\tVulkan renderer" + echo -e "GLES2\tOpenGL ES 2.0 renderer" +end + +# Erase existing completions for Godot. +complete -c godot -e + +# General options: +complete -c godot -s h -l help -d "Display the full help message" +complete -c godot -l version -d "Display the version string" +complete -c godot -s v -l verbose -d "Use verbose stdout mode" +complete -c godot -l quiet -d "Quiet mode, silences stdout messages (errors are still displayed)" + +# Run options: +complete -c godot -s e -l editor -d "Start the editor instead of running the scene" +complete -c godot -s p -l project-manager -d "Start the project manager, even if a project is auto-detected" +complete -c godot -s q -l quit -d "Quit after the first iteration" +complete -c godot -s l -l language -d "Use a specific locale (<locale> being a two-letter code)" -x +complete -c godot -l path -d "Path to a project (<directory> must contain a 'project.godot' file)" -r +complete -c godot -s u -l upwards -d "Scan folders upwards for project.godot file" +complete -c godot -l main-pack -d "Path to a pack (.pck) file to load" -r +complete -c godot -l render-thread -d "Set the render thread mode" -x -a "unsafe safe separate" +complete -c godot -l remote-fs -d "Use a remote filesystem (<host/IP>[:<port>] address)" -x +complete -c godot -l remote-fs-password -d "Password for remote filesystem" -x +complete -c godot -l audio-driver -d "Set the audio driver" -x +complete -c godot -l video-driver -d "Set the video driver" -x -a "(godot_video_driver_args)" + +# Display options: +complete -c godot -s f -l fullscreen -d "Request fullscreen mode" +complete -c godot -s m -l maximized -d "Request a maximized window" +complete -c godot -s w -l windowed -d "Request windowed mode" +complete -c godot -s t -l always-on-top -d "Request an always-on-top window" +complete -c godot -l resolution -d "Request window resolution" -x +complete -c godot -l position -d "Request window position" -x +complete -c godot -l low-dpi -d "Force low-DPI mode (macOS and Windows only)" +complete -c godot -l no-window -d "Disable window creation (Windows only), useful together with --script" +complete -c godot -l enable-vsync-via-compositor -d "When Vsync is enabled, Vsync via the OS' window compositor (Windows only)" +complete -c godot -l disable-vsync-via-compositor -d "Disable Vsync via the OS' window compositor (Windows only)" + +# Debug options: +complete -c godot -s d -l debug -d "Debug (local stdout debugger)" +complete -c godot -s b -l breakpoints -d "Specify the breakpoint list as source::line comma-separated pairs, no spaces (use %20 instead)" -x +complete -c godot -l profiling -d "Enable profiling in the script debugger" +complete -c godot -l remote-debug -d "Enable remote debugging" +complete -c godot -l debug-collisions -d "Show collision shapes when running the scene" +complete -c godot -l debug-navigation -d "Show navigation polygons when running the scene" +complete -c godot -l frame-delay -d "Simulate high CPU load (delay each frame by the given number of milliseconds)" -x +complete -c godot -l time-scale -d "Force time scale (higher values are faster, 1.0 is normal speed)" -x +complete -c godot -l disable-render-loop -d "Disable render loop so rendering only occurs when called explicitly from script" +complete -c godot -l disable-crash-handler -d "Disable crash handler when supported by the platform code" +complete -c godot -l fixed-fps -d "Force a fixed number of frames per second (this setting disables real-time synchronization)" -x +complete -c godot -l print-fps -d "Print the frames per second to the stdout" + +# Standalone tools: +complete -c godot -s s -l script -d "Run a script" -r +complete -c godot -l check-only -d "Only parse for errors and quit (use with --script)" +complete -c godot -l export -d "Export the project using the given preset and matching release template" -x +complete -c godot -l export-debug -d "Same as --export, but using the debug template" -x +complete -c godot -l export-pack -d "Same as --export, but only export the game pack for the given preset" -x +complete -c godot -l doctool -d "Dump the engine API reference to the given path in XML format, merging if existing files are found" -r +complete -c godot -l no-docbase -d "Disallow dumping the base types (used with --doctool)" +complete -c godot -l build-solutions -d "Build the scripting solutions (e.g. for C# projects)" +complete -c godot -l gdnative-generate-json-api -d "Generate JSON dump of the Godot API for GDNative bindings" +complete -c godot -l test -d "Run a unit test" -x diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 097b2a9378..a6585578e1 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -3,11 +3,17 @@ CLANG_FORMAT=clang-format-8 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - # Check the whole commit range against $TRAVIS_BRANCH, the base merge branch - # We could use $TRAVIS_COMMIT_RANGE but it doesn't play well with force pushes - RANGE="$(git rev-parse $TRAVIS_BRANCH) HEAD" + # Travis only clones the PR branch and uses its HEAD commit as detached HEAD, + # so it's problematic when we want an exact commit range for format checks. + # We fetch upstream to ensure that we have the proper references to resolve. + # Ideally we would use $TRAVIS_COMMIT_RANGE but it doesn't play well with PR + # updates, as it only includes changes since the previous state of the PR. + git remote add upstream https://github.com/godotengine/godot \ + --no-tags -f -t $TRAVIS_BRANCH + RANGE="upstream/$TRAVIS_BRANCH HEAD" else - # Test only the last commit + # Test only the last commit, since $TRAVIS_COMMIT_RANGE wouldn't support + # force pushes. RANGE=HEAD fi |