Skip to content

Commit

Permalink
[merge] Update to Godot 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
IceflowRE committed Nov 30, 2023
2 parents a3fa68e + 0fbafad commit b55cfa7
Show file tree
Hide file tree
Showing 38 changed files with 512 additions and 312 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
id: "prepare-artifacts"
working-directory: publisher
run: |
go run . zip ../ ${{ matrix.config.id }}
echo "version=$(go run . version ../ ${{ matrix.config.id }})" >> $GITHUB_OUTPUT
go run . zip -b ../ -a ${{ matrix.config.id }} -o ../archives/
go run . github -b ../ -a ${{ matrix.config.id }} -o $GITHUB_OUTPUT
- name: Upload Artifacts
uses: actions/upload-artifact@v3
Expand All @@ -83,15 +83,15 @@ jobs:
- uses: mukunku/tag-exists-action@v1.2.0
id: checkTag
with:
tag: ${{ matrix.config.id }}-${{steps.prepare-artifacts.outputs.version}}
tag: ${{ matrix.config.id }}-${{ steps.prepare-artifacts.outputs.version }}

- name: Prepare Release
if: ${{ steps.checkTag.outputs.exists == 'false' }}
run: |
git config user.name github-actions
git config user.email github-actions@github.com
git tag ${{ matrix.config.id }}-${{steps.prepare-artifacts.outputs.version}}
git push origin tag ${{ matrix.config.id }}-${{steps.prepare-artifacts.outputs.version}}
git tag ${{ matrix.config.id }}-${{ steps.prepare-artifacts.outputs.version }}
git push origin tag ${{ matrix.config.id }}-${{ steps.prepare-artifacts.outputs.version }}
# wait 5s that the pushed tag is available in the next step, sometimes the next step saw only the local tag
- name: Wait 5s
Expand All @@ -102,11 +102,8 @@ jobs:
if: ${{ steps.checkTag.outputs.exists == 'false' }}
env:
GITHUB_TOKEN: ${{ github.token }}
NOTES: |
${{ matrix.config.name }}
Version: ${{steps.prepare-artifacts.outputs.version}}
run: |
gh release create ${{ matrix.config.id }}-${{steps.prepare-artifacts.outputs.version}} ./archives/* --title "${{ matrix.config.name }} ${{steps.prepare-artifacts.outputs.version}}" --notes "${{ env.NOTES }}"
gh release create ${{ matrix.config.id }}-${{ steps.prepare-artifacts.outputs.version }} ./archives/* --title "${{ matrix.config.name }} ${{ steps.prepare-artifacts.outputs.version }}" --notes "${{ steps.prepare-artifacts.outputs.notes }}"
combined-release:
name: Combined Release
Expand Down
79 changes: 68 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,20 @@ You are also not able to use the property `custom_minimum_size` anymore as it is

### Compatibility

- Godot 4.1
- Godot 4.2

### Example

[examples/aspect_ratio_resize_container](./examples/aspect_ratio_resize_container)

### Changelog

#### 3.1.0

- Require Godot 4.2
- Add more values to plugin.cfg
- Add static typing in for loops

---

## Custom Theme Overrides
Expand All @@ -67,7 +75,7 @@ If everything is set up, your theme override variables can be handled like every

### Compatibility

- Godot 4.1
- Godot 4.2

### Screenshot

Expand Down Expand Up @@ -113,6 +121,14 @@ func _property_get_revert(_property: StringName) -> Variant:

[examples/custom_theme_overrides](./examples/custom_theme_overrides)

### Changelog

#### 1.1.0

- Require Godot 4.2
- Add more values to plugin.cfg
- Add static typing in for loops

---

## Git SHA Project Setting
Expand All @@ -124,18 +140,23 @@ This one is automatically set and updated when you run any scene or on exporting

### Compatibility

- Godot 4.1
- Godot 4.2

### Example

[examples/metadata](./examples/metadata)

### Changelog

#### 2.1.0

- Require Godot 4.2
- Add more values to plugin.cfg

#### 2.0.0

Added an initial Git SHA load on opening the project.
Removed `application/config/version`, there was no need that this was part of the addon. The value can still be added manually.
- Added an initial Git SHA load on opening the project.
- Removed `application/config/version`, there was no need that this was part of the addon. The value can still be added manually.

---

Expand All @@ -147,12 +168,19 @@ This plugin will hide exported private properties in the inspector for instantia

### Compatibility

- Godot 4.1
- Godot 4.2

### Example

[examples/hide_private_properties](./examples/hide_private_properties)

### Changelog

#### 1.1.0

- Require Godot 4.2
- Add more values to plugin.cfg

---

## Icons Patcher
Expand All @@ -165,10 +193,15 @@ Then use `Project` -> `Tools` -> `Icons Patcher` to patch the icons.

### Compatibility

- Godot 4.1
- Godot 4.2

### Changelog

#### 1.3.0

- Require Godot 4.2
- Add more values to plugin.cfg

#### 1.2.0

- Added automatic file reimporting.
Expand All @@ -186,7 +219,7 @@ You can change the project license file either with a button at the upper right,

### Compatibility

- Godot 4.1
- Godot 4.2

### Screenshot

Expand All @@ -212,6 +245,13 @@ License class.

### Changelog

#### 1.6.0

- Require Godot 4.2
- Add more values to plugin.cfg
- Add static typing in for loops
- Use static sorting function as lambda

#### 1.5.0

- Removed overriden engine methods
Expand All @@ -232,7 +272,7 @@ Logging into a file is not supported yet. The output will be always done via pri

### Compatibility

- Godot 4.1
- Godot 4.2

### Example

Expand Down Expand Up @@ -295,6 +335,12 @@ If not log level is set, the log level of the parent logger will be used.
- `log(level: int, message: Variant, values: Array[Variant] = []) -> void`
log at custom level

### Changelog

#### 1.5.0

- Require Godot 4.2
- Add more values to plugin.cfg

---

Expand All @@ -304,7 +350,7 @@ QR Code generation either with the included `QRCodeRect` node or use the encodin

### Compatibility

- Godot 4.1
- Godot 4.2

### Screenshot

Expand Down Expand Up @@ -416,6 +462,12 @@ Shift JIS encoding utility.

### Changelog

#### 1.1.0

- Require Godot 4.2
- Add more values to plugin.cfg
- Add static typing in for loops

#### 1.0.0

- Renamed `get_string_from_jis_2004` to `get_string_from_shift_jis_2004`
Expand All @@ -441,7 +493,7 @@ Let you apply the icon color theme properties for the texture button. Uses `self

### Compatibility

- Godot 4.1
- Godot 4.2

### Dependencies

Expand All @@ -453,6 +505,11 @@ Let you apply the icon color theme properties for the texture button. Uses `self

### Changelog

#### 1.3.0

- Require Godot 4.2
- Add more values to plugin.cfg

#### 1.2.3

- Rename method `get_theme_color` to `get_theme_coloring`, this function was never called by the engine anyway and should not be overridden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func _set(property: StringName, value: Variant) -> bool:

func _get_children_min_size() -> Vector2:
var min_size: Vector2 = Vector2.ZERO
for child in self.get_children():
for child: Node in self.get_children():
if !(child is Control) || !child.visible:
continue
var child_min: Vector2 = child.get_combined_minimum_size()
Expand Down
16 changes: 14 additions & 2 deletions addons/aspect_ratio_resize_container/plugin.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
[plugin]

name="Aspect Ratio Resize Container"
description="MIT License"
description="Extending `AspectRatioContainer` and update it's own minimum size based on the children."
author="Iceflower S"
version="3.0.2"
version="3.1.0"
script="plugin.gd"
license="MIT"
repository="https://github.com/kenyoni-software/godot-addons"
keywords=[
"node"
]
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: MIT License"
]

[plugin.dependencies]
godot=">=4.2"
16 changes: 14 additions & 2 deletions addons/custom_theme_overrides/plugin.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
[plugin]

name="Custom Theme Overrides"
description="MIT License"
description="Utility to provide custom theme overrides for any node."
author="Iceflower S"
version="1.0.2"
version="1.1.0"
script="plugin.gd"
license="MIT"
repository="https://github.com/kenyoni-software/godot-addons"
keywords=[
"utility"
]
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: MIT License"
]

[plugin.dependencies]
godot=">=4.2"
6 changes: 3 additions & 3 deletions addons/custom_theme_overrides/theme_overrides.gd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Item:
return self.name

func _init(overrides: Array[Array]) -> void:
for item in overrides:
for item: Array in overrides:
self._overrides.append(Item.new(item[0], item[1]))

func theme_property_list(obj: Control) -> Array[Dictionary]:
Expand All @@ -41,7 +41,7 @@ func theme_property_list(obj: Control) -> Array[Dictionary]:
"usage": PROPERTY_USAGE_GROUP,
"hint_string": "theme_override_"
}]
for item in self._overrides:
for item: Item in self._overrides:
var prop_type: Variant.Type
var prop_hint: PropertyHint
var prop_hint_string: String
Expand Down Expand Up @@ -79,7 +79,7 @@ func theme_property_list(obj: Control) -> Array[Dictionary]:
return props

func can_revert(prop_name: StringName) -> bool:
for item in self._overrides:
for item: Item in self._overrides:
if item.full_name() == prop_name:
return true
return false
16 changes: 14 additions & 2 deletions addons/git_sha_project_setting/plugin.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
[plugin]

name="Git SHA Project Setting"
description="Adds Git SHA as prohect setting at application/config/git_sha - MIT License"
description="Adds Git SHA as prohect setting at application/config/git_sha"
author="Iceflower S"
version="2.0.1"
version="2.1.0"
script="plugin.gd"
license="MIT"
repository="https://github.com/kenyoni-software/godot-addons"
keywords=[
"tool"
]
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: MIT License"
]

[plugin.dependencies]
godot=">=4.2"
16 changes: 14 additions & 2 deletions addons/glogging/plugin.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
[plugin]

name="GLogging"
description="Adds a 'GLogging' singleton. - MIT License"
description="Adds a 'GLogging' singleton."
author="Iceflower S"
version="1.4.1"
version="1.5.0"
script="plugin.gd"
license="MIT"
repository="https://github.com/kenyoni-software/godot-addons"
keywords=[
"tool"
]
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: MIT License"
]

[plugin.dependencies]
godot=">=4.2"
4 changes: 1 addition & 3 deletions addons/hide_private_properties/inspector_plugin.gd
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
extends EditorInspectorPlugin

var editor_interface: EditorInterface

func _can_handle(object: Object) -> bool:
var scene_path: Variant = object.get("scene_file_path")
return scene_path != null && scene_path != "" && object != self.editor_interface.get_edited_scene_root()
return scene_path != null && scene_path != "" && object != EditorInterface.get_edited_scene_root()

func _parse_property(object: Object, type: Variant.Type, name: String, hint_type: PropertyHint, hint_string: String, usage_flags: int, wide: bool) -> bool:
if name.begins_with("_"):
Expand Down
Loading

0 comments on commit b55cfa7

Please sign in to comment.