darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solved conflict #1

Browse Source
This commit is contained in:
stilobique-surface
2021-05-13 20:30:04 +02:00
parent 87bd230306
commit 5cc53fca02
21 changed files with 1379 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/props/Spyglass/materials/MA_spyglass.material
BIN
View File
Binary file not shown.
assets/props/Spyglass/sm_spyglass.mesh
BIN
View File
Binary file not shown.
assets/props/Spyglass/spyglass.gltf
+21 -26
View File
File diff suppressed because one or more lines are too long
assets/props/Spyglass/spyglass.gltf.import
+3 -3
View File
@@ -2,12 +2,12 @@
importer="scene"
type="PackedScene"
path="res://.import/spyglass.gltf-d150be4703b31b395c1c71afd876d526.scn"
path="res://.import/spyglass.gltf-f88c2aed065225936fc295c1654b7c4b.scn"
[deps]
source_file="res://assets/props/Spyglass/spyglass.gltf"
dest_files=[ "res://.import/spyglass.gltf-d150be4703b31b395c1c71afd876d526.scn" ]
source_file="res://assets/props/spyglass/spyglass.gltf"
dest_files=[ "res://.import/spyglass.gltf-f88c2aed065225936fc295c1654b7c4b.scn" ]
[params]