From 2e212083e1bca4f96e51ec934e44e22960ce456a Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 2 Feb 2020 02:45:47 +0100 Subject: [PATCH] Update to the latest ESS, and fix a few errors in the console. --- HEADS | 2 +- game/autoload/Entities.gd | 3 ++- game/project.godot | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/HEADS b/HEADS index 10d4f12f..6db3e991 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "217d8f4e9760ab846e258b7c8842548b601c2ab9", "world_generator": "09372b146936fda509f5c23a522e998d12f38e13", "entity_spell_system": "26c638881bcb8f1d86360e22fa39f3c95af32429", "ui_extensions": "38acc650db260a831dc26ca96fe9d9a087230bdc", "voxelman": "db77530ec1b70861fb2e3783d3ea6ba75a4ac793", "texture_packer": "7bff901e4946b903a73b266d6a02c317f079ab33", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "4bda19b12be2c2a79a6121de6d22e48f3934e726", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49", "procedural_animations": "9c287b9e54dc8d306668a6118a6d2c78415eb8de", "fast_quadratic_mesh_simplifier": "63d55b154967321212a6426e9b327c95e007785d"} \ No newline at end of file +{"engine": "739f583151ee5b66b2a3d60c8c206ccdba8fa7f9", "world_generator": "09372b146936fda509f5c23a522e998d12f38e13", "entity_spell_system": "26c638881bcb8f1d86360e22fa39f3c95af32429", "ui_extensions": "38acc650db260a831dc26ca96fe9d9a087230bdc", "voxelman": "db77530ec1b70861fb2e3783d3ea6ba75a4ac793", "texture_packer": "7bff901e4946b903a73b266d6a02c317f079ab33", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "4bda19b12be2c2a79a6121de6d22e48f3934e726", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49", "procedural_animations": "9c287b9e54dc8d306668a6118a6d2c78415eb8de", "fast_quadratic_mesh_simplifier": "63d55b154967321212a6426e9b327c95e007785d"} \ No newline at end of file diff --git a/game/autoload/Entities.gd b/game/autoload/Entities.gd index c0b52d17..c8ede900 100644 --- a/game/autoload/Entities.gd +++ b/game/autoload/Entities.gd @@ -38,7 +38,8 @@ var _players : Array var _mobs : Array func _ready(): - #EntityDataManager.load_all() + ProfileManager.load() + EntityDataManager.load_all() _spawn_parent = get_node(spawn_parent_path) diff --git a/game/project.godot b/game/project.godot index f6b9bdaf..370a2ca1 100644 --- a/game/project.godot +++ b/game/project.godot @@ -258,7 +258,6 @@ enabled=PoolStringArray( "ess_data", "prop_tool" ) [ess] -data/automatic_load=true data/xp_data_path="res://data/xp/xp_data.tres" data/entity_resources_folder="res://data/entity_resources" data/entity_skills_folder="res://data/entity_skills" @@ -270,7 +269,6 @@ data/craft_data_folder="res://data/crafting" data/item_template_folder="res://data/item_templates" data/mob_data_folder="res://data/mob_data" data/player_character_data_folder="res://data/player_character_data" -profiles/automatic_load=true [importer_defaults]