Changeset 254 for binary-improvements


Ignore:
Timestamp:
Dec 24, 2015, 1:15:17 PM (9 years ago)
Author:
alloc
Message:

Fixes 6_8_11

Location:
binary-improvements
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r253 r254  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>10.0.0</ProductVersion>
     6    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{81DA7F87-1A66-4920-AADA-6EAF1971F8D0}</ProjectGuid>
    … …  
    1919    <WarningLevel>4</WarningLevel>
    2020    <ConsolePause>false</ConsolePause>
     21    <NoStdLib>true</NoStdLib>
    2122  </PropertyGroup>
    2223  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Version|AnyCPU' ">
    … …  
    3233    </CustomCommands>
    3334    <ConsolePause>false</ConsolePause>
     35    <NoStdLib>true</NoStdLib>
    3436  </PropertyGroup>
    3537  <ItemGroup>

  • binary-improvements/AllocsCommands/AllocsCommands.csproj

    r253 r254  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>10.0.0</ProductVersion>
     6    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{E273D042-57F9-4E2E-8268-5053527E5287}</ProjectGuid>
    … …  
    1919    <WarningLevel>4</WarningLevel>
    2020    <ConsolePause>false</ConsolePause>
     21    <NoStdLib>true</NoStdLib>
    2122  </PropertyGroup>
    2223  <ItemGroup>

  • binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

    r253 r254  
    3333                                        ClientInfo ci1 = null;
    3434                                        EntityPlayer ep1 = null;
    35                                         UnityEngine.Vector3 destPos;
     35                                        UnityEngine.Vector3 destPos = new UnityEngine.Vector3 ();
    3636 
    3737                                        if (_params.Count == 2 || _params.Count == 4) {

  • binary-improvements/MapRendering/ModInfo.xml

    r253 r254  
    55                <Description value="Render the game map to image map tiles as it is uncovered" />
    66                <Author value="Christian 'Alloc' Illy" />
    7                 <Version value="10" />
     7                <Version value="11" />
    88                <Website value="http://7dtd.illy.bz" />
    99        </ModInfo>

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

    r253 r254  
    9494                                        if (tintedIcons.ContainsKey (name)) {
    9595                                                foreach (Color c in tintedIcons [name]) {
    96                                                         Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
     96                                                        string tintedName = name + "__" + AllocsUtils.ColorToHex (c);
     97                                                        if (!icons.ContainsKey (tintedName)) {
     98                                                                Texture2D tintedTex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
    9799
    98                                                         for (int x = 0; x < data.width; x++) {
    99                                                                 for (int y = 0; y < data.height; y++) {
    100                                                                         tintedTex.SetPixel (x, y, tex.GetPixel (x, y) * c);
     100                                                                for (int x = 0; x < data.width; x++) {
     101                                                                        for (int y = 0; y < data.height; y++) {
     102                                                                                tintedTex.SetPixel (x, y, tex.GetPixel (x, y) * c);
     103                                                                        }
    101104                                                                }
     105
     106                                                                icons.Add (tintedName, tintedTex.EncodeToPNG ());
     107
     108                                                                UnityEngine.Object.Destroy (tintedTex);
    102109                                                        }
    103 
    104                                                         icons.Add (name + "__" + AllocsUtils.ColorToHex (c), tintedTex.EncodeToPNG ());
    105 
    106                                                         UnityEngine.Object.Destroy (tintedTex);
    107110                                                }
    108111                                        }

  • binary-improvements/MapRendering/WebAndMapRendering.csproj

    r253 r254  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>10.0.0</ProductVersion>
     6    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}</ProjectGuid>
    … …  
    1919    <WarningLevel>4</WarningLevel>
    2020    <ConsolePause>false</ConsolePause>
     21    <NoStdLib>true</NoStdLib>
    2122  </PropertyGroup>
    2223  <ItemGroup>

  • binary-improvements/server-fixes.userprefs

    r253 r254  
    11<Properties>
    22  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
    3   <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/Web/API/GetPlayerInventory.cs">
     3  <MonoDevelop.Ide.Workbench ActiveDocument="AllocsCommands/Commands/TeleportPlayer.cs">
    44    <Files>
    5       <File FileName="7dtd-server-fixes/ModInfo.xml" Line="10" Column="7" />
    6       <File FileName="AllocsCommands/ModInfo.xml" Line="7" Column="20" />
    7       <File FileName="MapRendering/ModInfo.xml" Line="7" Column="20" />
    8       <File FileName="MapRendering/Web/Web.cs" Line="34" Column="29" />
    9       <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="36" Column="114" />
    10       <File FileName="MapRendering/Web/LogBuffer.cs" Line="110" Column="28" />
    11       <File FileName="MapRendering/Web/API/GetLog.cs" Line="19" Column="86" />
    12       <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="26" Column="33" />
    13       <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="39" Column="68" />
    14       <File FileName="MapRendering/Web/API/GetLandClaims.cs" Line="1" Column="1" />
    15       <File FileName="AllocsCommands/Commands/ShowInventory.cs" Line="85" Column="1" />
    16       <File FileName="MapRendering/Web/API/GetPlayerInventory.cs" Line="75" Column="16" />
     5      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
     6      <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
     7      <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
     8      <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
     9      <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
     10      <File FileName="MapRendering/Web/LogBuffer.cs" Line="1" Column="1" />
     11      <File FileName="MapRendering/Web/API/GetLog.cs" Line="1" Column="1" />
     12      <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="1" Column="1" />
     13      <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
     14      <File FileName="MapRendering/Commands/WebTokens.cs" Line="67" Column="67" />
     15      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
    1716    </Files>
    18     <Pads>
    19       <Pad Id="ClassPad">
    20         <State expanded="True" selected="True" />
    21       </Pad>
    22     </Pads>
    2317  </MonoDevelop.Ide.Workbench>
    2418  <MonoDevelop.Ide.DebuggingService.Breakpoints>
Note: See TracChangeset for help on using the changeset viewer.