From 68157fa4339076e1cea3d11f41bdac5b3a6e806d Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 6 Apr 2020 14:53:27 +0200 Subject: [PATCH] Update Voxelman to the latest. --- HEADS | 2 +- game/project.godot | 4 ++-- game/voxelman/world/TVVoxelMesher.gd | 2 +- game/voxelman/world/TestVoxelMesher.gd | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HEADS b/HEADS index af993ced..d2136723 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "81dc8bcb36999bfd3cdaf84732cb911a788912d3"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}} \ No newline at end of file +{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "28ce072e512885c0b8db9630f879279f6f1baeaa"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}} \ No newline at end of file diff --git a/game/project.godot b/game/project.godot index 06ecdaff..3275446b 100644 --- a/game/project.godot +++ b/game/project.godot @@ -249,12 +249,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://voxelman/world/TVVoxelChunk.gd" }, { -"base": "VoxelMesherTransvoxel", +"base": "VoxelMesherUVTransvoxel", "class": "TVVoxelMesher", "language": "GDScript", "path": "res://voxelman/world/TVVoxelMesher.gd" }, { -"base": "VoxelMesherTransvoxel", +"base": "VoxelMesherUVTransvoxel", "class": "TestVoxelMesher", "language": "GDScript", "path": "res://voxelman/world/TestVoxelMesher.gd" diff --git a/game/voxelman/world/TVVoxelMesher.gd b/game/voxelman/world/TVVoxelMesher.gd index b03863f1..4a7573f8 100644 --- a/game/voxelman/world/TVVoxelMesher.gd +++ b/game/voxelman/world/TVVoxelMesher.gd @@ -1,4 +1,4 @@ -extends VoxelMesherTransvoxel +extends VoxelMesherUVTransvoxel class_name TVVoxelMesher # Copyright Péter Magyar relintai@gmail.com diff --git a/game/voxelman/world/TestVoxelMesher.gd b/game/voxelman/world/TestVoxelMesher.gd index 0d67d72e..8c8372ba 100644 --- a/game/voxelman/world/TestVoxelMesher.gd +++ b/game/voxelman/world/TestVoxelMesher.gd @@ -1,4 +1,4 @@ -extends VoxelMesherTransvoxel +extends VoxelMesherUVTransvoxel class_name TestVoxelMesher # Copyright Péter Magyar relintai@gmail.com