Merge branch 'develop' into feature/Maroon-437_NetworkSimulator

GameLabGraz · Dec 20, 2024 · 252b8c5 · 252b8c5
2 parents e2bb527 + a5b2f75
commit 252b8c5
Show file tree

Hide file tree

Showing 2,474 changed files with 509,106 additions and 157,691 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,3 @@
-# Prevent git from auto-merging scenes, prefabs and assets
-# Git does not understand the semantics of these files and can produce broken files
-*.unity binary
-*.prefab binary
-*.asset binary
-
 # Force use of LF as end of line (instead of CRLF on Windows) for Javascript and CSS vendor files
 # Otherwise the hash for the integrity check is wrong
 unity/[Aa]ssets/WebGLTemplates/MaroonWeb/vendor/**/*.css text eol=lf

diff --git a/.github/workflows/clean-workspace.yml b/.github/workflows/clean-workspace.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml