Julian/JuegoClase
1
1
Fork 5
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
Julian 2024-11-13 12:39:13 +00:00
commit bf5c8466a0
7 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
# Godot 4+ specific ignores
.godot/
/android/
.pa

BIN
Assets_PixelAdventure/Enemies/Skull/Hit (52x54).png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

12
Maps/main_menu.tscn
View File

@ -33,20 +33,15 @@ offset_right = 268.0
offset_bottom = 228.0
[node name="Button" type="Button" parent="VBoxContainer"]
offset_right = 110.0
offset_bottom = 31.0
layout_mode = 2
text = "START"
[node name="Button2" type="Button" parent="VBoxContainer"]
offset_top = 35.0
offset_right = 110.0
offset_bottom = 66.0
layout_mode = 2
text = "EXIT"
[node name="Button3" type="Button" parent="VBoxContainer"]
offset_top = 70.0
offset_right = 110.0
offset_bottom = 101.0
layout_mode = 2
text = "FULL SCREEN
"
@ -95,7 +90,6 @@ texture = ExtResource("7_ubh51")
[node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(214, 117)
current = true
[connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]
[connection signal="pressed" from="VBoxContainer/Button2" to="." method="_on_button_2_pressed"]

1
Maps/world.tscn
View File

File diff suppressed because one or more lines are too long

44
Maps/world_2.tscn
View File

@ -19,42 +19,30 @@
texture = ExtResource("1_hkahx")
0:10/0 = 0
0:10/0/terrain_set = 0
0:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:10/0/physics_layer_0/angular_velocity = 0.0
0:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:10/0/terrains_peering_bit/top_right_corner = 0
0:9/0 = 0
0:9/0/terrain_set = 0
0:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:9/0/physics_layer_0/angular_velocity = 0.0
0:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:9/0/terrains_peering_bit/right_side = 0
0:9/0/terrains_peering_bit/bottom_right_corner = 0
0:9/0/terrains_peering_bit/top_right_corner = 0
0:8/0 = 0
0:8/0/terrain_set = 0
0:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:8/0/physics_layer_0/angular_velocity = 0.0
0:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:8/0/terrains_peering_bit/bottom_right_corner = 0
1:8/0 = 0
1:8/0/terrain_set = 0
1:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:8/0/physics_layer_0/angular_velocity = 0.0
1:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:8/0/terrains_peering_bit/bottom_right_corner = 0
1:8/0/terrains_peering_bit/bottom_side = 0
1:8/0/terrains_peering_bit/bottom_left_corner = 0
2:8/0 = 0
2:8/0/terrain_set = 0
2:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:8/0/physics_layer_0/angular_velocity = 0.0
2:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:8/0/terrains_peering_bit/bottom_left_corner = 0
3:8/0 = 0
3:8/0/terrain_set = 0
3:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:8/0/physics_layer_0/angular_velocity = 0.0
3:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:8/0/terrains_peering_bit/bottom_left_corner = 0
3:8/0/terrains_peering_bit/left_side = 0
@ -63,8 +51,6 @@ texture = ExtResource("1_hkahx")
3:8/0/terrains_peering_bit/top_right_corner = 0
4:8/0 = 0
4:8/0/terrain_set = 0
4:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:8/0/physics_layer_0/angular_velocity = 0.0
4:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:8/0/terrains_peering_bit/right_side = 0
4:8/0/terrains_peering_bit/bottom_right_corner = 0
@ -73,8 +59,6 @@ texture = ExtResource("1_hkahx")
4:8/0/terrains_peering_bit/top_right_corner = 0
4:9/0 = 0
4:9/0/terrain_set = 0
4:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:9/0/physics_layer_0/angular_velocity = 0.0
4:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:9/0/terrains_peering_bit/right_side = 0
4:9/0/terrains_peering_bit/bottom_right_corner = 0
@ -82,21 +66,13 @@ texture = ExtResource("1_hkahx")
4:9/0/terrains_peering_bit/bottom_left_corner = 0
4:9/0/terrains_peering_bit/top_right_corner = 0
4:10/0 = 0
4:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:10/0/physics_layer_0/angular_velocity = 0.0
3:10/0 = 0
3:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:10/0/physics_layer_0/angular_velocity = 0.0
2:10/0 = 0
2:10/0/terrain_set = 0
2:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:10/0/physics_layer_0/angular_velocity = 0.0
2:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:10/0/terrains_peering_bit/top_left_corner = 0
1:10/0 = 0
1:10/0/terrain_set = 0
1:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:10/0/physics_layer_0/angular_velocity = 0.0
1:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:10/0/terrains_peering_bit/top_left_corner = 0
1:10/0/terrains_peering_bit/top_side = 0
@ -104,8 +80,6 @@ texture = ExtResource("1_hkahx")
1:9/0 = 0
1:9/0/terrain_set = 0
1:9/0/terrain = 0
1:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:9/0/physics_layer_0/angular_velocity = 0.0
1:9/0/terrains_peering_bit/right_side = 0
1:9/0/terrains_peering_bit/bottom_right_corner = 0
1:9/0/terrains_peering_bit/bottom_side = 0
@ -116,16 +90,12 @@ texture = ExtResource("1_hkahx")
1:9/0/terrains_peering_bit/top_right_corner = 0
2:9/0 = 0
2:9/0/terrain_set = 0
2:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:9/0/physics_layer_0/angular_velocity = 0.0
2:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:9/0/terrains_peering_bit/bottom_left_corner = 0
2:9/0/terrains_peering_bit/left_side = 0
2:9/0/terrains_peering_bit/top_left_corner = 0
3:9/0 = 0
3:9/0/terrain_set = 0
3:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:9/0/physics_layer_0/angular_velocity = 0.0
3:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:9/0/terrains_peering_bit/bottom_right_corner = 0
3:9/0/terrains_peering_bit/bottom_side = 0
@ -229,9 +199,9 @@ curve = SubResource("Curve2D_xbbc4")
platformSpeed = 0.284
[node name="PathFollow2D" parent="Platform" index="0"]
position = Vector2(230.957, -12.1214)
rotation = -0.0282943
progress = 235.163
position = Vector2(29.1281, -6.18427)
rotation = -0.0658388
progress = 33.2031
[node name="FallDamage" parent="." instance=ExtResource("10_1wkwm")]
position = Vector2(85, 259)
@ -249,12 +219,12 @@ platformSpeed = 0.888
curve = SubResource("Curve2D_2qvbj")
[node name="PathFollow2D" parent="Sierra2/Path2D" index="0"]
position = Vector2(2.12025, -27.5509)
rotation = -1.59782
progress = 32.5748
position = Vector2(2.00764, -32.5866)
rotation = -1.5779
progress = 37.7707
[node name="Sprite" parent="Sierra2/Path2D/PathFollow2D/SierraVerdadera" index="0"]
rotation = 1857.37
rotation = 2132.02
[node name="Chain" type="Sprite2D" parent="Sierra2"]
position = Vector2(3, 1)

2
Personajes/EnemigoCerdito/enemigo_cerdito.gd
View File

@ -1,5 +1,5 @@
extends Personajes
# comentario

6
Player/player.tscn
View File

@ -199,12 +199,14 @@ collision_mask = 6
script = ExtResource("1_7wx7r")
[node name="LabelState" type="Label" parent="."]
visible = false
z_index = 10
offset_left = -9.0
offset_top = -28.0
offset_right = 38.0
offset_bottom = -2.0
text = "aaaaa"
text = "as
"
label_settings = SubResource("LabelSettings_82qkg")
[node name="StateMachine" type="Node" parent="."]
@ -337,7 +339,7 @@ stream = ExtResource("7_jbpay")
collision_mask = 6
[node name="CollisionShape2D" type="CollisionShape2D" parent="RecibirDanio"]
position = Vector2(1, 4.5)
position = Vector2(1, 4)
shape = SubResource("RectangleShape2D_menop")
[connection signal="timeout" from="StateMachine/Dash/DashTimer" to="StateMachine/Dash" method="_on_dash_timer_timeout"]