Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'developer' into heightmapTrees

Browse Source 
# Conflicts:
#	CrystalPoint.cpp
#	HeightMap.cpp
This commit is contained in:
kennyboy55
2016-06-03 11:39:19 +02:00
parent e2f13cd311 95febc136f
commit c43718f8fa
22 changed files with 315 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CrystalPoint.vcxproj
+4
View File
@@ -152,9 +152,11 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="CrystalPoint.cpp" />
<ClCompile Include="Cursor.cpp" />
<ClCompile Include="Enemy.cpp" />
<ClCompile Include="Entity.cpp" />
<ClCompile Include="HeightMap.cpp" />
<ClCompile Include="Interface.cpp" />
<ClCompile Include="json.cpp" />
<ClCompile Include="LevelObject.cpp" />
<ClCompile Include="Main.cpp" />
@@ -167,9 +169,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="CrystalPoint.h" />
<ClInclude Include="Cursor.h" />
<ClInclude Include="Enemy.h" />
<ClInclude Include="Entity.h" />
<ClInclude Include="HeightMap.h" />
<ClInclude Include="Interface.h" />
<ClInclude Include="json.h" />
<ClInclude Include="LevelObject.h" />
<ClInclude Include="Main.h" />