Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
remove unnecessary checks for Engine.editor_hint; fixed bug RakugoColor
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremi360 committed Jul 16, 2019
1 parent 04c58d8 commit dfdc8b9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions addons/Rakugo/nodes/rakugo_avatar.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tool
extends Node
class_name RakugoAvatar, "res://addons/Rakugo/icons/rakugo_avatar.svg"

Expand Down
5 changes: 2 additions & 3 deletions addons/Rakugo/nodes/rakugo_control.gd
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ func _set_state(value: Array) -> void:
if not rnode:
return

if not Engine.editor_hint and rnode:
_state = rnode.setup_state(value)
_state = rnode.setup_state(value)


func _get_state() -> Array:
Expand Down Expand Up @@ -137,7 +136,7 @@ func on_load(game_version: String) -> void:
if not node_link:
push_error("error with loading: %s" %node_id)
return

visible = node_link.value["visible"]

if visible:
Expand Down
3 changes: 1 addition & 2 deletions addons/Rakugo/nodes/rakugo_node2d.gd
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ func _set_state(value: Array) -> void:
if not rnode:
return

if not Engine.editor_hint:
_state = rnode.setup_state(value)
_state = rnode.setup_state(value)


func _get_state() -> Array:
Expand Down
3 changes: 1 addition & 2 deletions addons/Rakugo/nodes/rakugo_spatial.gd
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ func _set_state(value: Array) -> void:
if not rnode:
return

if not Engine.editor_hint:
_state = rnode.setup_state(value)
_state = rnode.setup_state(value)


func _get_state() -> Array:
Expand Down
2 changes: 1 addition & 1 deletion addons/Rakugo/types/rakugo_color.gd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var b8: int setget _set_b8, _get_b8
var a8: int setget _set_a8, _get_a8

func _init(var_id: String, color := Color.white.to_html()
).(var_id, color, Rakugo.Type.COLOR):
).(var_id, Color(color), Rakugo.Type.COLOR):
pass

func _set_value(v: Color) -> void:
Expand Down
11 changes: 6 additions & 5 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -368,19 +368,20 @@ _global_script_class_icons={

[application]

config/name="Rakugo"
config/name="The Question: Rakugo Edition"
run/main_scene="res://game/scenes/Start/start.tscn"
boot_splash/image="res://graphics/splash.png"
boot_splash/bg_color=Color( 0.741176, 0.733333, 0.733333, 1 )
config/icon="res://graphics/window_icon.png"
config/auto_accept_quit=false
config/quit_on_go_back=false
rakugo/version="2.0.0"
rakugo/game_credits="Your Company"
rakugo/version="1.0.0"
rakugo/game_credits="{a=https://github.com/jebedaia360}Jeremi Biernacki ({i}Jebedaia{/i}){/a}"
rakugo/markup="renpy"
rakugo/debug=false
rakugo/scenes_links="res://scenes_links.tres"
rakugo/save_folder="saves"
rakugo/theme="res://themes/new_gui/new_gui.theme"
rakugo/theme="res://themes/question/question.theme"
rakugo/default_kind="adv"

[autoload]
Expand All @@ -400,7 +401,7 @@ gdscript/warnings/return_value_discarded=false

[editor_plugins]

enabled=PoolStringArray( "Rakugo" )
enabled=PoolStringArray( "Rakugo", "godot-plugin-refresher" )

[input]

Expand Down

0 comments on commit dfdc8b9

Please sign in to comment.