Skip to content

Commit

Permalink
Bring up to date with FreeSO. Fix TTAT reading.
Browse files Browse the repository at this point in the history
  • Loading branch information
riperiperi committed Sep 19, 2017
1 parent 1dad877 commit 7846055
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Client/Simitone/Simitone.Windows/Simitone.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
<Project>{6d75e618-19ca-4c51-9546-f10965fbc0b8}</Project>
<Name>MonoGame.Framework.WindowsGL</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\FreeSO\Other\libs\mp3sharp\mp3sharp\Mp3Sharp.csproj">
<Project>{834cab58-648d-47cc-ac6f-d01c08c809a4}</Project>
<Name>Mp3Sharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\FreeSO\TSOClient\FSO.IDE\FSO.IDE.csproj">
<Project>{5deb20eb-1eb7-48f9-922c-463abae56e63}</Project>
<Name>FSO.IDE</Name>
Expand Down
2 changes: 1 addition & 1 deletion FreeSO
Submodule FreeSO updated 49 files
+1 −1 Other/libs/FSOMonoGame
+2 −1 TSOClient/FSO.IDE/Common/Debug/UI3DDGRP.cs
+4 −1 TSOClient/FSO.Server/Program.cs
+26 −1 TSOClient/FSO.Server/Servers/Lot/Domain/LotContainer.cs
+2 −0 TSOClient/FSO.UI/Controls/UITextEdit.cs
+2 −2 TSOClient/FreeSO.sln
+1 −0 TSOClient/tso.client/Rendering/City/Terrain.cs
+2 −0 TSOClient/tso.client/TSOGame.cs
+0 −3 TSOClient/tso.client/UI/Controls/UILotButton.cs
+37 −2 TSOClient/tso.client/UI/Panels/UIChatDialog.cs
+8 −0 TSOClient/tso.client/UI/Panels/UIChatPanel.cs
+11 −0 TSOClient/tso.client/UI/Panels/UILoginDialog.cs
+12 −2 TSOClient/tso.client/UI/Screens/LoginScreen.cs
+1 −0 TSOClient/tso.common/FSO.Common.csproj
+1 −0 TSOClient/tso.common/FSOEnvironment.cs
+34 −0 TSOClient/tso.common/utils/FeatureLevelTest.cs
+19 −1 TSOClient/tso.common/utils/GameThread.cs
+3 −2 TSOClient/tso.common/utils/TextureGenerator.cs
+71 −0 TSOClient/tso.common/utils/TextureUtils.cs
+ TSOClient/tso.content/Content/DX/Effects/GrassShader.xnb
+ TSOClient/tso.content/Content/DX/Effects/RCObject.xnb
+ TSOClient/tso.content/Content/DX/Effects/Vitaboy.xnb
+ TSOClient/tso.content/Content/OGL/Effects/GrassShader.xnb
+ TSOClient/tso.content/Content/OGL/Effects/RCObject.xnb
+ TSOClient/tso.content/Content/OGL/Effects/Vitaboy.xnb
+ TSOClient/tso.content/Content/iOS/Effects/2DWorldBatch.xnb
+ TSOClient/tso.content/Content/iOS/Effects/GrassShader.xnb
+ TSOClient/tso.content/Content/iOS/Effects/LightMap2D.xnb
+ TSOClient/tso.content/Content/iOS/Effects/RCObject.xnb
+ TSOClient/tso.content/Content/iOS/Effects/Vitaboy.xnb
+43 −7 TSOClient/tso.content/ContentSrc/Effects/GrassShader.fx
+12 −1 TSOClient/tso.content/ContentSrc/Effects/RCObject.fx
+1 −1 TSOClient/tso.content/ContentSrc/Effects/Vitaboy.fx
+5 −5 TSOClient/tso.content/TS1/TS1NeighbourProvider.cs
+8 −0 TSOClient/tso.content/WorldWallProvider.cs
+13 −0 TSOClient/tso.content/codecs/TextureCodec.cs
+3 −12 TSOClient/tso.files/Formats/IFF/Chunks/TTAT.cs
+3 −2 TSOClient/tso.files/RC/DGRP3DGeometry.cs
+1 −1 TSOClient/tso.files/RC/DGRP3DMesh.cs
+3 −2 TSOClient/tso.files/RC/OBJReader.cs
+16 −2 TSOClient/tso.files/formats/iff/chunks/SPR.cs
+4 −2 TSOClient/tso.files/formats/iff/chunks/SPR2.cs
+2 −2 TSOClient/tso.simantics/engine/VMMemory.cs
+12 −6 TSOClient/tso.simantics/entities/VMGameObject.cs
+1 −1 TSOClient/tso.world/RC/WallComponentRC.cs
+2 −1 TSOClient/tso.world/World.cs
+2 −0 TSOClient/tso.world/components/TerrainComponent.cs
+1 −0 TSOClient/tso.world/utils/SSAADownsample.cs
+2 −1 TSOClient/tso.world/utils/_3DWorldBatch.cs

0 comments on commit 7846055

Please sign in to comment.