Fix Syntax

Update Jenkinsfile
Add Jenkinsfile
2025-04-13 09:53:35 -07:00 · 2025-04-13 09:52:41 -07:00 · 2025-04-13 09:47:06 -07:00 · 2025-04-08 18:37:43 -07:00 · 2025-04-08 18:04:48 -07:00 · 2025-04-08 10:15:27 -07:00
227 changed files with 6708 additions and 1034952 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*  text=false
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@
 *.res
 *.ilk
 *.dep
+*.bin

 # ResEditor files
 *.aps
@@ -49,8 +50,6 @@ stdout.txt
 log.txt
 *.suo
 *.suo
-G3DTest.suo
-G3DTest.suo
 stderr.txt
 desktop.ini
 *.db
@@ -58,3 +57,11 @@ desktop.ini
 #Redist
 !Installer/Redist/*
 UpgradeLog.htm
+click_output.JPEG
+click_output.PNG
+
+#Level Files
+*.b3dl
+*.b3dm
+*.rbxl
+*.rbxm
--- a/B3dIcon.ico
+++ b/B3dIcon.ico
--- a/VS2003.sln
+++ b/VS2003.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D VS2003.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug.ActiveCfg = Debug|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug.Build.0 = Debug|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release.ActiveCfg = Release|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.Build.0 = Debug|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.ActiveCfg = Release|Win32
+		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/VS2003.vcproj
+++ b/VS2003.vcproj
@@ -0,0 +1,825 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Blocks3D"
+	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+	RootNamespace="Blocks3D">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				WholeProgramOptimization="TRUE"
+				AdditionalIncludeDirectories="C:\libraries\ode\include;C:\libraries\sdl\include;&quot;C:\libraries\g3d-6_10\include&quot;;.\src\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;NO_SDL_MAIN;_ATL_STATIC_REGISTRY"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
+				OutputFile="./Blocks3D.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="C:\libraries\sdl\lib\x86;C:\libraries\ode\lib\releaselib;&quot;C:\libraries\g3d-6_10\win32-7-lib&quot;"
+				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
+				SubSystem="2"
+				StackReserveSize="16777216"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="2"
+				LinkTimeCodeGeneration="TRUE"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Blocks3D.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="4105"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			ManagedExtensions="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="C:\libraries\ode\include;C:\libraries\sdl\include;&quot;C:\libraries\g3d-6_10\include&quot;;.\src\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="FALSE"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib ode.lib"
+				OutputFile="./Blocks3D-Debug.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="C:\libraries\sdl\lib\x86;C:\libraries\ode\lib\debuglib;&quot;C:\libraries\g3d-6_10\win32-7-lib&quot;"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
+				SubSystem="1"
+				StackReserveSize="16777216"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Blocks3D.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="4105"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Relese (Dec ALPHA)|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				WholeProgramOptimization="TRUE"
+				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;NO_SDL_MAIN;_ATL_STATIC_REGISTRY"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
+				OutputFile="./Blocks3D.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
+				SubSystem="2"
+				StackReserveSize="16777216"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="2"
+				LinkTimeCodeGeneration="TRUE"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Blocks3D.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="4105"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath=".\src\include\AbstractedInput.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Application.h">
+			</File>
+			<File
+				RelativePath=".\src\include\AudioPlayer.h">
+			</File>
+			<File
+				RelativePath=".\src\include\ax.h">
+			</File>
+			<File
+				RelativePath=".\src\include\BrowserCallHandler.h">
+			</File>
+			<File
+				RelativePath=".\src\include\CameraController.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Enum.h">
+			</File>
+			<File
+				RelativePath=".\src\include\ErrorFunctions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Faces.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Globals.h">
+			</File>
+			<File
+				RelativePath=".\src\include\IEBrowser.h">
+			</File>
+			<File
+				RelativePath=".\src\include\IEDispatcher.h">
+			</File>
+			<File
+				RelativePath=".\src\include\MenuActions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Mouse.h">
+			</File>
+			<File
+				RelativePath=".\src\include\propertyGrid.h">
+			</File>
+			<File
+				RelativePath=".\src\include\PropertyWindow.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Renderer.h">
+			</File>
+			<File
+				RelativePath=".\src\include\resource.h">
+			</File>
+			<File
+				RelativePath=".\src\include\SignalTypes.h">
+			</File>
+			<File
+				RelativePath=".\src\include\StringFunctions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\TextureHandler.h">
+			</File>
+			<File
+				RelativePath=".\src\include\ToolEnum.h">
+			</File>
+			<File
+				RelativePath=".\src\include\versioning.h">
+			</File>
+			<File
+				RelativePath=".\src\include\VS2005CompatShim.h">
+			</File>
+			<File
+				RelativePath=".\src\include\win32Defines.h">
+			</File>
+			<File
+				RelativePath=".\src\include\WindowFunctions.h">
+			</File>
+			<Filter
+				Name="RapidXML">
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Tool">
+				<File
+					RelativePath=".\src\include\Tool\ArrowTool.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\DraggerTool.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\SurfaceTool.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\Tool.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="Helpers">
+				<File
+					RelativePath=".\src\include\base64.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="Reflection"
+				Filter="">
+				<File
+					RelativePath=".\src\include\Reflection\Reflection.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Reflection\ReflectionDataTable.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Reflection\ReflectionProperty.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Reflection\ReflectionProperty_impl.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Reflection\ReflectionProperty_op_overload.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV3"
+				Filter="">
+				<File
+					RelativePath=".\src\include\DataModelV3\DataModelInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\GroupInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\InputService.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\Instance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\LevelInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\LightingInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\PartInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\PVInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SelectionService.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SignalService.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SoundInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SoundService.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\WorkspaceInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\XplicitNgine\XplicitNgine.h">
+				</File>
+				<Filter
+					Name="Gui"
+					Filter="">
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\BaseButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\BaseGuiInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\GuiRootInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\ImageButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\TextButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV3\Gui\ToggleImageButtonInstance.h">
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath=".\src\source\Application.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\AudioPlayer.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\ax.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\BrowserCallHandler.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\CameraController.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\ErrorFunctions.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Globals.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\IEBrowser.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\IEDispatcher.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\main.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\MenuActions.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Mouse.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\propertyGrid.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\PropertyWindow.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Renderer.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\StringFunctions.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\TextureHandler.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\WindowFunctions.cpp">
+			</File>
+			<Filter
+				Name="Tool">
+				<File
+					RelativePath=".\src\source\Tool\ArrowTool.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\DraggerTool.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\SurfaceTool.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\Tool.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Helpers">
+				<File
+					RelativePath=".\src\source\base64.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Reflection"
+				Filter="">
+				<File
+					RelativePath=".\src\source\Reflection\ReflectionDataTable.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV3"
+				Filter="">
+				<File
+					RelativePath=".\src\source\DataModelV3\DataModelInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\GroupInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\InputService.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\Instance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\LevelInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\LightingInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Relese (Dec ALPHA)|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\PartInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\PVInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\SelectionService.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Relese (Dec ALPHA)|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\SignalService.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\SoundInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Relese (Dec ALPHA)|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\SoundService.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Relese (Dec ALPHA)|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\WorkspaceInstance.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\XplicitNgine\XplicitNgine.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Relese (Dec ALPHA)|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<Filter
+					Name="Gui"
+					Filter="">
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\BaseButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\BaseGuiInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\GuiRootInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\ImageButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\TextButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\ToggleImageButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Relese (Dec ALPHA)|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath=".\Dialogs.rc">
+			</File>
+			<File
+				RelativePath=".\icon1.ico">
+			</File>
+			<File
+				RelativePath=".\Parts.bmp">
+			</File>
+			<File
+				RelativePath=".\roblox_RN1_icon.ico">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"/>
+	</Globals>
+</VisualStudioProject>
--- a/Blocks3D.dsp
+++ b/Blocks3D.dsp
@@ -1,105 +1,827 @@
-# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=Blocks3D - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Blocks3D - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "Blocks3D - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1009 /d "NDEBUG"
-# ADD RSC /l 0x1009 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1009 /d "_DEBUG"
-# ADD RSC /l 0x1009 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Blocks3D - Win32 Release"
-# Name "Blocks3D - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=Blocks3D - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Blocks3D.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Blocks3D - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "Blocks3D - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Blocks3D - Win32 Release"
+# Name "Blocks3D - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "DataModelV2"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\BaseButtonInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\BaseGuiInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\DataModelInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\GroupInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\GuiRootInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\ImageButtonInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\Instance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\LevelInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\LightingInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\PartInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\PVInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\SelectionService.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\SoundInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\SoundService.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\TextButtonInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\ToggleImageButtonInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\DataModelV2\WorkspaceInstance.cpp
+# End Source File
+# End Group
+# Begin Group "Listener"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\source\Listener\ButtonListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\CameraButtonListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\DeleteListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\GUDButtonListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\MenuButtonListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\ModeSelectionListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\RotateButtonListener.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Listener\ToolbarListener.cpp
+# End Source File
+# End Group
+# Begin Group "Tool"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\source\Tool\ArrowTool.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Tool\DraggerTool.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Tool\SurfaceTool.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Tool\Tool.cpp
+# End Source File
+# End Group
+# Begin Group "Reflection"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\source\Reflection\ReflectionDataTable.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Reflection\ReflectionProperty.cpp
+# End Source File
+# End Group
+# Begin Group "XplicitNgine"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\source\XplicitNgine\XplicitNgine.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\src\source\Application.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\AudioPlayer.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\ax.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\base64.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\BrowserCallHandler.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\CameraController.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\ErrorFunctions.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Globals.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\IEBrowser.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\IEDispatcher.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\main.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Mouse.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\propertyGrid.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\PropertyWindow.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\Renderer.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\StringFunctions.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\TextureHandler.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\source\WindowFunctions.cpp
+
+!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+
+# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+
+# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
+# SUBTRACT CPP /X
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "DataModelV2_h"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\BaseButtonInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\BaseGuiInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\DataModelInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\GroupInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\GuiRootInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\ImageButtonInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\Instance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\LevelInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\LightingInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\PartInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\PVInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\SelectionService.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\SoundInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\SoundService.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\TextButtonInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\ThumbnailGeneratorInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\ToggleImageButtonInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\DataModelV2\WorkspaceInstance.h
+# End Source File
+# End Group
+# Begin Group "Listener_h"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\Listener\ButtonListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\CameraButtonListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\DeleteListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\GUDButtonListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\MenuButtonListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\ModeSelectionListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\RotateButtonListener.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Listener\ToolbarListener.h
+# End Source File
+# End Group
+# Begin Group "Tool_h"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\Tool\ArrowTool.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Tool\DraggerTool.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Tool\SurfaceTool.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Tool\Tool.h
+# End Source File
+# End Group
+# Begin Group "Reflection_h"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\Reflection\Reflection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Reflection\ReflectionDataTable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Reflection\ReflectionProperty.h
+# End Source File
+# End Group
+# Begin Group "XplicitNgine_h"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\XplicitNgine\XplicitNgine.h
+# End Source File
+# End Group
+# Begin Group "rapidxml"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\include\rapidxml\rapidxml.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\rapidxml\rapidxml_iterators.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\rapidxml\rapidxml_print.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\rapidxml\rapidxml_utils.hpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\src\include\Application.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\AudioPlayer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\ax.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\base64.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\BrowserCallHandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\CameraController.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Enum.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\ErrorFunctions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Faces.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\IEBrowser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\IEDispatcher.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Mouse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\propertyGrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\PropertyWindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\Renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\StringFunctions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\TextureHandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\ToolEnum.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\versioning.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\VS2005CompatShim.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\win32Defines.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\include\WindowFunctions.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/Blocks3D.dsw
+++ b/Blocks3D.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Blocks3D"=.\Blocks3D.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Blocks3D"=".\Blocks3D.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/Blocks3D.exe.manifest
+++ b/Blocks3D.exe.manifest
@@ -5,4 +5,10 @@
 			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
 		</dependentAssembly>
 	</dependency>
+	<!--This should generally not be specified, but XP's VS2005 won't update automatically-->
+<!--	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+		</dependentAssembly>
+	</dependency> -->
 </assembly>
--- a/Blocks3D.opt
+++ b/Blocks3D.opt
--- a/Blocks3D.plg
+++ b/Blocks3D.plg
@@ -0,0 +1,120 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: Blocks3D - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP109.tmp" with contents
+[
+/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/Blocks3D.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\BaseButtonInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\DataModelInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\GroupInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\GuiRootInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\ImageButtonInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\LevelInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\PartInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\PVInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\TextButtonInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\ToggleImageButtonInstance.cpp"
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\WorkspaceInstance.cpp"
+]
+Creating command line "cl.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP109.tmp" 
+Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10A.tmp" with contents
+[
+/nologo /MLd /W3 /Gm /GX /ZI /Od /I "src\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "NO_SDL_MAIN" /Fp"Debug/Blocks3D.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\Application.cpp"
+]
+Creating command line "cl.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10A.tmp" 
+Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10B.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/Blocks3D.pdb" /debug /machine:I386 /out:"Debug/Blocks3D.exe" /pdbtype:sept 
+".\Debug\BaseButtonInstance.obj"
+".\Debug\BaseGuiInstance.obj"
+".\Debug\DataModelInstance.obj"
+".\Debug\GroupInstance.obj"
+".\Debug\GuiRootInstance.obj"
+".\Debug\ImageButtonInstance.obj"
+".\Debug\Instance.obj"
+".\Debug\LevelInstance.obj"
+".\Debug\LightingInstance.obj"
+".\Debug\PartInstance.obj"
+".\Debug\PVInstance.obj"
+".\Debug\SelectionService.obj"
+".\Debug\SoundInstance.obj"
+".\Debug\SoundService.obj"
+".\Debug\TextButtonInstance.obj"
+".\Debug\ToggleImageButtonInstance.obj"
+".\Debug\WorkspaceInstance.obj"
+".\Debug\ButtonListener.obj"
+".\Debug\CameraButtonListener.obj"
+".\Debug\DeleteListener.obj"
+".\Debug\GUDButtonListener.obj"
+".\Debug\MenuButtonListener.obj"
+".\Debug\ModeSelectionListener.obj"
+".\Debug\RotateButtonListener.obj"
+".\Debug\ToolbarListener.obj"
+".\Debug\ArrowTool.obj"
+".\Debug\DraggerTool.obj"
+".\Debug\SurfaceTool.obj"
+".\Debug\Tool.obj"
+".\Debug\ReflectionDataTable.obj"
+".\Debug\ReflectionProperty.obj"
+".\Debug\XplicitNgine.obj"
+".\Debug\Application.obj"
+".\Debug\AudioPlayer.obj"
+".\Debug\ax.obj"
+".\Debug\base64.obj"
+".\Debug\BrowserCallHandler.obj"
+".\Debug\CameraController.obj"
+".\Debug\ErrorFunctions.obj"
+".\Debug\Globals.obj"
+".\Debug\IEBrowser.obj"
+".\Debug\IEDispatcher.obj"
+".\Debug\main.obj"
+".\Debug\Mouse.obj"
+".\Debug\propertyGrid.obj"
+".\Debug\PropertyWindow.obj"
+".\Debug\Renderer.obj"
+".\Debug\StringFunctions.obj"
+".\Debug\TextureHandler.obj"
+".\Debug\WindowFunctions.obj"
+]
+Creating command line "link.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10B.tmp"
+<h3>Output Window</h3>
+Compiling...
+BaseButtonInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\basebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/BaseButtonInstance.h': No such file or directory
+DataModelInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\datamodelinstance.cpp(4) : fatal error C1083: Cannot open include file: 'DataModelV2/GuiRootInstance.h': No such file or directory
+GroupInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\groupinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/GroupInstance.h': No such file or directory
+GuiRootInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\guirootinstance.cpp(4) : fatal error C1083: Cannot open include file: 'DataModelV2/BaseButtonInstance.h': No such file or directory
+ImageButtonInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\imagebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/ImageButtonInstance.h': No such file or directory
+LevelInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\levelinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/DataModelInstance.h': No such file or directory
+PartInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\partinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/PartInstance.h': No such file or directory
+PVInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\pvinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/PVInstance.h': No such file or directory
+TextButtonInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\textbuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/TextButtonInstance.h': No such file or directory
+ToggleImageButtonInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\toggleimagebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/ToggleImageButtonInstance.h': No such file or directory
+WorkspaceInstance.cpp
+e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\workspaceinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/WorkspaceInstance.h': No such file or directory
+Error executing cl.exe.
+Build : warning : failed to (or don't know how to) build 'E:\Documents and Settings\Andreja\git\Blocks3D\src\source\Reflection\ReflectionProperty.cpp'
+
+
+
+
+<h3>Results</h3>
+Blocks3D.exe - 11 error(s), 1 warning(s)
+</pre>
+</body>
+</html>
--- a/Blocks3D.vcproj
+++ b/Blocks3D.vcproj
@@ -55,7 +55,7 @@
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -154,8 +154,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\libraries\ode-0.5\include\drawstuff&quot;;.\src\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				AdditionalIncludeDirectories=".\src\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
@@ -185,6 +185,7 @@
 				OutputFile="./Blocks3D-Debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
 				SubSystem="1"
@@ -321,6 +322,10 @@
 					RelativePath=".\src\source\Tool\ArrowTool.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\source\Tool\DraggerTool.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\source\Tool\SurfaceTool.cpp"
 					>
@@ -331,46 +336,42 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="Listener"
+				Name="Helpers"
 				>
 				<File
-					RelativePath=".\src\source\Listener\ButtonListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\DeleteListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Listener\ToolbarListener.cpp"
+					RelativePath=".\src\source\base64.cpp"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="DataModelV2"
+				Name="Reflection"
 				>
 				<File
-					RelativePath=".\src\source\DataModelV2\DataModelInstance.cpp"
+					RelativePath=".\src\source\Reflection\ReflectionDataTable.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV3"
+				>
+				<File
+					RelativePath=".\src\source\DataModelV3\DataModelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\GroupInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\Instance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\LevelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\LightingInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
@@ -392,7 +393,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\source\DataModelV2\GroupInstance.cpp"
+					RelativePath=".\src\source\DataModelV3\PartInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\PVInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV3\SelectionService.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
@@ -414,7 +423,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\source\DataModelV2\Instance.cpp"
+					RelativePath=".\src\source\DataModelV3\SoundInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
@@ -436,7 +445,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\source\DataModelV2\LevelInstance.cpp"
+					RelativePath=".\src\source\DataModelV3\SoundService.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
@@ -458,214 +467,82 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\source\DataModelV2\PartInstance.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV2\PVInstance.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModel\SelectionService.cpp"
+					RelativePath=".\src\source\DataModelV3\WorkspaceInstance.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<Filter
-					Name="Gui"
-					>
-					<File
-						RelativePath=".\src\source\DataModelV2\BaseButtonInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV2\BaseGuiInstance.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV2\GuiRootInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV2\ImageButtonInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV2\TextButtonInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV2\ToggleImageButtonInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
 				<Filter
 					Name="XplicitNgine"
 					>
 					<File
-						RelativePath=".\src\source\XplicitNgine\XplicitNgine.cpp"
+						RelativePath=".\src\source\DataModelV3\XplicitNgine\XplicitNgine.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+				<Filter
+					Name="Gui"
+					>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\BaseButtonInstance.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\BaseGuiInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\GuiRootInstance.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\ImageButtonInstance.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\TextButtonInstance.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV3\Gui\ToggleImageButtonInstance.cpp"
 						>
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="Properties"
-				>
-				<File
-					RelativePath=".\src\source\Properties\BoolProperty.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Properties\Property.cpp"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -747,6 +624,10 @@
 				RelativePath=".\src\include\ToolEnum.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\include\versioning.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\include\VS2005CompatShim.h"
 				>
@@ -779,46 +660,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="Listener"
-				>
-				<File
-					RelativePath=".\src\include\Listener\ButtonListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\CameraButtonListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\DeleteListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\GUDButtonListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\MenuButtonListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\ModeSelectionListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\RotateButtonListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Listener\ToolbarListener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModel\WorkspaceInstance.h"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="Tool"
 				>
@@ -826,6 +667,10 @@
 					RelativePath=".\src\include\Tool\ArrowTool.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\include\Tool\DraggerTool.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\include\Tool\SurfaceTool.h"
 					>
@@ -836,89 +681,117 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="DataModelV2"
+				Name="Helpers"
 				>
 				<File
-					RelativePath=".\src\include\DataModelV2\DataModelInstance.h"
+					RelativePath=".\src\include\base64.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Reflection"
+				>
+				<File
+					RelativePath=".\src\include\Reflection\Reflection.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\GroupInstance.h"
+					RelativePath=".\src\include\Reflection\ReflectionDataTable.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\Instance.h"
+					RelativePath=".\src\include\Reflection\ReflectionProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\LevelInstance.h"
+					RelativePath=".\src\include\Reflection\ReflectionProperty_impl.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV3"
+				>
+				<File
+					RelativePath=".\src\include\DataModelV3\DataModelInstance.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\PartInstance.h"
+					RelativePath=".\src\include\DataModelV3\GroupInstance.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\PVInstance.h"
+					RelativePath=".\src\include\DataModelV3\Instance.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\SelectionService.h"
+					RelativePath=".\src\include\DataModelV3\LevelInstance.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h"
+					RelativePath=".\src\include\DataModelV3\LightingInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\PartInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\PVInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SelectionService.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SoundInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\SoundService.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV3\WorkspaceInstance.h"
 					>
 				</File>
 				<Filter
 					Name="Gui"
 					>
 					<File
-						RelativePath=".\src\include\DataModelV2\BaseButtonInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\BaseButtonInstance.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\include\DataModelV2\BaseGuiInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\BaseGuiInstance.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\include\DataModelV2\GuiRootInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\GuiRootInstance.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\include\DataModelV2\ImageButtonInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\ImageButtonInstance.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\include\DataModelV2\TextButtonInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\TextButtonInstance.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\include\DataModelV2\ToggleImageButtonInstance.h"
+						RelativePath=".\src\include\DataModelV3\Gui\ToggleImageButtonInstance.h"
 						>
 					</File>
 				</Filter>
 				<Filter
-					Name="XplicitNgine"
+					Name="XplicitNgin"
 					>
 					<File
-						RelativePath=".\src\include\XplicitNgine\XplicitNgine.h"
+						RelativePath=".\src\include\DataModelV3\XplicitNgine\XplicitNgine.h"
 						>
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="Properties"
-				>
-				<File
-					RelativePath=".\src\include\Properties\BoolProperty.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Properties\Property.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/Dialogs.rc
+++ b/Dialogs.rc
@@ -36,7 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
            VALUE "FileDescription", "Blocks 3D"
            VALUE "FileVersion", VER_STR(APP_VER_STRING)
            VALUE "InternalName", "Blocks3D"
-            VALUE "LegalCopyright", "Blocks3D Team - 2022"
+            VALUE "LegalCopyright", "Blocks3D Team 2018-2023"
            VALUE "LegalTrademarks", ""
            VALUE "OriginalFilename", "Blocks3D.exe"
            VALUE "PrivateBuild", ""
--- a/Documentation/index.html
+++ b/Documentation/index.html
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title> RBX05R Documentation </title>
-    <meta charset="utf-8">
-  </head>
-  <body>
-    <div class="content" style="text-align:center;">
-      <h1> ROBLOX 2005 Recreation documentation </h1>
-      <br>
-      <h4> Current for: r360 </h4> 
-    </div>
-  </body>
-  </html>
--- a/Installer/Redist/msvcp71.dll
+++ b/Installer/Redist/msvcp71.dll
--- a/Installer/Redist/msvcr71.dll
+++ b/Installer/Redist/msvcr71.dll
--- a/Installer/install_script.iss
+++ b/Installer/install_script.iss
@@ -1,4 +1,5 @@
 ;InnoSetupVersion=5.4.3
+;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
 #define AppVer GetFileVersion('..\Blocks3D.exe')

 [Setup]
@@ -21,9 +22,9 @@ Type: filesandordirs; Name: "{app}"

 [Files]
 Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
-Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
+;Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
 Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
-Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+;Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs

 [Registry]
@@ -31,7 +32,7 @@ Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs

 [Run]
 Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
-Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
+;Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
 Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent

 [Icons]
--- a/Installer/install_script_floppy.iss
+++ b/Installer/install_script_floppy.iss
@@ -0,0 +1,52 @@
+;InnoSetupVersion=5.4.3
+;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
+#define AppVer GetFileVersion('..\Blocks3D.exe')
+
+[Setup]
+AppName=Blocks3D
+AppVersion=v{#AppVer}
+AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppPublisherURL=http://blocks3d.com/
+AppSupportURL=http://blocks3d.com/
+AppUpdatesURL=http://blocks3d.com/
+DefaultDirName={%localappdata}\Blocks3D
+OutputBaseFilename=B3DSTP
+Compression=lzma2
+PrivilegesRequired=lowest
+WizardImageFile=setup.bmp
+DefaultGroupName=Blocks3D
+DiskSpanning=yes
+SlicesPerDisk=1
+DiskSliceSize=1457664
+
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}"
+
+[Files]
+Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
+;Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
+Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
+;Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+
+[Registry]
+
+
+[Run]
+Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
+;Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
+Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
+
+Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
+
+[Tasks]
+Name: "instvc"; Description: "Install Visual C++ Redistributable 2005 SP1 (Requires elevated permissions)";
+Name: "desktopicon"; Description: "Create Desktop Icons";
+Name: "startscut"; Description: "Create Start Menu Icons";
+
--- a/Installer/install_script_floppy_vs2003.iss
+++ b/Installer/install_script_floppy_vs2003.iss
@@ -0,0 +1,48 @@
+;InnoSetupVersion=5.4.3
+;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
+#define AppVer GetFileVersion('..\Blocks3D.exe')
+
+[Setup]
+AppName=Blocks3D
+AppVersion=v{#AppVer}
+AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppPublisherURL=http://blocks3d.com/
+AppSupportURL=http://blocks3d.com/
+AppUpdatesURL=http://blocks3d.com/
+DefaultDirName={%localappdata}\Blocks3D
+OutputBaseFilename=B3DSTP
+Compression=lzma2
+PrivilegesRequired=lowest
+WizardImageFile=setup.bmp
+DefaultGroupName=Blocks3D
+DiskSpanning=yes
+SlicesPerDisk=1
+DiskSliceSize=1457664
+
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}"
+
+[Files]
+Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion 
+Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion 
+Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
+Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+
+[Registry]
+
+
+[Run]
+Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
+
+Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
+
+[Tasks]
+Name: "desktopicon"; Description: "Create Desktop Icons";
+Name: "startscut"; Description: "Create Start Menu Icons";
+
--- a/Installer/install_script_vs2003.iss
+++ b/Installer/install_script_vs2003.iss
@@ -0,0 +1,45 @@
+;InnoSetupVersion=5.4.3
+;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
+#define AppVer GetFileVersion('..\Blocks3D.exe')
+
+[Setup]
+AppName=Blocks3D
+AppVersion=v{#AppVer}
+AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppPublisherURL=http://blocks3d.com/
+AppSupportURL=http://blocks3d.com/
+AppUpdatesURL=http://blocks3d.com/
+DefaultDirName={%localappdata}\Blocks3D
+OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
+Compression=lzma2
+PrivilegesRequired=lowest
+WizardImageFile=setup.bmp
+DefaultGroupName=Blocks3D
+
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}"
+
+[Files]
+Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion 
+Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion 
+Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
+Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+
+[Registry]
+
+
+[Run]
+Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
+
+Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
+Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
+
+[Tasks]
+Name: "desktopicon"; Description: "Create Desktop Icons";
+Name: "startscut"; Description: "Create Start Menu Icons";
+
--- a/Installer/setup.png
+++ b/Installer/setup.png
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+pipeline {
+	agent {label 'windows'}
+	stages {
+		stage('Build') {
+			steps {
+				bat """
+					call "c:\\Program Files (x86)\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\vsvars32.bat"
+					devenv "Blocks3D VS2003.sln" /build release
+				"""
+			}
+		}
+		stage('Package') {
+			steps {
+				bat """
+					"C:\\Program Files (x86)\\Inno Setup 5\\ISCC" Installer\\install_script_vs2003.iss
+					"C:\\Program Files (x86)\\Inno Setup 5\\ISCC" Installer\\install_script_floppy_vs2003.iss 
+				"""
+			}
+		}
+		stage('Archive') {
+			steps {
+				archiveArtifacts artifacts: 'Installer\\Output\\Blocks3D_Setup_*,Installer\\Output\\B3DSTP*', fingerprint: true
+			}
+		}
+	}
+}
+ 
--- a/Parts.bmp
+++ b/Parts.bmp
--- a/Test/1524_doll_7place_9-26-3007.rbxl
+++ b/Test/1524_doll_7place_9-26-3007.rbxl
--- a/Test/1622_arkitects_place_3-24-2006.rbxl
+++ b/Test/1622_arkitects_place_3-24-2006.rbxl
--- a/Test/1792_drummerdude952s_place_7-8-2006.rbxl
+++ b/Test/1792_drummerdude952s_place_7-8-2006.rbxl
--- a/Test/2006_Pirate_Ship.rbxl
+++ b/Test/2006_Pirate_Ship.rbxl
--- a/Test/Cylinder.rbxl
+++ b/Test/Cylinder.rbxl
@@ -1,588 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="Workspace" referent="RBX0">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX1</Ref>
-			<double name="DistributedGameTime">0</double>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">null</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX1">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>-2.9603548</X>
-					<Y>115.389259</Y>
-					<Z>44.9416084</Z>
-					<R00>0.112786211</R00>
-					<R01>0.522245169</R01>
-					<R02>-0.845304191</R02>
-					<R10>-2.22539209e-009</R10>
-					<R11>0.850732446</R11>
-					<R12>0.525598884</R12>
-					<R20>0.993619263</R20>
-					<R21>-0.0592803061</R21>
-					<R22>0.0959508941</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>13.9457293</X>
-					<Y>104.877281</Y>
-					<Z>43.0225906</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX2">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">21</int>
-				<CoordinateFrame name="CFrame">
-					<X>87.0174942</X>
-					<Y>48.0466728</Y>
-					<Z>25.0001202</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">2</token>
-				<Vector3 name="size">
-					<X>6</X>
-					<Y>6</Y>
-					<Z>6</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX3">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>108.911415</X>
-					<Y>38.7803154</Y>
-					<Z>27.5002155</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX4">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>141.499893</X>
-					<Y>38.1177788</Y>
-					<Z>27.0499611</Z>
-					<R00>1</R00>
-					<R01>-1.07914104e-006</R01>
-					<R02>-4.49890285e-006</R02>
-					<R10>-5.98966139e-008</R10>
-					<R11>0.969315231</R11>
-					<R12>-0.245820925</R12>
-					<R20>4.6261307e-006</R20>
-					<R21>0.245820925</R21>
-					<R22>0.969315231</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>1</X>
-					<Y>16.8000011</Y>
-					<Z>12</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX5">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>108.911438</X>
-					<Y>38.7803192</Y>
-					<Z>22.5002174</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX6">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>140.499786</X>
-					<Y>24.7802944</Y>
-					<Z>47.911438</Z>
-					<R00>4.35209677e-006</R00>
-					<R01>-1.87532066e-006</R01>
-					<R02>0.999999642</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-0.969314575</R20>
-					<R21>0.245822206</R21>
-					<R22>4.6762093e-006</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX7">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>135.499786</X>
-					<Y>24.7802944</Y>
-					<Z>47.9114227</Z>
-					<R00>4.35515585e-006</R00>
-					<R01>-1.85873387e-006</R01>
-					<R02>0.999999881</R02>
-					<R10>0.245822236</R10>
-					<R11>0.969314933</R11>
-					<R12>7.14274279e-007</R12>
-					<R20>-0.969314814</R20>
-					<R21>0.245822236</R21>
-					<R22>4.67732343e-006</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<Item class="RunService" referent="RBX8">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX9</External>
-	<External>RBX10</External>
-	<Item class="Players" referent="RBX11">
-		<Properties>
-			<int name="MaxPlayers">12</int>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="StarterPack" referent="RBX12">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService" referent="RBX13">
-		<Properties>
-			<token name="AmbientReverb">0</token>
-			<float name="DistanceFactor">10</float>
-			<float name="DopplerScale">1</float>
-			<string name="Name">Soundscape</string>
-			<float name="RolloffScale">1</float>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<External>RBX14</External>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-		<External>RBX18</External>
-		<External>RBX19</External>
-		<External>RBX20</External>
-		<External>RBX21</External>
-		<External>RBX22</External>
-		<External>RBX23</External>
-		<External>RBX24</External>
-		<External>RBX25</External>
-		<External>RBX26</External>
-		<External>RBX27</External>
-	</Item>
-	<Item class="ContentProvider" referent="RBX28">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="PhysicsService" referent="RBX29">
-		<Properties>
-			<string name="Name">PhysicsService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX30</External>
-	<Item class="Selection" referent="RBX31">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX32</External>
-	<Item class="Lighting" referent="RBX33">
-		<Properties>
-			<Color3 name="Ambient">4286940549</Color3>
-			<float name="Brightness">1</float>
-			<Color3 name="ColorShift_Bottom">4278190080</Color3>
-			<Color3 name="ColorShift_Top">4278190080</Color3>
-			<float name="GeographicLatitude">41.7332993</float>
-			<string name="Name">Lighting</string>
-			<Color3 name="ShadowColor">4290295997</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService" referent="RBX34">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ChangeHistoryService" referent="RBX35">
-		<Properties>
-			<string name="Name">ChangeHistoryService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX36</External>
-</roblox>
--- a/Test/Physics
+++ b/Test/Physics
--- a/Test/Roblox
+++ b/Test/Roblox
--- a/Test/phys-test-room-collapse.rbxl
+++ b/Test/phys-test-room-collapse.rbxl
--- a/Test/phys-test-tower-collapse.rbxl
+++ b/Test/phys-test-tower-collapse.rbxl
--- a/Test/phys-test-tower-stable.rbxl
+++ b/Test/phys-test-tower-stable.rbxl
--- a/Test/phys_test_004.rbxl
+++ b/Test/phys_test_004.rbxl
@@ -1,578 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="RunService">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="Selection">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="Workspace">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX0</Ref>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">RBX1</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX0">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>202.42688</X>
-					<Y>55.4607582</Y>
-					<Z>3.2956109</Z>
-					<R00>0.0106770508</R00>
-					<R01>0.00328579429</R01>
-					<R02>0.999937654</R02>
-					<R10>4.65661287e-010</R10>
-					<R11>0.999994576</R11>
-					<R12>-0.00328598148</R12>
-					<R20>-0.999943018</R20>
-					<R21>3.50852497e-005</R21>
-					<R22>0.010676994</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>182.428116</X>
-					<Y>55.5264778</Y>
-					<Z>3.08207107</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX1">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">37</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>2.79999995</Y>
-					<Z>-4</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">true</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>64</X>
-					<Y>1</Y>
-					<Z>248</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>78.3000031</Y>
-					<Z>-96</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>2</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>79.3000031</Y>
-					<Z>-62</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>4</X>
-					<Y>4</Y>
-					<Z>4</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>81.3000031</Y>
-					<Z>-25</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>8</X>
-					<Y>8</Y>
-					<Z>8</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>85.3000031</Y>
-					<Z>18</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>16</X>
-					<Y>16</Y>
-					<Z>16</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>93.3000031</Y>
-					<Z>73</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>32</X>
-					<Y>32</Y>
-					<Z>32</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<External>RBX2</External>
-	<External>RBX3</External>
-	<Item class="Players">
-		<Properties>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-			<int name="maxPlayers">10</int>
-		</Properties>
-	</Item>
-	<Item class="StarterPack">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService">
-		<Properties>
-			<string name="Name">SoundService</string>
-			<bool name="archivable">true</bool>
-			<float name="distancefactor">10</float>
-			<float name="dopplerscale">1</float>
-			<float name="rolloffscale">1</float>
-		</Properties>
-		<External>RBX4</External>
-		<External>RBX5</External>
-		<External>RBX6</External>
-		<External>RBX7</External>
-		<External>RBX8</External>
-		<External>RBX9</External>
-		<External>RBX10</External>
-		<External>RBX11</External>
-		<External>RBX12</External>
-		<External>RBX13</External>
-		<External>RBX14</External>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-	</Item>
-	<Item class="Lighting">
-		<Properties>
-			<Color3 name="BottomAmbientV9">4286220152</Color3>
-			<Color3 name="ClearColor">4278190080</Color3>
-			<string name="Name">Lighting</string>
-			<Color3 name="SpotLightV9">4290822336</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<Color3 name="TopAmbientV9">4292006362</Color3>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX18</External>
-	<External>RBX19</External>
-	<External>RBX20</External>
-</roblox>
--- a/Test/phys_test_005.rbxl
+++ b/Test/phys_test_005.rbxl
--- a/Test/phys_test_stable.rbxl
+++ b/Test/phys_test_stable.rbxl
@@ -1,660 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="Workspace" referent="RBX0">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX1</Ref>
-			<double name="DistributedGameTime">0</double>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">null</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX1">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>-62.3436203</X>
-					<Y>290.964996</Y>
-					<Z>130.047195</Z>
-					<R00>0.900759101</R00>
-					<R01>0.385544956</R01>
-					<R02>-0.199970409</R02>
-					<R10>3.07713033e-009</R10>
-					<R11>0.460422784</R11>
-					<R12>0.887699783</R12>
-					<R20>0.434319079</R20>
-					<R21>-0.799603641</R21>
-					<R22>0.414730012</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>-58.3442116</X>
-					<Y>273.210999</Y>
-					<Z>121.752594</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX2">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">37</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>0.600000024</Y>
-					<Z>0</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>-0</R02>
-					<R10>-0</R10>
-					<R11>1</R11>
-					<R12>-0</R12>
-					<R20>-0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">true</bool>
-				<string name="Name">Baseplate</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>512</X>
-					<Y>1.20000005</Y>
-					<Z>512</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX3">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>-2</X>
-					<Y>5.69999981</Y>
-					<Z>1</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX4">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>6</X>
-					<Y>5.69999981</Y>
-					<Z>1</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX5">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>6</X>
-					<Y>5.69999981</Y>
-					<Z>-7</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX6">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>-2</X>
-					<Y>5.69999981</Y>
-					<Z>-7</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX7">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>2</X>
-					<Y>11.1999998</Y>
-					<Z>-3</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>10</X>
-					<Y>2</Y>
-					<Z>10</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX8">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>2</X>
-					<Y>13.1999998</Y>
-					<Z>-3</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>6</X>
-					<Y>2</Y>
-					<Z>6</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<Item class="RunService" referent="RBX9">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX10</External>
-	<External>RBX11</External>
-	<Item class="Players" referent="RBX12">
-		<Properties>
-			<int name="MaxPlayers">12</int>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="StarterPack" referent="RBX13">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService" referent="RBX14">
-		<Properties>
-			<token name="AmbientReverb">0</token>
-			<float name="DistanceFactor">10</float>
-			<float name="DopplerScale">1</float>
-			<string name="Name">Soundscape</string>
-			<float name="RolloffScale">1</float>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-		<External>RBX18</External>
-		<External>RBX19</External>
-		<External>RBX20</External>
-		<External>RBX21</External>
-		<External>RBX22</External>
-		<External>RBX23</External>
-		<External>RBX24</External>
-		<External>RBX25</External>
-		<External>RBX26</External>
-		<External>RBX27</External>
-		<External>RBX28</External>
-	</Item>
-	<Item class="ContentProvider" referent="RBX29">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="PhysicsService" referent="RBX30">
-		<Properties>
-			<string name="Name">PhysicsService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX31</External>
-	<Item class="Selection" referent="RBX32">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX33</External>
-	<Item class="Lighting" referent="RBX34">
-		<Properties>
-			<Color3 name="Ambient">4286611584</Color3>
-			<float name="Brightness">1</float>
-			<Color3 name="ColorShift_Bottom">4278190080</Color3>
-			<Color3 name="ColorShift_Top">4278190080</Color3>
-			<float name="GeographicLatitude">41.7332993</float>
-			<string name="Name">Lighting</string>
-			<Color3 name="ShadowColor">4289967032</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService" referent="RBX35">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ChangeHistoryService" referent="RBX36">
-		<Properties>
-			<string name="Name">ChangeHistoryService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX37</External>
-</roblox>
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# IMPORTANT -- READ BEFORE CONTRIBUTING
+Work on DataModel V3 will be starting November 3rd at 3PM PDT! This will mean **many PRs involving DataModel V2 may be immediately rejected until completion!** Progress on DataModelV3 can be tracked/contributed to on the feature/datamodel_v3 branch during this time.
+
 # ROBLOX 2005 Recreation Project
 ## Why are we doing this?
 ROBLOX in 2005 was a different game, based around minigames with win and lose conditions rather than a 3D building game. Since this build of the client is presumed lost despite having around 100 users, we have to recreate it. We are using era-appropriate tools for this as well (Visual Studio 2005 and 2005-era compilers), as well as G3D 6.10, the era-appropriate version of the Graphics3D graphics library used by ROBLOX to this day.
--- a/SDL.dll
+++ b/SDL.dll
--- a/content/cursor.png
+++ b/content/cursor.png
--- a/content/cursor2.png
+++ b/content/cursor2.png
--- a/content/font/arial-small.fnt
+++ b/content/font/arial-small.fnt
--- a/content/font/arial.fnt
+++ b/content/font/arial.fnt
--- a/content/font/arialblack-small.fnt
+++ b/content/font/arialblack-small.fnt
--- a/content/font/arialblack.fnt
+++ b/content/font/arialblack.fnt
--- a/content/font/arialround.fnt
+++ b/content/font/arialround.fnt
--- a/content/font/ariaround-small.fnt
+++ b/content/font/ariaround-small.fnt
--- a/content/font/dominant-small.fnt
+++ b/content/font/dominant-small.fnt
--- a/content/font/lighttrek-small.fnt
+++ b/content/font/lighttrek-small.fnt
--- a/content/images/ArrowCursor.png
+++ b/content/images/ArrowCursor.png
--- a/content/images/ArrowFarCursor.png
+++ b/content/images/ArrowFarCursor.png
--- a/content/images/CameraZoomIn.png
+++ b/content/images/CameraZoomIn.png
--- a/content/images/CameraZoomIn_dn.png
+++ b/content/images/CameraZoomIn_dn.png
--- a/content/images/CameraZoomIn_ovr.png
+++ b/content/images/CameraZoomIn_ovr.png
--- a/content/images/DragCursor.png
+++ b/content/images/DragCursor.png
--- a/content/images/DropperCursor.png
+++ b/content/images/DropperCursor.png
--- a/content/images/FillCursor.png
+++ b/content/images/FillCursor.png
--- a/content/images/FlagCursor.png
+++ b/content/images/FlagCursor.png
--- a/content/images/FlatCursor.png
+++ b/content/images/FlatCursor.png
--- a/content/images/GlueCursor.png
+++ b/content/images/GlueCursor.png
--- a/content/images/GrabCursor.png
+++ b/content/images/GrabCursor.png
--- a/content/images/GrabRotateCursor.png
+++ b/content/images/GrabRotateCursor.png
--- a/content/images/HammerCursor.png
+++ b/content/images/HammerCursor.png
--- a/content/images/HammerDownCursor.png
+++ b/content/images/HammerDownCursor.png
--- a/content/images/HammerOverCursor.png
+++ b/content/images/HammerOverCursor.png
--- a/content/images/HingeCursor.png
+++ b/content/images/HingeCursor.png
--- a/content/images/LockCursor.png
+++ b/content/images/LockCursor.png
--- a/content/images/MotorCursor.png
+++ b/content/images/MotorCursor.png
--- a/content/images/ResizeCursor.png
+++ b/content/images/ResizeCursor.png
--- a/content/images/SelectionRotate.png
+++ b/content/images/SelectionRotate.png
--- a/content/images/SelectionRotate_ds.png
+++ b/content/images/SelectionRotate_ds.png
--- a/content/images/SelectionRotate_ovr.png
+++ b/content/images/SelectionRotate_ovr.png
--- a/content/images/SelectionTilt.png
+++ b/content/images/SelectionTilt.png
--- a/content/images/SelectionTilt_ds.png
+++ b/content/images/SelectionTilt_ds.png
--- a/content/images/SelectionTilt_ovr.png
+++ b/content/images/SelectionTilt_ovr.png
--- a/content/images/SpawnCursor.png
+++ b/content/images/SpawnCursor.png
--- a/content/images/Thumbs.db
+++ b/content/images/Thumbs.db
--- a/content/images/UnAnchorCursor.png
+++ b/content/images/UnAnchorCursor.png
--- a/content/images/UnlockCursor.png
+++ b/content/images/UnlockCursor.png
--- a/content/images/WeldCursor.png
+++ b/content/images/WeldCursor.png
--- a/content/images/surface.png
+++ b/content/images/surface.png
--- a/content/images/surfacebr.png
+++ b/content/images/surfacebr.png
--- a/content/sounds/bass.wav
+++ b/content/sounds/bass.wav
--- a/content/sounds/clickfast.wav
+++ b/content/sounds/clickfast.wav
--- a/content/sounds/collide.wav
+++ b/content/sounds/collide.wav
--- a/content/sounds/flashbulb.wav
+++ b/content/sounds/flashbulb.wav
--- a/content/sounds/glassbreak.wav
+++ b/content/sounds/glassbreak.wav
--- a/content/sounds/snap.wav
+++ b/content/sounds/snap.wav
--- a/content/sounds/splat.wav
+++ b/content/sounds/splat.wav
--- a/content/sounds/swoosh.wav
+++ b/content/sounds/swoosh.wav
--- a/content/sounds/victory.wav
+++ b/content/sounds/victory.wav
--- a/ode-0.6.zip
+++ b/ode-0.6.zip
--- a/roblox_RN1_icon.ico
+++ b/roblox_RN1_icon.ico
--- a/src/include/AbstractedInput.h
+++ b/src/include/AbstractedInput.h
@@ -0,0 +1,8 @@
+#pragma once
+namespace B3D{
+	namespace AbstractedInput{
+		static const unsigned char MOUSE_LEFT = 0x01;
+		static const unsigned char MOUSE_RIGHT = 0x02;
+		static const unsigned char MOUSE_MIDDLE = 0x03;
+	}
+}
--- a/src/include/Application.h
+++ b/src/include/Application.h
@@ -1,23 +1,21 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "DataModelV2/TextButtonInstance.h"
-#include "DataModelV2/ImageButtonInstance.h"
+#include "DataModelV3/Gui/TextButtonInstance.h"
+#include "DataModelV3/Gui/ImageButtonInstance.h"
 #include "CameraController.h"
 #include "IEBrowser.h"
 #include "Mouse.h"
 #include "Tool/Tool.h"
-//#include "GuiRoot.h"

-class TextButtonInstance;
-class ImageButtonInstance;
-class PartInstance;
+class B3D::TextButtonInstance;
+class B3D::ImageButtonInstance;
+class B3D::PartInstance;
 class CameraController;

 class Application { // : public GApp {
 	public:
 		Application(HWND parentWindow);
-		void Boop();
 		virtual			~Application() {}
 		virtual void	exitApplication();
 		virtual void	onInit();
@@ -30,8 +28,6 @@ class Application { // : public GApp {
 		void			clearInstances();
 		void			navigateToolbox(std::string);
 		PartInstance*	makePart();
-		void			drawButtons(RenderDevice* rd);
-		void			drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
 		void		deleteInstance();
 		void		run();
 		void		QuitApp();
@@ -48,14 +44,16 @@ class Application { // : public GApp {
 		void		setFocus(bool isFocused);
 		int			getMode();
 		void		unSetMode();
+
 		CameraController	cameraController;
 		UserInput*			userInput;
 		PropertyWindow*		_propWindow;
-		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
+		void				generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
 		RenderDevice*		getRenderDevice();
 		void				selectInstance(Instance* selectedInstance,PropertyWindow* propWindow);
 		void				setMode(int mode);
-		
+		void				resize3DView(int w, int h);		
+
 		Tool * tool;
 		void changeTool(Tool *);
 		Mouse mouse;
@@ -65,7 +63,6 @@ class Application { // : public GApp {
 		RenderDevice*		renderDevice;
 		//void				initGUI();
 		HWND				_hWndMain;
-		SkyRef				sky;
 		bool				quit;
 		bool				mouseOnScreen;
 		bool				rightButtonHolding;
@@ -74,13 +71,15 @@ class Application { // : public GApp {
 		HWND				_hwndToolbox;
 		HWND				_buttonTest;
 		HWND				_hwndRenderer;
+		//TODO make list
 		DataModelInstance*	_dataModel;
-		G3D::TextureRef		shadowMap;
 		std::string			_title;
+		//TODO deprecated?
 		bool				_dragging;
+		//TODO deprecated
 		int					_mode;
+		//Can be moved?
 		GAppSettings		_settings;
-		double lightProjX, lightProjY, lightProjNear, lightProjFar;
 		IEBrowser*		webBrowser;
 	protected:
 		Stopwatch           m_graphicsWatch;
--- a/src/include/AudioPlayer.h
+++ b/src/include/AudioPlayer.h
@@ -1,11 +1,12 @@
-#include <G3DAll.h>
 #pragma once
-
+#include <iostream>
+#include <string.h>
 class AudioPlayer
 {
 public:
 	AudioPlayer(void);
 	~AudioPlayer(void);
-	static void playSound(std::string);
+
 	static void init();
+	static void playSound(std::string);
 };
--- a/src/include/CameraController.h
+++ b/src/include/CameraController.h
@@ -1,7 +1,7 @@
 #pragma once

 #include <G3DAll.h>
-#include "DataModelV2/Instance.h"
+#include "DataModelV3/Instance.h"
 #include "Globals.h"
 #include <string>

--- a/src/include/DataModelV2/BaseButtonInstance.h
+++ b/src/include/DataModelV2/BaseButtonInstance.h
@@ -1,26 +0,0 @@
-#pragma once
-#include "Instance.h"
-#include "Listener/ButtonListener.h"
-
-class ButtonListener;
-class Instance;
-
-class BaseButtonInstance : public Instance
-{
-public:
-	BaseButtonInstance(void);
-	virtual ~BaseButtonInstance(void);
-	virtual void render(RenderDevice* rd);
-	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
-	virtual bool mouseInButton(float, float, RenderDevice* rd);
-	virtual void onMouseClick();
-	void setButtonListener(ButtonListener&);
-	bool floatBottom;
-	bool floatRight;
-	bool floatCenter;
-	volatile bool disabled;
-	bool selected;
-protected:
-	bool mouseInArea(float, float, float, float, float, float);
-	class ButtonListener* listener;
-};
--- a/src/include/DataModelV2/BaseGuiInstance.h
+++ b/src/include/DataModelV2/BaseGuiInstance.h
@@ -1,49 +0,0 @@
-#pragma once
-#include "Instance.h"
-
-struct UDim
-{
-	float scale;
-	float offset;
-	UDim()
-	{
-		scale = offset = 0;
-	}
-	UDim(float scale_, float offset_)
-	{
-		scale = scale_;
-		offset = offset_;
-	}
-};
-
-struct UDim2
-{
-	UDim x;
-	UDim y;
-	UDim2(UDim x_, UDim y_)
-	{
-		x = x_;
-		y = y_;
-	}
-	UDim2(float scale_x, float offset_x, float scale_y, float offset_y)
-	{
-		x = UDim(scale_x, offset_x);
-		y = UDim(scale_y, offset_y);
-	}
-};
-
-class Instance;
-
-class BaseGuiInstance : public Instance
-{
-public:
-	BaseGuiInstance(void);
-	virtual ~BaseGuiInstance(void);
-	virtual void render(RenderDevice* rd);
-	virtual bool mouseHovered(float, float, RenderDevice* rd);
-	UDim2 position;
-	UDim2 size;	
-protected:
-	bool mouseInArea(float, float, float, float, float, float);
-	class ButtonListener* listener;
-};
--- a/src/include/DataModelV2/DataModelInstance.h
+++ b/src/include/DataModelV2/DataModelInstance.h
@@ -1,58 +0,0 @@
-#pragma once
-#include "WorkspaceInstance.h"
-#include "LevelInstance.h"
-#include "PartInstance.h"
-#include "SelectionService.h"
-#include "rapidxml/rapidxml.hpp"
-#include "GuiRootInstance.h"
-#include "XplicitNgine/XplicitNgine.h"
-
-class GuiRootInstance;
-
-class DataModelInstance :
-	public Instance
-{
-public:
-	DataModelInstance(void);
-	~DataModelInstance(void);
-	void					setMessage(std::string);
-	void					setMessageBrickCount();
-	void					clearMessage();
-	bool					debugGetOpen();
-	bool					getOpen();
-	bool					load(const char* filename,bool clearObjects);	
-	bool					readXMLFileStream(std::ifstream* file);
-	void					drawMessage(RenderDevice*);
-	WorkspaceInstance*		getWorkspace();
-	LevelInstance *			getLevel();
-	XplicitNgine *			getEngine();
-	std::string				message;
-	std::string				_loadedFileName;
-	bool					showMessage;
-	G3D::GFontRef			font;
-	GuiRootInstance*		getGuiRoot();
-	SelectionService*		getSelectionService();
-	PartInstance*			makePart();
-	void					clearLevel();
-	void					toggleRun();
-	bool					isRunning();
-	void					resetEngine();
-#if _DEBUG
-	void					modXMLLevel(float modY);
-#endif
-private:
-	bool isBrickCount;
-	bool					scanXMLObject(rapidxml::xml_node<>* node);
-	rapidxml::xml_node<>*	getNode(rapidxml::xml_node<> * node,const char* name );
-	float					getFloatValue(rapidxml::xml_node<> * node,const char* name);
-	bool					_successfulLoad;
-	std::string				_errMsg;
-	bool					_legacyLoad;
-	float					_modY;
-	WorkspaceInstance*		workspace;
-	LevelInstance *			level;
-	GuiRootInstance*		guiRoot;
-	SelectionService*		selectionService;
-	bool					running;
-	XplicitNgine *			xplicitNgine;
-};
--- a/src/include/DataModelV2/GroupInstance.h
+++ b/src/include/DataModelV2/GroupInstance.h
@@ -1,16 +0,0 @@
-#pragma once
-#include "PartInstance.h"
-
-class GroupInstance :
-	public PVInstance
-{
-public:
-	GroupInstance(void);
-	~GroupInstance(void);
-	GroupInstance(const GroupInstance &oinst);
-	virtual std::vector<PROPGRIDITEM> getProperties();
-	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
-	std::vector<Instance *> unGroup();
-	PartInstance * primaryPart;
-	void render(RenderDevice * r);
-};
--- a/src/include/DataModelV2/GuiRootInstance.h
+++ b/src/include/DataModelV2/GuiRootInstance.h
@@ -1,24 +0,0 @@
-#pragma once
-#include "Instance.h"
-
-class ImageButtonInstance;
-
-class TextButtonInstance;
-
-class GuiRootInstance : public Instance
-{
-public:
-	GuiRootInstance();
-	GuiRootInstance::~GuiRootInstance();
-	TextButtonInstance*		makeTextButton();
-	void					drawButtons(RenderDevice* rd);
-	ImageButtonInstance*	makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);
-	void					renderGUI(G3D::RenderDevice* rd, double fps);
-	void					setDebugMessage(std::string msg, G3D::RealTime msgTime);
-	void					update();
-	bool					mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y);
-	void					onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y);
-private:
-	std::string			_message;
-	G3D::RealTime		_messageTime;
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vulpovile	e63e87fe29	Fix Syntax All checks were successful CSPublic/Blocks3D/pipeline/head This commit looks good Details	2025-04-13 09:53:35 -07:00
Vulpovile	d03cf2d8b3	Update Jenkinsfile Some checks failed CSPublic/Blocks3D/pipeline/head There was a failure building this commit Details	2025-04-13 09:52:41 -07:00
Vulpovile	a662fcf8fa	Add Jenkinsfile All checks were successful CSPublic/Blocks3D/pipeline/head This commit looks good Details	2025-04-13 09:47:06 -07:00
Vulpovile	cd735f6c62	Reimplement button hover, go button	2025-04-08 18:37:43 -07:00
Vulpovile	7c29d7ca9f	Fix memory error with reflection	2025-04-08 18:04:48 -07:00
Vulpovile	67f519705d	Fix missed files	2025-04-08 10:15:27 -07:00
Vulpovile	a064697561	Fix parent datamodel issues, update callbacks	2025-04-08 08:04:32 -07:00
Vulpovile	d854ddfdd4	Add callbacks, make library locations part of project now	2025-04-07 19:44:51 -07:00
Vulpovile	d06251ce7f	Finished signal service	2023-11-16 16:36:05 -08:00
Vulpovile	a222ac2b67	InputService stub	2023-11-12 22:12:23 -08:00
Vulpovile	528ab72e80	Signal service stub	2023-11-12 20:07:23 -08:00
Vulpovile	bb06376719	Create input service	2023-11-09 11:24:08 -08:00
Vulpovile	3928307609	Fixed bugs	2023-11-09 00:44:31 -08:00
Vulpovile	39d91f3943	Minor bugfix, added reflection notify	2023-11-09 00:36:59 -08:00
Vulpovile	11362f0f63	Deleted unused files	2023-11-08 23:47:49 -08:00
Vulpovile	0fb941bf07	It's alive\!\!\!... almost, still crashes on exit lol	2023-11-08 23:47:10 -08:00
Vulpovile	70bace117c	The calm before the storm	2023-11-08 21:56:17 -08:00
starfrost013	791f0a7cff	remove a bunch of old or useless files e.g. patent cursor	2023-11-08 22:51:04 +00:00
starfrost013	47dfe1ef06	For some reason half the Datamodelv3 files were not in the project, wtf?	2023-11-08 22:43:33 +00:00
Modnark	1e51b22a8a	make GUI more accurate to Morgan McGuire screenshots	2023-11-08 15:56:24 -05:00
Modnark	adab8ef35c	cleanup guirootinstance foundations of a "factory" model	2023-11-08 07:33:16 -05:00
Vulpovile	ce808f672f	Ported all instances, now the hard part	2023-11-07 17:21:21 -08:00
Vulpovile	944afec7a3	Fixed selection box error	2023-11-06 23:17:47 -08:00
Vulpovile	8726e1e3e3	Enable soundservice in datamodelinstance	2023-11-06 18:44:42 -08:00
Vulpovile	d8a2fe7495	Ported services and sound, now just GUI left	2023-11-06 18:28:57 -08:00
Vulpovile	b58161cf81	Implemented SelectionService	2023-11-05 22:39:06 -08:00
Vulpovile	ebfbade283	Ported workspace instance	2023-11-05 19:34:57 -08:00
Vulpovile	8a1a457f4b	Ported GroupInstance	2023-11-05 19:14:06 -08:00
Vulpovile	cab66d1152	Implemented operator overloads for Reflection	2023-11-05 00:37:25 -07:00
Vulpovile	901539e594	Ported part and pvinstance, made XplicitNgine not use globals	2023-11-04 23:01:43 -07:00
Vulpovile	cb8f6f1a80	Address memory leak	2023-11-04 20:29:16 -07:00
Vulpovile	e8eef916b0	Add DMv3 stubs, add reflection warning	2023-11-04 20:15:07 -07:00
Vulpovile	53427dd385	Made impl name clearer	2023-11-04 00:31:00 -07:00
Vulpovile	c0aab09960	Added reflection memory cleanup	2023-11-04 00:28:41 -07:00
Vulpovile	26398f0586	Fixed template	2023-11-03 23:56:59 -07:00
Vulpovile	25d34d28ee	Reflection stub	2023-11-03 22:56:09 -07:00
Vulpovile	061fc1e564	Merge pull request #136 from Vulpovile/bugfix/debug_assertion_failure Added macro to disable VS2003 workaround when not required	2023-11-03 19:41:39 -08:00
Vulpovile	796a47ad38	Added macro to disable VS2003 workaround when not required	2023-11-03 19:57:11 -07:00
Vulpovile	f6110fa3a3	Merge pull request #135 from Vulpovile/bugfix/vs2003_stack_obliteration Visual Studio 2003 stack clobbering workaround	2023-11-03 16:20:35 -08:00
Vulpovile	0120bc857d	Merge branch 'develop' of github.com:Vulpovile/Blocks3D into bugfix/vs2003_stack_obliteration	2023-11-03 17:15:30 -07:00
Vulpovile	78fcebd1fc	Merge pull request #133 from Vulpovile/bugfix/no_eol_conversions Bugfix/no eol conversions	2023-11-03 16:15:10 -08:00
Vulpovile	706d16f9c3	Added redists and install script builds for VS2003	2023-11-03 17:09:50 -07:00
Vulpovile	111cc7cd01	Update copyright	2023-11-03 16:48:05 -07:00
Vulpovile	8817712cc3	Fixed stack clobbering in VS2003 compiler	2023-11-03 16:36:27 -07:00
Vulpovile	522a926965	Merge branch 'develop' into bugfix/no_eol_conversions	2023-11-03 12:26:02 -08:00
starfrost	f5d42a3b92	Merge pull request #134 from Vulpovile/feature/cleanup-projects Remove absolute path in include directories	2023-11-03 19:44:26 +00:00
starfrost013	6f7fbdae2f	Remove absolute path in include directories	2023-11-03 19:39:56 +00:00
Vulpovile	943ce9a5eb	Merge branch 'develop' of github.com:Vulpovile/Blocks3D into bugfix/no_eol_conversions	2023-11-02 19:43:28 -07:00
Vulpovile	6bfbc4a97e	Merge pull request #132 from KeyboardCombination/develop move tool	2023-11-02 18:43:08 -08:00
Vulpovile	f5b31d8e99	Disable line ending conversions	2023-11-02 19:40:56 -07:00
KeyboardCombination	4336140b90	move tool	2023-11-02 22:18:35 -04:00
MusicalProgrammer	cb6eb4653d	Merge pull request #129 from Vulpovile/feature/readme_update_dmv3 Update README.md to reflect DataModel V3	2023-11-02 19:45:22 -04:00
Vulpovile	43327b8974	Update README.md to reflect DataModel V3	2023-11-02 13:17:49 -07:00
Vulpovile	8e48115d37	Merge pull request #128 from Vulpovile/feature/property_grid_toggle Made MENU toggle property grid	2023-11-02 10:27:44 -08:00
Vulpovile	d2bdd4e124	Made MENU toggle property grid	2023-11-02 11:17:53 -07:00
Vulpovile	c1431c8dff	VS 2003 build files, made physics more stable, fix Win98/WINE IE	2023-11-02 01:16:05 -07:00
Vulpovile	cc0c195c0b	Removed SDL from installer	2023-11-02 00:08:42 -07:00
Vulpovile	3c415e7297	Updated instance icon, no more SDL	2023-11-02 00:07:10 -07:00
MusicalProgrammer	5d96985667	Merge pull request #127 from Vulpovile/bugfix/use_consistent_crt Fixed issues with Windows XP/2000 using different CRT DLLs	2023-11-01 22:23:24 -04:00
Vulpovile	03ab7122c3	Fixed issues with Windows XP/2000 using different CRT DLLs on build time causing a completely broken EXE	2023-11-01 18:10:56 -07:00
starfrost	a75f7bf381	Merge pull request #123 from KeyboardCombination/develop GUD improvements (nobody merged this despite approval?)	2023-08-15 22:58:48 +01:00
KeyboardCombination	00b165c208	Update GUDButtonListener.cpp	2023-06-11 18:16:36 -04:00
KeyboardCombination	2a17185cc0	Fixed name inconsistencies	2023-05-21 17:29:11 -04:00
KeyboardCombination	b7f2b8f5a7	dynamic casting, extra sounds, fixes	2023-04-30 15:58:10 -04:00
KeyboardCombination	fd3679fb6b	Removing useless check	2023-04-09 19:30:23 -04:00
KeyboardCombination	e37ad4879e	duplicate improvements, prototype model insertion	2023-04-07 18:46:19 -04:00
KeyboardCombination	20bf032f1e	Merge branch 'develop' of https://github.com/KeyboardCombination/Blocks3D into develop	2023-04-07 15:04:06 -04:00
KeyboardCombination	eb2766304a	bigger selectionbox	2023-04-07 15:04:01 -04:00
KeyboardCombination	e914126c87	remove ode stuff	2023-04-06 23:07:27 -04:00
KeyboardCombination	48f3455b53	GUD improvements	2023-04-06 22:57:56 -04:00
Vulpovile	0b8847cd8e	Merge pull request #113 from Vulpovile/feature/draggers Added dragger tool base, removed useless stuff	2022-10-15 22:00:16 -07:00
Vulpovile	4ec70e6ee7	Removed unwanted file	2022-10-15 21:59:51 -07:00
FlareMicrosystems	c6699b5112	???	2022-10-15 21:58:48 -07:00
FlareMicrosystems	48b90b1a93	Removed surfaces from code	2022-10-15 21:54:50 -07:00
FlareMicrosystems	c70d39fb25	Moved currently unnecessary files	2022-10-15 21:44:52 -07:00
FlareMicrosystems	1b34573b06	Remove 64 bit redist from installer	2022-10-15 20:13:18 -07:00
FlareMicrosystems	649a1aaa06	Cleanup	2022-10-15 20:10:13 -07:00
FlareMicrosystems	6b8ca28060	Add floppy disk setup generation	2022-10-15 19:37:06 -07:00
FlareMicrosystems	dc7f7f3cc5	Update versioning	2022-10-15 19:36:55 -07:00
FlareMicrosystems	575f5dab46	Added dragger tool, removed useless stuff	2022-10-15 16:43:06 -07:00
Vulpovile	efbc832321	Merge pull request #111 from Vulpovile/modnark Modnark	2022-10-14 08:24:53 -07:00
Modnark	2471abb8dd	Merge branch 'develop' into modnark	2022-10-12 13:51:21 -04:00
Modnark	57db5511bd	Merge pull request #110 from pinksub/develop Mouse.cpp is very confusing	2022-10-12 13:50:49 -04:00
Modnark	0ac516618a	Add LightingInstance Still need to work on PropertyGrid for it	2022-10-12 13:47:39 -04:00
Modnark	8916797e55	Merge branch 'develop' into modnark	2022-10-11 22:39:59 -04:00
Modnark	2dc7f3e667	solve merge conflict	2022-10-11 22:38:34 -04:00
Modnark	d32b0ea4e4	Add more sounds internally	2022-10-11 22:34:36 -04:00
Modnark	af5c31d5d0	Add dynamic_cast for playSound makes it so developers don't need to dynamic_cast any time they want to play sound	2022-10-11 21:28:19 -04:00
Modnark	9df862f72e	Add required sounds	2022-10-11 21:27:42 -04:00
Modnark	d269b360ce	SoundService & SoundInstance Basic implementation. More work needs to be done.	2022-10-11 21:16:14 -04:00
pinksub	d2dd05b620	Update Mouse.cpp	2022-10-11 13:58:38 -04:00
pinksub	9d62380df9	cleanup mouse.cpp code a bit more	2022-10-11 13:58:21 -04:00
pinksub	8f3d12c516	Stud snapping is confusing Anything divided by 1 and anything multiplied by 1 is itself. Not sure if that was intentional,	2022-10-11 13:54:55 -04:00
Modnark	d2f3e718a7	Very basic implementation of OnTouch	2022-10-11 10:03:04 -04:00
Modnark	adade066cc	Start OnTouch	2022-10-10 20:01:30 -04:00
Modnark	7e9f34e1ac	handle some errors in ThumbnailGenerator	2022-10-10 18:47:49 -04:00
Modnark	5e74564956	Add listener for View button	2022-10-10 18:41:46 -04:00
Modnark	04823f5911	Add listeners for all menu buttons	2022-10-10 18:41:29 -04:00
Vulpovile	e62d3ab49c	Merge pull request #109 from thecssdoom/patch-1 Name shown fix	2022-10-09 19:29:27 -07:00
thecssdoom	fb5d6495dc	Update Application.cpp	2022-10-09 22:06:55 -03:00
thecssdoom	5078b849b0	Update PartInstance.cpp	2022-10-09 22:06:01 -03:00
thecssdoom	20e772f932	Update PartInstance.h	2022-10-09 22:05:09 -03:00
thecssdoom	00e61d4f17	Update Instance.cpp	2022-10-09 22:04:38 -03:00
thecssdoom	fe55127129	add rendername	2022-10-09 22:01:36 -03:00
Modnark	e8dbf50df9	Merge pull request #108 from Vulpovile/modnark Modnark	2022-10-09 06:01:41 -04:00
Modnark	6ee7d76859	Undo FSAA changes also removed some useless comment.	2022-10-08 21:11:35 -04:00
Modnark	8a2b7f6308	Merge branch 'modnark' of https://github.com/Vulpovile/Blocks3D into modnark	2022-10-08 21:05:10 -04:00
Modnark	415ea71664	Clean bloat comments Please make sure these were bloat and not important.	2022-10-08 21:05:09 -04:00
Modnark	eefb981993	stupid thing you're in gitignore	2022-10-08 19:32:17 -04:00
Modnark	9f741e0df7	Base64 Output	2022-10-08 19:29:17 -04:00
Modnark	e2d75ae4d4	merge develop with my branch	2022-10-07 17:19:23 -04:00
Modnark	52c2f114a5	Merge branch 'develop' into modnark	2022-10-07 17:15:13 -04:00
Modnark	7f8cdc0f33	minor fixes for branch	2022-10-07 17:12:51 -04:00
Vulpovile	36153c293b	Merge pull request #105 from Vulpovile/bugfix-negativetimer Fix the timer going into the negatives when the game is running slowly	2022-10-07 10:47:09 -07:00
NT_x86	a63aa52108	Increment patch version number	2022-10-07 16:32:07 +03:00
NT_x86	d25f4a6ba2	Fix the timer going into the negatives when the game is running slowly	2022-10-07 12:10:24 +03:00
Vulpovile	b7ed5bd832	Merge pull request #104 from Vulpovile/master sync: master to develop	2022-10-06 21:40:20 -07:00
Modnark	7a89ddd94e	hide gui with thumbnail generation	2022-10-06 18:08:58 -04:00
Modnark	c1118489e3	very basic ThumbnailGenerator	2022-10-06 12:18:35 -04:00
Modnark	71fda54338	Merge branch 'develop' into modnark	2022-10-06 12:18:11 -04:00
Modnark	a456ee6196	Merge branch 'feature/physics_sleep' into modnark	2022-10-05 17:18:38 -04:00
Modnark	30ea19c5b0	change part fall height limit	2022-10-05 17:14:21 -04:00