Merge pull request #96 from cinnabar-engine/feature/better-material

multitexture materials
cinnabar-engine · Sep 13, 2021 · 5ca80c7 · 5ca80c7
2 parents af1893b + e05e935
commit 5ca80c7
Show file tree

Hide file tree

Showing 459 changed files with 209 additions and 50,654 deletions.
diff --git a/.github/workflows/Doxygen.yml b/.github/workflows/Doxygen.yml
@@ -1,5 +1,7 @@
 name: Documentation Generation
-on: [push]
+on:
+  push:
+    branches: [develop]
 jobs:
   Doxygen:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
@@ -1,5 +1,8 @@
 name: Unit Testing
-on: [push]
+on:
+  push:
+    branches: [develop]
+  pull_request:
 jobs:
   Debian:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -10,8 +10,7 @@
 # supported CodeQL languages.
 #
 name: "Code Quality"
-
-on: [push]
+on: [push, pull_request]
 jobs:
   analyze:
     name: Analyze

diff --git a/docs/README_8md.html b/docs/README_8md.html
diff --git a/docs/_2github_2workspace_2src_2cinnabar-render-demo_2main_8cpp-example.html b/docs/_2github_2workspace_2src_2cinnabar-render-demo_2main_8cpp-example.html
diff --git a/docs/annotated.html b/docs/annotated.html
diff --git a/docs/annotated_dup.js b/docs/annotated_dup.js
diff --git a/docs/assets_8hpp.html b/docs/assets_8hpp.html