Skip to content

A different branch with the bat implementation #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ResendeTech wants to merge 2 commits into
base: main
Choose a base branch
from
Open

A different branch with the bat implementation #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eab71d
A different branch with the bat implementation (I don't understand wh…
ResendeTech Apr 25, 2025
68529af
Merge branch 'main' into Bat-implementation
ResendeTech Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions better bat.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=3 uid="uid://cxfb6f5emeeoo"]

[ext_resource type="PackedScene" uid="uid://xyss1dae808n" path="res://assets/models/bat/scene.gltf" id="1_ncase"]

[sub_resource type="SphereShape3D" id="SphereShape3D_imkf1"]
radius = 1.0

[node name="Bat" type="Area3D" groups=["Hazard"]]

[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("SphereShape3D_imkf1")

[node name="BatModel" parent="." instance=ExtResource("1_ncase")]
transform = Transform3D(1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, -0.7, 0)
1 change: 1 addition & 0 deletions refueling_pad.gd.uid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dcsta8rmoe340
6 changes: 5 additions & 1 deletion scenes/refueling_pad.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[gd_scene load_steps=5 format=3 uid="uid://cwivci11c4qe8"]
[gd_scene load_steps=5 format=3 uid="uid://drmmkm10dn20y"]

<<<<<<< HEAD:refueling_pad.tscn
[ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"]
=======
[ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]
>>>>>>> origin/main:scenes/refueling_pad.tscn
Comment on lines +3 to +7
Copy link
Member

@brylie brylie Apr 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This contains merge conflict makers:

Suggested change
<<<<<<< HEAD:refueling_pad.tscn
[ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"]
=======
[ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]
>>>>>>> origin/main:scenes/refueling_pad.tscn
[ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]

Comment on lines +3 to +7
Copy link

@qodo-code-review qodo-code-review bot Apr 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Resolve merge conflict

Suggested change
<<<<<<< HEAD:refueling_pad.tscn
[ext_resource type="Script" uid="uid://dcsta8rmoe340" path="res://refueling_pad.gd" id="1_6wxl3"]
=======
[ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]
>>>>>>> origin/main:scenes/refueling_pad.tscn
[ext_resource type="Script" uid="uid://df7nhc0md14xw" path="res://scenes/refueling_pad.gd" id="1_6wxl3"]


[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_s8ska"]
albedo_color = Color(0, 0.435682, 0.0116695, 1)
Expand Down
6 changes: 5 additions & 1 deletion scenes/ui/fuel_slider.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://bds3pc6arkgvv"]
[gd_scene load_steps=6 format=3 uid="uid://bt0f8rckpnlhi"]

[ext_resource type="Texture2D" uid="uid://b5wcn006sn2kw" path="res://assets/sprites/Fuel gauge - rocket game.png" id="1_ts72v"]
<<<<<<< HEAD:scenes/fuel_slider.tscn
[ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"]
=======
>>>>>>> origin/main:scenes/ui/fuel_slider.tscn
Comment on lines +4 to +7
Copy link
Member

@brylie brylie Apr 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove these Git merge conflict markers:

Suggested change
<<<<<<< HEAD:scenes/fuel_slider.tscn
[ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"]
=======
>>>>>>> origin/main:scenes/ui/fuel_slider.tscn
[ext_resource type="Script" uid="uid://nr0q7iu61suy" path="res://scenes/fuel_bar.gd" id="2_q6t1k"]


[sub_resource type="Gradient" id="Gradient_64sbd"]
offsets = PackedFloat32Array(0, 0.535211, 1)
Expand Down