Merge from 0.4.10

Overwrite on conflicts
Infinideastudio · Jan 1, 2016 · a554bce · a554bce
1 parent 3a780a7
commit a554bce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/NEWorld.vcxproj b/NEWorld.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -36,15 +36,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140_xp</PlatformToolset>
-<<<<<<< HEAD
-=======
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140_xp</PlatformToolset>
->>>>>>> refs/remotes/origin/0.4.10
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

diff --git a/source/Chunk.cpp b/source/Chunk.cpp
@@ -11,11 +11,8 @@ namespace ChunkRenderer {
 namespace world{
 
 	void chunk::create(){
-<<<<<<< HEAD
-=======
 		//assert(Empty == false);
 
->>>>>>> refs/remotes/origin/0.4.10
 		pblocks = new block[4096];
 		pbrightness = new brightness[4096];
 		//memset(pblocks, 0, sizeof(pblocks));

diff --git a/source/Chunk.h b/source/Chunk.h
@@ -12,12 +12,6 @@ namespace world{
 
 	class chunk{
 	private:
-<<<<<<< HEAD
-		bool Modified = false;
-		//block pblocks[4096];
-		//brightness pbrightness[4096];
-=======
->>>>>>> refs/remotes/origin/0.4.10
 		block* pblocks;
 		brightness* pbrightness;