Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

2021-11-02 11:31:46 -03:00
parent f4d6c686fe a49decc2ed
commit 2048389896
77 changed files with 508 additions and 224 deletions
@@ -20,6 +20,9 @@ bld/
 *.shproj.user
 *.vcxproj.user

+# Rider
+.idea/
+
 # Platform-specific webm_mem_playback files
 Libraries/webm_mem_playback/libvpx_x64_linux/
 Libraries/webm_mem_playback/libvpx_x64_vs15/
@@ -40,7 +43,13 @@ Libraries/webm_mem_playback/opus_x64_linux/
 # Win
 desktop.ini

-#Merge script
+# Merge script
 temp.txt

 docs/html
+# Private assets
+Barotrauma/BarotraumaShared/Content/*
+.github/ISSUE_TEMPLATE/release-checklist.md
+
+#Rider
+*.DotSettings.user