bif/retrace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move materials to their own top-level folder

Browse Source
This commit is contained in:
karl 2019-11-22 12:15:51 +01:00
parent 696b1cf724
commit a79ae2402b
13 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Characters/Player/UI/UI.tscn
View File

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://Characters/Player/UI/UI.gd" type="Script" id=1] [ext_resource path="res://Characters/Player/UI/UI.gd" type="Script" id=1]
[ext_resource path="res://Things/ReusableMaterials/pillLevel_fill.png" type="Texture" id=2] [ext_resource path="res://Resources/Textures/pillLevel_fill.png" type="Texture" id=2]
[node name="HUD" type="Control"] [node name="HUD" type="Control"]
anchor_right = 1.0 anchor_right = 1.0

2
Level/Machinations/FactoryGameplay.tscn
View File

@ -2,7 +2,7 @@
[ext_resource path="res://Level/Machinations/PipeGame.gd" type="Script" id=1] [ext_resource path="res://Level/Machinations/PipeGame.gd" type="Script" id=1]
[ext_resource path="res://Things/Pipes/EckiPipe.tscn" type="PackedScene" id=2] [ext_resource path="res://Things/Pipes/EckiPipe.tscn" type="PackedScene" id=2]
[ext_resource path="res://Things/ReusableMaterials/Pipe_Dream.tres" type="Material" id=3] [ext_resource path="res://Materials/Pipe_Dream.tres" type="Material" id=3]
[ext_resource path="res://Things/Pipes/StraightPipe.tscn" type="PackedScene" id=4] [ext_resource path="res://Things/Pipes/StraightPipe.tscn" type="PackedScene" id=4]
[ext_resource path="res://Things/Pipes/StraightForkPipe.tscn" type="PackedScene" id=5] [ext_resource path="res://Things/Pipes/StraightForkPipe.tscn" type="PackedScene" id=5]
[ext_resource path="res://Things/Lever/Lever.tscn" type="PackedScene" id=6] [ext_resource path="res://Things/Lever/Lever.tscn" type="PackedScene" id=6]

0
Things/ReusableMaterials/Glow.tres → Materials/Glow.tres
View File

0
Things/ReusableMaterials/Pipe_Dream.tres → Materials/Pipe_Dream.tres
View File

0
Things/ReusableMaterials/pillLevel_fill.png → Resources/Textures/pillLevel_fill.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

6
Things/ReusableMaterials/pillLevel_fill.png.import → Resources/Textures/pillLevel_fill.png.import
View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/pillLevel_fill.png-fdb431190d360a95b9350b24d68930cb.stex" path="res://.import/pillLevel_fill.png-6a491fb74599bcf3a4bd9c492369d636.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://Things/ReusableMaterials/pillLevel_fill.png" source_file="res://Resources/Textures/pillLevel_fill.png"
dest_files=[ "res://.import/pillLevel_fill.png-fdb431190d360a95b9350b24d68930cb.stex" ] dest_files=[ "res://.import/pillLevel_fill.png-6a491fb74599bcf3a4bd9c492369d636.stex" ]
[params] [params]

3
Things/Door/Door.tscn
View File

@ -1,7 +1,8 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Door/Door.gd" type="Script" id=1] [ext_resource path="res://Things/Door/Door.gd" type="Script" id=1]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=2] [ext_resource path="res://Materials/Glow.tres" type="Material" id=2]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]

3
Things/Key/Key.tscn
View File

@ -2,10 +2,11 @@
[ext_resource path="res://Things/Key/Key.gd" type="Script" id=1] [ext_resource path="res://Things/Key/Key.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/key/Material.material" type="Material" id=2] [ext_resource path="res://Resources/Models/key/Material.material" type="Material" id=2]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[ext_resource path="res://Resources/Models/key/key.dae" type="PackedScene" id=4] [ext_resource path="res://Resources/Models/key/key.dae" type="PackedScene" id=4]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube.001" resource_name = "Cube.001"
surfaces/0 = { surfaces/0 = {

13
Things/Keycard/Keycard.tscn
View File

File diff suppressed because one or more lines are too long

3
Things/Lever/Lever.tscn
View File

@ -1,7 +1,8 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Lever/Lever.gd" type="Script" id=1] [ext_resource path="res://Things/Lever/Lever.gd" type="Script" id=1]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=2] [ext_resource path="res://Materials/Glow.tres" type="Material" id=2]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]

3
Things/Pipes/EckiPipe.tscn
View File

@ -2,7 +2,8 @@
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/eckiPipe/Material.material" type="Material" id=2] [ext_resource path="res://Resources/Models/eckiPipe/Material.material" type="Material" id=2]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]

3
Things/Pipes/StraightForkPipe.tscn
View File

@ -2,7 +2,8 @@
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/straightForkPipe/Material_001.material" type="Material" id=2] [ext_resource path="res://Resources/Models/straightForkPipe/Material_001.material" type="Material" id=2]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]

3
Things/Pipes/StraightPipe.tscn
View File

@ -2,7 +2,8 @@
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/straightPipe/Material_001.material" type="Material" id=2] [ext_resource path="res://Resources/Models/straightPipe/Material_001.material" type="Material" id=2]
[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]