Update HEADS to get the new prop related changes from Voxelman, and the WorldGenerator. Changed the voxel scale in the menu aswell.

This commit is contained in:
Relintai 2020-02-16 02:57:24 +01:00
parent 1213360c58
commit f3f9de391a
7 changed files with 49 additions and 8 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "8a0f94a688f18a9565a21657bf44791550aec96a", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "09372b146936fda509f5c23a522e998d12f38e13"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "07afd06c2a805bf994fa756f44328527de08e217"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "655be02357fb4fd9d8d1b537758c1599fb37bb15"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} {"engine": {"3.2": "245ecb6684d089940273564fb7a314e5e11ea72e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "919080a1b5b6a6d7b0013c777b1ee7e41e206683"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "655be02357fb4fd9d8d1b537758c1599fb37bb15"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}

View File

@ -1,6 +1,11 @@
[gd_resource type="DungeonRoomData" load_steps=2 format=2] [gd_resource type="DungeonRoomData" load_steps=4 format=2]
[ext_resource path="res://scripts/dungeon_start_rooms/start_room.gd" type="Script" id=1] [ext_resource path="res://scripts/dungeon_start_rooms/start_room.gd" type="Script" id=1]
[ext_resource path="res://data/props/1_test.tres" type="PropData" id=2]
[sub_resource type="WorldGeneratorPropData" id=1]
prop = ExtResource( 2 )
[resource] [resource]
target_script = ExtResource( 1 ) target_script = ExtResource( 1 )
prop_datas = [ SubResource( 1 ) ]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,14 @@
[gd_resource type="PropData" format=2] [gd_resource type="PropData" load_steps=4 format=2]
[ext_resource path="res://data/character_models/upperarm.dae" type="MeshDataResource" id=1]
[ext_resource path="res://data/voxel_textures/test_brick_albedo.png" type="Texture" id=2]
[sub_resource type="PropDataMesh" id=1]
mesh = ExtResource( 1 )
texture = ExtResource( 2 )
snap_to_mesh = false
snap_axis = Vector3( 0, -1, 0 )
[resource] [resource]
resource_name = "adad"
props = [ SubResource( 1 ) ]

View File

@ -1,14 +1,15 @@
[gd_resource type="VoxelmanLibraryMerger" load_steps=7 format=2] [gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2]
[ext_resource path="res://data/materials/1_standard_material.tres" type="Material" id=1] [ext_resource path="res://data/materials/1_standard_material.tres" type="Material" id=1]
[ext_resource path="res://data/voxel_surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2] [ext_resource path="res://data/voxel_surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2]
[ext_resource path="res://data/voxel_surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3] [ext_resource path="res://data/voxel_surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3]
[ext_resource path="res://data/voxel_surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4] [ext_resource path="res://data/voxel_surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4]
[ext_resource path="res://data/voxel_surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5] [ext_resource path="res://data/voxel_surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5]
[ext_resource path="res://data/materials/4_standard_material_prop.tres" type="Material" id=6]
[ext_resource path="res://data/voxel_surfaces/0_air.tres" type="VoxelSurfaceMerger" id=7] [ext_resource path="res://data/voxel_surfaces/0_air.tres" type="VoxelSurfaceMerger" id=7]
[resource] [resource]
material = ExtResource( 1 ) material = ExtResource( 1 )
prop_material = ExtResource( 1 ) prop_material = ExtResource( 6 )
texture_flags = 1 texture_flags = 1
voxel_surfaces = [ ExtResource( 7 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ) ] voxel_surfaces = [ ExtResource( 7 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ) ]

View File

@ -553,10 +553,10 @@ visible = false
transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 0.926699, 0 ) transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 0.926699, 0 )
[node name="CharacterDisplay" type="Spatial" parent="Char"] [node name="CharacterDisplay" type="Spatial" parent="Char"]
transform = Transform( 1, 0, 0, 0, 0.990268, -0.139173, 0, 0.139173, 0.990268, 0, 0, 0 ) transform = Transform( 1, 1.49012e-08, 0, 0, 0.990268, -0.139173, -2.98023e-08, 0.139173, 0.990268, -5.96046e-08, 0.578123, 0.08125 )
[node name="Camera" type="Camera" parent="Char"] [node name="Camera" type="Camera" parent="Char"]
transform = Transform( 0.907555, -0.0761571, 0.41297, 0.0262364, 0.99178, 0.125239, -0.419113, -0.102827, 0.902093, 0.324024, 1.1984, 2.19226 ) transform = Transform( 0.907555, -0.0761572, 0.41297, 0.0262364, 0.99178, 0.12524, -0.419113, -0.102827, 0.902093, 0.752064, 1.69463, 3.15021 )
current = true current = true
[node name="World" type="VoxelWorld" parent="." groups=[ [node name="World" type="VoxelWorld" parent="." groups=[
@ -568,6 +568,7 @@ use_threads = false
max_concurrent_generations = 1 max_concurrent_generations = 1
library = ExtResource( 17 ) library = ExtResource( 17 )
level_generator = SubResource( 1 ) level_generator = SubResource( 1 )
voxel_scale = 1.6
chunk_spawn_range = 1 chunk_spawn_range = 1
script = ExtResource( 16 ) script = ExtResource( 16 )
show_loading_screen = false show_loading_screen = false