Skip to content

Commit 457b8ea

Browse files
Sync with upstream (#63)
1 parent fe8c44c commit 457b8ea

123 files changed

Lines changed: 1760 additions & 2124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/disabled_classes.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
"RichTextEffect",
119119
"SceneReplicationConfig",
120120
"ScriptExtension",
121-
"ShaderInclude",
122121
"Shape2D",
123122
"Shape3D",
124123
"SkeletonModification2D",
@@ -151,4 +150,4 @@
151150
"X509Certificate"
152151
],
153152
"type": "build_profile"
154-
}
153+
}

assets/icons/ShortcutPanel.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bqmx4oyj8c5mm"
6+
path="res://.godot/imported/ShortcutPanel.svg-954786637bc59adfc322367d34feba33.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/icons/ShortcutPanel.svg"
14+
dest_files=["res://.godot/imported/ShortcutPanel.svg-954786637bc59adfc322367d34feba33.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/uastc_level=0
22+
compress/rdo_quality_loss=0.0
23+
compress/hdr_compression=1
24+
compress/normal_map=0
25+
compress/channel_pack=0
26+
mipmaps/generate=false
27+
mipmaps/limit=-1
28+
roughness/mode=0
29+
roughness/src_normal=""
30+
process/channel_remap/red=0
31+
process/channel_remap/green=1
32+
process/channel_remap/blue=2
33+
process/channel_remap/alpha=3
34+
process/fix_alpha_border=true
35+
process/premult_alpha=false
36+
process/normal_map_invert_y=false
37+
process/hdr_as_srgb=false
38+
process/hdr_clamp_exposure=false
39+
process/size_limit=0
40+
detect_3d/compress_to=1
41+
svg/scale=1.0
42+
editor/scale_with_editor_scale=false
43+
editor/convert_colors_with_editor_theme=false

godot_only/scripts/tests.gd

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ func _run() -> void:
1515
for report_line in report:
1616
print_rich(report_line)
1717

18-
func add_to_report(test_category: String, test: String, result: String,
19-
expected: String) -> void:
20-
report.append('%s: [b]"%s"[/b] returned [b]"%s"[/b], expected [b]"%s"[/b]' %\
21-
[test_category, test, result, expected])
18+
func add_to_report(test_category: String, test: String, result: String, expected: String) -> void:
19+
report.append('%s: [b]"%s"[/b] returned [b]"%s"[/b], expected [b]"%s"[/b]' % [test_category, test, result, expected])
2220

2321

2422
# This test is dependent on specifics of the Formatter and AttributePathdata classes.

godot_only/scripts/update_translations.gd

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@tool
33
extends EditorScript
44

5-
const COMMENTS_DICT = {
5+
const COMMENTS_DICT: Dictionary[String, String] = {
66
"Viewport": "The viewport is the area where the graphic is displayed. In similar applications, it's often called the canvas.",
77
"CDATA color": "CDATA shouldn't be translated. It's a type of XML section.",
88
"Editor formatter": "Refers to the formatter used for VectorTouch's code editor.",
@@ -16,6 +16,7 @@ const COMMENTS_DICT = {
1616
"Dark": "Refers to a theme preset.",
1717
"Light": "Refers to a theme preset.",
1818
"Black (OLED)": "Refers to a theme preset.",
19+
"translation-credits": "Translators (comma-separated): Name or alias, optionally followed by an email in angle brackets <email@example.com>.\nUsed for credits. Adding yourself is optional. New entries go at the end. Don't remove or rearrange existing entries.",
1920
}
2021

2122
const TRANSLATIONS_DIR = "translations"
@@ -104,19 +105,21 @@ func update_translations() -> void:
104105
fa.store_string(HEADER)
105106
for msg in messages:
106107
if COMMENTS_DICT.has(msg.msgid):
107-
fa.store_string("#. %s\n" % COMMENTS_DICT[msg.msgid])
108+
var comment_lines := COMMENTS_DICT[msg.msgid].split("\n")
109+
var comment := ""
110+
for line in comment_lines:
111+
comment += "#. %s\n" % line
112+
fa.store_string(comment)
108113
used_comments.append(msg.msgid)
109114
fa.store_string(msg.to_string())
110115
fa = null
111-
print("Created %s with %d strings" % [TRANSLATIONS_DIR.path_join("/VectorTouch.pot"),
112-
(messages.size() + 1)])
116+
print("Created %s with %d strings" % [TRANSLATIONS_DIR.path_join("/GodSVG.pot"), (messages.size() + 1)])
113117

114118
for file in DirAccess.get_files_at(folder_location):
115119
if not (file.get_extension() == "po" or file == "VectorTouch.pot"):
116120
continue
117121

118-
var args := PackedStringArray(["--update", "--quiet", "--verbose", "--backup=off",
119-
folder_location.path_join(file), pot_location])
122+
var args := PackedStringArray(["--update", "--quiet", "--verbose", "--backup=off", folder_location.path_join(file), pot_location])
120123
var output: Array = []
121124
var result := OS.execute("msgmerge", args, output, true)
122125
if not result == -1:

0 commit comments

Comments
 (0)