BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
This commit is contained in:
Fahafar
2014-03-07 19:25:43 +01:00
parent 336dc06f35 2fa8963e0a
commit b06f8a54b2
27 changed files with 6268 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Escape-the-Dawn.vcxproj
+2 -2
View File
@@ -103,7 +103,8 @@
<ClCompile Include="GUIManager.cpp" />
<ClCompile Include="MenuFrame.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="Renderer\Renderer.cpp" />
<ClCompile Include="Renderer.cpp" />
<ClCompile Include="ShaderProgram.cpp" />
<ClCompile Include="Systems\CollisionSystem.cpp" />
<ClCompile Include="TextFrame.cpp" />
<ClCompile Include="World.cpp" />
@@ -115,7 +116,6 @@
<ClCompile Include="Systems\SoundsSystem.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AABB.h" />
<ClInclude Include="Color.h" />
<ClInclude Include="Component.h" />
<ClInclude Include="Components\Camera.h" />