Update target Godot version: 3.3.2-stable -> 3.4.4-stable

This commit is contained in:
Leroy Hopson 2022-05-22 11:37:22 +07:00
parent 1659591d15
commit bb74585c20
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
6 changed files with 18 additions and 16 deletions

View file

@ -6,10 +6,6 @@ on:
- cron: 0 11 * * *
env:
GODOT: Godot_v3.4.3-stable
GODOT_VERSION: 3.4.3
GODOT_RELEASE: stable
# Caches should be automatically invalidated when versions change,
# but invalidation can be forced by incrementing these numbers.
EMSCRIPTEN_CACHE_VERSION: 1
@ -309,7 +305,7 @@ jobs:
matrix:
os: [ windows-latest, macos-latest, ubuntu-latest ]
bits: [ 64, 32 ]
godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.3-stable', 'v3.5-beta1' ]
godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.4-stable', 'v3.5-beta1' ]
exclude:
- os: macos-latest
bits: 32

View file

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `--docker` option to `build.sh` script, in order to build Linux binaries inside a docker container with an older GLIBC version.
### Changed
- Target Godot version from 3.3.2-stable -> 3.4.4-stable.
- GitHub Actions workflow to build Linux debug/release binaries inside docker container in order to target older GLIBC versions.
### Fixed

View file

@ -8,6 +8,7 @@
#include <ResourceLoader.hpp>
#include <Theme.hpp>
#include <algorithm>
#include <string>
#include <xkbcommon/xkbcommon-keysyms.h>
// For _populate_key_list(), see below.
@ -418,14 +419,12 @@ void Terminal::update_theme() {
Color default_color) -> void {
Color c;
c = has_color(theme_color, "Terminal")
? get_color(theme_color, "Terminal")
: has_color_override(theme_color)
? get_color(theme_color, "")
: (default_theme != nullptr &&
default_theme->has_color(theme_color, "Terminal"))
? default_theme->get_color(theme_color, "Terminal")
: default_color;
c = has_color(theme_color, "Terminal") ? get_color(theme_color, "Terminal")
: has_color_override(theme_color) ? get_color(theme_color, "")
: (default_theme != nullptr &&
default_theme->has_color(theme_color, "Terminal"))
? default_theme->get_color(theme_color, "Terminal")
: default_color;
color_palette[color][0] = c.get_r8();
color_palette[color][1] = c.get_g8();

@ -1 +1 @@
Subproject commit 26d4df4e174124e1174c624d770661b1394fcf5f
Subproject commit f4f6fac4c784da8c973ade0dbc64a9d8400ee247

@ -1 +1 @@
Subproject commit 45eaa2daf1e3d2571a9f31a3421911262ec82f51
Subproject commit 419e713a29f20bd3351a54d1e6c4c5af7ef4b253

View file

@ -8,8 +8,14 @@
config_version=4
_global_script_classes=[ ]
_global_script_classes=[ {
"base": "Reference",
"class": "GutHookScript",
"language": "GDScript",
"path": "res://addons/gut/hook_script.gd"
} ]
_global_script_class_icons={
"GutHookScript": ""
}
[application]