Deleted Tilte
This commit is contained in:
Logan
parent
6a2d2015b4
commit
eafea3ba24
|
|
@ -1,60 +0,0 @@
|
|||
[gd_scene load_steps=8 format=2]
|
||||
|
||||
<<<<<<< Updated upstream:Title/Tilte.tscn
|
||||
[ext_resource path="res://Title/Quit 1.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Title/Wizard Background.png" type="Texture" id=2]
|
||||
[ext_resource path="res://Title/Quit 2.png" type="Texture" id=3]
|
||||
[ext_resource path="res://Title/Play 1.png" type="Texture" id=4]
|
||||
[ext_resource path="res://Title/Play 2.png" type="Texture" id=5]
|
||||
[ext_resource path="res://Title/Tilte.gd" type="Script" id=6]
|
||||
=======
|
||||
[ext_resource path="res://levels/Tilte.gd" type="Script" id=1]
|
||||
[ext_resource path="res://levels/Wizard Background.png" type="Texture" id=2]
|
||||
[ext_resource path="res://levels/Play 1.png" type="Texture" id=3]
|
||||
[ext_resource path="res://levels/Play 2.png" type="Texture" id=4]
|
||||
[ext_resource path="res://levels/Quit 1.png" type="Texture" id=5]
|
||||
[ext_resource path="res://levels/Quit 2.png" type="Texture" id=6]
|
||||
>>>>>>> Stashed changes:levels/Tilte.tscn
|
||||
|
||||
[node name="Title" type="Node"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 2 )
|
||||
centered = false
|
||||
|
||||
[node name="TextureButton" type="TextureButton" parent="."]
|
||||
margin_left = 0.989594
|
||||
margin_top = 73.7678
|
||||
margin_right = 120.99
|
||||
margin_bottom = 124.768
|
||||
texture_normal = ExtResource( 3 )
|
||||
texture_hover = ExtResource( 4 )
|
||||
expand = true
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="TextureButton2" type="TextureButton" parent="."]
|
||||
margin_left = 1.0
|
||||
margin_top = 128.0
|
||||
margin_right = 125.0
|
||||
margin_bottom = 179.0
|
||||
<<<<<<< Updated upstream:Title/Tilte.tscn
|
||||
texture_normal = ExtResource( 1 )
|
||||
texture_hover = ExtResource( 3 )
|
||||
=======
|
||||
texture_normal = ExtResource( 5 )
|
||||
texture_hover = ExtResource( 6 )
|
||||
>>>>>>> Stashed changes:levels/Tilte.tscn
|
||||
expand = true
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource( 7 )
|
||||
volume_db = -36.349
|
||||
autoplay = true
|
||||
[connection signal="pressed" from="TextureButton" to="." method="_on_TextureButton_pressed"]
|
||||
[connection signal="pressed" from="TextureButton2" to="." method="_on_TextureButton2_pressed"]
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -4,10 +4,9 @@
|
|||
[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2]
|
||||
|
||||
[node name="Node2D" type="Node2D"]
|
||||
position = Vector2( -14, 0 )
|
||||
|
||||
[node name="Player" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 169, 166 )
|
||||
position = Vector2( 152, 157 )
|
||||
|
||||
[node name="TileMap" parent="." instance=ExtResource( 2 )]
|
||||
tile_data = PoolIntArray( 0, 0, 8, 1, 0, 10, 2, 0, 10, 3, 0, 10, 4, 0, 10, 5, 0, 10, 6, 0, 10, 7, 0, 10, 8, 0, 10, 9, 0, 10, 10, 0, 10, 11, 0, 10, 12, 0, 10, 13, 0, 10, 14, 0, 10, 15, 0, 10, 16, 0, 10, 17, 0, 10, 18, 0, 10, 19, 0, 10, 20, 0, 11, 65536, 0, 65544, 65537, 0, 131078, 65538, 0, 196617, 65539, 0, 196617, 65540, 0, 196617, 65541, 0, 196617, 65542, 0, 196617, 65543, 0, 196617, 65544, 0, 196617, 65545, 0, 196617, 65546, 0, 196617, 65547, 0, 196617, 65548, 0, 196617, 65549, 0, 196617, 65550, 0, 196617, 65551, 0, 196617, 65552, 0, 196617, 65553, 0, 196617, 65554, 0, 196617, 65555, 0, 131077, 65556, 0, 131083, 131072, 0, 65544, 131073, 0, 131083, 131091, 0, 65544, 131092, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196627, 0, 65544, 196628, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262163, 0, 65544, 262164, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327699, 0, 65544, 327700, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393235, 0, 65544, 393236, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458771, 0, 65544, 458772, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524307, 0, 65544, 524308, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589843, 0, 65544, 589844, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655379, 0, 65544, 655380, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 10, 720911, 0, 10, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 65541, 720916, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196619 )
|
||||
tile_data = PoolIntArray( 0, 0, 8, 1, 0, 10, 2, 0, 10, 3, 0, 10, 4, 0, 10, 5, 0, 10, 6, 0, 10, 7, 0, 10, 8, 0, 10, 9, 0, 10, 10, 0, 10, 11, 0, 10, 12, 0, 10, 13, 0, 10, 14, 0, 10, 15, 0, 10, 16, 0, 10, 17, 0, 10, 18, 0, 10, 19, 0, 10, 20, 0, 10, 21, 0, 11, 65536, 0, 65544, 65537, 0, 131078, 65538, 0, 196617, 65539, 0, 196617, 65540, 0, 196617, 65541, 0, 196617, 65542, 0, 196617, 65543, 0, 196617, 65544, 0, 196617, 65545, 0, 196617, 65546, 0, 196617, 65547, 0, 196617, 65548, 0, 196617, 65549, 0, 196617, 65550, 0, 196617, 65551, 0, 196617, 65552, 0, 196617, 65553, 0, 196617, 65554, 0, 196617, 65555, 0, 196617, 65556, 0, 131077, 65557, 0, 131083, 131072, 0, 65544, 131073, 0, 131083, 131092, 0, 65544, 131093, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196628, 0, 65544, 196629, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262164, 0, 65544, 262165, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327700, 0, 65544, 327701, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393236, 0, 65544, 393237, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458772, 0, 65544, 458773, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524308, 0, 65544, 524309, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589844, 0, 65544, 589845, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655380, 0, 65544, 655381, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 10, 720911, 0, 10, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 65541, 720917, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196617, 786453, 0, 196619 )
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
[ext_resource path="res://art/WhiteProjectile.png" type="Texture" id=2]
|
||||
|
||||
[sub_resource type="CircleShape2D" id=1]
|
||||
radius = 7.0
|
||||
radius = 4.0
|
||||
|
||||
[node name="WhiteProjectile" type="KinematicBody2D"]
|
||||
collision_layer = 8
|
||||
collision_mask = 0
|
||||
collision_mask = 2
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
|
|
|
|||
|
|
@ -27,11 +27,7 @@ _global_script_class_icons={
|
|||
[application]
|
||||
|
||||
config/name="Gamejam"
|
||||
<<<<<<< Updated upstream
|
||||
run/main_scene="res://Title/Tilte.tscn"
|
||||
=======
|
||||
run/main_scene="res://levels/test.tscn"
|
||||
>>>>>>> Stashed changes
|
||||
config/icon="res://icon.png"
|
||||
|
||||
[autoload]
|
||||
|
|
@ -39,6 +35,11 @@ config/icon="res://icon.png"
|
|||
UserData="*res://addons/github-integration/scripts/user_data.gd"
|
||||
IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd"
|
||||
RestHandler="*res://addons/github-integration/scripts/RestHandler.gd"
|
||||
globals="*res://script/globals.gd"
|
||||
|
||||
[debug]
|
||||
|
||||
settings/fps/force_fps=60
|
||||
|
||||
[display]
|
||||
|
||||
|
|
@ -75,16 +76,6 @@ texture={
|
|||
"stream": false,
|
||||
"svg/scale": 1.0
|
||||
}
|
||||
wav={
|
||||
"compress/mode": 0,
|
||||
"edit/loop": true,
|
||||
"edit/normalize": false,
|
||||
"edit/trim": false,
|
||||
"force/8_bit": false,
|
||||
"force/max_rate": false,
|
||||
"force/max_rate_hz": 44100,
|
||||
"force/mono": false
|
||||
}
|
||||
|
||||
[input]
|
||||
|
||||
|
|
@ -108,6 +99,18 @@ right={
|
|||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
shoot={
|
||||
"deadzone": 0.5,
|
||||
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
|
||||
]
|
||||
}
|
||||
|
||||
[layer_names]
|
||||
|
||||
2d_physics/layer_1="Player"
|
||||
2d_physics/layer_2="World"
|
||||
2d_physics/layer_3="Enemy"
|
||||
2d_physics/layer_4="Projectiles"
|
||||
|
||||
[rendering]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue