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

Commit

Permalink
Merge pull request #357 from jebedaia360/2.1.01
Browse files Browse the repository at this point in the history
2.1.01 + Set project to Template
  • Loading branch information
Jeremi360 authored May 25, 2020
2 parents adadfd7 + 7311b43 commit c889200
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion addons/Rakugo/nodes/rakugo_avatar.gd
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func _ready():
avatar_link = Rakugo.avatar_link(_avatar_id, get_path())

else:
avatar_link.node_path = get_path()
avatar_link.value.node_path = get_path()

add_to_group("save", true)

Expand Down
5 changes: 2 additions & 3 deletions gui/InGame/InGameGUI.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[gd_scene load_steps=28 format=2]
[gd_scene load_steps=27 format=2]

[ext_resource path="res://themes/new_gui/new_gui.tres" type="Theme" id=1]
[ext_resource path="res://addons/Rakugo/nodes/rakugo_control.gd" type="Script" id=2]
[ext_resource path="res://addons/Rakugo/nodes/rakugo_menu.gd" type="Script" id=3]
[ext_resource path="res://gui/InGame/ChoiceButton.tscn" type="PackedScene" id=4]
Expand Down Expand Up @@ -418,7 +417,7 @@ pause_mode = 1
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 1
theme = ExtResource( 1 )
theme = ExtResource( 6 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
Expand Down
8 changes: 4 additions & 4 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -394,16 +394,16 @@ boot_splash/bg_color=Color( 0, 0, 0, 1 )
config/icon="res://graphics/window_icon.png"
config/auto_accept_quit=false
config/quit_on_go_back=false
rakugo/version="1.0.0"
rakugo/version="0.0.1"
rakugo/game_credits="Jeremi {i}jebedaia360{/i} Biernacki"
rakugo/debug=false
rakugo/scenes_links="res://test/scenes_links.tres"
rakugo/debug=true
rakugo/scenes_links="res://game/scenes_links.tres"
rakugo/save_folder="saves"
rakugo/default_kind="adv"
rakugo/test_saves=false
rakugo/markup="renpy"
rakugo/default_mkind="grid"
rakugo/default_mcolumns=1.0
rakugo/default_mcolumns=2.0
rakugo/default_manchor="center"
rakugo/punctuation_pause="1"
rakugo/default_mcolums=2.0
Expand Down

0 comments on commit c889200

Please sign in to comment.