kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2026-03-22 00:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into game-handle

Browse Source
This commit is contained in:
Kristofers Solo
2021-11-12 20:04:49 +02:00
parent 439e1dcdb3 5231ce8624
commit a7f278b8c9
283 changed files with 8423 additions and 8951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/entities/grass/grass_node.tscn
View File

@@ -49,6 +49,11 @@ animations = [ {
"name": "idle",
"speed": 12.0
}, {
"frames": [ ExtResource( 38 ), ExtResource( 35 ), ExtResource( 41 ), ExtResource( 37 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 40 ) ],
"loop": false,
"name": "transition_up",
"speed": 24.0
}, {
"frames": [ ExtResource( 30 ), ExtResource( 42 ), ExtResource( 16 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 31 ), ExtResource( 21 ), ExtResource( 32 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 33 ) ],
"loop": true,
"name": "idle_down",
@@ -58,11 +63,6 @@ animations = [ {
"loop": false,
"name": "transition_down",
"speed": 24.0
}, {
"frames": [ ExtResource( 38 ), ExtResource( 35 ), ExtResource( 41 ), ExtResource( 37 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 40 ) ],
"loop": false,
"name": "transition_up",
"speed": 24.0
} ]
[sub_resource type="RectangleShape2D" id=2]
@@ -76,7 +76,7 @@ position = Vector2( -3.36365, 0 )
scale = Vector2( 0.75, 0.75 )
frames = SubResource( 1 )
animation = "idle"
frame = 4
frame = 7
playing = true
[node name="trinity_site_level_layout-level_design_z-index_0_grass_type-2" type="Sprite" parent="."]

6
source/entities/player/player_node.tscn
View File

@@ -205,8 +205,8 @@ animations = [ {
}, {
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"loop": true,
"name": "idle-speed-left-02",
"speed": 25.0
"name": "boost-speed-right-02",
"speed": 50.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
@@ -265,7 +265,7 @@ animations = [ {
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
"name": "idle-speed-right-01",
"name": "idle-speed-right-02",
"speed": 25.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],

8
source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
View File

@@ -5,15 +5,11 @@
[sub_resource type="CapsuleShape2D" id=1]
[node name="playert_bullet" type="Sprite" groups=[
"Net",
]]
[node name="playert_bullet" type="Sprite" groups=["Net"]]
texture = ExtResource( 1 )
script = ExtResource( 2 )
[node name="hitbox" type="Area2D" parent="." groups=[
"Player_damager",
]]
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
rotation = 1.5708

8
source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
View File

@@ -5,15 +5,11 @@
[sub_resource type="CapsuleShape2D" id=1]
[node name="player_bullet2" type="Sprite" groups=[
"Net",
]]
[node name="player_bullet2" type="Sprite" groups=["Net"]]
texture = ExtResource( 1 )
script = ExtResource( 2 )
[node name="hitbox" type="Area2D" parent="." groups=[
"Player_damager",
]]
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
rotation = 1.5708