Changeset 256 for binary-improvements


Ignore:
Timestamp:
Feb 7, 2016, 12:47:06 PM (3 years ago)
Author:
alloc
Message:

Mod 6-8-12

Location:
binary-improvements
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • binary-improvements/MapRendering/ModInfo.xml

    r254 r256  
    55                <Description value="Render the game map to image map tiles as it is uncovered" />
    66                <Author value="Christian 'Alloc' Illy" />
    7                 <Version value="11" />
     7                <Version value="12" />
    88                <Website value="http://7dtd.illy.bz" />
    99        </ModInfo>
  • binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs

    r253 r256  
    3939                    JSONObject pJson = new JSONObject ();
    4040                    pJson.Add("steamid", new JSONString (sid));
     41                                        pJson.Add("entityid", new JSONNumber (p.EntityID));
    4142                    pJson.Add("ip", new JSONString (p.IP));
    4243                    pJson.Add("name", new JSONString (p.Name));
  • binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs

    r244 r256  
    2525                                JSONObject p = new JSONObject();
    2626                                p.Add ("steamid", new JSONString (ci.playerId));
     27                                p.Add ("entityid", new JSONNumber (ci.entityId));
    2728                                p.Add ("ip", new JSONString (ci != null ? ci.ip : string.Empty));
    2829                                p.Add ("name", new JSONString (current.Value.EntityName));
  • binary-improvements/server-fixes.userprefs

    r254 r256  
    11<Properties>
    22  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
    3   <MonoDevelop.Ide.Workbench ActiveDocument="AllocsCommands/Commands/TeleportPlayer.cs">
     3  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/ModInfo.xml">
    44    <Files>
    55      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
    66      <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
    7       <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
     7      <File FileName="MapRendering/ModInfo.xml" Line="21" Column="21" />
    88      <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
    99      <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
     
    1212      <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="1" Column="1" />
    1313      <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
    14       <File FileName="MapRendering/Commands/WebTokens.cs" Line="67" Column="67" />
     14      <File FileName="MapRendering/Commands/WebTokens.cs" Line="1" Column="1" />
    1515      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
     16      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="42" Column="42" />
    1617    </Files>
    1718  </MonoDevelop.Ide.Workbench>
  • binary-improvements/webserver/index.html

    r251 r256  
    108108        <div id="playerInventoryDialog" title="Player inventory">
    109109                Player: <span id="invPlayerName"></span><br/>
     110                SteamID: <span id="invSteamId"></span><br/>
    110111                <br/>
    111112                <table>
  • binary-improvements/webserver/js/inventory_dialog.js

    r253 r256  
    3939                }
    4040        }
    41 
     41       
     42//      function linkId(steamid) {
     43//              var value = "https://steamid.io/lookup/"+steamid;
     44//      }
     45       
    4246        $.getJSON( "../api/getplayerinventory", { steamid: steamid  })
    4347        .done(function(data) {
    4448                $("#invPlayerName").text(data.playername);
     49                $("#invSteamId").text(steamid);
    4550               
    4651                for (var y = 0; y < BAG_ROWS; y++) {
  • binary-improvements/webserver/js/leaflet.layer.landclaims.js

    r245 r256  
    4040                                var r = L.rectangle(bounds, {color: color, weight: 1, opacity: 0.8, fillOpacity: 0.15});
    4141                                var m = L.marker(pos, { clickable: false, keyboard: false, zIndexOffset:-1000, iconSize: [0,0], icon: L.divIcon({className: 'invisIcon', iconSize:[0,0]}) });
    42                                 r.bindPopup("Owner: " + name + " ("+steamid+")<br/>Position: " + val.x + " / " + val.y + " / " + val.z);
     42                                r.bindPopup("Owner: " + name + " ("+steamid+")<br/>Position: " + val.x + " " + val.y + " " + val.z);
    4343                                landClaimsRectGroup.addLayer(r);
    4444                                landClaimsClusterGroup.addLayer(m);
Note: See TracChangeset for help on using the changeset viewer.