diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/html/editor.html | 4 | ||||
| -rw-r--r-- | misc/dist/html/manifest.json | 2 | ||||
| -rw-r--r-- | misc/dist/html/offline.html | 2 | ||||
| -rw-r--r-- | misc/dist/osx_template.app/Contents/Info.plist | 7 | ||||
| -rw-r--r-- | misc/dist/shell/_godot.zsh-completion | 1 | ||||
| -rw-r--r-- | misc/dist/shell/godot.bash-completion | 1 | ||||
| -rw-r--r-- | misc/dist/shell/godot.fish | 1 | ||||
| -rwxr-xr-x | misc/scripts/clang_format.sh | 2 | ||||
| -rwxr-xr-x | misc/scripts/file_format.sh | 2 |
9 files changed, 9 insertions, 13 deletions
diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html index 8b077a5725..a681a2a1c3 100644 --- a/misc/dist/html/editor.html +++ b/misc/dist/html/editor.html @@ -9,8 +9,8 @@ <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="application-name" content="Godot" /> <meta name="apple-mobile-web-app-title" content="Godot" /> - <meta name="theme-color" content="#478cbf" /> - <meta name="msapplication-navbutton-color" content="#478cbf" /> + <meta name="theme-color" content="#202531" /> + <meta name="msapplication-navbutton-color" content="#202531" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="msapplication-starturl" content="/latest" /> <meta property="og:site_name" content="Godot Engine Web Editor" /> diff --git a/misc/dist/html/manifest.json b/misc/dist/html/manifest.json index 0ca27b3742..adc8106e2a 100644 --- a/misc/dist/html/manifest.json +++ b/misc/dist/html/manifest.json @@ -6,7 +6,7 @@ "start_url": "./godot.tools.html", "display": "standalone", "orientation": "landscape", - "theme_color": "#478cbf", + "theme_color": "#202531", "icons": [ { "src": "favicon.png", diff --git a/misc/dist/html/offline.html b/misc/dist/html/offline.html index 000c21b4d3..5cfc3362d9 100644 --- a/misc/dist/html/offline.html +++ b/misc/dist/html/offline.html @@ -4,6 +4,8 @@ <meta charset="utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> + <meta name="theme-color" content="#202531" /> + <meta name="msapplication-navbutton-color" content="#202531" /> <title>You are offline</title> <style> html { diff --git a/misc/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist index 8e221df946..a087550290 100644 --- a/misc/dist/osx_template.app/Contents/Info.plist +++ b/misc/dist/osx_template.app/Contents/Info.plist @@ -24,10 +24,7 @@ <string>$signature</string> <key>CFBundleVersion</key> <string>$version</string> - <key>NSMicrophoneUsageDescription</key> - <string>$microphone_usage_description</string> - <key>NSCameraUsageDescription</key> - <string>$camera_usage_description</string> +$usage_descriptions <key>NSHumanReadableCopyright</key> <string>$copyright</string> <key>CFBundleSupportedPlatforms</key> @@ -46,6 +43,6 @@ <string>10.12</string> </dict> <key>NSHighResolutionCapable</key> - $highres +$highres </dict> </plist> diff --git a/misc/dist/shell/_godot.zsh-completion b/misc/dist/shell/_godot.zsh-completion index ba386b55cc..9d42f4fe05 100644 --- a/misc/dist/shell/_godot.zsh-completion +++ b/misc/dist/shell/_godot.zsh-completion @@ -49,7 +49,6 @@ _arguments \ '(-t --always-on-top)'{-t,--always-on-top}'[request an always-on-top window]' \ '--resolution[request window resolution]:resolution in WxH format' \ '--position[request window position]:position in X,Y format' \ - '--low-dpi[force low-DPI mode (macOS and Windows only)]' \ '--headless[enable headless mode (--display-driver headless --audio-driver Dummy). Useful for servers and with --script]' \ '(-d --debug)'{-d,--debug}'[debug (local stdout debugger)]' \ '(-b --breakpoints)'{-b,--breakpoints}'[specify the breakpoint list as source::line comma-separated pairs, no spaces (use %20 instead)]:breakpoint list' \ diff --git a/misc/dist/shell/godot.bash-completion b/misc/dist/shell/godot.bash-completion index 218fbd81b1..eeee538aba 100644 --- a/misc/dist/shell/godot.bash-completion +++ b/misc/dist/shell/godot.bash-completion @@ -52,7 +52,6 @@ _complete_godot_options() { --always-on-top --resolution --position ---low-dpi --headless --debug --breakpoints diff --git a/misc/dist/shell/godot.fish b/misc/dist/shell/godot.fish index 2a6b18ed8f..79df2de7f0 100644 --- a/misc/dist/shell/godot.fish +++ b/misc/dist/shell/godot.fish @@ -59,7 +59,6 @@ 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 headless -d "Enable headless mode (--display-driver headless --audio-driver Dummy). Useful for servers and with --script" # Debug options: diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh index b0020da597..0006b82280 100755 --- a/misc/scripts/clang_format.sh +++ b/misc/scripts/clang_format.sh @@ -29,8 +29,6 @@ while IFS= read -rd '' f; do continue 2 elif [[ "$f" == *"glsl" ]]; then continue 2 - elif [[ "$f" == *"theme_data.h" ]]; then - continue 2 elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/input/InputManager"* ]]; then continue 2 fi diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index b241f3da70..e66bc88bc0 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -20,6 +20,8 @@ while IFS= read -rd '' f; do continue elif [[ "$f" == *"sln" ]]; then continue + elif [[ "$f" == *".bat" ]]; then + continue elif [[ "$f" == *".out" ]]; then # GDScript integration testing files. continue |