Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2024-11-22 17:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Also apply automatic updates to .import files after opening project in
3.4.4 editor.
This commit is contained in:
Leroy Hopson 2022-05-22 11:37:22 +07:00
parent 3fdc9ef27e
commit f0bd70cb3e
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
4 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View file

@ -6,10 +6,6 @@ on:
- cron: 0 11 * * * - cron: 0 11 * * *
env: env:
GODOT: Godot_v3.4.3-stable
GODOT_VERSION: 3.4.3
GODOT_RELEASE: stable
# Caches should be automatically invalidated when versions change, # Caches should be automatically invalidated when versions change,
# but invalidation can be forced by incrementing these numbers. # but invalidation can be forced by incrementing these numbers.
EMSCRIPTEN_CACHE_VERSION: 1 EMSCRIPTEN_CACHE_VERSION: 1
@ -268,7 +264,7 @@ jobs:
matrix: matrix:
os: [ windows-latest, macos-latest, ubuntu-latest ] os: [ windows-latest, macos-latest, ubuntu-latest ]
bits: [ 64, 32 ] 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: exclude:
- os: macos-latest - os: macos-latest
bits: 32 bits: 32

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Linux binaries now support systems with older GLIBC versions. By building the - Linux binaries now support systems with older GLIBC versions. By building the
binaries inside a docker container with an older GLIBC version, the minimum binaries inside a docker container with an older GLIBC version, the minimum
required GLIBC version is now 2.17 which was released in 2012. required GLIBC version is now 2.17 which was released in 2012.
- Target Godot version from 3.3.2-stable -> 3.4.4-stable.
### Fixed ### Fixed
- The `kill()` method of unix PTY node can now be called without error as the underlying - The `kill()` method of unix PTY node can now be called without error as the underlying

14
addons/godot_xterm/native/src/terminal.cpp
View file

@ -419,14 +419,12 @@ void Terminal::update_theme() {
Color default_color) -> void { Color default_color) -> void {
Color c; Color c;
c = has_color(theme_color, "Terminal") c = has_color(theme_color, "Terminal") ? get_color(theme_color, "Terminal")
? get_color(theme_color, "Terminal") : has_color_override(theme_color) ? get_color(theme_color, "")
: has_color_override(theme_color) : (default_theme != nullptr &&
? get_color(theme_color, "") default_theme->has_color(theme_color, "Terminal"))
: (default_theme != nullptr && ? default_theme->get_color(theme_color, "Terminal")
default_theme->has_color(theme_color, "Terminal")) : default_color;
? default_theme->get_color(theme_color, "Terminal")
: default_color;
color_palette[color][0] = c.get_r8(); color_palette[color][0] = c.get_r8();
color_palette[color][1] = c.get_g8(); color_palette[color][1] = c.get_g8();

4
project.godot
View file

@ -8,10 +8,6 @@
config_version=4 config_version=4
_global_script_classes=[ ]
_global_script_class_icons={
}
[application] [application]
config/name="Godot Xterm" config/name="Godot Xterm"