bendn 2022-05-06
parent adc7a31 · commit 9dbb08a
-rw-r--r--.github/workflows/export.yml33
-rw-r--r--Chat.gd3
-rw-r--r--WS.gd2
-rw-r--r--WS.tscn1
4 files changed, 22 insertions, 17 deletions
diff --git a/.github/workflows/export.yml b/.github/workflows/export.yml
index e6b6e23..04e2aaf 100644
--- a/.github/workflows/export.yml
+++ b/.github/workflows/export.yml
@@ -1,4 +1,3 @@
-# Whenever a push is made to the master branch then run the job
on:
push:
branches:
@@ -7,24 +6,26 @@ on:
jobs:
# job id, can be anything
export_game:
+ permissions: write-all # can be read-all, write-all, or read-write
# Always use ubuntu-latest for this action
runs-on: ubuntu-latest
# Job name, can be anything
name: export
steps:
- # Always include the checkout step so that
+ # Always include the checkout step so that
# your project is available for Godot to export
- - name: checkout
- uses: actions/[email protected]
- - name: export game
- # Use latest version (see releases for all versions)
-
- uses: firebelley/[email protected]
- with:
- # Defining all the required inputs
- # I used the mono version of Godot in this example
- godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.4.2/Godot_v3.4.2-stable_linux_headless.64.zip
- godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.4.2/Godot_v3.4.2-stable_export_templates.tpz
- relative_project_path: ./
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: checkout
+ uses: actions/[email protected]
+ # Ensure that you get the entire project history
+ with:
+ fetch-depth: 0
+ - name: export game
+ # Use latest version (see releases for all versions)
+ uses: firebelley/[email protected]
+ with:
+ # Defining all the required inputs
+ godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.4.2/Godot_v3.4.2-stable_linux_headless.64.zip
+ godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.4.2/Godot_v3.4.2-stable_export_templates.tpz
+ relative_project_path: ./
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Chat.gd b/Chat.gd
index 95f5727..72d97ee 100644
--- a/Chat.gd
+++ b/Chat.gd
@@ -10,7 +10,7 @@ onready var scrollbar = scroller.get_v_scrollbar()
const server_says = "[b]server[color=#f0e67e]:[/color][/b] "
-func _ready():
+func _connected():
add_label(
(
"%s[b][matrix]welcome to [/matrix][rainbow freq=.3 sat=.7][shake rate=20 level=25]room 2!"
@@ -18,6 +18,7 @@ func _ready():
),
"server"
)
+ yield(get_tree().create_timer(.4), "timeout")
add_label(
(
"%s[b][tornado freq=5 radius=10] you can use [/tornado][wave amp=20 freq=20][url=https://en.wikipedia.org/wiki/BBCode]bbcode"
diff --git a/WS.gd b/WS.gd
index ef3717e..29a8592 100644
--- a/WS.gd
+++ b/WS.gd
@@ -5,6 +5,7 @@ var ws = WebSocketClient.new()
var timer = Timer.new()
signal recieved(data)
+signal connected
signal err(err)
const HEADERS = {"chat": "C", "ping": "P"}
@@ -34,6 +35,7 @@ func ping():
func _connection_established(protocol):
print("Connection established ", protocol)
+ emit_signal("connected")
func _connection_closed(_err):
diff --git a/WS.tscn b/WS.tscn
index d8b4db5..b3fd4be 100644
--- a/WS.tscn
+++ b/WS.tscn
@@ -101,6 +101,7 @@ text = "send"
[node name="Tween" type="Tween" parent="Chat"]
+[connection signal="connected" from="." to="Chat" method="_connected"]
[connection signal="err" from="." to="Chat" method="_on_Main_err"]
[connection signal="recieved" from="." to="Chat" method="_on_Main_recieved"]
[connection signal="text_entered" from="Chat/v/h/whoami" to="Chat" method="_on_whoami_text_entered"]