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

Update ESS tot he latest to get the getter/setter renames. Also fix an unrelated error.

Browse Source
This commit is contained in:
Relintai 2020-06-05 19:45:42 +02:00
parent 70b1b4badd
commit bb56fb05c5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "9f4a14ba97394d1fc08d123c40699c03f56b6aad", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "64cb83c5436690aa0196a8036cdb18cbfc16b7b0"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}} {"engine": {"3.2": "9f4a14ba97394d1fc08d123c40699c03f56b6aad", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "6a3716bc420164edceb7fd213a412e5ba11fa474"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

14
game/addons/module_manager/panels/ResourcePanel.gd
View File

@ -65,16 +65,16 @@ func refresh() -> void:
for ch in _entry_container.get_children(): for ch in _entry_container.get_children():
ch.queue_free() ch.queue_free()
var d : Directory = Directory.new() var dir : Directory = Directory.new()
if d.open(_folder) == OK: if dir.open(_folder) == OK:
d.list_dir_begin() dir.list_dir_begin()
var data_array : Array = Array() var data_array : Array = Array()
var file_name = d.get_next() var file_name = dir.get_next()
while (file_name != ""): while (file_name != ""):
if not d.current_is_dir(): if not dir.current_is_dir():
if ResourceLoader.exists(_folder + file_name, _resource_type): if ResourceLoader.exists(_folder + file_name, _resource_type):
@ -95,7 +95,7 @@ func refresh() -> void:
ftext = ftext.to_lower() ftext = ftext.to_lower()
if ftext.find(_filter_term) == -1: if ftext.find(_filter_term) == -1:
file_name = d.get_next() file_name = dir.get_next()
continue continue
var id : int = 0 var id : int = 0
@ -108,7 +108,7 @@ func refresh() -> void:
"resource": res "resource": res
}) })
file_name = d.get_next() file_name = dir.get_next()
data_array.sort_custom(self, "sort_entries") data_array.sort_custom(self, "sort_entries")

4
game/player/MobTest.gd
View File

@ -37,10 +37,10 @@ func _ready():
func c_on_damage_taken(entity, dpd): func c_on_damage_taken(entity, dpd):
print("c " + str(dpd.damage)) print("c " + str(dpd.damage))
# print("ch " + str(get_health().ccurrent) + "/" + str(get_health().cmax)) # print("ch " + str(heal_getth().ccurrent) + "/" + str(heal_getth().cmax))
pass pass
func s_on_damage_taken(entity, dpd): func s_on_damage_taken(entity, dpd):
print("s " + str(dpd.damage)) print("s " + str(dpd.damage))
#print("ch " + str(get_health().scurrent) + "/" + str(get_health().smax)) #print("ch " + str(heal_getth().scurrent) + "/" + str(heal_getth().smax))
pass pass