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

peaceful merge conflict

Browse Source
This commit is contained in:
SlightlyObscure 2019-11-18 20:04:36 +01:00
commit 343fa46c3c
2 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Level/Buildings/Factory.tscn Normal file
View File

@ -0,0 +1,24 @@
[gd_scene load_steps=2 format=2]
[sub_resource type="CylinderMesh" id=4]
top_radius = 20.0
bottom_radius = 35.0
height = 100.0
[node name="Factory" type="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -185, 0, -191 )
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 50, 0 )
mesh = SubResource( 4 )
material/0 = null
[node name="MeshInstance2" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, 60 )
mesh = SubResource( 4 )
material/0 = null
[node name="MeshInstance3" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 50, -60 )
mesh = SubResource( 4 )
material/0 = null

76
Level/World.tscn
View File

File diff suppressed because one or more lines are too long