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

Merge pull request 'feature/populate-warcraft' (#5) from feature/populate-warcraft into dev

Browse Source 
Reviewed-on: Athena/game-source#5
This commit is contained in:
stilobique
2021-05-08 20:21:07 +02:00
parent a8ec672071 0c46660d92
commit 30b06fcbae
4 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/props/table/table.material
BIN
View File
Binary file not shown.
project.godot
+2 -1
View File
@@ -16,7 +16,6 @@ config/icon="res://icon.png"
[display]
window/size/borderless=true
window/stretch/mode="2d"
[physics]
@@ -25,4 +24,6 @@ common/enable_pause_aware_picking=true
[rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true
environment/default_environment="res://default_env.tres"
scenes/levels/WarCraft.tscn
+62 -1
View File
@@ -1,3 +1,64 @@
[gd_scene format=2]
[gd_scene load_steps=8 format=2]
[ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1]
[ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2]
[ext_resource path="res://assets/props/stool b/stool b.gltf" type="PackedScene" id=3]
[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=4]
[ext_resource path="res://assets/props/book/book.gltf" type="PackedScene" id=5]
[sub_resource type="PanoramaSky" id=1]
panorama = ExtResource( 4 )
[sub_resource type="Environment" id=2]
background_mode = 3
background_sky = SubResource( 1 )
ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 )
[node name="Warcraft" type="Spatial"]
[node name="rock floor" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 )
[node name="rock floor2" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -3.747 )
[node name="Camera" type="Camera" parent="."]
transform = Transform( 0.160708, -0.339306, 0.926846, 0, 0.939052, 0.343774, -0.987002, -0.0552473, 0.150913, 1.62519, 1.61928, 0.658554 )
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource( 2 )
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( -0.919434, 0.313904, -0.236865, 0.0166148, 0.632807, 0.774131, 0.392893, 0.707827, -0.58704, 0, 1.62188, 0 )
light_color = Color( 0.611765, 0.517647, 0.882353, 1 )
shadow_enabled = true
shadow_contact = 0.3
[node name="Props Table" type="Spatial" parent="."]
[node name="book3" parent="Props Table" instance=ExtResource( 5 )]
transform = Transform( 0.259561, 0, 0.965727, 0.03751, 0.999245, -0.0100817, -0.964998, 0.0388413, 0.259365, 0.18091, 0.89617, -0.217671 )
[node name="book4" parent="Props Table" instance=ExtResource( 5 )]
transform = Transform( 0.970684, -0.0388311, -0.237202, 0.0301257, 0.998737, -0.0402167, 0.238464, 0.0318918, 0.970628, 0.18091, 0.97011, -0.217671 )
[node name="book5" parent="Props Table" instance=ExtResource( 5 )]
transform = Transform( 0.712873, -0.0851354, -0.696107, 0.03751, 0.995812, -0.0833766, 0.70029, 0.0333259, 0.71308, 0.180416, 1.04419, -0.217477 )
[node name="table" parent="Props Table" instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.082685, 0.0325576, 0.290515 )
[node name="stool b" parent="Props Table" instance=ExtResource( 3 )]
transform = Transform( 0.656257, 0, 0.754538, 0, 1, 0, -0.754538, 0, 0.656257, -0.888955, 0.0130518, 1.64328 )
[node name="stool b2" parent="Props Table" instance=ExtResource( 3 )]
transform = Transform( 0.892389, 0, -0.451267, 0, 1, 0, 0.451267, 0, 0.892389, 1.35966, 0.013052, 1.23435 )
[node name="stool b3" parent="Props Table" instance=ExtResource( 3 )]
transform = Transform( 0.839193, 0, 0.543834, 0, 1, 0, -0.543834, 0, 0.839193, 0.474083, 0.013052, -1.39025 )
[node name="book" parent="Props Table" instance=ExtResource( 5 )]
transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 0, 0.923053, 1 )
[node name="book2" parent="Props Table" instance=ExtResource( 5 )]
transform = Transform( -0.017264, 0, 1.15546, 0, 1.15559, 0, -1.15546, 0, -0.017264, 0, 0.998191, 1 )
scenes/levels/warcraft/env_warcraft.tres
+6
View File
@@ -0,0 +1,6 @@
[gd_resource type="World" load_steps=2 format=2]
[sub_resource type="Environment" id=1]
[resource]
environment = SubResource( 1 )