Merge commit 'ebfb1608adc39345a29a0c9314d861d7828f080d'

Author: AnidemDex

addons/event_system_plugin/core/event_inspector.gd

@@ -28,6 +28,8 @@ func parse_category(object: Object, category: String) -> void:
 
 
 func parse_property(object: Object, type: int, path: String, hint: int, hint_text: String, usage: int) -> bool:
+	if object == null:
+		return false
 	var path_ignore = path+"_ignore"
 	if (path_ignore in object):
 		return true

addons/event_system_plugin/events/call.gd

@@ -1,23 +1,16 @@
 tool
-extends Event
-class_name EventCall
-
-export(String) var method:String = "" setget set_method
-export(Array) var args:Array = []
+extends "res://addons/event_system_plugin/events/call_from.gd"
 
 func _init() -> void:
 	event_color = Color("EB5E55")
 	event_name = "Call"
 	event_category = "Node"
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/call.png") as Texture
 	event_preview_string = "{method} ( {args} ) "
+	node_path = NodePath()
 
 	args = []
-
-
-func _execute() -> void:
-	event_node.callv(method, args)
-	finish()
+	push_warning("Call event is deprecated. Will be removed in future versions. Consider using EventCallFrom")
 
 
 func set_method(value:String) -> void:

addons/event_system_plugin/events/call_from.gd

@@ -1,14 +1,14 @@
 tool
 extends Event
-class_name EventCallFrom
+class_name EventCall
 
 export(NodePath) var node_path:NodePath setget set_node_path
 export(String) var method:String = "" setget set_method
 export(Array) var args:Array = []
 
 func _init() -> void:
-	event_color = Color("5AA0EB")
-	event_name = "Call From"
+	event_color = Color("EB5E55")
+	event_name = "Call"
 	event_category = "Node"
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/call.png") as Texture
 	event_preview_string = "{node_path} {method} ( {args} ) "
@@ -17,9 +17,13 @@ func _init() -> void:
 
 
 func _execute() -> void:
-	var node = event_node.get_tree().current_scene.get_node_or_null(node_path)
-	if node != null:
-		node.callv(method, args)
+	if node_path == NodePath():
+		if event_node.has_method(method):
+			event_node.callv(method, args)
+	else:
+		var node = event_node.get_tree().current_scene.get_node_or_null(node_path)
+		if node != null:
+			node.callv(method, args)
 	finish()
 
 func set_node_path(value:NodePath) -> void:

addons/event_system_plugin/events/hide.gd

@@ -1,14 +1,19 @@
 tool
-extends Event
+extends "res://addons/event_system_plugin/events/call_from.gd"
 class_name EventHide
 
 func _init() -> void:
 	event_color = Color("EB5E55")
 	event_name = "Hide"
 	event_category = "Node"
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/hidden.png") as Texture
+	method = "set"
+	args = ["visible", false]
+	event_preview_string = "{node_path}"
 
 
-func _execute() -> void:
-	event_node.set("visible", false)    
-	finish()
+func _get(property: String):
+	if property == "method_ignore":
+		return true
+	if property == "args_ignore":
+		return true

addons/event_system_plugin/events/set.gd

@@ -1,5 +1,5 @@
 tool
-extends Event
+extends "res://addons/event_system_plugin/events/call_from.gd"
 class_name EventSet
 
 export(String) var variable_name:String = "" setget set_var_name
@@ -12,25 +12,28 @@ func _init() -> void:
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/set_variable.png") as Texture
 	event_preview_string = "Set [ {variable_name} ] to be [ {variable_value} ]"
 	continue_at_end = true
-
-
-func _execute() -> void:
-	event_node.set(variable_name, variable_value)
-	finish()
+	method = "set"
+	args = ["",""]
 
 
 func set_var_name(value:String) -> void:
 	variable_name = value
+	args[0] = variable_name
 	emit_changed()
 	property_list_changed_notify()
 
 
 func set_var_value(value:String) -> void:
 	variable_value = value
+	args[1] = variable_value
 	emit_changed()
 	property_list_changed_notify()
 
 
 func _get(property: String):
 	if property == "continue_at_end_ignore":
 		return true
+	if property == "method_ignore":
+		return true
+	if property == "args_ignore":
+		return true

addons/event_system_plugin/events/show.gd

@@ -1,14 +1,19 @@
 tool
-extends Event
+extends "res://addons/event_system_plugin/events/call_from.gd"
 class_name EventShow
 
 func _init() -> void:
 	event_color = Color("EB5E55")
 	event_name = "Show"
 	event_category = "Node"
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/visible.png") as Texture
+	method = "set"
+	args = ["visible", true]
+	event_preview_string = "{node_path}"
 
 
-func _execute() -> void:
-	event_node.set("visible", true)    
-	finish()
+func _get(property: String):
+	if property == "method_ignore":
+		return true
+	if property == "args_ignore":
+		return true

addons/event_system_plugin/events/wait.gd

@@ -2,7 +2,7 @@ tool
 extends Event
 class_name EventWait
 
-export(float, 0, 60, 1) var wait_time = 0.0 setget set_wait_time
+export(float) var wait_time = 0.0 setget set_wait_time
 
 func _init():
 	event_name = "Wait"

addons/event_system_plugin/nodes/editor/timeline_editor/event_timeline_editor.gd

@@ -108,6 +108,8 @@ func _update_history() -> void:
 
 	_history_popup_menu.clear()
 	for res in refs:
+		if res == null:
+			continue
 		_path =  "%s | [%s]"%[res.resource_name,res.resource_path]
 		_history_popup_menu.add_item(_path)
 

addons/event_system_plugin/nodes/event_manager/event_manager.gd

@@ -13,7 +13,7 @@ signal timeline_finished(timeline_resource)
 export(NodePath) var event_node_path:NodePath = "."
 export(bool) var start_on_ready:bool = false
 
-export(Resource) var timeline
+var timeline
 
 func _ready() -> void:
 	if Engine.editor_hint:
@@ -90,3 +90,21 @@ func _notify_timeline_end() -> void:
 
 func _hide_script_from_inspector():
 	return true
+
+
+func _get_property_list() -> Array:
+	var p := []
+	p.append({"type":TYPE_OBJECT, "name":"timeline", "usage":PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_SCRIPT_VARIABLE, "hint":PROPERTY_HINT_RESOURCE_TYPE, "hint_string":"Resource"})
+	return p
+
+
+func property_can_revert(property:String) -> bool:
+	if property == "timeline":
+		return true
+	return false
+
+
+func property_get_revert(property:String):
+	if property == "timeline":
+		var tmln := Timeline.new()
+		return tmln

addons/event_system_plugin/plugin.cfg

@@ -3,5 +3,5 @@
 name="EventSystem"
 description="An easy but powerful event system implementation for Godot Engine"
 author="AnidemDex"
-version="1.2.1"
+version="1.3"
 script="plugin_script.gd"