Changeset 254

Timestamp:

Dec 24, 2015, 1:15:17 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_11

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (3 diffs)
• AllocsCommands/AllocsCommands.csproj (modified) (2 diffs)
• AllocsCommands/Commands/TeleportPlayer.cs (modified) (1 diff)
• MapRendering/ModInfo.xml (modified) (1 diff)
• MapRendering/Web/Handlers/ItemIconHandler.cs (modified) (1 diff)
• MapRendering/WebAndMapRendering.csproj (modified) (2 diffs)
• server-fixes.userprefs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{81DA7F87-1A66-4920-AADA-6EAF1971F8D0}</ProjectGuid>
@@ -19 +19 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <NoStdLib>true</NoStdLib>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Version|AnyCPU' ">
@@ -32 +33 @@
     </CustomCommands>
     <ConsolePause>false</ConsolePause>
+    <NoStdLib>true</NoStdLib>
   </PropertyGroup>
   <ItemGroup>

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E273D042-57F9-4E2E-8268-5053527E5287}</ProjectGuid>
@@ -19 +19 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <NoStdLib>true</NoStdLib>
   </PropertyGroup>
   <ItemGroup>

binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

@@ -33 +33 @@
                                         ClientInfo ci1 = null;
                                         EntityPlayer ep1 = null;
-                                        UnityEngine.Vector3 destPos;
+                                        UnityEngine.Vector3 destPos = new UnityEngine.Vector3 ();
  
                                         if (_params.Count == 2 || _params.Count == 4) {

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="10" />
+                <Version value="11" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs

@@ -94 +94 @@
                                         if (tintedIcons.ContainsKey (name)) {
                                                 foreach (Color c in tintedIcons [name]) {
-                                                        Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
+                                                        string tintedName = name + "__" + AllocsUtils.ColorToHex (c);
+                                                        if (!icons.ContainsKey (tintedName)) {
+                                                                Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
 
-                                                        for (int x = 0; x < data.width; x++) {
-                                                                for (int y = 0; y < data.height; y++) {
-                                                                        tintedTex.SetPixel (x, y, tex.GetPixel (x, y) * c);
+                                                                for (int x = 0; x < data.width; x++) {
+                                                                        for (int y = 0; y < data.height; y++) {
+                                                                                tintedTex.SetPixel (x, y, tex.GetPixel (x, y) * c);
+                                                                        }
                                                                 }
+
+                                                                icons.Add (tintedName, tintedTex.EncodeToPNG ());
+
+                                                                UnityEngine.Object.Destroy (tintedTex);
                                                         }
-
-                                                        icons.Add (name + "__" + AllocsUtils.ColorToHex (c), tintedTex.EncodeToPNG ());
-
-                                                        UnityEngine.Object.Destroy (tintedTex);
                                                 }
                                         }

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}</ProjectGuid>
@@ -19 +19 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <NoStdLib>true</NoStdLib>
   </PropertyGroup>
   <ItemGroup>

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/Web/API/GetPlayerInventory.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="AllocsCommands/Commands/TeleportPlayer.cs">
     <Files>
-      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="10" Column="7" />
-      <File FileName="AllocsCommands/ModInfo.xml" Line="7" Column="20" />
-      <File FileName="MapRendering/ModInfo.xml" Line="7" Column="20" />
-      <File FileName="MapRendering/Web/Web.cs" Line="34" Column="29" />
-      <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="36" Column="114" />
-      <File FileName="MapRendering/Web/LogBuffer.cs" Line="110" Column="28" />
-      <File FileName="MapRendering/Web/API/GetLog.cs" Line="19" Column="86" />
-      <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="26" Column="33" />
-      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="39" Column="68" />
-      <File FileName="MapRendering/Web/API/GetLandClaims.cs" Line="1" Column="1" />
-      <File FileName="AllocsCommands/Commands/ShowInventory.cs" Line="85" Column="1" />
-      <File FileName="MapRendering/Web/API/GetPlayerInventory.cs" Line="75" Column="16" />
+      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/LogBuffer.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/API/GetLog.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Commands/WebTokens.cs" Line="67" Column="67" />
+      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
     </Files>
-    <Pads>
-      <Pad Id="ClassPad">
-        <State expanded="True" selected="True" />
-      </Pad>
-    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>