Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grab the latest Voxelman, and small amounts of test code.

Browse Source
This commit is contained in:
Relintai 2020-02-26 01:16:19 +01:00
parent 3e68b820b5
commit 84668b4153
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "c5c0f2cddd74c849017fa5138bc6ebdeb76dcd80"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "5b32345181338f06a7751c924af2b57807ba99cd"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} {"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "c5c0f2cddd74c849017fa5138bc6ebdeb76dcd80"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "3e98b8e01ca1d4ea87d6a0f796217c2842f00e22"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}

2
game/scenes/Menu.tscn
View File

@ -571,8 +571,6 @@ level_generator = SubResource( 1 )
voxel_scale = 1.6 voxel_scale = 1.6
chunk_spawn_range = 1 chunk_spawn_range = 1
script = ExtResource( 16 ) script = ExtResource( 16 )
meshes = [ ]
editor_generate = false
show_loading_screen = false show_loading_screen = false
generate_on_ready = true generate_on_ready = true

20
game/voxelman/world/TVVoxelWorld.gd
View File

@ -39,7 +39,19 @@ var _editor_generate : bool
var _player_file_name : String var _player_file_name : String
var _player : Entity var _player : Entity
func _ready(): func _enter_tree():
# for ch in get_children():
# if ch is VoxelChunk:
# var c : VoxelChunk = ch as VoxelChunk
#
# c.set_voxel_world(self)
# c.set_library(library)
# c.set_size(c.size_x, c.size_y, c.size_z, c.margin_start, c.margin_end)
# add_chunk(c, c.position_x, c.position_y, c.position_z)
# c.build_deferred()
if generate_on_ready and not Engine.is_editor_hint(): if generate_on_ready and not Engine.is_editor_hint():
if level_generator != null: if level_generator != null:
@ -136,9 +148,9 @@ func set_editor_generate(value : bool) -> void:
level_generator.setup(self, current_seed, false, library) level_generator.setup(self, current_seed, false, library)
spawn() spawn()
else: # else:
spawned = false # spawned = false
clear() # clear()
_editor_generate = value _editor_generate = value