Merge remote-tracking branch 'upstream/master' into osx

robn · Sep 11, 2012 · 7b29495 · 7b29495
2 parents 3e44479 + e271e09
commit 7b29495
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/win32/vc2008/pioneer-msvc-9.0.vcproj b/win32/vc2008/pioneer-msvc-9.0.vcproj
@@ -653,6 +653,10 @@
 				RelativePath="..\..\src\LuaRand.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\LuaRef.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\LuaSerializer.cpp"
 				>
@@ -1191,6 +1195,10 @@
 				RelativePath="..\..\src\AmbientSounds.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\AnimationCurves.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\Background.h"
 				>
@@ -1631,10 +1639,18 @@
 				RelativePath="..\..\src\LuaPlayer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\LuaPushPull.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\LuaRand.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\LuaRef.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\LuaSBody.h"
 				>
@@ -1675,6 +1691,10 @@
 				RelativePath="..\..\src\LuaSystemPath.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\LuaTable.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\LuaTimer.h"
 				>

diff --git a/win32/vc2010/pioneer.vcxproj b/win32/vc2010/pioneer.vcxproj
@@ -157,6 +157,7 @@
     <ClCompile Include="..\..\src\LuaPlanet.cpp" />
     <ClCompile Include="..\..\src\LuaPlayer.cpp" />
     <ClCompile Include="..\..\src\LuaRand.cpp" />
+    <ClCompile Include="..\..\src\LuaRef.cpp" />
     <ClCompile Include="..\..\src\LuaSerializer.cpp" />
     <ClCompile Include="..\..\src\LuaShip.cpp" />
     <ClCompile Include="..\..\src\LuaShipType.cpp" />
@@ -242,6 +243,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\src\Aabb.h" />
     <ClInclude Include="..\..\src\AmbientSounds.h" />
+    <ClInclude Include="..\..\src\AnimationCurves.h" />
     <ClInclude Include="..\..\src\Background.h" />
     <ClInclude Include="..\..\src\BezierCurve.h" />
     <ClInclude Include="..\..\src\Body.h" />
@@ -304,7 +306,9 @@
     <ClInclude Include="..\..\src\LuaObject.h" />
     <ClInclude Include="..\..\src\LuaPlanet.h" />
     <ClInclude Include="..\..\src\LuaPlayer.h" />
+    <ClInclude Include="..\..\src\LuaPushPull.h" />
     <ClInclude Include="..\..\src\LuaRand.h" />
+    <ClInclude Include="..\..\src\LuaRef.h" />
     <ClInclude Include="..\..\src\LuaSerializer.h" />
     <ClInclude Include="..\..\src\LuaShip.h" />
     <ClInclude Include="..\..\src\LuaShipType.h" />
@@ -314,6 +318,7 @@
     <ClInclude Include="..\..\src\LuaStarSystem.h" />
     <ClInclude Include="..\..\src\LuaSystemBody.h" />
     <ClInclude Include="..\..\src\LuaSystemPath.h" />
+    <ClInclude Include="..\..\src\LuaTable.h" />
     <ClInclude Include="..\..\src\LuaTimer.h" />
     <ClInclude Include="..\..\src\LuaUtils.h" />
     <ClInclude Include="..\..\src\LuaVector.h" />

diff --git a/win32/vc2010/pioneer.vcxproj.filters b/win32/vc2010/pioneer.vcxproj.filters
@@ -390,6 +390,9 @@
     <ClCompile Include="..\..\src\Lua.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\LuaRef.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\Aabb.h">
@@ -815,6 +818,18 @@
     <ClInclude Include="..\..\src\Lua.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\AnimationCurves.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\LuaRef.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\LuaTable.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\LuaPushPull.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\Makefile.am">