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

This commit is contained in:
Jasper
2021-06-08 12:14:04 +02:00
10 changed files with 224 additions and 25 deletions

View File

@@ -35,6 +35,7 @@
<ClCompile Include="src\renderEngine\loader.cpp" />
<ClCompile Include="src\renderEngine\obj_loader.cpp" />
<ClCompile Include="src\renderEngine\renderer.cpp" />
<ClCompile Include="src\scenes\scene.cpp" />
<ClCompile Include="src\shaders\gui_shader.cpp" />
<ClCompile Include="src\shaders\shader_program.cpp" />
<ClCompile Include="src\shaders\entity_shader.cpp" />