ld52/pineapple-surf
ld52/pineapple-surf
1
Fork 0
mirror of https://github.com/Steffo99/pineapple-surf.git synced 2024-11-25 01:04:18 +00:00
Code Activity

Godot changes ids again

Browse source
This commit is contained in:
Steffo 2023-01-08 23:19:04 +01:00
parent 1ff4b22eb2
commit dc0bfdd91a
Signed by: steffo
GPG key ID: 6965406171929D01
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
island/Pineapple.tscn
View file

@ -8,7 +8,7 @@
[ext_resource type="PackedScene" uid="uid://ci0hy0d4d1476" path="res://island/CollectibleByPlayer.tscn" id="5_yps0c"] [ext_resource type="PackedScene" uid="uid://ci0hy0d4d1476" path="res://island/CollectibleByPlayer.tscn" id="5_yps0c"]
[ext_resource type="PackedScene" uid="uid://bj4d3a0jxgvpu" path="res://island/CanSplash.tscn" id="7_3mgie"] [ext_resource type="PackedScene" uid="uid://bj4d3a0jxgvpu" path="res://island/CanSplash.tscn" id="7_3mgie"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ax3vd"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_e5jtb"]
height = 0.9 height = 0.9
radius = 0.3 radius = 0.3
@ -21,7 +21,7 @@ script = ExtResource("1_sbec5")
[node name="Shape" type="CollisionShape3D" parent="."] [node name="Shape" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, 0)
shape = SubResource("CylinderShape3D_ax3vd") shape = SubResource("CylinderShape3D_e5jtb")
[node name="PineappleMesh" parent="." instance=ExtResource("1_ndmmp")] [node name="PineappleMesh" parent="." instance=ExtResource("1_ndmmp")]

7
player/Player.tscn
View file

@ -128,7 +128,6 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"] [node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -168,7 +167,6 @@ theme = SubResource("Theme_smyke")
[node name="FPS_Label" type="Label" parent="HUD"] [node name="FPS_Label" type="Label" parent="HUD"]
visible = false visible = false
layout_mode = 1
anchors_preset = 1 anchors_preset = 1
anchor_left = 1.0 anchor_left = 1.0
anchor_right = 1.0 anchor_right = 1.0
@ -181,7 +179,7 @@ horizontal_alignment = 2
script = SubResource("GDScript_iiadi") script = SubResource("GDScript_iiadi")
[node name="PointsSpawner" type="Control" parent="HUD"] [node name="PointsSpawner" type="Control" parent="HUD"]
layout_mode = 1 layout_mode = 3
anchors_preset = 8 anchors_preset = 8
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@ -192,7 +190,6 @@ grow_vertical = 2
script = SubResource("GDScript_5d122") script = SubResource("GDScript_5d122")
[node name="AmmoLabel" type="Label" parent="HUD"] [node name="AmmoLabel" type="Label" parent="HUD"]
layout_mode = 1
anchors_preset = 3 anchors_preset = 3
anchor_left = 1.0 anchor_left = 1.0
anchor_top = 1.0 anchor_top = 1.0
@ -221,7 +218,6 @@ modulate = Color(1, 0.596078, 1, 1)
show_behind_parent = true show_behind_parent = true
z_index = 4096 z_index = 4096
z_as_relative = false z_as_relative = false
layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -246,7 +242,6 @@ MainCamera = NodePath("../../../../Head/Viewport/CameraViewportContainer/GameVie
[node name="Crosshair" type="ColorRect" parent="HUD"] [node name="Crosshair" type="ColorRect" parent="HUD"]
material = SubResource("ShaderMaterial_2p6rt") material = SubResource("ShaderMaterial_2p6rt")
layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0

2
project.godot
View file

@ -9,7 +9,7 @@
config_version=5 config_version=5
_global_script_classes=[{ _global_script_classes=[{
"base": "Node3D", "base": "Node",
"class": &"BaseWeapon", "class": &"BaseWeapon",
"language": &"GDScript", "language": &"GDScript",
"path": "res://player/onhand/BaseWeapon.gd" "path": "res://player/onhand/BaseWeapon.gd"