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

Merge branch 'STASHBRANCH'

Browse Source 
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
This commit is contained in:
sippeangelo
2014-03-03 20:12:26 +01:00
parent c60b490d01 444be4f502
commit 1b135fb525
12 changed files with 248 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Escape-the-Dawn.vcxproj
+3 -1
View File
@@ -91,6 +91,7 @@
<ClCompile Include="main.cpp" />
<ClCompile Include="Renderer\Renderer.cpp" />
<ClCompile Include="Systems\CollisionSystem.cpp" />
<ClCompile Include="World.cpp" />
<ClCompile Include="Systems\InputSystem.cpp" />
<ClCompile Include="Systems\LevelGenerationSystem.cpp" />
<ClCompile Include="Systems\ParticleSystem.cpp" />
@@ -106,8 +107,9 @@
<ClInclude Include="logging.h" />
<ClInclude Include="glerror.h" />
<ClInclude Include="Renderer\Renderer.h" />
<ClInclude Include="Systems\CollisionSystem.h" />
<ClInclude Include="Systems\InputSystem.h" />
<ClInclude Include="System.h" />
<ClInclude Include="Systems\CollisionSystem.h" />
<ClInclude Include="Systems\LevelGenerationSystem.h" />
<ClInclude Include="Systems\ParticleSystem.h" />
<ClInclude Include="Systems\PlayerSystem.h" />