Merge branch 'opensim-org:main' into main

RTnhN · Aug 12, 2024 · 61d86bc · 61d86bc
2 parents c7e43b4 + 3fa052e
commit 61d86bc
Show file tree

Hide file tree

Showing 277 changed files with 26,517 additions and 13,881 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
diff --git a/.gitignore b/.gitignore
@@ -55,6 +55,10 @@ delete_this_to_stop_optimization*.txt
 .idea/editor.xml
 .idea/codeStyles/codeStyleConfig.xml
 .idea/codeStyles/Project.xml
+.idea/editor.xml
+.cache/clangd/**
+**/.vscode/
+
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/
@@ -76,3 +80,4 @@ cmake-build-*
 
 ## File-based project format:
 *.iws
+.vscode/settings.json
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/customTargets.xml b/.idea/customTargets.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/fileTemplates/C Source File - Moco.cpp b/.idea/fileTemplates/C Source File - Moco.cpp
diff --git a/.idea/fileTemplates/includes/C File Header - Moco.h b/.idea/fileTemplates/includes/C File Header - Moco.h
diff --git a/.idea/fileTemplates/includes/C File Header - tropter.h b/.idea/fileTemplates/includes/C File Header - tropter.h
diff --git a/.idea/fileTemplates/includes/C File Header.h b/.idea/fileTemplates/includes/C File Header.h
diff --git a/.idea/fileTemplates/internal/C Header File.h b/.idea/fileTemplates/internal/C Header File.h
diff --git a/.idea/fileTemplates/internal/C++ Class Header.h b/.idea/fileTemplates/internal/C++ Class Header.h