Merge pull request #706 from uni-bremen-agst/create-seperate-gameserver

Create separate gameserver
uni-bremen-agst · Jul 3, 2024 · 4be764c · 4be764c
2 parents d8e87e9 + f92cd3a
commit 4be764c
Show file tree

Hide file tree

Showing 221 changed files with 34,777 additions and 26,457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,6 @@ ExportedObj/
 *.mdb
 *.opendb
 *.VC.db
-.vsconfig
 
 # Java class files
 **/*.class
@@ -117,6 +116,16 @@ ManagedThreadPoolCallBackError*.txt
 PacketHandlerErrorGlobal*.txt
 GlobalConnectionShutdownDelegate*.txt
 
+# MacOS
+.DS_Store
+._.DS_Store
+**/.DS_Store
+**/._.DS_Store
+
+# VSCode
+.vscode
+.vsconfig
+
 # Custom entries
 LinuxPlayer_s.debug
 UnityPlayer_s.debug

diff --git a/Assets/Editor/DataPathEditor.cs b/Assets/Editor/DataPathEditor.cs
diff --git a/Assets/Editor/PersonalAssistantSpeechInputEditor.cs b/Assets/Editor/PersonalAssistantSpeechInputEditor.cs
diff --git a/Assets/Plugins/ShaderControl/Editor/Resources/BuiltShaders.asset b/Assets/Plugins/ShaderControl/Editor/Resources/BuiltShaders.asset