Added voice chat?

I need to make commits more often, what even did I do here
J0SE-S · Sep 21, 2023 · 428138c · 428138c
1 parent ae03e9e
commit 428138c
Show file tree

Hide file tree

Showing 22 changed files with 179 additions and 84 deletions.
diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node
@@ -1,3 +1,4 @@
+Node
 Node2D
 Label
 TileMap

diff --git a/.godot/editor/default_bus_layout.tres-folding-19246414aa9fb561ced4b8dce477acec.cfg b/.godot/editor/default_bus_layout.tres-folding-19246414aa9fb561ced4b8dce477acec.cfg
@@ -0,0 +1,3 @@
+[folding]
+
+sections_unfolded=PackedStringArray()
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
@@ -19,7 +19,7 @@ dock_filesystem_split=0
 dock_filesystem_display_mode=0
 dock_filesystem_file_sort=0
 dock_filesystem_file_list_display_mode=1
-dock_filesystem_selected_paths=PackedStringArray()
+dock_filesystem_selected_paths=PackedStringArray("res://addons/godot-voip/plugin.gd")
 dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://Sprites/", "res://Sprites/Tiles/", "res://Scripts/", "res://Scenes/", "res://addons/", "res://addons/godot-voip/", "res://addons/godot-voip/scripts/")
 dock_3="Scene,Import"
 dock_4="FileSystem"
@@ -37,7 +37,7 @@ selected_bottom_panel_item=0
 [ScriptEditor]
 
 open_scripts=["res://Scripts/main.gd", "res://Scripts/Player.gd", "res://addons/godot-voip/plugin.cfg", "res://addons/godot-voip/plugin.gd", "res://addons/godot-voip/scripts/voice_instance.gd", "res://addons/godot-voip/scripts/voice_mic.gd", "res://addons/godot-voip/scripts/voice_orchestrator.gd"]
-selected_script="res://Scripts/Player.gd"
+selected_script="res://Scripts/main.gd"
 open_help=[]
 script_split_offset=70
 list_split_offset=0
@@ -47,3 +47,13 @@ list_split_offset=0
 open_shaders=[]
 split_offset=0
 selected_shader=""
+
+[editor_log]
+
+log_filter_0=true
+log_filter_2=true
+log_filter_1=true
+log_filter_3=true
+log_filter_4=true
+collapse=false
+show_search=true
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
@@ -1,32 +1,29 @@
 ea4bc82a6ad023ab7ee23ee620429895
-::res://::1695211712
+::res://::1695307261
 icon.svg::CompressedTexture2D::383280478923293990::1694731507::1694731510::1::::<><>::
 README.md::TextFile::-1::1694814353::0::1::::<><>::
 splash_screen.png::CompressedTexture2D::8570804774821566952::1695006787::1695006850::1::::<><>::
-::res://addons/::1621534317
-::res://addons/godot-voip/::1621534317
+::res://addons/::1695256010
+::res://addons/godot-voip/::1695302290
 plugin.cfg::TextFile::-1::1621534317::0::1::::<><>::
-plugin.gd::GDScript::-1::1621534317::0::1::::<>RefCounted<>::
-::res://addons/godot-voip/demo/::1621534317
-Demo.tscn::PackedScene::-1::1621534317::0::1::::<><>::res://addons/godot-voip/scripts/voice_orchestrator.gd<>res://addons/godot-voip/demo/Network.gd<>res://icon.svg
-Network.gd::GDScript::-1::1621534317::0::1::::Network<>Node<>::
-::res://addons/godot-voip/icons/::1621534317
-VoiceInstance.svg::CompressedTexture2D::2038113171629974119::1621534317::1695211717::1::::<><>::
-VoiceOrchestrator.svg::CompressedTexture2D::505976562550975549::1621534317::1695211717::1::::<><>::
-::res://addons/godot-voip/scripts/::1621534317
-voice_instance.gd::GDScript::-1::1621534317::0::1::::VoiceInstance<>Node<>::
-voice_mic.gd::GDScript::-1::1621534317::0::1::::VoiceMic<>AudioStreamPlayer<>::
-voice_orchestrator.gd::GDScript::-1::1621534317::0::1::::VoiceOrchestrator<>Node<>::
-::res://Scenes/::1695162530
-main.tscn::PackedScene::1261677095850593114::1695162530::0::1::::<><>::res://Scripts/main.gd<>uid://508denx2qf6r::::res://Scenes/player.tscn<>uid://bmfcmd38iy45d::::res://Sprites/Tiles/tiles.tres
-player.tscn::PackedScene::2159284002393063443::1695162530::0::1::::<><>::res://Scripts/Player.gd
+plugin.gd::GDScript::-1::1695302290::0::1::::<>EditorPlugin<>::
+::res://addons/godot-voip/icons/::1695255711
+VoiceInstance.svg::CompressedTexture2D::400263071128357493::1621534317::1695255711::1::::<><>::
+VoiceOrchestrator.svg::CompressedTexture2D::6700457965216183476::1621534317::1695255711::1::::<><>::
+::res://addons/godot-voip/scripts/::1695303106
+voice_instance.gd::GDScript::-1::1695302290::0::1::::VoiceInstance<>Node<>::
+voice_mic.gd::GDScript::-1::1695302137::0::1::::VoiceMic<>AudioStreamPlayer<>::
+voice_orchestrator.gd::GDScript::-1::1695303106::0::1::::VoiceOrchestrator<>Node<>::
+::res://Scenes/::1695307258
+main.tscn::PackedScene::1261677095850593114::1695307258::0::1::::<><>::res://Scripts/main.gd<>uid://508denx2qf6r::::res://Scenes/player.tscn<>uid://bmfcmd38iy45d::::res://Sprites/Tiles/tiles.tres<>res://addons/godot-voip/scripts/voice_orchestrator.gd
+player.tscn::PackedScene::2159284002393063443::1695307258::0::1::::<><>::res://Scripts/Player.gd
 world.tscn::PackedScene::5046796521462869901::1694886851::0::1::::<><>::res://Scripts/world.gd<>uid://508denx2qf6r
-::res://Scripts/::1695161551
-main.gd::GDScript::-1::1695160072::0::1::::<>Node2D<>::
-main_menu.gd::GDScript::-1::1695161551::0::1::::<>Node2D<>::
+::res://Scripts/::1695302914
+main.gd::GDScript::-1::1695256097::0::1::::<>Node2D<>::
+main_menu.gd::GDScript::-1::1695302914::0::1::::<>Node2D<>::
 Player.gd::GDScript::-1::1695041092::0::1::::<>CharacterBody2D<>::
 world.gd::GDScript::-1::1694886851::0::1::::<>Node2D<>::
 ::res://Sprites/::1694966402
-::res://Sprites/Tiles/::1695161551
+::res://Sprites/Tiles/::1695302914
 tiles.png::CompressedTexture2D::8344869193441338783::1672668469::1694966403::1::::<><>::
-tiles.tres::TileSet::3239151761967791827::1695161551::0::1::::<><>::uid://dq5k1nsh01ttn::::res://Sprites/Tiles/tiles.png
+tiles.tres::TileSet::3239151761967791827::1695302914::0::1::::<><>::uid://dq5k1nsh01ttn::::res://Sprites/Tiles/tiles.png
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
@@ -1,7 +1,5 @@
 res://Scenes/main.tscn
 res://Scripts/main_menu.gd
 res://Sprites/Tiles/tiles.tres
-res://addons/godot-voip/scripts/voice_instance.gd
-res://addons/godot-voip/plugin.gd
-res://addons/godot-voip/scripts/voice_orchestrator.gd
 res://Scenes/player.tscn
+res://addons/godot-voip/scripts/voice_orchestrator.gd
diff --git a/.godot/editor/main.tscn-editstate-2ddd04d543d5858e7f20c9299a8b5096.cfg b/.godot/editor/main.tscn-editstate-2ddd04d543d5858e7f20c9299a8b5096.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17664/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/Main")])
+selected_nodes=Array[NodePath]([])
diff --git a/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg b/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg
@@ -172,4 +172,4 @@ Anim={
 "zfar": 4000.01,
 "znear": 0.05
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17664/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/Main")])
+selected_nodes=Array[NodePath]([])
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
@@ -39,15 +39,15 @@ project_settings=Rect2(2432, 305, 900, 700)
 [recent_files]
 
 scenes=["res://Scenes/player.tscn", "res://Scenes/main.tscn", "res://addons/godot-voip/demo/Demo.tscn", "res://Scenes/world.tscn", "res://Scenes/main_menu.tscn", "res://world.tscn", "res://player.tscn", "res://main_menu.tscn", "res://game.tscn"]
-scripts=["res://addons/godot-voip/plugin.gd", "res://addons/godot-voip/plugin.cfg", "res://addons/godot-voip/demo/Network.gd", "res://addons/godot-voip/scripts/voice_orchestrator.gd", "res://addons/godot-voip/scripts/voice_mic.gd", "res://addons/godot-voip/scripts/voice_instance.gd", "res://addons/godot-voip/demo/Demo.tscn::1", "res://Scenes/VoiceManager.cs", "res://Libraries/MumbleSharp/TcpSocket.cs", "res://Libraries/MumbleSharp/MumbleConnection.cs"]
+scripts=["res://addons/godot-voip/plugin.cfg", "res://addons/godot-voip/demo/Network.gd", "res://addons/godot-voip/plugin.gd", "res://addons/discord_gd/discord.gd", "res://addons/godot-voip/scripts/voice_orchestrator.gd", "res://addons/godot-voip/scripts/voice_mic.gd", "res://addons/godot-voip/scripts/voice_instance.gd", "res://addons/godot-voip/demo/Demo.tscn::1", "res://Scenes/VoiceManager.cs", "res://Libraries/MumbleSharp/TcpSocket.cs"]
 
 [color_picker]
 
 recent_presets=PackedColorArray(0, 0, 0.270588, 1, 0, 0, 0.266667, 1, 0, 0, 0.262745, 1, 0, 0, 0.258824, 1, 0, 0, 0.254902, 1, 0, 0, 0.25098, 1, 0, 0, 0.247059, 1, 0, 0, 0.121569, 1, 0, 0, 0.121569, 0.603922)
 
 [script_setup]
 
-last_selected_language="C#"
+last_selected_language="GDScript"
 
 [project_settings]
 

diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
@@ -49,11 +49,11 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 19,
+"column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 39,
-"scroll_position": 15.0,
+"row": 19,
+"scroll_position": 2.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -63,11 +63,11 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 29,
+"column": 46,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 51,
-"scroll_position": 76.0,
+"row": 10,
+"scroll_position": 42.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
@@ -77,7 +77,7 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 0,
+"column": 5,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
 "row": 0,
@@ -91,24 +91,10 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 0,
-"folded_lines": Array[int]([]),
-"h_scroll_position": 0,
-"row": 47,
-"scroll_position": 31.0,
-"selection": false,
-"syntax_highlighter": "GDScript"
-}
-
-[res://addons/godot-voip/demo/Network.gd]
-
-state={
-"bookmarks": PackedInt32Array(),
-"breakpoints": PackedInt32Array(),
-"column": 0,
+"column": 29,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 0,
+"row": 96,
 "scroll_position": 0.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
@@ -133,10 +119,10 @@ state={
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 40,
+"column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 19,
+"row": 10,
 "scroll_position": 0.0,
 "selection": false,
 "syntax_highlighter": "GDScript"

diff --git a/.godot/editor/voice_mic.gd-folding-e9eadb4797c63e4bb7705a843f8cd156.cfg b/.godot/editor/voice_mic.gd-folding-e9eadb4797c63e4bb7705a843f8cd156.cfg
@@ -0,0 +1,3 @@
+[folding]
+
+sections_unfolded=PackedStringArray()
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
@@ -1,10 +1,88 @@
 list=Array[Dictionary]([{
+"base": &"RefCounted",
+"class": &"ApplicationCommand",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/application_command.gd"
+}, {
+"base": &"RefCounted",
+"class": &"BitField",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/bit_field.gd"
+}, {
+"base": &"HTTPRequest",
+"class": &"DiscordBot",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/discord.gd"
+}, {
+"base": &"RefCounted",
+"class": &"DiscordInteraction",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/discord_interaction.gd"
+}, {
+"base": &"RefCounted",
+"class": &"Embed",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/embed.gd"
+}, {
+"base": &"RefCounted",
+"class": &"Helpers",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/helpers.gd"
+}, {
+"base": &"RefCounted",
+"class": &"Message",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/message.gd"
+}, {
+"base": &"RefCounted",
+"class": &"MessageActionRow",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/message_action_row.gd"
+}, {
+"base": &"RefCounted",
+"class": &"MessageButton",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/message_button.gd"
+}, {
+"base": &"BitField",
+"class": &"MessageFlags",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/message_flags.gd"
+}, {
 "base": &"Node",
 "class": &"Network",
 "icon": "",
 "language": &"GDScript",
 "path": "res://addons/godot-voip/demo/Network.gd"
 }, {
+"base": &"BitField",
+"class": &"Permissions",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/permissions.gd"
+}, {
+"base": &"RefCounted",
+"class": &"SelectMenu",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/select_menu.gd"
+}, {
+"base": &"RefCounted",
+"class": &"User",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/discord_gd/classes/user.gd"
+}, {
 "base": &"Node",
 "class": &"VoiceInstance",
 "icon": "",

diff --git a/.godot/mono/metadata/ide_messaging_meta.txt b/.godot/mono/metadata/ide_messaging_meta.txt
@@ -0,0 +1,2 @@
+37867
+/home/jsimutis/Documents/Godot/Godot_v4.1.1-stable_mono_linux.x86_64
diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin
diff --git a/Scenes/main.tscn b/Scenes/main.tscn
@@ -1,15 +1,20 @@
-[gd_scene load_steps=4 format=3 uid="uid://r8fvw401ot6a"]
+[gd_scene load_steps=5 format=3 uid="uid://r8fvw401ot6a"]
 
 [ext_resource type="Script" path="res://Scripts/main.gd" id="1_rjp15"]
 [ext_resource type="PackedScene" uid="uid://508denx2qf6r" path="res://Scenes/player.tscn" id="2_0pux8"]
 [ext_resource type="TileSet" uid="uid://bmfcmd38iy45d" path="res://Sprites/Tiles/tiles.tres" id="3_8m2w6"]
+[ext_resource type="Script" path="res://addons/godot-voip/scripts/voice_orchestrator.gd" id="3_pfolm"]
 
 [node name="Main" type="Node2D" node_paths=PackedStringArray("network_objects_node", "cam")]
 script = ExtResource("1_rjp15")
 player_scene = ExtResource("2_0pux8")
 network_objects_node = NodePath("NetworkObjects")
 cam = NodePath("Camera2D")
 
+[node name="VoiceOrchestrator" type="Node" parent="."]
+script = ExtResource("3_pfolm")
+recording = true
+
 [node name="NetworkObjects" type="Node2D" parent="."]
 
 [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."]

diff --git a/addons/godot-voip/icons/VoiceInstance.svg.import b/addons/godot-voip/icons/VoiceInstance.svg.import
@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://4bjoqv8he3pj"
+uid="uid://fx5jldgcdm10"
 path="res://.godot/imported/VoiceInstance.svg-56fbd7fa19d2e57deeeef52ce13ce7ac.ctex"
 metadata={
 "vram_texture": false

diff --git a/addons/godot-voip/icons/VoiceOrchestrator.svg.import b/addons/godot-voip/icons/VoiceOrchestrator.svg.import
@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://hhdmih3vml2l"
+uid="uid://c2p0tfxfk2brw"
 path="res://.godot/imported/VoiceOrchestrator.svg-1a02a4ff0ae9a89021ae13701008c299.ctex"
 metadata={
 "vram_texture": false

diff --git a/addons/godot-voip/plugin.gd b/addons/godot-voip/plugin.gd
@@ -1,3 +1,4 @@
+@tool
 extends EditorPlugin
 
 func _enter_tree() -> void:
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    Node
     Node2D
     Label
     TileMap
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		[folding]

		sections_unfolded=PackedStringArray()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		37867
		/home/jsimutis/Documents/Godot/Godot_v4.1.1-stable_mono_linux.x86_64