From e16aa1c73fd9d77be340fe3399fe6a9d778da66c Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 17 Apr 2021 19:31:23 +0200 Subject: [PATCH] Updated terraman to the latest. --- HEADS | 2 +- game/tw/TerraWorldBlocky.gd | 6 ------ game/tw/TerraWorldBlocky.tscn | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/HEADS b/HEADS index 210fb05b..11586974 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "701fa8a7796615d2fdd0c19931b50e020eb0a5ad"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3bbe1138973bafe57638e569e87d28b6e0a0eb46"}, "ui_extensions": {"master": "f1ae14c1be0750f65c77ecaad037dbe1cfb28269"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "c712c4b30839400ba22e5a6b01f2a20fd9b311fa"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2cb2d2e558e00e55c8995b19d59e3b7c654b5210"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "f4bc70c94e5042c2f8bc91b89bd5d476274f79cc"}, "mesh_utils": {"master": "9bd800489580680d4b778d78cc7b2449092caefd"}, "broken_seals_module": {"master": "4d8de70db8e48b283beb0b0537649e7e4f1b19e7"}, "thread_pool": {"master": "da4e049da09cb726a00f1edb1df935a2e8475902"}, "terraman": {"master": "94d18a7c4811d5cf68b5fb5d947681af146216c8"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "701fa8a7796615d2fdd0c19931b50e020eb0a5ad"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3bbe1138973bafe57638e569e87d28b6e0a0eb46"}, "ui_extensions": {"master": "f1ae14c1be0750f65c77ecaad037dbe1cfb28269"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "c712c4b30839400ba22e5a6b01f2a20fd9b311fa"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2cb2d2e558e00e55c8995b19d59e3b7c654b5210"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "f4bc70c94e5042c2f8bc91b89bd5d476274f79cc"}, "mesh_utils": {"master": "9bd800489580680d4b778d78cc7b2449092caefd"}, "broken_seals_module": {"master": "4d8de70db8e48b283beb0b0537649e7e4f1b19e7"}, "thread_pool": {"master": "da4e049da09cb726a00f1edb1df935a2e8475902"}, "terraman": {"master": "07788b6e8dc5819c1f7cc949e8c6b18eba2159b0"}} \ No newline at end of file diff --git a/game/tw/TerraWorldBlocky.gd b/game/tw/TerraWorldBlocky.gd index 1ea996d2..fa11677b 100644 --- a/game/tw/TerraWorldBlocky.gd +++ b/game/tw/TerraWorldBlocky.gd @@ -176,9 +176,6 @@ func _process(delta): # get_node("..").hide_loading_screen() func _generation_finished(): - if not Engine.editor_hint: - max_frame_chunk_build_steps = _max_frame_chunk_build_temp - initial_generation = false # for i in range(get_chunk_count()): @@ -271,9 +268,6 @@ func _create_chunk(x : int, z : int, pchunk : TerraChunk) -> TerraChunk: return ._create_chunk(x, z, pchunk) func spawn(start_x : int, start_z : int) -> void: - if not Engine.editor_hint: - _max_frame_chunk_build_temp = max_frame_chunk_build_steps - max_frame_chunk_build_steps = 0 var spv : Vector2 = Vector2(start_x, start_z) diff --git a/game/tw/TerraWorldBlocky.tscn b/game/tw/TerraWorldBlocky.tscn index d155a228..07661f92 100644 --- a/game/tw/TerraWorldBlocky.tscn +++ b/game/tw/TerraWorldBlocky.tscn @@ -5,7 +5,6 @@ [ext_resource path="res://tw/new_terramanlevelgenerator.tres" type="TerramanLevelGenerator" id=3] [node name="TerraWorldBlocky" type="TerraWorldBlocky"] -editable = true library = ExtResource( 1 ) level_generator = ExtResource( 3 ) voxel_scale = 2.0