Skip to content

Commit 4938de5

Browse files
piierthopiiertho
authored
chore: update to godot 4.2.1 and bump module version to 0.8.2 (#583)
1 parent 369b71f commit 4938de5

26 files changed

+180
-66
lines changed

‎.github/workflows/check-pr-engine-editor-debug-and-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/checkout@v2
3131
with:
3232
repository: godotengine/godot
33-
ref: 4.2-stable
33+
ref: 4.2.1-stable
3434
# TODO: remove once on godot 4.2.2 or newer!
3535
- name: Cherry pick macos fix
3636
run: |
@@ -85,7 +85,7 @@ jobs:
8585
uses: actions/checkout@v2
8686
with:
8787
repository: godotengine/godot
88-
ref: 4.2-stable
88+
ref: 4.2.1-stable
8989
# TODO: remove once on godot 4.2.2 or newer!
9090
- name: Cherry pick macos fix
9191
run: |
@@ -174,7 +174,7 @@ jobs:
174174
uses: actions/checkout@v2
175175
with:
176176
repository: godotengine/godot
177-
ref: 4.2-stable
177+
ref: 4.2.1-stable
178178
# TODO: remove once on godot 4.2.2 or newer!
179179
- name: Cherry pick macos fix
180180
run: |

‎.github/workflows/check-pr-engine-editor-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v2
4040
with:
4141
repository: godotengine/godot
42-
ref: 4.2-stable
42+
ref: 4.2.1-stable
4343
- name: Clone Godot JVM module.
4444
uses: actions/checkout@v2
4545
with:

‎.github/workflows/check-pr-engine-export-template-debug.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 4.2.0
7-
GODOT_BASE_BRANCH: 4.2.0
6+
GODOT_BASE_VERSION: 4.2.1
7+
GODOT_BASE_BRANCH: 4.2.1
88

99
concurrency:
1010
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-debug
@@ -63,7 +63,7 @@ jobs:
6363
uses: actions/checkout@v2
6464
with:
6565
repository: godotengine/godot
66-
ref: 4.2-stable
66+
ref: 4.2.1-stable
6767
# TODO: remove once on godot 4.2.2 or newer!
6868
- name: Cherry pick macos fix
6969
run: |
@@ -129,7 +129,7 @@ jobs:
129129
uses: actions/checkout@v2
130130
with:
131131
repository: godotengine/godot
132-
ref: 4.2-stable
132+
ref: 4.2.1-stable
133133
- name: Clone Godot JVM module.
134134
uses: actions/checkout@v2
135135
with:

‎.github/workflows/check-pr-engine-export-template-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
uses: actions/checkout@v2
6363
with:
6464
repository: godotengine/godot
65-
ref: 4.2-stable
65+
ref: 4.2.1-stable
6666
- name: Clone Godot JVM module.
6767
uses: actions/checkout@v2
6868
with:
@@ -128,7 +128,7 @@ jobs:
128128
uses: actions/checkout@v2
129129
with:
130130
repository: godotengine/godot
131-
ref: 4.2-stable
131+
ref: 4.2.1-stable
132132
- name: Clone Godot JVM module.
133133
uses: actions/checkout@v2
134134
with:

‎.github/workflows/check-pr-entry-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: godotengine/godot
16-
ref: 4.2-stable
16+
ref: 4.2.1-stable
1717
- name: Clone Godot JVM module.
1818
uses: actions/checkout@v2
1919
with:

‎.github/workflows/check-pr-godot-kotlin-symbol-processor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: godotengine/godot
16-
ref: 4.2-stable
16+
ref: 4.2.1-stable
1717
- name: Clone Godot JVM module.
1818
uses: actions/checkout@v2
1919
with:

‎.github/workflows/check-pr-jvm-godot-library.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v2
2222
with:
2323
repository: godotengine/godot
24-
ref: 4.2-stable
24+
ref: 4.2.1-stable
2525
- name: Clone Godot JVM module.
2626
uses: actions/checkout@v2
2727
with:

‎.github/workflows/deploy-export-template.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
uses: actions/checkout@v2
166166
with:
167167
repository: godotengine/godot
168-
ref: 4.2-stable
168+
ref: 4.2.1-stable
169169

170170
# TODO: remove once on godot 4.2.2 or newer!
171171
- name: Cherry pick macos fix
@@ -266,7 +266,7 @@ jobs:
266266
uses: actions/checkout@v2
267267
with:
268268
repository: godotengine/godot
269-
ref: 4.2-stable
269+
ref: 4.2.1-stable
270270

271271
- name: Clone Godot JVM module.
272272
uses: actions/checkout@v2
@@ -418,7 +418,7 @@ jobs:
418418
uses: actions/checkout@v2
419419
with:
420420
repository: godotengine/godot
421-
ref: 4.2-stable
421+
ref: 4.2.1-stable
422422

423423
- name: Get release export template binary
424424
uses: actions/download-artifact@v3
@@ -477,7 +477,7 @@ jobs:
477477
uses: actions/checkout@v2
478478
with:
479479
repository: godotengine/godot
480-
ref: 4.2-stable
480+
ref: 4.2.1-stable
481481

482482
- name: Get release export template binary
483483
uses: actions/download-artifact@v3
@@ -618,7 +618,7 @@ jobs:
618618

619619
- name: Create version.txt
620620
run: |
621-
refVersion=4.2-stable #for easier search and replace with other `ref` occurrences
621+
refVersion=4.2.1-stable #for easier search and replace with other `ref` occurrences
622622
templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
623623
echo "$templatesVersion" > templates/version.txt
624624
shell: bash

‎.github/workflows/deploy-godot-editor-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
uses: actions/checkout@v2
7575
with:
7676
repository: godotengine/godot
77-
ref: 4.2-stable
77+
ref: 4.2.1-stable
7878

7979
# TODO: remove once on godot 4.2.2 or newer!
8080
- name: Cherry pick macos fix
@@ -237,7 +237,7 @@ jobs:
237237
uses: actions/checkout@v2
238238
with:
239239
repository: godotengine/godot
240-
ref: 4.2-stable
240+
ref: 4.2.1-stable
241241

242242
- name: Get editor binary
243243
uses: actions/download-artifact@v3

‎.github/workflows/deploy-godot-entry-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v2
1515
with:
1616
repository: godotengine/godot
17-
ref: 4.2-stable
17+
ref: 4.2.1-stable
1818
- name: Clone Godot JVM module.
1919
uses: actions/checkout@v2
2020
with:

‎.github/workflows/deploy-godot-kotlin-symbol-processor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v2
1818
with:
1919
repository: godotengine/godot
20-
ref: 4.2-stable
20+
ref: 4.2.1-stable
2121
- name: Clone Godot JVM module.
2222
uses: actions/checkout@v2
2323
with:

‎.github/workflows/deploy-godot-library.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v2
3030
with:
3131
repository: godotengine/godot
32-
ref: 4.2-stable
32+
ref: 4.2.1-stable
3333
- name: Clone Godot JVM module.
3434
uses: actions/checkout@v2
3535
with:

‎docs/src/doc/user-guide/versioning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The module uses semantic versioning for its own versions but adds a suffix for the supported Godot version:
22

3-
Full version: `0.8.1-4.2.0`
3+
Full version: `0.8.2-4.2.0`
44

5-
Module Version: `0.8.1`
5+
Module Version: `0.8.2`
66

77
Supported Godot Version: `4.2.0`

‎kt/api-generator/src/main/resources/api.json

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"header": {
33
"version_major": 4,
44
"version_minor": 2,
5-
"version_patch": 0,
5+
"version_patch": 1,
66
"version_status": "stable",
77
"version_build": "custom_build",
8-
"version_full_name": "Godot Engine v4.2.stable.custom_build"
8+
"version_full_name": "Godot Engine v4.2.1.stable.custom_build"
99
},
1010
"builtin_class_sizes": [
1111
{
@@ -136423,6 +136423,17 @@
136423136423
"inherits": "Node2D",
136424136424
"api_type": "core",
136425136425
"methods": [
136426+
{
136427+
"name": "get_rid",
136428+
"is_const": true,
136429+
"is_vararg": false,
136430+
"is_static": false,
136431+
"is_virtual": false,
136432+
"hash": 2944877500,
136433+
"return_value": {
136434+
"type": "RID"
136435+
}
136436+
},
136426136437
{
136427136438
"name": "set_enabled",
136428136439
"is_const": false,
@@ -136744,6 +136755,17 @@
136744136755
"inherits": "Node3D",
136745136756
"api_type": "core",
136746136757
"methods": [
136758+
{
136759+
"name": "get_rid",
136760+
"is_const": true,
136761+
"is_vararg": false,
136762+
"is_static": false,
136763+
"is_virtual": false,
136764+
"hash": 2944877500,
136765+
"return_value": {
136766+
"type": "RID"
136767+
}
136768+
},
136747136769
{
136748136770
"name": "set_enabled",
136749136771
"is_const": false,
@@ -140341,6 +140363,17 @@
140341140363
"inherits": "Node2D",
140342140364
"api_type": "core",
140343140365
"methods": [
140366+
{
140367+
"name": "get_rid",
140368+
"is_const": true,
140369+
"is_vararg": false,
140370+
"is_static": false,
140371+
"is_virtual": false,
140372+
"hash": 2944877500,
140373+
"return_value": {
140374+
"type": "RID"
140375+
}
140376+
},
140344140377
{
140345140378
"name": "set_navigation_polygon",
140346140379
"is_const": false,
@@ -140741,6 +140774,17 @@
140741140774
"inherits": "Node3D",
140742140775
"api_type": "core",
140743140776
"methods": [
140777+
{
140778+
"name": "get_rid",
140779+
"is_const": true,
140780+
"is_vararg": false,
140781+
"is_static": false,
140782+
"is_virtual": false,
140783+
"hash": 2944877500,
140784+
"return_value": {
140785+
"type": "RID"
140786+
}
140787+
},
140744140788
{
140745140789
"name": "set_navigation_mesh",
140746140790
"is_const": false,

‎kt/godot-library/src/main/kotlin/godot/gen/godot/BaseMaterial3D.kt

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kt/godot-library/src/main/kotlin/godot/gen/godot/CameraAttributesPhysical.kt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)