Techwizz/tank-blaster
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Added stuff

Browse source
This commit is contained in:
Paul Black 2022-04-22 12:07:23 -06:00
parent c0d1377615
commit 6aacf9ff6e
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Levels/Win-02.tscn
View file

@ -1,4 +1,8 @@
<<<<<<< HEAD
[gd_scene load_steps=6 format=2] [gd_scene load_steps=6 format=2]
=======
[gd_scene load_steps=5 format=2]
>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
[ext_resource path="res://fonts/Born2bSportyV2.ttf" type="DynamicFontData" id=1] [ext_resource path="res://fonts/Born2bSportyV2.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://Levels/Win-02.gd" type="Script" id=2] [ext_resource path="res://Levels/Win-02.gd" type="Script" id=2]
@ -11,17 +15,23 @@ font_data = ExtResource( 1 )
size = 100 size = 100
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )
<<<<<<< HEAD
[sub_resource type="DynamicFont" id=3] [sub_resource type="DynamicFont" id=3]
size = 100 size = 100
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )
=======
>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
[node name="Win-level02" type="Control"] [node name="Win-level02" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( 2 ) script = ExtResource( 2 )
<<<<<<< HEAD
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
=======
>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5
@ -67,6 +77,7 @@ align = 1
[node name="VBoxContainer3" type="VBoxContainer" parent="."] [node name="VBoxContainer3" type="VBoxContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5
<<<<<<< HEAD
anchor_top = 1.0 anchor_top = 1.0
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -80,10 +91,21 @@ __meta__ = {
[node name="Button" type="Button" parent="VBoxContainer3"] [node name="Button" type="Button" parent="VBoxContainer3"]
margin_right = 172.0 margin_right = 172.0
=======
anchor_right = 0.5
margin_left = -75.0
margin_top = 112.0
margin_right = 75.0
margin_bottom = 218.0
[node name="Button" type="Button" parent="VBoxContainer3"]
margin_right = 150.0
>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
margin_bottom = 106.0 margin_bottom = 106.0
custom_fonts/font = SubResource( 2 ) custom_fonts/font = SubResource( 2 )
text = "Quit" text = "Quit"
<<<<<<< HEAD
[node name="VBoxContainer4" type="VBoxContainer" parent="."] [node name="VBoxContainer4" type="VBoxContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
@ -103,3 +125,6 @@ text = "Main Menu"
[connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"] [connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"]
[connection signal="pressed" from="VBoxContainer4/ButtonMainMenu" to="." method="_on_ButtonMainMenu_pressed"] [connection signal="pressed" from="VBoxContainer4/ButtonMainMenu" to="." method="_on_ButtonMainMenu_pressed"]
=======
[connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"]
>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d

2
Objects/Bullet/Bullet.gd
View file

@ -8,7 +8,7 @@ export var g = Vector3.DOWN * 20
var velocity = Vector3.ZERO var velocity = Vector3.ZERO
###### CHEATS ###### CHEATS
var godmode = 1 var godmode = 0
func _physics_process(delta): func _physics_process(delta):

BIN
Objects/tutorial-map/Tutorial_blender.glb Normal file
View file

Binary file not shown.