Skip to content

Commit

Permalink
Merge pull request #6 from V-Sekai/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
fire authored Dec 5, 2024
2 parents 0617887 + f94acc8 commit bc62849
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 13 deletions.
23 changes: 19 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,19 @@ jobs:
name: Godot-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
path: editor

merge:
runs-on: ubuntu-latest
needs: ["build", "build-native"]
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: v-sekai-world
delete-merged: true

release:
runs-on: ubuntu-latest
needs: build
needs: merge
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
steps:
- name: Create Release
Expand All @@ -217,12 +227,17 @@ jobs:
path: v-sekai-world
name: v-sekai-world

- name: Zip Artifacts
run: |
tree
zip -r v-sekai-world.zip v-sekai-world
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./v-sekai-world
asset_name: v-sekai-world
asset_content_type: application/octet-stream
asset_path: ./v-sekai-world.zip
asset_name: v-sekai-world.zip
asset_content_type: application/zip
4 changes: 2 additions & 2 deletions godot/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/V-Sekai/godot.git
branch = groups-4.4
commit = 2e88ac16c1fad1d13f4882f466356cc1c24b22a7
parent = dbea8e19ac226e26b20cbb6c85a18ea07940b772
commit = 44d2bc3ab61be9576a941f9c5931db4426215af4
parent = 671983d2cb7b4c5ad5e3c70fc81624058be03227
method = merge
cmdver = 0.4.9
7 changes: 4 additions & 3 deletions godot/doc/classes/AnimationNode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,21 @@
<method name="get_processing_animation_tree_instance_id" qualifiers="const">
<return type="int" />
<description>
Returns the object id of the [AnimationTree] that owns this node. This method should only be called from within the [method AnimationNodeExtension._process] method, and will return an invalid id otherwise.
Returns the object id of the [AnimationTree] that owns this node.
[b]Note:[/b] This method should only be called from within the [method AnimationNodeExtension._process] method, and will return an invalid id otherwise.
</description>
</method>
<method name="is_path_filtered" qualifiers="const">
<return type="bool" />
<param index="0" name="path" type="NodePath" />
<description>
Returns whether the given path is filtered.
Returns [code]true[/code] if the given path is filtered.
</description>
</method>
<method name="is_process_testing" qualifiers="const">
<return type="bool" />
<description>
Returns whether this animation node is being processed in test-only mode.
Returns [code]true[/code] if this animation node is being processed in test-only mode.
</description>
</method>
<method name="remove_input">
Expand Down
8 changes: 4 additions & 4 deletions godot/doc/classes/AnimationNodeExtension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
<param index="1" name="test_only" type="bool" />
<description>
A version of the [method AnimationNode._process] method that is meant to be overridden by custom nodes. It returns a [PackedFloat32Array] with the processed animation data.
The [PackedFloat64Array] parameter contains the playback information, containing the following values (in order): playback time and delta, start and end times, whether a seek was requested, whether the seek request was externally requested, the current [enum Animation.LoopedFlag] (encoded as a float), and the current blend weight.
The function must return a [PackedFloat32Array] of the node's time info, containing the following values (in order): animation length, time position, delta, [enum Animation.LoopMode] (encoded as a float), whether the animation is about to end and whether the animation is infinite. All values must be included in the returned array.
The [PackedFloat64Array] parameter contains the playback information, containing the following values encoded as floating point numbers (in order): playback time and delta, start and end times, whether a seek was requested (encoded as a float greater than [code]0[/code]), whether the seek request was externally requested (encoded as a float greater than [code]0[/code]), the current [enum Animation.LoopedFlag] (encoded as a float), and the current blend weight.
The function must return a [PackedFloat32Array] of the node's time info, containing the following values (in order): animation length, time position, delta, [enum Animation.LoopMode] (encoded as a float), whether the animation is about to end (encoded as a float greater than [code]0[/code]) and whether the animation is infinite (encoded as a float greater than [code]0[/code]). All values must be included in the returned array.
</description>
</method>
<method name="get_remaining_time" qualifiers="static">
<return type="float" />
<param index="0" name="node_info" type="PackedFloat32Array" />
<param index="1" name="break_loop" type="bool" />
<description>
Returns the remaining time of the animation for a given node time info [PackedFloat32Array].
Returns the animation's remaining time for the given node info. For looping animations, it will only return the remaining time if [param break_loop] is [code]true[/code], a large integer value will be returned otherwise.
</description>
</method>
<method name="is_looping" qualifiers="static">
<return type="bool" />
<param index="0" name="node_info" type="PackedFloat32Array" />
<description>
Returns whether the animation is looping for a given node time info [PackedFloat32Array].
Returns [code]true[/code] if the animation for the given [param node_info] is looping.
</description>
</method>
</methods>
Expand Down

0 comments on commit bc62849

Please sign in to comment.