Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updates submodule (#56)

Browse Source 
* Adds audio to the content repo.

* Content repo updates

* I forgot this AGAIN.
This commit is contained in:
Pieter-Jan Briers
2018-04-12 23:56:43 +02:00
committed by GitHub
parent 4a5a2ceb31
commit 9989d6db75
15 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Content.Client.csproj
View File

@@ -63,8 +63,8 @@
<Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="YamlDotNet, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll</HintPath>
<Reference Include="YamlDotNet, Version=4.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -107,4 +107,4 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
</Project>
</Project>

2
Content.Client/UserInterface/HandsGui.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Client.UserInterface
base.Initialize();
var _resMgr = IoCManager.Resolve<IResourceCache>();
var handsBoxTexture = _resMgr.GetResource<TextureResource>("Textures/UserInterface/handsbox.png");
var handsBoxTexture = _resMgr.GetResource<TextureResource>("/Textures/UserInterface/handsbox.png");
handBox = new StyleBoxTexture()
{
Texture = handsBoxTexture,

4
Content.Client/app.config
View File

@@ -6,6 +6,10 @@
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
Content.Client/packages.config
View File

@@ -2,5 +2,5 @@
<packages>
<package id="OpenTK" version="3.0.0-pre" targetFramework="net451" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net451" />
<package id="YamlDotNet" version="4.3.0" targetFramework="net451" />
</packages>
<package id="YamlDotNet" version="4.3.1" targetFramework="net451" />
</packages>