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

Solve conflict #2

Browse Source
This commit is contained in:
stilobique-surface
2021-05-13 20:31:47 +02:00
parent 5cc53fca02
commit 92f1fc6f4f
14 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/props/book/materials/MA_book.material
BIN
View File
Binary file not shown.
assets/props/book/sm_book.mesh
BIN
View File
Binary file not shown.
assets/props/fiole/materials/MA_fiole_green.material
BIN
View File
Binary file not shown.
assets/props/godet/materials/MA_godet.material
BIN
View File
Binary file not shown.
assets/props/parchment/materials/MA_PaperParchment.material
BIN
View File
Binary file not shown.
assets/props/parchment/materials/MA_WoodParchment.material
BIN
View File
Binary file not shown.
assets/props/parchment/materials/WoodParchment.material
BIN
View File
Binary file not shown.
assets/props/parchment/sm_paper_parchment.mesh
BIN
View File
Binary file not shown.
assets/props/rock floor/ground_library.tres
+3 -3
View File
@@ -1,9 +1,9 @@
[gd_resource type="MeshLibrary" load_steps=17 format=2] [gd_resource type="MeshLibrary" load_steps=17 format=2]
[ext_resource path="res://assets/materials/gray.tres" type="Material" id=1] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=1]
[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=2] [ext_resource path="res://assets/props/book/materials/MA_book.material" type="Material" id=2]
[ext_resource path="res://assets/props/table/materials/table.material" type="Material" id=3] [ext_resource path="res://assets/props/table/materials/MA_table.material" type="Material" id=3]
[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=4] [ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=4]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]
material = ExtResource( 1 ) material = ExtResource( 1 )
assets/props/rock floor/materials/rock_floor.material → assets/props/rock floor/materials/MA_rock_floor.material
View File
assets/props/stool b/materials/stool_b.material → assets/props/stool b/materials/MA_stool_b.material
View File
assets/props/table/materials/MA_table.material
BIN
View File
Binary file not shown.
assets/props/table/materials/table.material
BIN
View File
Binary file not shown.
developers/aurelien/CheckLightmap.tscn
+1 -1
View File
@@ -13,7 +13,7 @@
[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=12] [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=12]
[ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=13] [ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=13]
[ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=14] [ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=14]
[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=15] [ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=15]
[ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=16] [ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=16]
[ext_resource path="res://assets/props/rock floor/sm_floor.mesh" type="ArrayMesh" id=17] [ext_resource path="res://assets/props/rock floor/sm_floor.mesh" type="ArrayMesh" id=17]
[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=18] [ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=18]