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.filters
+15 -3
View File
@@ -63,6 +63,12 @@
<ClCompile Include="CrystalPoint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Cursor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Interface.cpp">
<Filter>Source Files\World</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="World.h">
@@ -77,9 +83,6 @@
<ClInclude Include="LevelObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="vector.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Model.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -107,6 +110,15 @@
<ClInclude Include="CrystalPoint.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Interface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Cursor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="vector.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="worlds\worlds.json">