Added stuff

Levels/Win-02.tscn

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 [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://Levels/Win-02.gd" type="Script" id=2]
@@ -11,17 +15,23 @@ font_data = ExtResource( 1 )
 size = 100
 font_data = ExtResource( 1 )
 
+<<<<<<< HEAD
 [sub_resource type="DynamicFont" id=3]
 size = 100
 font_data = ExtResource( 1 )
 
+=======
+>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
 [node name="Win-level02" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 2 )
+<<<<<<< HEAD
 __meta__ = {
 "_edit_use_anchors_": false
 }
+=======
+>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 anchor_left = 0.5
@@ -67,6 +77,7 @@ align = 1
 
 [node name="VBoxContainer3" type="VBoxContainer" parent="."]
 anchor_left = 0.5
+<<<<<<< HEAD
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
@@ -80,10 +91,21 @@ __meta__ = {
 
 [node name="Button" type="Button" parent="VBoxContainer3"]
 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
 custom_fonts/font = SubResource( 2 )
 text = "Quit"
 
+<<<<<<< HEAD
 [node name="VBoxContainer4" type="VBoxContainer" parent="."]
 anchor_left = 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="VBoxContainer4/ButtonMainMenu" to="." method="_on_ButtonMainMenu_pressed"]
+=======
+[connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"]
+>>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d

Objects/Bullet/Bullet.gd

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