* Fixed "CallbackOnCollectedDelegate" bug in demos

* Added "CubeMapping" textures
* Added texture loading target and preprocessing options in TextureManager
* Removed unnecessary textures from old/experimental demos

.gitignore

@@ -6,8 +6,14 @@
 /OpenGLDotNet.VC.VC.opendb
 *.suo
 *.user
-Debug/
-Release/
+*.sdf
+*.exp
+*.iobj
+*.ipdb
+*.pdb
+/bin/debug/
+/debug/
+/release/
 obj/
 .git/
 .vs/

Assembler.vcxproj

@@ -22,15 +22,15 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

OpenGLDemos.csproj

@@ -12,6 +12,21 @@
     <AssemblyName>OpenGLDemos</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -27,16 +42,19 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>OpenGLDemos.OpenGLDemos</StartupObject>
+    <StartupObject>Quake2DotNet.Quake2Main</StartupObject>
   </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
     <Reference Include="NAudio">
       <HintPath>D:\Development\Windows\Projects\Quake2DotNet\bin\Release\NAudio.dll</HintPath>
@@ -53,20 +71,30 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\OpenGLDemos.AssemblyInfo.cs" />
-    <Compile Include="Source\Demos\Quake2ConsoleDemo\Q2CommandManager.cs" />
-    <Compile Include="Source\Demos\Quake2ConsoleDemo\Q2ConsoleManager.cs" />
-    <Compile Include="Source\Demos\Quake2ConsoleDemo\Q2ConsoleVarManager.cs" />
-    <Compile Include="Source\Demos\Quake2ConsoleDemo\Q2ConsoleMain.cs" />
-    <Compile Include="Source\Demos\Quake2ConsoleDemo\Q2TextureManager.cs" />
-    <Compile Include="Source\Demos\GLDemoMain.cs" />
+    <Compile Include="Source\Demos\Q2CommandManager.cs" />
+    <Compile Include="Source\Demos\Q2ConsoleManager.cs" />
+    <Compile Include="Source\Demos\Q2ConsoleVarManager.cs" />
+    <Compile Include="Source\Demos\Q2ConsoleMain.cs" />
+    <Compile Include="Source\Demos\Q2TextureManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="OpenGLDotNet.csproj">
       <Project>{51991C31-1314-4726-9544-D37E228F5D60}</Project>
       <Name>OpenGLDotNet</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Source\app.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

OpenGLDotNet.csproj

@@ -44,13 +44,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>
@@ -110,11 +111,6 @@
     <Compile Include="Source\OpenGL\GLUT.Functions.cs" />
     <Compile Include="Properties\OpenGLDotNet.AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -135,7 +131,11 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.