Skip to content

Commit

Permalink
Merge branch '4.1' into 4.2-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
badlogic committed Sep 21, 2023
2 parents f221cf2 + a2b80fe commit c99535e
Show file tree
Hide file tree
Showing 75 changed files with 20,668 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/spine-godot-v4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ jobs:
ls -lahR
mv godot.windows.editor.x86_64.mono.exe godot-$BRANCH-$GODOT_TAG-mono.exe
mv godot.linuxbsd.editor.x86_64.mono godot-$BRANCH-$GODOT_TAG-mono
zip godot-editor-windows-mono.zip godot-$BRANCH-$GODOT_TAG-mono.exe GodotSharp
zip godot-editor-linux-mono.zip godot-$BRANCH-$GODOT_TAG-mono GodotSharp
zip -r godot-editor-windows-mono.zip godot-$BRANCH-$GODOT_TAG-mono.exe GodotSharp
zip -r godot-editor-linux-mono.zip godot-$BRANCH-$GODOT_TAG-mono GodotSharp
mv godot-editor-macos.zip godot-editor-macos-mono.zip
aws s3 cp godot-editor-windows-mono.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
aws s3 cp godot-editor-linux-mono.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,4 @@ spine-godot/godot-nuget
spine-godot/godot-spine-csharp
spine-ue4/Plugins/Developer
spine-haxe/export
spine-godot/example-v4-csharp/.godot
7 changes: 4 additions & 3 deletions spine-godot/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"cmake.configureOnOpen": false,
"C_Cpp.intelliSenseEngine": "disabled",
}
"cmake.configureOnOpen": false,
"C_Cpp.intelliSenseEngine": "disabled",
"dotnet.defaultSolution": "disable"
}
7 changes: 2 additions & 5 deletions spine-godot/build/build-v4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ fi

if [ -f "../godot/custom.py" ]; then
dev="true"
fi

if [ -f "../godot/custom.py" ]; then
dev="true"
echo "DEV build"
fi

mono_module=""
Expand All @@ -55,7 +52,7 @@ cpus=2
if [ "$OSTYPE" == "msys" ]; then
os="windows"
cpus=$NUMBER_OF_PROCESSORS
target="vsproj=yes livepp=$LIVEPP"
target="$target vsproj=yes livepp=$LIVEPP"
godot_exe="godot.windows.editor$dev_extension.x86_64$mono_extension.exe"
godot_exe_host=$godot_exe
elif [[ "$OSTYPE" == "darwin"* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion spine-godot/build/install-macos-vulkan-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set -euo pipefail
IFS=$'\n\t'

# Download and install the Vulkan SDK.
curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/vulkan-sdk.dmg
curl -L "https://sdk.lunarg.com/sdk/download/1.3.250.1/mac/vulkansdk-macos-1.3.250.1.dmg" -o /tmp/vulkan-sdk.dmg
hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
--accept-licenses --default-answer --confirm-command install
Expand Down
22 changes: 11 additions & 11 deletions spine-godot/build/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ if [ $dev = "true" ]; then
rm -rf example/.import
rm -rf example/.godot

if [ "$OSTYPE" = "msys" ]; then
pushd godot
if [[ $branch == 3* ]]; then
echo "Applying V3 Live++ patch"
git apply ../build/livepp.patch
else
echo "Applying V4 Live++ patch"
git apply ../build/livepp-v4.patch
fi
popd
fi
#if [ "$OSTYPE" = "msys" ]; then
# pushd godot
# if [[ $branch == 3* ]]; then
# echo "Applying V3 Live++ patch"
# git apply ../build/livepp.patch
# else
# echo "Applying V4 Live++ patch"
# git apply ../build/livepp-v4.patch
# fi
# popd
#fi

if [ `uname` == 'Darwin' ] && [ ! -d "$HOME/VulkanSDK" ]; then
./build/install-macos-vulkan-sdk.sh
Expand Down
Binary file added spine-godot/example-v4-csharp/assets/footstep.ogg
Binary file not shown.
19 changes: 19 additions & 0 deletions spine-godot/example-v4-csharp/assets/footstep.ogg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://can7k84o8svum"
path="res://.godot/imported/footstep.ogg-789c3f1e3c4e0ca3bebcb13f1160f623.oggvorbisstr"

[deps]

source_file="res://assets/footstep.ogg"
dest_files=["res://.godot/imported/footstep.ogg-789c3f1e3c4e0ca3bebcb13f1160f623.oggvorbisstr"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2]

[ext_resource path="res://assets/mix-and-match/mix-and-match.atlas" type="SpineAtlasResource" id=1]
[ext_resource path="res://assets/mix-and-match/mix-and-match-pro.spine-json" type="SpineSkeletonFileResource" id=2]

[resource]
atlas_res = ExtResource( 1 )
skeleton_file_res = ExtResource( 2 )
animations = null
skins = null
Loading

0 comments on commit c99535e

Please sign in to comment.