Skip to content

Commit

Permalink
Merge pull request #267 from Jeremi360/bump_version_to_2.2
Browse files Browse the repository at this point in the history
Bump version to 2.2
  • Loading branch information
Jeremi360 authored Nov 1, 2023
2 parents 84f697c + 13e1884 commit bcd975f
Show file tree
Hide file tree
Showing 9 changed files with 139 additions and 34 deletions.
5 changes: 0 additions & 5 deletions addons/Rakugo/.gitattributes

This file was deleted.

24 changes: 0 additions & 24 deletions addons/Rakugo/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion addons/Rakugo/Rakugo.gd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const save_folder = "addons/rakugo/save_folder"
## Setting's strings
const game_title = "application/config/name"

const version := "2.1.1"
const version := "2.2"

const StoreManager = preload("res://addons/Rakugo/lib/systems/StoreManager.gd")
const Parser = preload("res://addons/Rakugo/lib/systems/Parser.gd")
Expand Down
34 changes: 34 additions & 0 deletions addons/Rakugo/icons/16x16Icon.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cwqq3y1gurpk8"
path="res://.godot/imported/16x16Icon.png-236ad5a6251f936881502036db52882f.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/Rakugo/icons/16x16Icon.png"
dest_files=["res://.godot/imported/16x16Icon.png-236ad5a6251f936881502036db52882f.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
37 changes: 37 additions & 0 deletions addons/Rakugo/icons/Dialogue.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ci24iqkrjdoxf"
path="res://.godot/imported/Dialogue.svg-10abd36a053ef302b98b54686fdcc20e.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/Rakugo/icons/Dialogue.svg"
dest_files=["res://.godot/imported/Dialogue.svg-10abd36a053ef302b98b54686fdcc20e.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
37 changes: 37 additions & 0 deletions addons/Rakugo/icons/Icon.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cd6sh6wryb4d2"
path="res://.godot/imported/Icon.svg-818f85d546e7d61f2ef982330177dedb.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/Rakugo/icons/Icon.svg"
dest_files=["res://.godot/imported/Icon.svg-818f85d546e7d61f2ef982330177dedb.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
2 changes: 1 addition & 1 deletion addons/Rakugo/plugin.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
name="Rakugo Dialogue System"
description="Rakugo Dialogue System is base framework for story driven games"
author="Rakugo Team"
version="2.1.1"
version="2.2"
script="plugin.gd"
23 changes: 22 additions & 1 deletion addons/Rakugo/plugin.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
@tool
extends EditorPlugin

var editor_interface : EditorInterface
var script_editor : ScriptEditor
var code_highlighter : EditorSyntaxHighlighter
var default_script_types : PackedStringArray
var editor_settings : EditorSettings
var default_text_extensions : String

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

print("Rakugo is enabled")
default_script_types = ProjectSettings.get_setting(
"editor/script/search_in_file_extensions")

if !("rk" in default_script_types):
var script_types = default_script_types.duplicate()
script_types.append("rk")
ProjectSettings.set_setting(
"editor/script/search_in_file_extensions",
script_types
)

print("Rakugo is enabled")

func _exit_tree():
ProjectSettings.set_setting("addons/rakugo/game_version", null)
ProjectSettings.set_setting("addons/rakugo/history_length", null)
ProjectSettings.set_setting("addons/rakugo/narrator/name", null)
ProjectSettings.set_setting("addons/rakugo/debug", null)
ProjectSettings.set_setting("addons/rakugo/save_folder", null)

ProjectSettings.set_setting(
"editor/script/search_in_file_extensions",
default_script_types
)
9 changes: 7 additions & 2 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,19 @@ Rakugo="*res://addons/Rakugo/Rakugo.gd"
gdscript/warnings/return_value_discarded=false
gdscript/warnings/unused_argument=false

[dotnet]
[editor]

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

[editor_plugins]

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

[filesystem]

import/blender/enabled=false
import/fbx/enabled=false

[physics]

common/enable_pause_aware_picking=true
Expand Down

0 comments on commit bcd975f

Please sign in to comment.