layla/the-connection
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Action changes

Browse Source 
Action changes

Action changes

Action changes

Actions work

Delete error?

update addons

Test

Test

Fix exports
This commit is contained in:
Layla 2020-05-16 20:50:45 -04:00
parent 3dfff8793c
commit c39e44da3a
7 changed files with 13 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/release.yml vendored
View File

@ -16,7 +16,9 @@ jobs:
uses: actions/checkout@v2.1.0
with:
submodules: 'true'
lfs: 'true'
token: ${{ secrets.GH_SECRET }}
fetch-depth: 0
- name: Configure
env:
PLATFORM: ${{ matrix.platform }}
@ -34,7 +36,9 @@ jobs:
run: |
TAG=$(jq --raw-output '.release.tag_name' $GITHUB_EVENT_PATH)
echo ::set-output name=TAG::$TAG
echo $TAG > client/VERSION.txt
cd $GITHUB_WORKSPACE/client
echo $TAG > VERSION.txt
- name: Build
id: build
uses: josephbmanley/build-godot-action@v1.4.0
@ -42,6 +46,7 @@ jobs:
name: ${{ env.EXPORT_NAME }}
preset: ${{ matrix.platform }}
projectDir: client
debugMode: 'true'
- name: Push to Itch
uses: josephbmanley/butler-publish-itchio-action@v1.0.1
env:

3
client/Scripts/Component/Speaker.gd
View File

@ -47,14 +47,13 @@ func play_audio():
spoken_text = spoken_text + letter
emit_signal("updated_text")
if letter in " ,-'\"\n":
speaking_timer.start(0.05)
return
elif letter in ".!":
speaking_timer.start(0.15)
return
elif File.new().file_exists(audio_file):
elif load(audio_file):
track = load(audio_file)
audio_player.stream = track
audio_player.play()

2
client/Scripts/Singletons/MusicManager.gd
View File

@ -9,7 +9,7 @@ func _ready():
func play_music(song, loop=true):
var audio_file = "res://Assets/Music/" + song + ".ogg"
if File.new().file_exists(audio_file):
if load(audio_file):
var track = load(audio_file)
looping = loop
main_player.stream = track

11
client/addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/Line_Node.tscn
View File

@ -1,8 +1,6 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/line_node.gd" type="Script" id=1]
[ext_resource path="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg" type="Texture" id=2]
[node name="Line" type="GraphNode"]
margin_right = 324.0
@ -52,15 +50,6 @@ size_flags_horizontal = 3
size_flags_vertical = 3
smooth_scrolling = true
[node name="Editor_BTN" type="Button" parent="VBoxContainer/HBoxContainer2"]
margin_left = 332.0
margin_right = 364.0
margin_bottom = 64.0
rect_min_size = Vector2( 32, 0 )
hint_tooltip = "Expand this node's text editor."
icon = ExtResource( 2 )
expand_icon = true
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 68.0
margin_right = 364.0

1
client/addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg
View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m1 1v5l1.793-1.793 2.5 2.5 1.4141-1.4141-2.5-2.5 1.793-1.793h-5zm9 0 1.793 1.793-2.5 2.5 1.4141 1.4141 2.5-2.5 1.793 1.793v-5h-5zm-4.707 8.293-2.5 2.5-1.793-1.793v5h5l-1.793-1.793 2.5-2.5-1.4141-1.4141zm5.4141 0-1.4141 1.4141 2.5 2.5-1.793 1.793h5v-5l-1.793 1.793-2.5-2.5z" fill="#e0e0e0"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 388 B

34
client/addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg.import
View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg"
dest_files=[ "res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

10
client/export_presets.cfg
View File

@ -5,7 +5,7 @@ platform="Windows Desktop"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
@ -47,7 +47,7 @@ platform="Windows Desktop"
runnable=false
custom_features=""
export_filter="all_resources"
include_filter=""
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
@ -89,7 +89,7 @@ platform="Linux/X11"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
@ -115,7 +115,7 @@ platform="HTML5"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
@ -138,7 +138,7 @@ platform="Mac OSX"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )