diff --git a/HEADS b/HEADS index 50295d37..4771bc2d 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "529daebe07897c98260f63d4e087c2160831c4e8", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9d946f1623b9cb57b2e1d9681ac3b7f7e7b746d4"}, "entity_spell_system": {"master": "0f823f4206ec3f7710fafcdf7b76ba66c2c66d30"}, "ui_extensions": {"master": "8c4302f7f700d0c03adeeba305e728c39521ab65"}, "voxelman": {"master": "7c0390de74c69358ea72a0f9b7364689ce0e737b"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "f7aed39c065f465abcb6f1651ea0256306818934"}, "mesh_data_resource": {"master": "b9cb58897af8e4fc9526b3355528f10f3d2c19e1"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "58d46884a492e644b16f988479d286fc8a342239"}, "props": {"master": "0aceb2aeca8a9d7cd2c312b66cf23dc330f041b2"}} \ No newline at end of file +{"engine": {"3.2": "50582446ad13a7ce034bdd8695409bf26c1abac3", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9d946f1623b9cb57b2e1d9681ac3b7f7e7b746d4"}, "entity_spell_system": {"master": "5b14bf40bda81d2899c851c0dd9a2e1f7586781d"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "23c4321d71927a0e2d08b5d19fc4c5bb8242e7d2"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index 76bb53a9..8c3810ec 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -568,7 +568,7 @@ library = ExtResource( 17 ) level_generator = SubResource( 1 ) voxel_scale = 1.6 chunk_spawn_range = 1 -build_flags = 511 +build_flags = 255 script = ExtResource( 16 ) show_loading_screen = false generate_on_ready = true diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd index c7c2d6c2..f5720684 100644 --- a/game/voxelman/world/TVVoxelWorld.gd +++ b/game/voxelman/world/TVVoxelWorld.gd @@ -87,21 +87,21 @@ func _process(delta): remove_chunk_index(i) i -= 1 count -= 1 - else: - var dx : int = abs(ppx - c.position_x) - var dy : int = abs(ppy - c.position_y) - var dz : int = abs(ppz - c.position_z) - - var mr : int = max(max(dx, dy), dz) - - if mr <= 1: - c.current_lod_level = 0 - elif mr == 2: - c.current_lod_level = 1 - elif mr == 3:# or mr == 4: - c.current_lod_level = 2 - else: - c.current_lod_level = 3 +# else: +# var dx : int = abs(ppx - c.position_x) +# var dy : int = abs(ppy - c.position_y) +# var dz : int = abs(ppz - c.position_z) +# +# var mr : int = max(max(dx, dy), dz) +# +# if mr <= 1: +# c.current_lod_level = 0 +# elif mr == 2: +# c.current_lod_level = 1 +# elif mr == 3:# or mr == 4: +# c.current_lod_level = 2 +# else: +# c.current_lod_level = 3 i += 1 @@ -221,6 +221,8 @@ func load_character(file_name : String) -> void: _player = Entities.load_player(file_name, Vector3(5, 30, 5), 1) as Entity #TODO hack, do this properly _player.set_physics_process(false) + + set_player(_player.get_body()) Server.sset_seed(_player.sseed)