Updated to v2.7.2

qiangqiang101 · Sep 17, 2015 · 8ed890e · 8ed890e
1 parent 1088307
commit 8ed890e
Show file tree

Hide file tree

Showing 21 changed files with 560 additions and 332 deletions.
diff --git a/.vs/PDM.NET/v14/.suo b/.vs/PDM.NET/v14/.suo
diff --git a/NativeUI-master/Properties/AssemblyInfo.cs b/NativeUI-master/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]
diff --git a/NativeUI-master/UIMenu.cs b/NativeUI-master/UIMenu.cs
@@ -444,7 +444,9 @@ public void Draw()
                 DisEnableControls(false);
 
             if (_buttonsEnabled)
-                _instructionalButtonsScaleform.Render2D();
+                Function.Call(Hash._0x0DF606929C105BE1, _instructionalButtonsScaleform.Handle, 255, 255, 255, 255, 0);
+            // _instructionalButtonsScaleform.Render2D(); // Bug #13
+
 
             Function.Call((Hash)0xB8A850F20A067EB6, 76, 84);           // Safezone
             Function.Call((Hash)0xF5A2C681787E579D, 0f, 0f, 0f, 0f);   // stuff
@@ -1197,7 +1199,7 @@ public void RemoveInstructionalButton(InstructionalButton button)
         /// </summary>
         public void UpdateScaleform()
         {
-            if (!Visible) return;
+            if (!Visible || !_buttonsEnabled) return;
             _instructionalButtonsScaleform.CallFunction("CLEAR_ALL");
             _instructionalButtonsScaleform.CallFunction("TOGGLE_MOUSE_BUTTONS", 0);
             _instructionalButtonsScaleform.CallFunction("CREATE_CONTAINER");

diff --git a/PremiumDeluxeMotorsport.NET/My Project/AssemblyInfo.vb b/PremiumDeluxeMotorsport.NET/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.0.0")>
-<Assembly: AssemblyFileVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("2.7.2.0")>
+<Assembly: AssemblyFileVersion("2.7.2.0")>
diff --git a/PremiumDeluxeMotorsport.NET/My Project/Settings.Designer.vb b/PremiumDeluxeMotorsport.NET/My Project/Settings.Designer.vb
diff --git a/PremiumDeluxeMotorsport.NET/My Project/Settings.settings b/PremiumDeluxeMotorsport.NET/My Project/Settings.settings
@@ -5,17 +5,11 @@
     <Setting Name="keyModEnable" Type="System.Windows.Forms.Keys" Scope="User">
       <Value Profile="(Default)">F9</Value>
     </Setting>
-    <Setting Name="keyRotLeft" Type="System.Windows.Forms.Keys" Scope="User">
-      <Value Profile="(Default)">1</Value>
+    <Setting Name="showRoom" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="keyRotRight" Type="System.Windows.Forms.Keys" Scope="User">
-      <Value Profile="(Default)">2</Value>
-    </Setting>
-    <Setting Name="keyOpenDoor" Type="System.Windows.Forms.Keys" Scope="User">
-      <Value Profile="(Default)">3</Value>
-    </Setting>
-    <Setting Name="keyCloseDoor" Type="System.Windows.Forms.Keys" Scope="User">
-      <Value Profile="(Default)">4</Value>
+    <Setting Name="removeColor" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/PremiumDeluxeMotorsport.NET/PDM.NET.vbproj b/PremiumDeluxeMotorsport.NET/PDM.NET.vbproj
@@ -111,6 +111,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="timer.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">

diff --git a/PremiumDeluxeMotorsport.NET/app.config b/PremiumDeluxeMotorsport.NET/app.config
@@ -30,17 +30,11 @@
             <setting name="keyModEnable" serializeAs="String">
                 <value>F9</value>
             </setting>
-            <setting name="keyRotLeft" serializeAs="String">
-                <value>1</value>
+            <setting name="showRoom" serializeAs="String">
+                <value>False</value>
             </setting>
-            <setting name="keyRotRight" serializeAs="String">
-                <value>2</value>
-            </setting>
-            <setting name="keyOpenDoor" serializeAs="String">
-                <value>3</value>
-            </setting>
-            <setting name="keyCloseDoor" serializeAs="String">
-                <value>4</value>
+            <setting name="removeColor" serializeAs="String">
+                <value>True</value>
             </setting>
         </PDMCarShopMod.My.MySettings>
     </userSettings>

diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopGUI.dll b/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopGUI.dll
diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopGUI.pdb b/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopGUI.pdb
diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.dll b/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.dll
diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.dll.config b/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.dll.config
@@ -30,17 +30,11 @@
             <setting name="keyModEnable" serializeAs="String">
                 <value>F9</value>
             </setting>
-            <setting name="keyRotLeft" serializeAs="String">
-                <value>1</value>
+            <setting name="showRoom" serializeAs="String">
+                <value>False</value>
             </setting>
-            <setting name="keyRotRight" serializeAs="String">
-                <value>2</value>
-            </setting>
-            <setting name="keyOpenDoor" serializeAs="String">
-                <value>3</value>
-            </setting>
-            <setting name="keyCloseDoor" serializeAs="String">
-                <value>4</value>
+            <setting name="removeColor" serializeAs="String">
+                <value>True</value>
             </setting>
         </PDMCarShopMod.My.MySettings>
     </userSettings>

diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.pdb b/PremiumDeluxeMotorsport.NET/bin/Release/PDMCarShopMod.pdb
diff --git a/PremiumDeluxeMotorsport.NET/bin/Release/ScriptHookVDotNet.dll b/PremiumDeluxeMotorsport.NET/bin/Release/ScriptHookVDotNet.dll
diff --git a/PremiumDeluxeMotorsport.NET/obj/Release/DesignTimeResolveAssemblyReferences.cache b/PremiumDeluxeMotorsport.NET/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/PremiumDeluxeMotorsport.NET/obj/Release/PDM.NET.vbprojResolveAssemblyReference.cache b/PremiumDeluxeMotorsport.NET/obj/Release/PDM.NET.vbprojResolveAssemblyReference.cache
diff --git a/PremiumDeluxeMotorsport.NET/obj/Release/PDMCarShopMod.dll b/PremiumDeluxeMotorsport.NET/obj/Release/PDMCarShopMod.dll
diff --git a/PremiumDeluxeMotorsport.NET/obj/Release/PDMCarShopMod.pdb b/PremiumDeluxeMotorsport.NET/obj/Release/PDMCarShopMod.pdb
diff --git a/PremiumDeluxeMotorsport.NET/obj/Release/TempPE/My Project.Resources.Designer.vb.dll b/PremiumDeluxeMotorsport.NET/obj/Release/TempPE/My Project.Resources.Designer.vb.dll