From f7be2c16c007c0926fe30613f83e304c4d9d336f Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 23 Jan 2019 15:32:19 +0100 Subject: [PATCH] Fix bad scene files in content. (#141) --- Resources/Scenes/Construction/ConstructionMenu.tscn | 2 +- Resources/Scenes/Mobs/CharacterWindow.tscn | 2 +- Resources/Scenes/Mobs/StorageSlot.tscn | 2 +- Resources/Scenes/Power/Apc.tscn | 2 +- Resources/Scenes/Storage/Storage.tscn | 2 +- Resources/Scenes/Storage/StorageEntity.tscn | 2 +- engine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Scenes/Construction/ConstructionMenu.tscn b/Resources/Scenes/Construction/ConstructionMenu.tscn index 9613fb8ddf..0a4e8e022f 100644 --- a/Resources/Scenes/Construction/ConstructionMenu.tscn +++ b/Resources/Scenes/Construction/ConstructionMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] +[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] [node name="SS14Window" index="0" instance=ExtResource( 1 )] margin_left = 99.0 diff --git a/Resources/Scenes/Mobs/CharacterWindow.tscn b/Resources/Scenes/Mobs/CharacterWindow.tscn index a5020062fd..454d5babcd 100644 --- a/Resources/Scenes/Mobs/CharacterWindow.tscn +++ b/Resources/Scenes/Mobs/CharacterWindow.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] +[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] [node name="SS14Window" index="0" instance=ExtResource( 1 )] diff --git a/Resources/Scenes/Mobs/StorageSlot.tscn b/Resources/Scenes/Mobs/StorageSlot.tscn index fee8bd619c..87bae909a0 100644 --- a/Resources/Scenes/Mobs/StorageSlot.tscn +++ b/Resources/Scenes/Mobs/StorageSlot.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Content/Scenes/Mobs/StorageSlot.tres" type="StyleBox" id=1] -[ext_resource path="res://Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=2] +[ext_resource path="res://Engine/Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=2] [node name="PanelContainer" type="PanelContainer"] diff --git a/Resources/Scenes/Power/Apc.tscn b/Resources/Scenes/Power/Apc.tscn index f15cfb4a26..d6f12561d6 100644 --- a/Resources/Scenes/Power/Apc.tscn +++ b/Resources/Scenes/Power/Apc.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] +[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1] [node name="SS14Window" index="0" instance=ExtResource( 1 )] margin_right = 426.0 diff --git a/Resources/Scenes/Storage/Storage.tscn b/Resources/Scenes/Storage/Storage.tscn index d0221a94d5..8e7c2708fe 100644 --- a/Resources/Scenes/Storage/Storage.tscn +++ b/Resources/Scenes/Storage/Storage.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Scenes/SS14Window/closewindow.png" type="Texture" id=1] +[ext_resource path="res://Engine/Scenes/SS14Window/closewindow.png" type="Texture" id=1] [sub_resource type="StyleBoxFlat" id=1] diff --git a/Resources/Scenes/Storage/StorageEntity.tscn b/Resources/Scenes/Storage/StorageEntity.tscn index 9a8dc57848..ce48ecef22 100644 --- a/Resources/Scenes/Storage/StorageEntity.tscn +++ b/Resources/Scenes/Storage/StorageEntity.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=1] +[ext_resource path="res://Engine/Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=1] [sub_resource type="StyleBoxEmpty" id=1] diff --git a/engine b/engine index 6d9a1a4e43..b38873dc85 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 6d9a1a4e43b00a9024680c444bfa3d800d68e840 +Subproject commit b38873dc853639d86c0a48ddaaec5507c626814d