Merge branch 'cohaereo:main' into settings_fixup

cohaereo · Jul 8, 2024 · f60c22a · f60c22a
2 parents d6aefeb + 65b66db
commit f60c22a
Show file tree

Hide file tree

Showing 35 changed files with 552 additions and 250 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 **/target
-**/.idea
 **/.vscode
 
 imgui.ini

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.idea.alkahest-lf.dir/.idea/.gitignore b/.idea/.idea.alkahest-lf.dir/.idea/.gitignore
diff --git a/.idea/.idea.alkahest-lf.dir/.idea/indexLayout.xml b/.idea/.idea.alkahest-lf.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.alkahest-lf.dir/.idea/vcs.xml b/.idea/.idea.alkahest-lf.dir/.idea/vcs.xml
diff --git a/.idea/alkahest-lf.iml b/.idea/alkahest-lf.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,8 @@ received some polish!
 - Static instances can now be moved, rotated and scaled individually
 - Added a material ball with configurable GBuffer output parameters
 - Added a dim outline when hovering over nametags
+- Added a unit testing framework
+    - Currently used for sanity testing various loaders like maps and activities
 
 ### Changed