Skip to content

Commit bcd975f

Browse files
authored
Merge pull request #267 from Jeremi360/bump_version_to_2.2
Bump version to 2.2
2 parents 84f697c + 13e1884 commit bcd975f

File tree

9 files changed

+139
-34
lines changed

9 files changed

+139
-34
lines changed

addons/Rakugo/.gitattributes

Lines changed: 0 additions & 5 deletions
This file was deleted.

addons/Rakugo/.gitignore

Lines changed: 0 additions & 24 deletions
This file was deleted.

addons/Rakugo/Rakugo.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const save_folder = "addons/rakugo/save_folder"
1212
## Setting's strings
1313
const game_title = "application/config/name"
1414

15-
const version := "2.1.1"
15+
const version := "2.2"
1616

1717
const StoreManager = preload("res://addons/Rakugo/lib/systems/StoreManager.gd")
1818
const Parser = preload("res://addons/Rakugo/lib/systems/Parser.gd")
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cwqq3y1gurpk8"
6+
path="res://.godot/imported/16x16Icon.png-236ad5a6251f936881502036db52882f.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://addons/Rakugo/icons/16x16Icon.png"
14+
dest_files=["res://.godot/imported/16x16Icon.png-236ad5a6251f936881502036db52882f.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://ci24iqkrjdoxf"
6+
path="res://.godot/imported/Dialogue.svg-10abd36a053ef302b98b54686fdcc20e.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://addons/Rakugo/icons/Dialogue.svg"
14+
dest_files=["res://.godot/imported/Dialogue.svg-10abd36a053ef302b98b54686fdcc20e.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cd6sh6wryb4d2"
6+
path="res://.godot/imported/Icon.svg-818f85d546e7d61f2ef982330177dedb.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://addons/Rakugo/icons/Icon.svg"
14+
dest_files=["res://.godot/imported/Icon.svg-818f85d546e7d61f2ef982330177dedb.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false

addons/Rakugo/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
name="Rakugo Dialogue System"
44
description="Rakugo Dialogue System is base framework for story driven games"
55
author="Rakugo Team"
6-
version="2.1.1"
6+
version="2.2"
77
script="plugin.gd"

addons/Rakugo/plugin.gd

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
@tool
22
extends EditorPlugin
33

4+
var editor_interface : EditorInterface
5+
var script_editor : ScriptEditor
6+
var code_highlighter : EditorSyntaxHighlighter
7+
var default_script_types : PackedStringArray
8+
var editor_settings : EditorSettings
9+
var default_text_extensions : String
410

511
func _enter_tree():
612
# Initialization of the plugin goes here
@@ -12,12 +18,27 @@ func _enter_tree():
1218
ProjectSettings.set_setting("addons/rakugo/debug", false)
1319
ProjectSettings.set_setting("addons/rakugo/save_folder", "user://saves")
1420

15-
print("Rakugo is enabled")
21+
default_script_types = ProjectSettings.get_setting(
22+
"editor/script/search_in_file_extensions")
23+
24+
if !("rk" in default_script_types):
25+
var script_types = default_script_types.duplicate()
26+
script_types.append("rk")
27+
ProjectSettings.set_setting(
28+
"editor/script/search_in_file_extensions",
29+
script_types
30+
)
1631

32+
print("Rakugo is enabled")
1733

1834
func _exit_tree():
1935
ProjectSettings.set_setting("addons/rakugo/game_version", null)
2036
ProjectSettings.set_setting("addons/rakugo/history_length", null)
2137
ProjectSettings.set_setting("addons/rakugo/narrator/name", null)
2238
ProjectSettings.set_setting("addons/rakugo/debug", null)
2339
ProjectSettings.set_setting("addons/rakugo/save_folder", null)
40+
41+
ProjectSettings.set_setting(
42+
"editor/script/search_in_file_extensions",
43+
default_script_types
44+
)

project.godot

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,19 @@ Rakugo="*res://addons/Rakugo/Rakugo.gd"
3232
gdscript/warnings/return_value_discarded=false
3333
gdscript/warnings/unused_argument=false
3434

35-
[dotnet]
35+
[editor]
3636

37-
project/assembly_name="Rakugo.Core"
37+
script/search_in_file_extensions=PackedStringArray("gd", "gdshader", "rk")
3838

3939
[editor_plugins]
4040

4141
enabled=PackedStringArray("res://addons/Rakugo/plugin.cfg", "res://addons/gut/plugin.cfg")
4242

43+
[filesystem]
44+
45+
import/blender/enabled=false
46+
import/fbx/enabled=false
47+
4348
[physics]
4449

4550
common/enable_pause_aware_picking=true

0 commit comments

Comments
 (0)