Merge branch 'feature/pause-menu' into feature/menu

2021-06-08 12:14:04 +02:00
parent 1558ee298b 4587559030
commit 509f64f04d
10 changed files with 224 additions and 25 deletions
--- a/wk2_fps.vcxproj.filters
+++ b/wk2_fps.vcxproj.filters
@@ -78,6 +78,9 @@
    <ClCompile Include="src\computervision\MenuTest.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="src\scenes\scene.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="src\entities\Camera.h">