Browse Source

Remove all editor state (Warning: broad patch)

WARNING: Expect merge conflicts! This changes a line on nearly every
scene in existence.

However, it clears it all out for the future so we'll never have to deal
with it again.
master
Luna 7 years ago
parent
commit
6d457c4479
13 changed files with 10 additions and 56 deletions
  1. +1
    -1
      scenes/ai.tscn
  2. +1
    -2
      scenes/hero_select.tscn
  3. +1
    -1
      scenes/heroes/1.tscn
  4. +1
    -3
      scenes/heroes/1_wall.tscn
  5. +0
    -1
      scenes/heroes/2.tscn
  6. +0
    -1
      scenes/heroes/3.tscn
  7. +1
    -3
      scenes/heroes/5_portal.tscn
  8. +1
    -11
      scenes/level.tscn
  9. +1
    -1
      scenes/levels/0.tscn
  10. +1
    -3
      scenes/levels/2.tscn
  11. +1
    -10
      scenes/lobby.tscn
  12. +1
    -11
      scenes/objective.tscn
  13. +0
    -8
      scenes/test-level.tscn

+ 1
- 1
scenes/ai.tscn View File

@ -2,7 +2,7 @@
[ext_resource path="res://scripts/ai.gd" type="Script" id=1]
[node name="Node" type="Node" index="0"]
[node name="Node" type="Node"]
script = ExtResource( 1 )


+ 1
- 2
scenes/hero_select.tscn View File

@ -3,7 +3,7 @@
[ext_resource path="res://scripts/hero_select_screen.gd" type="Script" id=1]
[ext_resource path="res://scripts/hero_select.gd" type="Script" id=2]
[node name="HeroSelect" type="ColorRect" index="0"]
[node name="HeroSelect" type="ColorRect"]
pause_mode = 2
anchor_left = 0.0
@ -17,7 +17,6 @@ size_flags_horizontal = 1
size_flags_vertical = 1
color = Color( 0.097229, 0.104696, 0.105469, 1 )
script = ExtResource( 1 )
_sections_unfolded = [ "Anchor", "Margin", "Material", "Pause", "Visibility" ]
[node name="Hero" type="OptionButton" parent="." index="0"]


+ 1
- 1
scenes/heroes/1.tscn View File

@ -10,7 +10,7 @@
radius = 0.5
height = 0.5
[node name="RigidBody" index="0" instance=ExtResource( 1 )]
[node name="RigidBody" instance=ExtResource( 1 )]
script = ExtResource( 2 )


+ 1
- 3
scenes/heroes/1_wall.tscn View File

@ -13,7 +13,7 @@ subdivide_depth = 0
extents = Vector3( 1.5, 1.5, 0.25 )
[node name="StaticBody" type="StaticBody" index="0"]
[node name="StaticBody" type="StaticBody"]
input_ray_pickable = true
input_capture_on_drag = false
@ -40,13 +40,11 @@ lod_max_hysteresis = 0.0
mesh = SubResource( 1 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Transform" ]
[node name="CollisionShape" type="CollisionShape" parent="." index="1"]
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, -1.5 )
shape = SubResource( 2 )
disabled = true
_sections_unfolded = [ "Transform" ]

+ 0
- 1
scenes/heroes/2.tscn View File

@ -51,7 +51,6 @@ reverb_bus_enable = false
reverb_bus_name = "Master"
reverb_bus_amount = 0.0
reverb_bus_uniformity = 0.0
_sections_unfolded = [ "Audio Bus", "Collision", "Pause", "Reverb Bus", "Transform", "Visibility" ]
[node name="CollisionShape" type="CollisionShape" parent="Area" index="0"]


+ 0
- 1
scenes/heroes/3.tscn View File

@ -9,7 +9,6 @@
contacts_reported = 3
script = ExtResource( 2 )
_sections_unfolded = [ "Angular", "Axis Lock", "Collision", "Linear", "Pause", "Transform", "Visibility", "collision" ]
[node name="RotatedHead" parent="Yaw/Pitch" index="0"]


+ 1
- 3
scenes/heroes/5_portal.tscn View File

@ -58,7 +58,7 @@ distance_fade_enable = false
points = PoolVector3Array( -0.746582, -0.00657654, 0.750488, 0.75293, 0.41748, 0.750488, 0.75293, -0.00657654, 0.750488, -0.746582, -0.00657654, -0.749023, -0.746582, 0.41748, 0.750488, -0.746582, -0.00657654, 0.750488, 0.75293, -0.00657654, -0.749023, -0.746582, 0.41748, -0.749023, -0.746582, -0.00657654, -0.749023, 0.75293, -0.00657654, 0.750488, 0.75293, 0.41748, -0.749023, 0.75293, -0.00657654, -0.749023, 0.541016, -0.00657654, -0.537598, -0.746582, -0.00657654, -0.749023, -0.535156, -0.00657654, -0.537598, 0.75293, 0.41748, 0.750488, 0.541016, 0.41748, -0.537598, 0.75293, 0.41748, -0.749023, -0.535156, -0.00657654, -0.537598, 0.541016, 0.41748, -0.537598, 0.541016, -0.00657654, -0.537598, -0.535156, -0.00657654, 0.538574, -0.535156, 0.41748, -0.537598, -0.535156, -0.00657654, -0.537598, -0.746582, 0.41748, -0.749023, -0.535156, 0.41748, 0.538574, -0.746582, 0.41748, 0.750488, 0.541016, -0.00657654, 0.538574, -0.535156, 0.41748, 0.538574, -0.535156, -0.00657654, 0.538574, 0.541016, -0.00657654, -0.537598, 0.541016, 0.41748, 0.538574, 0.541016, -0.00657654, 0.538574, 0.75293, -0.00657654, -0.749023, 0.541016, -0.00657654, 0.538574, 0.75293, -0.00657654, 0.750488, -0.746582, 0.41748, 0.750488, -0.746582, 0.41748, -0.749023, 0.75293, 0.41748, -0.749023, 0.75293, 0.41748, 0.750488, -0.746582, -0.00657654, 0.750488, -0.535156, -0.00657654, 0.538574, -0.535156, 0.41748, -0.537598, 0.541016, 0.41748, 0.538574, -0.535156, 0.41748, -0.537598, -0.535156, 0.41748, 0.538574, 0.541016, 0.41748, 0.538574, 0.541016, 0.41748, -0.537598 )
[node name="StaticBody" type="StaticBody" index="0"]
[node name="StaticBody" type="StaticBody"]
input_ray_pickable = true
input_capture_on_drag = false
@ -69,7 +69,6 @@ bounce = 0.0
constant_linear_velocity = Vector3( 0, 0, 0 )
constant_angular_velocity = Vector3( 0, 0, 0 )
script = ExtResource( 1 )
_sections_unfolded = [ "Collision" ]
[node name="MeshInstance" type="MeshInstance" parent="." index="0"]
@ -86,7 +85,6 @@ lod_max_hysteresis = 0.0
mesh = ExtResource( 2 )
skeleton = NodePath("..")
material/0 = SubResource( 1 )
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="CollisionShape" type="CollisionShape" parent="." index="1"]


+ 1
- 11
scenes/level.tscn View File

@ -24,7 +24,6 @@ size = 16
use_mipmaps = false
use_filter = false
font_data = SubResource( 3 )
_sections_unfolded = [ "Font", "Resource" ]
[sub_resource type="ProceduralSky" id=5]
@ -45,7 +44,6 @@ sun_angle_max = 100.0
sun_curve = 0.05
sun_energy = 16.0
texture_size = 2
_sections_unfolded = [ "Ground", "Sky" ]
[sub_resource type="Environment" id=6]
@ -125,9 +123,8 @@ adjustment_enabled = false
adjustment_brightness = 1.0
adjustment_contrast = 1.0
adjustment_saturation = 1.0
_sections_unfolded = [ "Background" ]
[node name="Level" type="Spatial" index="0"]
[node name="Level" type="Spatial"]
[node name="DirectionalLight" type="DirectionalLight" parent="." index="0"]
@ -158,7 +155,6 @@ directional_shadow_max_distance = 200.0
[node name="Players" type="Spatial" parent="." index="1"]
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="Ball" type="RigidBody" parent="." index="2"]
@ -188,13 +184,11 @@ linear_velocity = Vector3( 0, 0, 0 )
linear_damp = -1.0
angular_velocity = Vector3( 0, 0, 0 )
angular_damp = -1.0
_sections_unfolded = [ "Collision", "Pause", "Transform", "Visibility" ]
[node name="CollisionShape" type="CollisionShape" parent="Ball" index="0"]
shape = SubResource( 1 )
disabled = false
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="MeshInstance" type="MeshInstance" parent="Ball" index="1"]
@ -210,12 +204,10 @@ lod_max_hysteresis = 0.0
mesh = SubResource( 2 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="FullObjective" parent="." index="3" instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -17.3706, 2.0316, 4.06596 )
_sections_unfolded = [ "Transform" ]
[node name="Debug" type="Label" parent="." index="4"]
@ -237,12 +229,10 @@ custom_fonts/font = SubResource( 4 )
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Pause", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]
[node name="LeftSpawn" type="Spatial" parent="." index="5"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.96426, 9.36109 )
_sections_unfolded = [ "Transform" ]
[node name="RightSpawn" type="Spatial" parent="." index="6"]


+ 1
- 1
scenes/levels/0.tscn
File diff suppressed because it is too large
View File


+ 1
- 3
scenes/levels/2.tscn View File

@ -53,7 +53,6 @@ uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Metallic" ]
[sub_resource type="ConcavePolygonShape" id=2]
@ -70,7 +69,7 @@ subdivide_width = 0
subdivide_height = 0
subdivide_depth = 0
[node name="Level" index="0" instance=ExtResource( 1 )]
[node name="Level" instance=ExtResource( 1 )]
[node name="DirectionalLight" parent="." index="0"]
@ -95,7 +94,6 @@ mesh = ExtResource( 2 )
material/0 = SubResource( 1 )
material/1 = null
material/2 = null
_sections_unfolded = [ "material" ]
[node name="StaticBody" type="StaticBody" parent="MainGeometry" index="0"]


+ 1
- 10
scenes/lobby.tscn View File

@ -6,7 +6,6 @@
[sub_resource type="DynamicFontData" id=1]
font_path = "res://assets/DejaVuSansMono.ttf"
_sections_unfolded = [ "Resource" ]
[sub_resource type="DynamicFont" id=2]
@ -14,12 +13,10 @@ size = 30
use_mipmaps = false
use_filter = false
font_data = SubResource( 1 )
_sections_unfolded = [ "Extra Spacing", "Font", "Resource", "Settings" ]
[sub_resource type="DynamicFontData" id=3]
font_path = "res://assets/DejaVuSansMono.ttf"
_sections_unfolded = [ "Resource" ]
[sub_resource type="DynamicFont" id=4]
@ -27,9 +24,8 @@ size = 16
use_mipmaps = false
use_filter = false
font_data = SubResource( 3 )
_sections_unfolded = [ "Font", "Resource", "Settings" ]
[node name="Lobby" type="Control" index="0"]
[node name="Lobby" type="Control"]
anchor_left = 0.0
anchor_top = 0.0
@ -45,7 +41,6 @@ mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
script = ExtResource( 1 )
_sections_unfolded = [ "Anchor" ]
[node name="Title" type="Label" parent="." index="0"]
@ -67,7 +62,6 @@ text = "VANAGLORIA"
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "custom_fonts" ]
[node name="GameBrowser" type="Control" parent="." index="1"]
@ -538,7 +532,6 @@ text = "IP:"
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Visibility" ]
[node name="IP" type="TextEdit" parent="CustomGame" index="5"]
@ -669,7 +662,6 @@ text = "Waiting for players to connect...."
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "BBCode", "custom_fonts" ]
[node name="StartGame" type="Button" parent="JoinedGameLobby" index="2"]
@ -694,6 +686,5 @@ group = null
text = "Start game"
flat = false
align = 1
_sections_unfolded = [ "Visibility" ]

+ 1
- 11
scenes/objective.tscn View File

@ -58,7 +58,6 @@ uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo" ]
[sub_resource type="CapsuleShape" id=3]
@ -71,9 +70,8 @@ size = 50
use_mipmaps = false
use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Extra Spacing", "Font", "Resource", "Settings" ]
[node name="FullObjective" type="Spatial" index="0"]
[node name="FullObjective" type="Spatial"]
[node name="Objective" type="RigidBody" parent="." index="0"]
@ -103,13 +101,11 @@ linear_damp = -1.0
angular_velocity = Vector3( 0, 0, 0 )
angular_damp = -1.0
script = ExtResource( 1 )
_sections_unfolded = [ "Axis Lock", "Collision", "Linear", "Transform", "Visibility" ]
[node name="CollisionShape" type="CollisionShape" parent="Objective" index="0"]
shape = SubResource( 1 )
disabled = false
_sections_unfolded = [ "Transform" ]
[node name="MeshInstance" type="MeshInstance" parent="Objective" index="1"]
@ -125,7 +121,6 @@ lod_max_hysteresis = 0.0
mesh = ExtResource( 2 )
skeleton = NodePath("..")
material/0 = SubResource( 2 )
_sections_unfolded = [ "Transform", "material" ]
[node name="HingeJoint" type="HingeJoint" parent="." index="1"]
@ -144,7 +139,6 @@ angular_limit/relaxation = 1.0
motor/enable = false
motor/target_velocity = 1.0
motor/max_impulse = 1.0
_sections_unfolded = [ "Transform", "Visibility", "angular_limit", "collision", "motor", "nodes", "params", "solver" ]
[node name="Rod" type="StaticBody" parent="." index="2"]
@ -157,13 +151,11 @@ friction = 1.0
bounce = 0.0
constant_linear_velocity = Vector3( 0, 0, 0 )
constant_angular_velocity = Vector3( 0, 0, 0 )
_sections_unfolded = [ "Collision", "Transform" ]
[node name="CollisionShape" type="CollisionShape" parent="Rod" index="0"]
shape = SubResource( 3 )
disabled = false
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="HUD" type="Control" parent="." index="3"]
@ -217,7 +209,6 @@ align = 1
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Theme" ]
[node name="RightTeam" type="Label" parent="HUD" index="2"]
@ -261,6 +252,5 @@ align = 1
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]

+ 0
- 8
scenes/test-level.tscn View File

@ -29,7 +29,6 @@ size = 16
use_mipmaps = false
use_filter = false
font_data = SubResource( 4 )
_sections_unfolded = [ "Font", "Resource" ]
[node name="world" type="Spatial"]
@ -63,7 +62,6 @@ directional_shadow_max_distance = 200.0
[node name="players" type="Spatial" parent="." index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.4634, 0 )
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="Maze" type="MeshInstance" parent="." index="2"]
@ -125,13 +123,11 @@ linear_velocity = Vector3( 0, 0, 0 )
linear_damp = -1.0
angular_velocity = Vector3( 0, 0, 0 )
angular_damp = -1.0
_sections_unfolded = [ "Collision", "Pause", "Transform", "Visibility" ]
[node name="CollisionShape" type="CollisionShape" parent="Ball" index="0"]
shape = SubResource( 2 )
disabled = false
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="MeshInstance" type="MeshInstance" parent="Ball" index="1"]
@ -147,12 +143,10 @@ lod_max_hysteresis = 0.0
mesh = SubResource( 3 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="FullObjective" parent="." index="4" instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -91.3336, 2.0316, 4.06596 )
_sections_unfolded = [ "Transform" ]
[node name="Debug" type="Label" parent="." index="5"]
@ -174,12 +168,10 @@ custom_fonts/font = SubResource( 5 )
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Pause", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]
[node name="LeftSpawn" type="Spatial" parent="." index="6"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.96426, 9.36109 )
_sections_unfolded = [ "Transform" ]
[node name="RightSpawn" type="Spatial" parent="." index="7"]


Loading…
Cancel
Save