Compare commits

..

7 Commits

Author SHA1 Message Date
9cd53d3a56 Lint job should use python 3.11
All checks were successful
linting & formatting / build (push) Successful in 22s
2025-01-13 19:01:45 -07:00
7642843f5b Added build badges
All checks were successful
linting & formatting / build (push) Successful in 24s
2025-01-13 14:53:36 -07:00
2e3b51e3b1 Added CI job for linting
All checks were successful
linting & formatting / build (push) Successful in 20s
2025-01-13 13:43:11 -07:00
f8fc28ed68 Added Git VCS plugin 2025-01-13 12:37:28 -07:00
35c795dbfe Ball meshes have a visibility root 2025-01-13 12:29:14 -07:00
dd15c88585 Revised debug version overlay to only try populating advanced info when running from editor
All checks were successful
GFOLF - itch.io publish action / build (linux64, x86_64) (push) Successful in 56s
GFOLF - itch.io publish action / build (osx, app) (push) Successful in 1m0s
GFOLF - itch.io publish action / build (win64, exe) (push) Successful in 1m7s
2025-01-12 22:49:56 -07:00
4854fd0aab Added gitea publish action
All checks were successful
GFOLF - itch.io publish action / build (linux64, x86_64) (push) Successful in 56s
GFOLF - itch.io publish action / build (osx, app) (push) Successful in 1m1s
GFOLF - itch.io publish action / build (win64, exe) (push) Successful in 1m9s
2025-01-12 22:35:34 -07:00
22 changed files with 1642 additions and 178 deletions

View File

@ -0,0 +1,32 @@
name: linting & formatting
run-name: ${{ gitea.actor }} is checking linting & formatting.
on:
push:
branches:
- main
- ci-test
tags:
- v*
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
run: |
git init
git remote add origin ${{ gitea.event.repository.clone_url }}
git fetch --depth 1 origin ${{ gitea.ref }}
git checkout FETCH_HEAD
git lfs pull
- name: Setup Python
uses: actions/setup-python@v5.3.0
with:
python-version: '3.11'
- name: Install gdscript-toolkit
run: pip install -r requirements.txt
- name: Run gdLint
run: gdlint src/
- name: Check formatting
run: gdformat -c src

View File

@ -0,0 +1,54 @@
# Based on https://github.com/aBARICHELLO/godot-ci/blob/master/.github/workflows/godot-ci.yml
name: GFOLF - itch.io publish action
run-name: ${{ gitea.actor }} is publishing GFOLF ${{ gitea.ref_name }} to itch.io.
on:
push:
tags:
- v*
env:
GODOT_VERSION: 4.3
EXPORT_NAME: gfolf
PROJECT_PATH: .
jobs:
build:
runs-on: ubuntu-20.04
container:
image: barichello/godot-ci:4.3
strategy:
matrix:
include:
- target: linux64
type: x86_64
- target: osx
type: app
- target: win64
type: exe
env:
BUILD_DIR: build/gfolf_${{ gitea.ref_name }}_${{ matrix.target }}
steps:
- name: Checkout repository
run: |
git init
git remote add origin ${{ gitea.event.repository.clone_url }}
git fetch --depth 1 origin ${{ gitea.ref }}
git checkout FETCH_HEAD
git lfs pull
- name: Reimport assets
# bruh are you fucking kidding me. bruhh
run: |
timeout 10 godot --headless --import || true
godot --headless --import
- name: Build project
run: |
echo "building to $BUILD_DIR"
mkdir -p $BUILD_DIR
godot --headless --export-debug ${{ matrix.target }} $BUILD_DIR/gfolf.${{ matrix.type }}
- name: Publish
run: |
echo "pushing $BUILD_DIR"
butler push $BUILD_DIR tetramorph/gfolf:${{ matrix.target }} --userversion ${{ gitea.ref_name }}
env:
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}

View File

@ -1,7 +1,16 @@
# Gfolf2 # Gfolf2
![Lint Status](../../../actions/workflows/lint.yaml/badge.svg)
![Publish Status](../../../actions/workflows/publish.yaml/badge.svg)
GFOLF: Combat Golf Action GFOLF: Combat Golf Action
## About
Go hit your friends with golf balls!
A prototype under active development.
## Development ## Development
see [[DEVELOPMENT.md]] see [[DEVELOPMENT.md]]

View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2016-2023 The Godot Engine community
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,12 @@
[configuration]
entry_symbol = "git_plugin_init"
compatibility_minimum = "4.1.0"
[libraries]
macos.editor = "macos/libgit_plugin.macos.editor.universal.dylib"
windows.editor.x86_64 = "win64/libgit_plugin.windows.editor.x86_64.dll"
linux.editor.x86_64 = "linux/libgit_plugin.linux.editor.x86_64.so"
linux.editor.arm64 = "linux/libgit_plugin.linux.editor.arm64.so"
linux.editor.rv64 = ""

View File

@ -0,0 +1,7 @@
[plugin]
name="Godot Git Plugin"
description="This plugin lets you interact with Git without leaving the Godot editor. More information can be found at https://github.com/godotengine/godot-git-plugin/wiki"
author="twaritwaikar"
version="v3.1.1"
script="godot-git-plugin.gd"

View File

@ -47,9 +47,8 @@ echo "Packaging to: $BUILD_DIR"
## Shared build logic ## Shared build logic
function build_project { function build_project {
TARGET="$1" TARGET="$1"
TARGET_SHORT="$2"
TARGET_EXT="$3" TARGET_EXT="$3"
TARGET_SUBDIR="$PROJECT_NAME""_$TARGET_SHORT" TARGET_SUBDIR="$PROJECT_NAME""_$TARGET"
TARGET_DIR="$BUILD_DIR/$TARGET_SUBDIR" TARGET_DIR="$BUILD_DIR/$TARGET_SUBDIR"
TARGET_OUT="$TARGET_DIR/$PROJECT_NAME.$TARGET_EXT" TARGET_OUT="$TARGET_DIR/$PROJECT_NAME.$TARGET_EXT"
@ -61,7 +60,7 @@ function build_project {
godot --headless --export-debug "$TARGET" $TARGET_OUT godot --headless --export-debug "$TARGET" $TARGET_OUT
set +x set +x
ZIP_OUT="$PROJECT_NAME""_$VERSION_TAG""_$TARGET_SHORT.7z" ZIP_OUT="$PROJECT_NAME""_$VERSION_TAG""_$TARGET.7z"
echo "Packaging to: $ZIP_OUT" echo "Packaging to: $ZIP_OUT"
# TODO # TODO
@ -72,10 +71,10 @@ function build_project {
# Build linux # Build linux
build_project "Linux" "linux64" "x86_64" build_project "linux64" "x86_64"
# Build OSX # Build OSX
build_project "macOS" "osx" "app" build_project "osx" "app"
# Build Michaelsoft Binbows # Build Michaelsoft Binbows
build_project "Windows Desktop" "win64" "exe" build_project "win64" "exe"

View File

@ -1,6 +1,6 @@
[preset.0] [preset.0]
name="Linux" name="linux64"
platform="Linux" platform="Linux"
runnable=true runnable=true
advanced_options=true advanced_options=true
@ -40,7 +40,7 @@ rm -rf \"{temp_dir}\""
[preset.1] [preset.1]
name="Windows Desktop" name="win64"
platform="Windows Desktop" platform="Windows Desktop"
runnable=true runnable=true
advanced_options=true advanced_options=true
@ -105,7 +105,7 @@ Remove-Item -Recurse -Force '{temp_dir}'"
[preset.2] [preset.2]
name="macOS" name="osx"
platform="macOS" platform="macOS"
runnable=true runnable=true
advanced_options=true advanced_options=true

View File

@ -51,6 +51,8 @@ project/assembly_name="Gfolf2"
movie_writer/movie_file="demos/demo.avi" movie_writer/movie_file="demos/demo.avi"
movie_writer/fps=40 movie_writer/fps=40
version_control/plugin_name="GitPlugin"
version_control/autoload_on_startup=true
[editor_plugins] [editor_plugins]

View File

@ -1,23 +1,27 @@
[gd_scene load_steps=9 format=3 uid="uid://bptiryfbnautm"] [gd_scene load_steps=9 format=3 uid="uid://bptiryfbnautm"]
[ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_pl6e6"] [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_pl6e6"]
[ext_resource type="Texture2D" uid="uid://daipuukf6e6bc" path="res://assets/textures/beach_ball/beach_ball.png" id="2_6dwmi"]
[ext_resource type="Script" path="res://src/equipment/balls/beach_ball/beach_ball.gd" id="2_ay78j"] [ext_resource type="Script" path="res://src/equipment/balls/beach_ball/beach_ball.gd" id="2_ay78j"]
[ext_resource type="Texture2D" uid="uid://3oatrxh60ed7" path="res://assets/textures/beach_ball/beach_ball_normal_map.png" id="3_rdlj8"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_867vn"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_867vn"]
friction = 0.7 friction = 0.7
bounce = 0.67 bounce = 0.67
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x6y4w"] [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_e5701"]
albedo_texture = ExtResource("2_6dwmi") load_path = "res://.godot/imported/beach_ball.png-103709b22c99e920077c858fb92c2e27.ctex"
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_oyl4c"]
load_path = "res://.godot/imported/beach_ball_normal_map.png-06c8d20483d619e155834bb8abd74c2f.s3tc.ctex"
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cybhj"]
albedo_texture = SubResource("CompressedTexture2D_e5701")
normal_enabled = true normal_enabled = true
normal_scale = 0.5 normal_scale = 0.5
normal_texture = ExtResource("3_rdlj8") normal_texture = SubResource("CompressedTexture2D_oyl4c")
texture_filter = 4 texture_filter = 4
[sub_resource type="SphereMesh" id="SphereMesh_iqcc5"] [sub_resource type="SphereMesh" id="SphereMesh_kstjc"]
material = SubResource("StandardMaterial3D_x6y4w") material = SubResource("StandardMaterial3D_cybhj")
radial_segments = 6 radial_segments = 6
rings = 6 rings = 6
@ -32,8 +36,11 @@ script = ExtResource("2_ay78j")
base_damage = 5.0 base_damage = 5.0
radius = 0.5 radius = 0.5
[node name="BallMesh" parent="." index="0"] [node name="BallMesh" parent="MeshRoot" index="0"]
mesh = SubResource("SphereMesh_iqcc5") visible = false
[node name="BeachBallMesh" type="MeshInstance3D" parent="MeshRoot" index="1"]
mesh = SubResource("SphereMesh_kstjc")
[node name="CollisionShape3D" parent="." index="1"] [node name="CollisionShape3D" parent="." index="1"]
shape = SubResource("SphereShape3D_cvsx2") shape = SubResource("SphereShape3D_cvsx2")

View File

@ -16,11 +16,11 @@ mass = 0.08
physics_material_override = SubResource("PhysicsMaterial_f03f4") physics_material_override = SubResource("PhysicsMaterial_f03f4")
radius = 0.15 radius = 0.15
[node name="BrickMesh" parent="." index="0" instance=ExtResource("2_ubuxr")] [node name="BallMesh" parent="MeshRoot" index="0"]
transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
[node name="BallMesh" parent="." index="1"]
visible = false visible = false
[node name="CollisionShape3D" parent="." index="2"] [node name="BrickMesh" parent="MeshRoot" index="1" instance=ExtResource("2_ubuxr")]
transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
[node name="CollisionShape3D" parent="." index="1"]
shape = SubResource("BoxShape3D_7v3re") shape = SubResource("BoxShape3D_7v3re")

View File

@ -24,10 +24,10 @@ subpixel_positioning = 0
[node name="DebugBall" instance=ExtResource("1_gcsxs")] [node name="DebugBall" instance=ExtResource("1_gcsxs")]
script = ExtResource("2_edye5") script = ExtResource("2_edye5")
[node name="MeshInstance3D" type="MeshInstance3D" parent="BallMesh" index="0"] [node name="MeshInstance3D" type="MeshInstance3D" parent="MeshRoot/BallMesh" index="0"]
mesh = SubResource("QuadMesh_lf5f4") mesh = SubResource("QuadMesh_lf5f4")
[node name="DebugInfo" type="Label3D" parent="BallMesh" index="1"] [node name="DebugInfo" type="Label3D" parent="MeshRoot/BallMesh" index="1"]
unique_name_in_owner = true unique_name_in_owner = true
pixel_size = 0.0005 pixel_size = 0.0005
offset = Vector2(0, -64) offset = Vector2(0, -64)

View File

@ -182,7 +182,9 @@ angular_damp_mode = 1
script = ExtResource("1_iwh2u") script = ExtResource("1_iwh2u")
terrain_physics = ExtResource("3_3gnie") terrain_physics = ExtResource("3_3gnie")
[node name="BallMesh" type="MeshInstance3D" parent="."] [node name="MeshRoot" type="Node3D" parent="."]
[node name="BallMesh" type="MeshInstance3D" parent="MeshRoot"]
mesh = SubResource("SphereMesh_y0d13") mesh = SubResource("SphereMesh_y0d13")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="."]

View File

@ -1,10 +1,17 @@
[gd_scene load_steps=13 format=3 uid="uid://dcqxlbsrubapk"] [gd_scene load_steps=14 format=3 uid="uid://dcqxlbsrubapk"]
[ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_yh4fp"] [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_yh4fp"]
[ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="2_8fdyx"] [ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="2_8fdyx"]
[ext_resource type="Script" path="res://src/equipment/balls/plasma_ball/plasma_ball.gd" id="2_16fhh"] [ext_resource type="Script" path="res://src/equipment/balls/plasma_ball/plasma_ball.gd" id="2_16fhh"]
[ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="3_6gyuc"] [ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="3_6gyuc"]
[sub_resource type="SphereMesh" id="SphereMesh_n65ut"]
material = ExtResource("3_6gyuc")
radius = 0.1
height = 0.2
radial_segments = 6
rings = 6
[sub_resource type="Curve" id="Curve_kabhn"] [sub_resource type="Curve" id="Curve_kabhn"]
max_value = 2.0 max_value = 2.0
_data = [Vector2(0, 2), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] _data = [Vector2(0, 2), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@ -55,11 +62,13 @@ radius = 0.1
script = ExtResource("2_16fhh") script = ExtResource("2_16fhh")
magnetic = true magnetic = true
[node name="BallMesh" parent="." index="0"] [node name="BallMesh" parent="MeshRoot" index="0"]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) visible = false
surface_material_override/0 = ExtResource("3_6gyuc")
[node name="PlasmaFireEffect" type="GPUParticles3D" parent="BallMesh" index="0"] [node name="PlasmaBallMesh" type="MeshInstance3D" parent="MeshRoot" index="1"]
mesh = SubResource("SphereMesh_n65ut")
[node name="PlasmaFireEffect" type="GPUParticles3D" parent="MeshRoot/PlasmaBallMesh" index="0"]
sorting_offset = -1.0 sorting_offset = -1.0
amount = 20 amount = 20
lifetime = 0.6 lifetime = 0.6

View File

@ -1,27 +1,31 @@
[gd_scene load_steps=37 format=4 uid="uid://deuytmxw2lc62"] [gd_scene load_steps=37 format=4 uid="uid://deuytmxw2lc62"]
[ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_14gld"] [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_14gld"]
[ext_resource type="Texture2D" uid="uid://ckhiq6rfjv63u" path="res://assets/textures/gfolfball/gfolfball.png" id="2_a2gtg"]
[ext_resource type="Script" path="res://src/equipment/balls/power_ball/power_ball.gd" id="2_hy51e"] [ext_resource type="Script" path="res://src/equipment/balls/power_ball/power_ball.gd" id="2_hy51e"]
[ext_resource type="Texture2D" uid="uid://btntjs7mbdigu" path="res://assets/textures/gfolfball/gfolfball_normal.png" id="3_60i75"]
[ext_resource type="PackedScene" uid="uid://dd2nxbfssd4hh" path="res://assets/models/balls/powerball/fireball.gltf" id="5_i8vmm"] [ext_resource type="PackedScene" uid="uid://dd2nxbfssd4hh" path="res://assets/models/balls/powerball/fireball.gltf" id="5_i8vmm"]
[ext_resource type="AudioStream" uid="uid://tqr7u7vb2r0f" path="res://assets/sound/sfx/ball/effects/fireball.wav" id="6_uwolu"] [ext_resource type="AudioStream" uid="uid://tqr7u7vb2r0f" path="res://assets/sound/sfx/ball/effects/fireball.wav" id="6_uwolu"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fcniu"] [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_bmjge"]
load_path = "res://.godot/imported/gfolfball.png-4fde775993c78b86828199273dc9e4be.s3tc.ctex"
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_314t2"]
load_path = "res://.godot/imported/gfolfball_normal.png-d9cc0e700a9a63c2e2cea72beebc6133.s3tc.ctex"
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ya45b"]
albedo_color = Color(2, 0.266, 0.266, 1) albedo_color = Color(2, 0.266, 0.266, 1)
albedo_texture = ExtResource("2_a2gtg") albedo_texture = SubResource("CompressedTexture2D_bmjge")
albedo_texture_force_srgb = true albedo_texture_force_srgb = true
metallic = 1.0 metallic = 1.0
roughness = 0.67 roughness = 0.67
normal_enabled = true normal_enabled = true
normal_scale = 0.2 normal_scale = 0.2
normal_texture = ExtResource("3_60i75") normal_texture = SubResource("CompressedTexture2D_314t2")
clearcoat_roughness = 0.0 clearcoat_roughness = 0.0
uv1_scale = Vector3(3, 1.5, 3) uv1_scale = Vector3(3, 1.5, 3)
texture_filter = 4 texture_filter = 4
[sub_resource type="SphereMesh" id="SphereMesh_0b0i7"] [sub_resource type="SphereMesh" id="SphereMesh_v4hrl"]
material = SubResource("StandardMaterial3D_fcniu") material = SubResource("StandardMaterial3D_ya45b")
radius = 0.05 radius = 0.05
height = 0.1 height = 0.1
radial_segments = 6 radial_segments = 6
@ -45,6 +49,33 @@ vertex_color_use_as_albedo = true
albedo_color = Color(2, 1.98431, 1.6, 0.156863) albedo_color = Color(2, 1.98431, 1.6, 0.156863)
albedo_texture = SubResource("GradientTexture2D_ny4ye") albedo_texture = SubResource("GradientTexture2D_ny4ye")
[sub_resource type="Animation" id="Animation_2co83"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("FireballScaleRoot:scale")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(1, 1, 1)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("FireballScaleRoot:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_5t74j"] [sub_resource type="Animation" id="Animation_5t74j"]
resource_name = "flicker" resource_name = "flicker"
length = 2.0 length = 2.0
@ -74,33 +105,6 @@ tracks/1/keys = {
"values": [Vector3(0, 0, 0), Vector3(0, 2.0944, 0)] "values": [Vector3(0, 0, 0), Vector3(0, 2.0944, 0)]
} }
[sub_resource type="Animation" id="Animation_2co83"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("FireballScaleRoot:scale")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(1, 1, 1)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("FireballScaleRoot:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_hmunj"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_hmunj"]
_data = { _data = {
"RESET": SubResource("Animation_2co83"), "RESET": SubResource("Animation_2co83"),
@ -234,6 +238,45 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_r0r4b") shadow_mesh = SubResource("ArrayMesh_r0r4b")
[sub_resource type="Animation" id="Animation_6c6mi"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("ParticleEffects/PowerParticles:emitting")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("ParticleEffects/SmokeParticles:emitting")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("SFX/PowerballSFX:playing")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="Animation" id="Animation_7yrvu"] [sub_resource type="Animation" id="Animation_7yrvu"]
resource_name = "activate" resource_name = "activate"
length = 4.8 length = 4.8
@ -266,115 +309,28 @@ tracks/1/keys = {
tracks/2/type = "value" tracks/2/type = "value"
tracks/2/imported = false tracks/2/imported = false
tracks/2/enabled = true tracks/2/enabled = true
tracks/2/path = NodePath("BallMesh/FireballPivot:visible") tracks/2/path = NodePath("ParticleEffects/SmokeParticles:emitting")
tracks/2/interp = 1 tracks/2/interp = 1
tracks/2/loop_wrap = true tracks/2/loop_wrap = true
tracks/2/keys = { tracks/2/keys = {
"times": PackedFloat32Array(0.8, 4.8),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [true, false]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("BallMesh/FireballPivot/FireballScaleRoot/fireball/Fireball:surface_material_override/0:albedo_color")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0.8, 0.9, 4, 4.8),
"transitions": PackedFloat32Array(1, 1, 1.618, 1),
"update": 0,
"values": [Color(1, 0.993333, 0.8, 0), Color(2, 1.98431, 1.6, 0.156863), Color(2, 1.98431, 1.6, 0.156863), Color(1, 0.993333, 0.8, 0)]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("ParticleEffects/SmokeParticles:emitting")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0.9, 4.5), "times": PackedFloat32Array(0.9, 4.5),
"transitions": PackedFloat32Array(1, 1), "transitions": PackedFloat32Array(1, 1),
"update": 1, "update": 1,
"values": [true, false] "values": [true, false]
} }
tracks/5/type = "value" tracks/3/type = "value"
tracks/5/imported = false tracks/3/imported = false
tracks/5/enabled = true tracks/3/enabled = true
tracks/5/path = NodePath("SFX/PowerballSFX:playing") tracks/3/path = NodePath("SFX/PowerballSFX:playing")
tracks/5/interp = 1 tracks/3/interp = 1
tracks/5/loop_wrap = true tracks/3/loop_wrap = true
tracks/5/keys = { tracks/3/keys = {
"times": PackedFloat32Array(0.333333), "times": PackedFloat32Array(0.333333),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 1, "update": 1,
"values": [true] "values": [true]
} }
[sub_resource type="Animation" id="Animation_6c6mi"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("ParticleEffects/PowerParticles:emitting")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("BallMesh/FireballPivot:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("BallMesh/FireballPivot/FireballScaleRoot/fireball/Fireball:surface_material_override/0:albedo_color")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(2, 1.98431, 1.6, 0.156863)]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("ParticleEffects/SmokeParticles:emitting")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("SFX/PowerballSFX:playing")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ospg0"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_ospg0"]
_data = { _data = {
"RESET": SubResource("Animation_6c6mi"), "RESET": SubResource("Animation_6c6mi"),
@ -386,23 +342,26 @@ freeze_mode = 1
script = ExtResource("2_hy51e") script = ExtResource("2_hy51e")
once_per_shot_ability = true once_per_shot_ability = true
[node name="BallMesh" parent="." index="0"] [node name="BallMesh" parent="MeshRoot" index="0"]
mesh = SubResource("SphereMesh_0b0i7") visible = false
[node name="FireballPivot" type="Node3D" parent="BallMesh" index="0"] [node name="PowerballMesh" type="MeshInstance3D" parent="MeshRoot" index="1"]
mesh = SubResource("SphereMesh_v4hrl")
[node name="FireballPivot" type="Node3D" parent="MeshRoot/PowerballMesh" index="0"]
unique_name_in_owner = true unique_name_in_owner = true
visible = false visible = false
[node name="FireballScaleRoot" type="Node3D" parent="BallMesh/FireballPivot" index="0"] [node name="FireballScaleRoot" type="Node3D" parent="MeshRoot/PowerballMesh/FireballPivot" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
[node name="fireball" parent="BallMesh/FireballPivot/FireballScaleRoot" index="0" instance=ExtResource("5_i8vmm")] [node name="fireball" parent="MeshRoot/PowerballMesh/FireballPivot/FireballScaleRoot" index="0" instance=ExtResource("5_i8vmm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.17, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.17, 0)
[node name="Fireball" parent="BallMesh/FireballPivot/FireballScaleRoot/fireball" index="0"] [node name="Fireball" parent="MeshRoot/PowerballMesh/FireballPivot/FireballScaleRoot/fireball" index="0"]
surface_material_override/0 = SubResource("StandardMaterial3D_aqmuo") surface_material_override/0 = SubResource("StandardMaterial3D_aqmuo")
[node name="FireballAnimation" type="AnimationPlayer" parent="BallMesh/FireballPivot" index="1"] [node name="FireballAnimation" type="AnimationPlayer" parent="MeshRoot/PowerballMesh/FireballPivot" index="1"]
libraries = { libraries = {
"": SubResource("AnimationLibrary_hmunj") "": SubResource("AnimationLibrary_hmunj")
} }
@ -438,4 +397,4 @@ libraries = {
"": SubResource("AnimationLibrary_ospg0") "": SubResource("AnimationLibrary_ospg0")
} }
[editable path="BallMesh/FireballPivot/FireballScaleRoot/fireball"] [editable path="MeshRoot/PowerballMesh/FireballPivot/FireballScaleRoot/fireball"]

View File

@ -9,6 +9,8 @@ func _ready() -> void:
# Fall back on baked version info # Fall back on baked version info
text = Game.settings.version text = Game.settings.version
# Try to expand on version number if running from the editor
if OS.has_feature("editor"):
var output: Array[String] = [] var output: Array[String] = []
var status := OS.execute("git", ["describe", "--always", "HEAD"], output) var status := OS.execute("git", ["describe", "--always", "HEAD"], output)
if status == 0: if status == 0: