martin
/
PirateTreasureHunt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed wrong rebase

master
Martin Felis 2021-06-17 23:25:01 +02:00
parent 0194d73345
commit 00ff356b9f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project.godot
View File

@ -10,6 +10,7 @@ config_version=4
_global_script_classes=[ ] _global_script_classes=[ ]
_global_script_class_icons={ _global_script_class_icons={
} }
[application] [application]

21
scenes/Game.tscn
View File

@ -1,10 +1,10 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=6 format=2]
[ext_resource path="res://scenes/World.gd" type="Script" id=1] [ext_resource path="res://scenes/World.gd" type="Script" id=1]
[ext_resource path="res://scenes/HexTile.gd" type="Script" id=2] [ext_resource path="res://scenes/HexTile.gd" type="Script" id=2]
[ext_resource path="res://assets/pirate.svg" type="Texture" id=3] [ext_resource path="res://assets/pirate.svg" type="Texture" id=3]
[ext_resource path="res://scenes/pirate.gd" type="Script" id=4]
[ext_resource path="res://scenes/FPSValue.gd" type="Script" id=4] [ext_resource path="res://scenes/FPSValue.gd" type="Script" id=4]
[ext_resource path="res://scenes/pirate.gd" type="Script" id=5]
[node name="GameRoot" type="Node"] [node name="GameRoot" type="Node"]
@ -79,14 +79,6 @@ margin_right = 317.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "(0,0)" text = "(0,0)"
[node name="PlayerChar" type="KinematicBody2D" parent="World"]
script = ExtResource( 4 )
[node name="pirate" type="Sprite" parent="World/PlayerChar"]
scale = Vector2( 0.45498, 0.45498 )
texture = ExtResource( 3 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="World/PlayerChar"]
[node name="VSeparator" type="VSeparator" parent="World/UI/TopContainer"] [node name="VSeparator" type="VSeparator" parent="World/UI/TopContainer"]
margin_left = 321.0 margin_left = 321.0
margin_right = 325.0 margin_right = 325.0
@ -103,3 +95,12 @@ margin_bottom = 27.0
text = "0" text = "0"
align = 2 align = 2
script = ExtResource( 4 ) script = ExtResource( 4 )
[node name="PlayerChar" type="KinematicBody2D" parent="World"]
script = ExtResource( 5 )
[node name="pirate" type="Sprite" parent="World/PlayerChar"]
scale = Vector2( 0.45498, 0.45498 )
texture = ExtResource( 3 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="World/PlayerChar"]