Merge branch 'mmaps_rewrite' of github.com:faramir118/mangos into mma…

…ps_rewrite
Archives · Jul 12, 2011 · 6ee3007 · 6ee3007
2 parents fe8705b + 7b96c6a
commit 6ee3007
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 330 deletions.
diff --git a/.gitignore b/.gitignore
@@ -109,3 +109,5 @@ dep/ACE_wrappers/ace/config.h
 !dep/ACE_wrappers/lib/.empty
 !dep/tbb/src/Makefile
 
+# recastnavigation directory needs exception
+!dep/recastnavigation/RecastDemo/Build/
diff --git a/contrib/vmap_assembler/VC71/vmap_assembler.vcproj b/contrib/vmap_assembler/VC71/vmap_assembler.vcproj
diff --git a/dep/lib/win32_debug/ADEd.pdb b/dep/lib/win32_debug/ADEd.pdb
diff --git a/win/VC100/shared.vcxproj.filters b/win/VC100/shared.vcxproj.filters
@@ -78,10 +78,6 @@
     <ClCompile Include="..\..\src\shared\Common.cpp" />
     <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
     <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\shared\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\src\shared\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\shared\vmap\WorldModel.cpp" />
     <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp">
       <Filter>Database</Filter>
     </ClCompile>
@@ -180,10 +176,6 @@
     <ClInclude Include="..\..\src\shared\revision_sql.h" />
     <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
     <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\vmap\MapTree.h" />
-    <ClInclude Include="..\..\src\shared\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\src\shared\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\src\shared\vmap\WorldModel.h" />
     <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h">
       <Filter>Database</Filter>
     </ClInclude>