Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ body:
attributes:
label: Godot Version / Godotのバージョン
description: What version of Godot are you using? / ご利用のGodotのバージョンを記載してください。
placeholder: e.g. 4.6.0-stable
placeholder: e.g. 4.7.0-stable
validations:
required: true

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ on:
required: true
type: choice
options:
- "4.6"
- "4.7"
default: "4.6"
default: "4.7"
description: "Target Godot API version"
upload_release:
# 既定でビルドのみ行い、true を指定した場合だけ Release を作成する
Expand All @@ -23,7 +22,7 @@ on:
type: boolean

env:
GODOT_VERSION: ${{ inputs.godot_version || '4.6' }}
GODOT_VERSION: ${{ inputs.godot_version || '4.7' }}
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
PYTHONIOENCODING: utf8
Expand Down
2 changes: 1 addition & 1 deletion README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

### 1. サンプルで動作確認する

1. **Godot Engine の準備**: [公式サイト](https://godotengine.org/download/) から 4.6 系のエディタをダウンロードします。
1. **Godot Engine の準備**: [公式サイト](https://godotengine.org/download/) から 4.7 系のエディタをダウンロードします。
2. **GDExtension の取得**: [Releases](https://github.com/cri-middleware/SSPlayerForGodot/releases) から最新パッケージをダウンロードし、展開します。
3. **サンプルの準備**: 取得した `addons` フォルダを、本リポジトリの [examples/Ringo](./examples/Ringo) フォルダ内にコピーします。
4. **確認**: Godot Engine で [examples/Ringo](./examples/Ringo) プロジェクトを開き、`Ringo.tscn` を開くことですぐにアニメーションの動作を確認できます。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ We provide two Quick Starts: one for quickly checking the operation using a samp

### 1. Check Operation with Sample

1. **Get Godot Engine**: Download a 4.6-series editor from the [official site](https://godotengine.org/download/).
1. **Get Godot Engine**: Download a 4.7-series editor from the [official site](https://godotengine.org/download/).
2. **Download GDExtension**: Get the latest package from [Releases](https://github.com/cri-middleware/SSPlayerForGodot/releases) and extract it.
3. **Prepare Sample**: Copy the extracted `addons` folder into the [examples/Ringo](./examples/Ringo) folder of this repository.
4. **Check**: Open the [examples/Ringo](./examples/Ringo) project in Godot Engine and open `Ringo.tscn` to immediately see the animation working.
Expand Down
4 changes: 2 additions & 2 deletions docs/en/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ graph LR

## Supported Versions

- **Godot Engine**: [4.6 branch](https://github.com/godotengine/godot/tree/4.6)
- **Godot Engine**: [4.7 branch](https://github.com/godotengine/godot/tree/4.7)
- **godot-cpp**: [master branch](https://github.com/godotengine/godot-cpp/tree/master)

> [!NOTE]
> GDExtension is officially supported starting from Godot 4.6.
> GDExtension is officially supported starting from Godot 4.7.

Build and execution have been verified on Windows / macOS.

Expand Down
4 changes: 2 additions & 2 deletions docs/en/setup/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Clone this repository, and clone Godot Engine / godot-cpp depending on your buil
```bash
git clone https://github.com/cri-middleware/SSPlayerForGodot.git
cd SSPlayerForGodot
git clone https://github.com/godotengine/godot.git -b 4.6
git clone https://github.com/godotengine/godot.git -b 4.7
git clone https://github.com/godotengine/godot-cpp.git -b master
```

Expand Down Expand Up @@ -81,7 +81,7 @@ Output is placed under `bin/<platform>/`, and the GDExtension package (including

## 2-B. Build the Custom-Module Godot Engine

Requires `godot` to be cloned at the `4.6` branch.
Requires `godot` to be cloned at the `4.7` branch.
`build.sh` / `build.ps1` invoke `scons` with `custom_modules=../ss_player`.

**macOS / Linux**
Expand Down
2 changes: 1 addition & 1 deletion docs/en/setup/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Steps for getting started with SpriteStudioPlayer for Godot.

The shortest path to using the plugin without any build work.

1. Download a 4.6-series Godot Engine from the [official site](https://godotengine.org/download/).
1. Download a 4.7-series Godot Engine from the [official site](https://godotengine.org/download/).
2. Download the GDExtension bundle for your platform from the [SSPlayerForGodot Releases](https://github.com/cri-middleware/SSPlayerForGodot/releases).
3. Extract the ZIP and copy the `addons` folder it contains into your Godot project root directory.
* If placed correctly, `res://addons/spritestudio/spritestudio.gdextension` should exist.
Expand Down
4 changes: 2 additions & 2 deletions docs/ja/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ graph LR

## 対応バージョン

- **Godot Engine**: [4.6 ブランチ](https://github.com/godotengine/godot/tree/4.6)
- **Godot Engine**: [4.7 ブランチ](https://github.com/godotengine/godot/tree/4.7)
- **godot-cpp**: [master ブランチ](https://github.com/godotengine/godot-cpp/tree/master)

> [!NOTE]
> GDExtension は Godot 4.6 以降から正式サポートされます。
> GDExtension は Godot 4.7 以降から正式サポートされます。

Windows / macOS でのビルドおよび実行を確認しています。

Expand Down
4 changes: 2 additions & 2 deletions docs/ja/setup/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GDExtension またはカスタムモジュール組み込み Godot Engine を自
```bash
git clone https://github.com/cri-middleware/SSPlayerForGodot.git
cd SSPlayerForGodot
git clone https://github.com/godotengine/godot.git -b 4.6
git clone https://github.com/godotengine/godot.git -b 4.7
git clone https://github.com/godotengine/godot-cpp.git -b master
```

Expand Down Expand Up @@ -81,7 +81,7 @@ $env:PYTHONUTF8=1

## 2-B. カスタムモジュール組み込み Godot Engine のビルド

`godot` を `4.6` ブランチで clone 済みであることが前提です。
`godot` を `4.7` ブランチで clone 済みであることが前提です。
`build.sh` / `build.ps1` は `custom_modules=../ss_player` を指定して `scons` を実行します。

**macOS / Linux**
Expand Down
2 changes: 1 addition & 1 deletion docs/ja/setup/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SpriteStudioPlayer for Godot を使い始めるための手順です。

ビルド作業なしでプラグインを利用できる最短の手順です。

1. [公式サイト](https://godotengine.org/download/) より 4.6 系の Godot Engine をダウンロードします。
1. [公式サイト](https://godotengine.org/download/) より 4.7 系の Godot Engine をダウンロードします。
2. [SSPlayerForGodot の Releases](https://github.com/cri-middleware/SSPlayerForGodot/releases) から該当プラットフォーム向けの GDExtension 一式をダウンロードします。
3. ダウンロードした ZIP を解凍し、中にある `addons` フォルダをそのまま Godot プロジェクトのルートディレクトリにコピーします。
* 正しく配置されると、`res://addons/spritestudio/spritestudio.gdextension` が存在する状態になります。
Expand Down
2 changes: 1 addition & 1 deletion examples/Override_Ringo/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="Override_Ringo"
run/main_scene="res://Ringo.tscn"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/ParticleEffect/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="ParticleEffect"
run/main_scene="uid://cty11r2qfs3we"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/Ringo/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="Ringo"
run/main_scene="res://Ringo.tscn"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/Scripting/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="Ringo"
run/main_scene="res://Ringo.tscn"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/allAttributeV7/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
[application]

config/name="allAttributeV7"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/allPartsV7/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
[application]

config/name="allPartsV7"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/dev_gdextension/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="dev_gdextension"
run/main_scene="uid://41tstw2esic"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[physics]
Expand Down
3 changes: 3 additions & 0 deletions examples/dev_module/node_2d.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ position = Vector2(145, 333)
ssab = ExtResource("1_wtcfe")
animation = "00_action_01_left"
autoplay = true
sub_frame_enabled = true
animation_section_end = 373
cellmaps/spr_00_00_1 = null
cellmaps/spr_00_00_0 = null
Expand All @@ -18,6 +19,7 @@ position = Vector2(365, 337)
ssab = ExtResource("1_wtcfe")
animation = "00_action_01_left"
autoplay = true
sub_frame_enabled = true
animation_section_end = 373
cellmaps/spr_00_00_1 = null
cellmaps/spr_00_00_0 = null
Expand All @@ -27,6 +29,7 @@ position = Vector2(605, 350)
ssab = ExtResource("1_wtcfe")
animation = "00_action_01_left"
autoplay = true
sub_frame_enabled = true
animation_section_end = 373
cellmaps/spr_00_00_1 = null
cellmaps/spr_00_00_0 = null
6 changes: 5 additions & 1 deletion examples/dev_module/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="dev_module"
run/main_scene="res://node_2d.tscn"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[display]

window/vsync/vsync_mode=0

[rendering]

textures/vram_compression/import_etc2_astc=true
2 changes: 1 addition & 1 deletion examples/overall/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="overall"
run/main_scene="uid://dnijei7f6aclq"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[rendering]
Expand Down
2 changes: 1 addition & 1 deletion examples/overall_gdextension/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true

config/name="overall_gdextension"
run/main_scene="uid://brj1ki824pka4"
config/features=PackedStringArray("4.6", "GL Compatibility")
config/features=PackedStringArray("4.7", "GL Compatibility")
config/icon="res://icon.svg"

[physics]
Expand Down
2 changes: 1 addition & 1 deletion misc/spritestudio.gdextension
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[configuration]

entry_symbol = "ss_player_library_init"
compatibility_minimum = "4.6"
compatibility_minimum = "4.7"

[libraries]

Expand Down
2 changes: 1 addition & 1 deletion scripts/build-extension.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $scons_default_opts = @{
target = "editor"
compiledb = "yes"
use_static_cpp = "no"
api_version = "4.6"
api_version = "4.7"
}

# winbuild default options
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-extension.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ declare -A scons_default_opts=(
[platform]=${PLATFORM}
[target]="editor"
[compiledb]="yes"
[api_version]="4.6"
[api_version]="4.7"
)

# macbuild default options
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $scons_default_opts = @{
$winbuild_default_opts = @{
cpus = $cpus
ccache = "no"
version = "4.6"
version = "4.7"
}

$opts = @{}
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ declare -A scons_default_opts=(
declare -A build_default_opts=(
[cpus]=${CPUS}
[ccache]="no"
[version]="4.6"
[version]="4.7"
[strip]="no"
)

Expand Down
2 changes: 1 addition & 1 deletion ss_player/SpriteStudio-SDK
Loading
Loading