From dde6212577555634d202341aca2d0f70a93d96b6 Mon Sep 17 00:00:00 2001 From: Juan Pablo Arce Date: Thu, 22 Apr 2021 13:11:21 -0300 Subject: [PATCH] v0.13.0.11 --- .../ClientSource/GUI/GUIComponent.cs | 6 + .../ClientSource/GUI/RectTransform.cs | 6 + .../ClientSource/GameSession/CrewManager.cs | 3 +- .../ClientSource/Items/Components/Turret.cs | 9 +- .../Content/Effects/grainshader.xnb | Bin 1158 -> 0 bytes .../Content/Effects/grainshader_opengl.xnb | Bin 1096 -> 0 bytes .../Content/Effects/losshader.xnb | Bin 1470 -> 1397 bytes .../Content/Effects/losshader_opengl.xnb | Bin 1398 -> 1307 bytes .../BarotraumaClient/LinuxClient.csproj | 2 +- Barotrauma/BarotraumaClient/MacClient.csproj | 2 +- .../BarotraumaClient/Shaders/Content.mgcb | 6 - .../Shaders/Content_opengl.mgcb | 6 - .../BarotraumaClient/Shaders/grainshader.fx | 28 - .../Shaders/grainshader_opengl.fx | 28 - .../BarotraumaClient/Shaders/losshader.fx | 4 +- .../Shaders/losshader_opengl.fx | 4 +- .../BarotraumaClient/WindowsClient.csproj | 2 +- Barotrauma/BarotraumaClient/app.manifest | 124 +- .../BarotraumaServer/LinuxServer.csproj | 278 +-- Barotrauma/BarotraumaServer/MacServer.csproj | 304 ++-- .../ServerSource/Networking/RespawnManager.cs | 27 +- .../BarotraumaServer/WindowsServer.csproj | 294 ++-- .../GameSession/GameModes/CampaignMode.cs | 2 + .../SharedSource/Map/Map/Location.cs | 45 +- .../SharedSource/Map/Map/Map.cs | 2 +- .../SharedSource/Networking/RespawnManager.cs | 6 +- .../SharedSource/Networking/SteamManager.cs | 16 +- .../SharedSource/SteamAchievementManager.cs | 3 + .../BarotraumaShared/SharedSource/TextPack.cs | 2 + Barotrauma/BarotraumaShared/changelog.txt | 600 ++----- .../Concentus/Concentus.NetStandard.csproj | 35 +- .../Farseer.NetStandard.csproj | 80 +- .../GA_SDK_NETSTANDARD.csproj | 70 +- .../Hyper.ComponentModel.NetStandard.csproj | 32 +- .../Lidgren.NetStandard.csproj | 66 +- Libraries/MonoGame.Framework/Src/.gitignore | 186 +-- .../Graphics/SpriteBatch.cs | 15 +- .../SharpFont/SharpFont.NetStandard.csproj | 90 +- Libraries/XNATypes/XNATypes.csproj | 20 +- .../opus/win32/VS2015/common.props | 162 +- .../opus/win32/VS2015/opus.vcxproj | 796 ++++----- .../opus/win32/VS2015/opus.vcxproj.filters | 1486 ++++++++--------- .../opus/win32/VS2015/opus_demo.vcxproj | 340 ++-- .../win32/VS2015/opus_demo.vcxproj.filters | 42 +- .../opus/win32/VS2015/test_opus_api.vcxproj | 340 ++-- .../VS2015/test_opus_api.vcxproj.filters | 26 +- .../win32/VS2015/test_opus_decode.vcxproj | 340 ++-- .../VS2015/test_opus_decode.vcxproj.filters | 26 +- .../win32/VS2015/test_opus_encode.vcxproj | 342 ++-- .../VS2015/test_opus_encode.vcxproj.filters | 32 +- .../opus/win32/genversion.bat | 74 +- .../webm-mem-playback.vcxproj | 294 ++-- 52 files changed, 3196 insertions(+), 3507 deletions(-) delete mode 100644 Barotrauma/BarotraumaClient/Content/Effects/grainshader.xnb delete mode 100644 Barotrauma/BarotraumaClient/Content/Effects/grainshader_opengl.xnb delete mode 100644 Barotrauma/BarotraumaClient/Shaders/grainshader.fx delete mode 100644 Barotrauma/BarotraumaClient/Shaders/grainshader_opengl.fx diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs index 4a1ddb06e..ecc75885a 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUIComponent.cs @@ -77,6 +77,12 @@ namespace Barotrauma return RectTransform.IsParentOf(component.RectTransform, recursive); } + public bool IsChildOf(GUIComponent component, bool recursive = true) + { + if (component == null) { return false; } + return RectTransform.IsChildOf(component.RectTransform, recursive); + } + public virtual void RemoveChild(GUIComponent child) { if (child == null) { return; } diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/RectTransform.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/RectTransform.cs index 4bb0dbc7a..a00a820a9 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/RectTransform.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/RectTransform.cs @@ -640,6 +640,12 @@ namespace Barotrauma return children.Contains(rectT) || (recursive && children.Any(c => c.IsParentOf(rectT))); } + public bool IsChildOf(RectTransform rectT, bool recursive = true) + { + if (Parent == null) { return false; } + return Parent == rectT || (recursive && Parent.IsChildOf(rectT)); + } + public void ClearChildren() { children.ForEachMod(c => c.Parent = null); diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs index 5401ed350..f2d72b36f 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs @@ -1290,7 +1290,8 @@ namespace Barotrauma WasCommandInterfaceDisabledThisUpdate = false; - if (PlayerInput.KeyDown(InputType.Command) && (GUI.KeyboardDispatcher.Subscriber == null || GUI.KeyboardDispatcher.Subscriber == crewList) && + if (PlayerInput.KeyDown(InputType.Command) && + (GUI.KeyboardDispatcher.Subscriber == null || (GUI.KeyboardDispatcher.Subscriber is GUIComponent component && (component == crewList || component.IsChildOf(crewList)))) && commandFrame == null && !clicklessSelectionActive && CanIssueOrders && !(GameMain.GameSession?.Campaign?.ShowCampaignUI ?? false)) { if (PlayerInput.KeyDown(Keys.LeftShift) || PlayerInput.KeyDown(Keys.RightShift)) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs index e2efa47a6..8991ef88a 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs @@ -540,15 +540,16 @@ namespace Barotrauma.Items.Components if (ShowProjectileIndicator) { Point slotSize = (Inventory.SlotSpriteSmall.size * Inventory.UIScale).ToPoint(); - int spacing = 5; + Point spacing = new Point(GUI.IntScale(5), GUI.IntScale(20)); int slotsPerRow = Math.Min(availableAmmo.Count, 6); - int totalWidth = slotSize.X * slotsPerRow + spacing * (slotsPerRow - 1); - Point invSlotPos = new Point(GameMain.GraphicsWidth / 2 - totalWidth / 2, powerIndicator.Rect.Y - (int)(75 * GUI.Scale)); + int totalWidth = slotSize.X * slotsPerRow + spacing.X * (slotsPerRow - 1); + int rows = (int)Math.Ceiling(availableAmmo.Count / (float)slotsPerRow); + Point invSlotPos = new Point(GameMain.GraphicsWidth / 2 - totalWidth / 2, powerIndicator.Rect.Y - (slotSize.Y + spacing.Y) * rows); for (int i = 0; i < availableAmmo.Count; i++) { // TODO: Optimize? Creates multiple new objects per frame? Inventory.DrawSlot(spriteBatch, null, - new VisualSlot(new Rectangle(invSlotPos + new Point((i % slotsPerRow) * (slotSize.X + spacing), (int)Math.Floor(i / (float)slotsPerRow) * (slotSize.Y + spacing)), slotSize)), + new VisualSlot(new Rectangle(invSlotPos + new Point((i % slotsPerRow) * (slotSize.X + spacing.X), (int)Math.Floor(i / (float)slotsPerRow) * (slotSize.Y + spacing.Y)), slotSize)), availableAmmo[i], -1, true); } if (flashNoAmmo) diff --git a/Barotrauma/BarotraumaClient/Content/Effects/grainshader.xnb b/Barotrauma/BarotraumaClient/Content/Effects/grainshader.xnb deleted file mode 100644 index 432e7191d4e2948ad758ff0aa2eff1c9a411aa65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1158 zcmZ8gOK1~O6uoaIv7uEHbt5ix5W6X1XzRiTiT$LV7;G{zNlO$#rtMTi;|xp^YIi|F zDu^p_AqwL*0V(*~h>APGMOSXRaFeCD=tcw~o;#mfz2wfj@7!~L@4ZwDGwV^h7aTD1&SbBtT&y6vo~8QW@_R#Tl@T{V}RCDT|jourbtEjtU!Ut&^OG@VAx zw$f+SbLyBnHjzpynO42oa?G@4wwjJnPb$UMQoXi($=s;eYo?X9TJ<`yh@Uc1KC4w@ zV&}>2Z-Npe7^YXiXR9-r<2DVCzBuyick%IV`uodI>}4N%r%~t^00*&eL#J&k^$2@b zlKTA>tjrN~CSda}v>6Ws+{;8!L2>u)uhSQRPVU4%Pwm8W9~qZ`r@rdb^XpG%IO4&N zku2jfaB*n+wK4SOZMQRW{{H4>itz~WZm07O)c5FYlJlKHM_AiL@vYDnByXVy;Bs4{ zo*RY1Hc<~s?p1G0(H7L(Voairi@EU=><3P+pau7sm&3>Y^>^U!yTgbPBzZA1>O}Tx zaqb1=?FTsqJPtR6-r(z@zlG=A7soS~)vpnQ?e*Yc%)xAk@3H!G#r%E0PgK4*Tbe+? z6cH7mSJ0F8P=V#&!%~9e-GqPpY>&g{12d6#S4nuho0yZa38JBKycCuLZN*#pBTW(Q zzb8NxCmJ{!aJ3+(7VPr~4}G*vG#KE>zZVl?0=fC#PvCx?uy(Mb%pmuJ@hGezfe-l* zsJG!>?gTO1gU1h6t{Kj$9rkC_PWl`?NRcaN3;dVCAyW)m^fLNq#~2Ip(>2fXKa6vY zI2=p=;e3uV2<64=MZKJ>9nf>si^g7yG z$J}Z_0M(XW}ZwkB_nNS$s`v+>&B`eW<|i&WfY2t3_ndC zzSgR9BLazq$xMVYo6SiSYd?MezlcR6t#=URqj=1bLR)~Y{i)oU8PLJzV^l+(l7pd1-L*k~h`Z38msyl3C<2d>+|IN;3)3@hB^ILco*GkkCr>*6vIB7_w_KYW2#Lj!Y!-$y@5xb+tg F{{i=ALa_h< diff --git a/Barotrauma/BarotraumaClient/Content/Effects/losshader.xnb b/Barotrauma/BarotraumaClient/Content/Effects/losshader.xnb index 7f09d5fe633c65a2edafa7e0eeb973a1442cc946..b17c38ef3a9dbe6c9888f48bff8a4923c48f1162 100644 GIT binary patch delta 260 zcmdnT{gsP7!q2Ikm7#PZdrRyy76t}icee-*#%G`3IWaN_FfcMOFfcJpU}9i!iEwhB z@vmCs7#IbB)BzyNCBn)1 z+V-L&Y1hr|t}Vati($vg?~FhNAUPHwZ2-gqKmijVzXymN^Ybik0L4IB-eh8k|7m8SH?XJSXpEv6=jWDU_Xwfe|RkyxE2M eGNU*P12boZPkymuPC-T@P#H)$5KNX}jRgRw$wS%z diff --git a/Barotrauma/BarotraumaClient/Content/Effects/losshader_opengl.xnb b/Barotrauma/BarotraumaClient/Content/Effects/losshader_opengl.xnb index f8f1b3f6a2d824ac21b767943802583a365ece9a..bd4516465c8e5bbb7095c45e4ee3eaf93e9def3b 100644 GIT binary patch delta 159 zcmeyyHJgh)!p|v%l|gzUdy7^N3j>3%yITYYgOMN0A4Y+K;`q|M%(VQX+~WAM)MOI@ z21W)31||k^rpX4(QWM{BOuXeGY8Y$H%axp;S6re1QlkLWlx#TJoH2Uxc}B6xrx`Da z8R(TO*ed7(C5jC6DipM#N-i-eF&a$%%B0D|$iT?RzzUQvHe}kY#e9R2k$JKtYb*c( CJuHj> delta 241 zcmbQu^^J=?!p|v%m7#1RdyDRK76t}icee-*hIX+JJd6Sb#qp(inQ8e&xyA8ismUe^ z3``6R42%LmDw1jPYbL3Q=L1BIVy$_(lJoP5OBBFrfSQtxCYvxuD=4R=re)@(Du6@` zK_rS{(T0Xj?lD(C`biwyKC6tuyrjr1yjhH^p#LGmCLNTn87+F)`olM!n%}<$bFp9GBarotrauma FakeFish, Undertow Games Barotrauma - 0.1300.0.10 + 0.13.0.11 Copyright © FakeFish 2018-2020 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj index 58f7b70c2..53342a335 100644 --- a/Barotrauma/BarotraumaClient/MacClient.csproj +++ b/Barotrauma/BarotraumaClient/MacClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 0.1300.0.10 + 0.13.0.11 Copyright © FakeFish 2018-2020 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/Shaders/Content.mgcb b/Barotrauma/BarotraumaClient/Shaders/Content.mgcb index 901a2171c..168994193 100644 --- a/Barotrauma/BarotraumaClient/Shaders/Content.mgcb +++ b/Barotrauma/BarotraumaClient/Shaders/Content.mgcb @@ -61,9 +61,3 @@ /processorParam:DebugMode=Auto /build:watershader.fx -#begin grainshader.fx -/importer:EffectImporter -/processor:EffectProcessor -/processorParam:DebugMode=Auto -/build:grainshader.fx - diff --git a/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb b/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb index cb119ed14..e18949d5d 100644 --- a/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb +++ b/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb @@ -61,9 +61,3 @@ /processorParam:DebugMode=Auto /build:watershader_opengl.fx -#begin grainshader_opengl.fx -/importer:EffectImporter -/processor:EffectProcessor -/processorParam:DebugMode=Auto -/build:grainshader_opengl.fx - diff --git a/Barotrauma/BarotraumaClient/Shaders/grainshader.fx b/Barotrauma/BarotraumaClient/Shaders/grainshader.fx deleted file mode 100644 index c5191f3a0..000000000 --- a/Barotrauma/BarotraumaClient/Shaders/grainshader.fx +++ /dev/null @@ -1,28 +0,0 @@ -// vim:ft=hlsl -//float4 baseColor; -float seed; - -float nrand(float2 uv) -{ - return frac(sin(dot(uv, float2(12.9898, 78.233) * seed)) * 43758.5453); -} - -float4 grain(float4 position : SV_POSITION, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0 -{ - float4 baseColor = { 1, 1, 1, 0.25 }; - float4 color = baseColor * nrand(texCoord); - float2 center = { 0.5, 0.5 }; - float2 diff = texCoord - center; - float alpha = diff.x * diff.x + diff.y * diff.y; - color.a = alpha; - return clr * color; -} - - -technique Grain -{ - pass Pass1 - { - PixelShader = compile ps_4_0_level_9_1 grain(); - } -} diff --git a/Barotrauma/BarotraumaClient/Shaders/grainshader_opengl.fx b/Barotrauma/BarotraumaClient/Shaders/grainshader_opengl.fx deleted file mode 100644 index bb9a45311..000000000 --- a/Barotrauma/BarotraumaClient/Shaders/grainshader_opengl.fx +++ /dev/null @@ -1,28 +0,0 @@ -// vim:ft=hlsl -//float4 baseColor; -float seed; - -float nrand(float2 uv) -{ - return frac(sin(dot(uv, float2(12.9898, 78.233) * seed)) * 43758.5453); -} - -float4 grain(float4 position : SV_POSITION, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0 -{ - float4 baseColor = { 1, 1, 1, 0.25 }; - float4 color = baseColor * nrand(texCoord); - float2 center = { 0.5, 0.5 }; - float2 diff = texCoord - center; - float alpha = diff.x * diff.x + diff.y * diff.y; - color.a = alpha; - return clr * color; -} - - -technique Grain -{ - pass Pass1 - { - PixelShader = compile ps_3_0 grain(); - } -} diff --git a/Barotrauma/BarotraumaClient/Shaders/losshader.fx b/Barotrauma/BarotraumaClient/Shaders/losshader.fx index f761aa1bc..d40f91c49 100644 --- a/Barotrauma/BarotraumaClient/Shaders/losshader.fx +++ b/Barotrauma/BarotraumaClient/Shaders/losshader.fx @@ -26,8 +26,6 @@ sampler TextureSampler : register (s0) = sampler_state { Texture = ; } Texture2D xLosTexture; sampler LosSampler = sampler_state { Texture = ; }; -float xLosAlpha; - float4 xColor; float4 mainPS(VertexShaderOutput input) : COLOR0 @@ -41,7 +39,7 @@ float4 mainPS(VertexShaderOutput input) : COLOR0 sampleColor.r * xColor.r, sampleColor.g * xColor.g, sampleColor.b * xColor.b, - obscureAmount * xLosAlpha); + obscureAmount); return outColor; } diff --git a/Barotrauma/BarotraumaClient/Shaders/losshader_opengl.fx b/Barotrauma/BarotraumaClient/Shaders/losshader_opengl.fx index a799c320a..23a48e4d2 100644 --- a/Barotrauma/BarotraumaClient/Shaders/losshader_opengl.fx +++ b/Barotrauma/BarotraumaClient/Shaders/losshader_opengl.fx @@ -26,8 +26,6 @@ sampler TextureSampler : register (s0) = sampler_state { Texture = ; } Texture xLosTexture; sampler LosSampler = sampler_state { Texture = ; }; -float xLosAlpha; - float4 xColor; float4 mainPS(VertexShaderOutput input) : COLOR0 @@ -41,7 +39,7 @@ float4 mainPS(VertexShaderOutput input) : COLOR0 sampleColor.r * xColor.r, sampleColor.g * xColor.g, sampleColor.b * xColor.b, - obscureAmount * xLosAlpha); + obscureAmount); return outColor; } diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj index 92fb3a9d1..619c4ffc8 100644 --- a/Barotrauma/BarotraumaClient/WindowsClient.csproj +++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 0.1300.0.10 + 0.13.0.11 Copyright © FakeFish 2018-2020 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/app.manifest b/Barotrauma/BarotraumaClient/app.manifest index 54b3a73be..ff31a5f7c 100644 --- a/Barotrauma/BarotraumaClient/app.manifest +++ b/Barotrauma/BarotraumaClient/app.manifest @@ -1,62 +1,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true/pm - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true/pm + + + + + + + diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj index 83db60119..50c12c344 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -1,139 +1,139 @@ - - - - Exe - netcoreapp3.1 - Barotrauma - FakeFish, Undertow Games - Barotrauma Dedicated Server - 0.1300.0.10 - Copyright © FakeFish 2018-2020 - AnyCPU;x64 - DedicatedServer - ..\BarotraumaShared\Icon.ico - Debug;Release;Unstable - - - - DEBUG;TRACE;SERVER;LINUX;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - TRACE;DEBUG;SERVER;LINUX;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - TRACE;SERVER;LINUX;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - TRACE;SERVER;LINUX;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - TRACE;SERVER;LINUX;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - TRACE;SERVER;LINUX;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Linux\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntermediateOutputPath)gitver - $(IntermediateOutputPath)gitbranch - - - - - - - - - - - - - - - - - - @(GitVersion) - - - - - - - - - @(GitBranch) - - - - - - - $(IntermediateOutputPath)CustomAssemblyInfo.cs - - - - - - - - - <_Parameter1>GitRevision - <_Parameter2>$(BuildHash) - - - <_Parameter1>GitBranch - <_Parameter2>$(BuildBranch) - - - <_Parameter1>ProjectDir - <_Parameter2>$(ProjectDir) - - - - - - - + + + + Exe + netcoreapp3.1 + Barotrauma + FakeFish, Undertow Games + Barotrauma Dedicated Server + 0.13.0.11 + Copyright © FakeFish 2018-2020 + AnyCPU;x64 + DedicatedServer + ..\BarotraumaShared\Icon.ico + Debug;Release;Unstable + + + + DEBUG;TRACE;SERVER;LINUX;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + TRACE;DEBUG;SERVER;LINUX;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + TRACE;SERVER;LINUX;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + TRACE;SERVER;LINUX;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + TRACE;SERVER;LINUX;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + TRACE;SERVER;LINUX;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Linux\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntermediateOutputPath)gitver + $(IntermediateOutputPath)gitbranch + + + + + + + + + + + + + + + + + + @(GitVersion) + + + + + + + + + @(GitBranch) + + + + + + + $(IntermediateOutputPath)CustomAssemblyInfo.cs + + + + + + + + + <_Parameter1>GitRevision + <_Parameter2>$(BuildHash) + + + <_Parameter1>GitBranch + <_Parameter2>$(BuildBranch) + + + <_Parameter1>ProjectDir + <_Parameter2>$(ProjectDir) + + + + + + + diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index d3ce6feed..b02374966 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -1,152 +1,152 @@ - - - - Exe - netcoreapp3.1 - Barotrauma - FakeFish, Undertow Games - Barotrauma Dedicated Server - 0.1300.0.10 - Copyright © FakeFish 2018-2020 - AnyCPU;x64 - DedicatedServer - ..\BarotraumaShared\Icon.ico - 0.9.0.0 - Debug;Release;Unstable - - - - TRACE;SERVER;OSX;USE_STEAM;DEBUG;NETCOREAPP;NETCOREAPP3_0 - x64 - ..\bin\DebugMac - true - - - - - TRACE;DEBUG;SERVER;OSX;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Mac\ - - - - TRACE;SERVER;OSX;USE_STEAM;RELEASE;NETCOREAPP;NETCOREAPP3_0 - x64 - - ..\bin\ReleaseMac - - - - TRACE;SERVER;OSX;USE_STEAM;RELEASE;NETCOREAPP;NETCOREAPP3_0;UNSTABLE - x64 - - ..\bin\ReleaseMac - - - - TRACE;SERVER;OSX;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Mac\ - - - - TRACE;SERVER;OSX;X64;USE_STEAM;UNSTABLE - x64 - ..\bin\$(Configuration)Mac\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - libsteam_api64.dylib - PreserveNewest - - - - - - $(IntermediateOutputPath)gitver - $(IntermediateOutputPath)gitbranch - - - - - - - - - - - - - - - - - - @(GitVersion) - - - - - - - - - @(GitBranch) - - - - - - - $(IntermediateOutputPath)CustomAssemblyInfo.cs - - - - - - - - - <_Parameter1>GitRevision - <_Parameter2>$(BuildHash) - - - <_Parameter1>GitBranch - <_Parameter2>$(BuildBranch) - - - <_Parameter1>ProjectDir - <_Parameter2>$(ProjectDir) - - - - - - - + + + + Exe + netcoreapp3.1 + Barotrauma + FakeFish, Undertow Games + Barotrauma Dedicated Server + 0.13.0.11 + Copyright © FakeFish 2018-2020 + AnyCPU;x64 + DedicatedServer + ..\BarotraumaShared\Icon.ico + 0.9.0.0 + Debug;Release;Unstable + + + + TRACE;SERVER;OSX;USE_STEAM;DEBUG;NETCOREAPP;NETCOREAPP3_0 + x64 + ..\bin\DebugMac + true + + + + + TRACE;DEBUG;SERVER;OSX;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Mac\ + + + + TRACE;SERVER;OSX;USE_STEAM;RELEASE;NETCOREAPP;NETCOREAPP3_0 + x64 + + ..\bin\ReleaseMac + + + + TRACE;SERVER;OSX;USE_STEAM;RELEASE;NETCOREAPP;NETCOREAPP3_0;UNSTABLE + x64 + + ..\bin\ReleaseMac + + + + TRACE;SERVER;OSX;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Mac\ + + + + TRACE;SERVER;OSX;X64;USE_STEAM;UNSTABLE + x64 + ..\bin\$(Configuration)Mac\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + libsteam_api64.dylib + PreserveNewest + + + + + + $(IntermediateOutputPath)gitver + $(IntermediateOutputPath)gitbranch + + + + + + + + + + + + + + + + + + @(GitVersion) + + + + + + + + + @(GitBranch) + + + + + + + $(IntermediateOutputPath)CustomAssemblyInfo.cs + + + + + + + + + <_Parameter1>GitRevision + <_Parameter2>$(BuildHash) + + + <_Parameter1>GitBranch + <_Parameter2>$(BuildBranch) + + + <_Parameter1>ProjectDir + <_Parameter2>$(ProjectDir) + + + + + + + diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs index 4db85237b..3c7e188a7 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs @@ -141,10 +141,10 @@ namespace Barotrauma.Networking GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.Spawning); - RespawnCharacters(); + Vector2 spawnPos = FindSpawnPos(); + RespawnCharacters(spawnPos); CoroutineManager.StopCoroutines("forcepos"); - Vector2 spawnPos = FindSpawnPos(); if (spawnPos.Y > Level.Loaded.Size.Y) { CoroutineManager.StartCoroutine(ForceShuttleToPos(Level.Loaded.StartPosition - Vector2.UnitY * Level.ShaftHeight, 100.0f), "forcepos"); @@ -163,7 +163,7 @@ namespace Barotrauma.Networking GameServer.Log("Respawning everyone in main sub.", ServerLog.MessageType.Spawning); GameMain.Server.CreateEntityEvent(this); - RespawnCharacters(); + RespawnCharacters(null); } } @@ -244,7 +244,7 @@ namespace Barotrauma.Networking } } - partial void RespawnCharactersProjSpecific() + partial void RespawnCharactersProjSpecific(Vector2? shuttlePos) { var respawnSub = RespawnShuttle ?? Submarine.MainSub; @@ -293,10 +293,21 @@ namespace Barotrauma.Networking //(in order to give them appropriate ID card tags) var mainSubSpawnPoints = WayPoint.SelectCrewSpawnPoints(characterInfos, Submarine.MainSub); - ItemPrefab divingSuitPrefab = MapEntityPrefab.Find(null, "divingsuit") as ItemPrefab; - ItemPrefab oxyPrefab = MapEntityPrefab.Find(null, "oxygentank") as ItemPrefab; - ItemPrefab scooterPrefab = MapEntityPrefab.Find(null, "underwaterscooter") as ItemPrefab; - ItemPrefab batteryPrefab = MapEntityPrefab.Find(null, "batterycell") as ItemPrefab; + ItemPrefab divingSuitPrefab = null; + if ((shuttlePos != null && Level.Loaded.GetRealWorldDepth(shuttlePos.Value.Y) > Level.DefaultRealWorldCrushDepth) || + Level.Loaded.GetRealWorldDepth(Submarine.MainSub.WorldPosition.Y) > Level.DefaultRealWorldCrushDepth) + { + divingSuitPrefab = ItemPrefab.Prefabs.FirstOrDefault(it => it.Tags.Any(t => t.Equals("respawnsuitdeep", StringComparison.OrdinalIgnoreCase))); + } + if (divingSuitPrefab == null) + { + divingSuitPrefab = + ItemPrefab.Prefabs.FirstOrDefault(it => it.Tags.Any(t => t.Equals("respawnsuit", StringComparison.OrdinalIgnoreCase))) ?? + ItemPrefab.Find(null, "divingsuit"); + } + ItemPrefab oxyPrefab = ItemPrefab.Find(null, "oxygentank"); + ItemPrefab scooterPrefab = ItemPrefab.Find(null, "underwaterscooter"); + ItemPrefab batteryPrefab = ItemPrefab.Find(null, "batterycell"); var cargoSp = WayPoint.WayPointList.Find(wp => wp.Submarine == respawnSub && wp.SpawnType == SpawnType.Cargo); diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index 660058e51..b3f2ff36d 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -1,147 +1,147 @@ - - - - Exe - netcoreapp3.1 - Barotrauma - FakeFish, Undertow Games - Barotrauma Dedicated Server - 0.1300.0.10 - Copyright © FakeFish 2018-2020 - AnyCPU;x64 - DedicatedServer - ..\BarotraumaShared\Icon.ico - Debug;Release;Unstable - - - - DEBUG;TRACE;SERVER;WINDOWS;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - - - - TRACE;DEBUG;SERVER;WINDOWS;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - full - true - - - - TRACE;SERVER;WINDOWS;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - - - - TRACE;SERVER;WINDOWS;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - - - - TRACE;SERVER;WINDOWS;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - full - true - - - - TRACE;SERVER;WINDOWS;X64;USE_STEAM - x64 - ..\bin\$(Configuration)Windows\ - full - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntermediateOutputPath)gitver - $(IntermediateOutputPath)gitbranch - - - - - - - - - - - - - - - - - - @(GitVersion) - - - - - - - - - @(GitBranch) - - - - - - - $(IntermediateOutputPath)CustomAssemblyInfo.cs - - - - - - - - - <_Parameter1>GitRevision - <_Parameter2>$(BuildHash) - - - <_Parameter1>GitBranch - <_Parameter2>$(BuildBranch) - - - <_Parameter1>ProjectDir - <_Parameter2>$(ProjectDir) - - - - - - - + + + + Exe + netcoreapp3.1 + Barotrauma + FakeFish, Undertow Games + Barotrauma Dedicated Server + 0.13.0.11 + Copyright © FakeFish 2018-2020 + AnyCPU;x64 + DedicatedServer + ..\BarotraumaShared\Icon.ico + Debug;Release;Unstable + + + + DEBUG;TRACE;SERVER;WINDOWS;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + + + + TRACE;DEBUG;SERVER;WINDOWS;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + full + true + + + + TRACE;SERVER;WINDOWS;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + + + + TRACE;SERVER;WINDOWS;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + + + + TRACE;SERVER;WINDOWS;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + full + true + + + + TRACE;SERVER;WINDOWS;X64;USE_STEAM + x64 + ..\bin\$(Configuration)Windows\ + full + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntermediateOutputPath)gitver + $(IntermediateOutputPath)gitbranch + + + + + + + + + + + + + + + + + + @(GitVersion) + + + + + + + + + @(GitBranch) + + + + + + + $(IntermediateOutputPath)CustomAssemblyInfo.cs + + + + + + + + + <_Parameter1>GitRevision + <_Parameter2>$(BuildHash) + + + <_Parameter1>GitBranch + <_Parameter2>$(BuildBranch) + + + <_Parameter1>ProjectDir + <_Parameter2>$(ProjectDir) + + + + + + + diff --git a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs index a7659ef7a..c5a02bcde 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs @@ -490,6 +490,7 @@ namespace Barotrauma if (Level.Loaded.StartOutpost.DockedTo.Any()) { var dockedSub = Level.Loaded.StartOutpost.DockedTo.FirstOrDefault(); + if (dockedSub == GameMain.NetworkMember?.RespawnManager?.RespawnShuttle) { return null; } return dockedSub.DockedTo.Contains(Submarine.MainSub) ? Submarine.MainSub : dockedSub; } @@ -517,6 +518,7 @@ namespace Barotrauma if (Level.Loaded.EndOutpost.DockedTo.Any()) { var dockedSub = Level.Loaded.EndOutpost.DockedTo.FirstOrDefault(); + if (dockedSub == GameMain.NetworkMember?.RespawnManager?.RespawnShuttle) { return null; } return dockedSub.DockedTo.Contains(Submarine.MainSub) ? Submarine.MainSub : dockedSub; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs index 7b13309c4..f5d8712f3 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs @@ -62,6 +62,8 @@ namespace Barotrauma private string baseName; private int nameFormatIndex; + private LocationType addInitialMissionsForType; + public bool Discovered; public readonly Dictionary ProximityTimer = new Dictionary(); @@ -266,6 +268,7 @@ namespace Barotrauma if (locationType.Equals("lair", StringComparison.OrdinalIgnoreCase)) { Type ??= LocationType.List.Find(lt => lt.Identifier.Equals("Abandoned", StringComparison.OrdinalIgnoreCase)); + addInitialMissionsForType = Type; } if (Type == null) { @@ -554,23 +557,37 @@ namespace Barotrauma public void InstantiateLoadedMissions(Map map) { availableMissions.Clear(); - if (loadedMissions == null || loadedMissions.None()) { return; } - foreach (LoadedMission loadedMission in loadedMissions) - { - Location destination; - if (loadedMission.DestinationIndex >= 0 && loadedMission.DestinationIndex < map.Locations.Count) + if (loadedMissions != null && loadedMissions.Any()) + { + foreach (LoadedMission loadedMission in loadedMissions) { - destination = map.Locations[loadedMission.DestinationIndex]; + Location destination; + if (loadedMission.DestinationIndex >= 0 && loadedMission.DestinationIndex < map.Locations.Count) + { + destination = map.Locations[loadedMission.DestinationIndex]; + } + else + { + destination = Connections.First().OtherLocation(this); + } + var mission = loadedMission.MissionPrefab.Instantiate(new Location[] { this, destination }); + availableMissions.Add(mission); + if (loadedMission.SelectedMission) { SelectedMission = mission; } } - else - { - destination = Connections.First().OtherLocation(this); - } - var mission = loadedMission.MissionPrefab.Instantiate(new Location[] { this, destination }); - availableMissions.Add(mission); - if (loadedMission.SelectedMission) { SelectedMission = mission; } + loadedMissions = null; + } + if (addInitialMissionsForType != null) + { + if (addInitialMissionsForType.MissionIdentifiers.Any()) + { + UnlockMissionByIdentifier(addInitialMissionsForType.MissionIdentifiers.GetRandom()); + } + if (addInitialMissionsForType.MissionTags.Any()) + { + UnlockMissionByTag(addInitialMissionsForType.MissionTags.GetRandom()); + } + addInitialMissionsForType = null; } - loadedMissions = null; } /// diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs index 8b68c952a..f82d99b94 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs @@ -522,7 +522,7 @@ namespace Barotrauma { allowedBiomes.Clear(); allowedBiomes.AddRange(biomes.Where(b => b.AllowedZones.Contains(generationParams.DifficultyZones - i))); - float zoneX = Width - zoneWidth * i; + float zoneX = zoneWidth * (generationParams.DifficultyZones - i); foreach (Location location in Locations) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs index b122b4469..c5be46c81 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs @@ -303,10 +303,10 @@ namespace Barotrauma.Networking RespawnShuttle.Velocity = Vector2.Zero; } - partial void RespawnCharactersProjSpecific(); - public void RespawnCharacters() + partial void RespawnCharactersProjSpecific(Vector2? shuttlePos); + public void RespawnCharacters(Vector2? shuttlePos) { - RespawnCharactersProjSpecific(); + RespawnCharactersProjSpecific(shuttlePos); } public Vector2 FindSpawnPos() diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/SteamManager.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/SteamManager.cs index 5da1564b8..5e236219e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/SteamManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/SteamManager.cs @@ -139,7 +139,21 @@ namespace Barotrauma.Steam } return success; } - + + public static bool StoreStats() + { + if (!isInitialized || !Steamworks.SteamClient.IsValid) { return false; } + DebugConsole.Log("Storing Steam stats..."); + bool success = Steamworks.SteamUserStats.StoreStats(); + if (!success) + { +#if DEBUG + DebugConsole.NewMessage("Failed to store Steam stats."); +#endif + } + return success; + } + public static void Update(float deltaTime) { if (!isInitialized) { return; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/SteamAchievementManager.cs b/Barotrauma/BarotraumaShared/SharedSource/SteamAchievementManager.cs index 793e253c9..c0c645e9b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/SteamAchievementManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/SteamAchievementManager.cs @@ -331,6 +331,9 @@ namespace Barotrauma } } + //make sure changed stats (kill count, kms traveled) get stored + SteamManager.StoreStats(); + if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; } foreach (Mission mission in gameSession.Missions) diff --git a/Barotrauma/BarotraumaShared/SharedSource/TextPack.cs b/Barotrauma/BarotraumaShared/SharedSource/TextPack.cs index 06526e2ab..395e5ffa4 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/TextPack.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/TextPack.cs @@ -87,6 +87,8 @@ namespace Barotrauma public List GetAll(string textTag) { + if (textTag is null) { return null; } + if (!texts.TryGetValue(textTag.ToLowerInvariant(), out List textList) || !textList.Any()) { return null; diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt index d84457951..c6d0ec1f7 100644 --- a/Barotrauma/BarotraumaShared/changelog.txt +++ b/Barotrauma/BarotraumaShared/changelog.txt @@ -1,436 +1,5 @@ --------------------------------------------------------------------------------------------------------- -v0.1300.0.10 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Only allow dropping a diving suit when trying to swap it with another suit, not when trying to swap it with for example body armor (#5519). -- Don't show the "respawn with penalty" tickbox when spawning as a returning player. -- Made abandoned outposts a bit more common. -- Once the respawn countdown starts, it doesn't stop even if some players change their mind and decide to wait for the next round as long as there's at least one player waiting to respawn. - -Fixes: -- Fixed logbooks being empty in the wreck salvage missions. -- Addressed the lag spikes occasionally caused by Spineling's spikes when they hit/get stuck to something. -- Fixed bots throw full oxygen tanks away when they are not in the main sub (e.g. in wrecks), resulting in suffocation because they can't use the oxygen (#5525). -- Fixed bots waiting for the oxygen tanks to be entirely drained before swapping new tanks in (#5524). -- Fixed water particle effects not showing up when water flows between certain rooms in Remora. -- Fixed misaligned trigger area on Remora's smaller engine (#5514). -- Fixed players who spawn as their previous character mid-round always getting the Reaper's Tax affliction in mp campaign (#5517). -- Fixed resizeable outpost hallway modules not having waypoints and thus causing navigation issues. -- Fixed bots abandoning the combat objectives when the target is farther than 2000px away. The behavior was only intended for non-friendly npcs, like bandits or outpost security. -- Fixed items that are being held in both hands (e.g. underwater scooter) getting duffelbagged between campaign rounds (#5511). -- Fixed clients failing to select the correct connection if you teleport from an empty location to another with console commands (#5510). -- Revert the previous fix to prevent the bots to take items contained inside fabricators/deconstructors (#5431) and use "donttakeitems" tag to fix it. -- Fixed bots saying "Can't reach target [name]". -- Fixed inventory tooltip not changing when the cursor is hovered on the slot and the condition of the item changes (#5508). -- Fixed waypoints not being able to find hulls that have been added since the sub was last saved in the sub editor, causing them to appear blue (#5194). -- Fixed abyss islands not showing up on sonar in mirrored levels. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.9 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Re-enabling in-game hints now resets hints previously set not be shown again. -- Reduced the stun duration of Molochs' and Hammerheads' attacks. Also add some bitewounds damage on the Molochs' attacks so that they trigger all the AI reactions and don't get treated as failed attacks. - -Fixes: -- Fixed occasional "mission mismatch" errors when entering a hunting grounds level in the multiplayer campaign. -- Fixed camera shaking/vibrating when moving at high speed. -- Fixed monsters being able to attack through ruin walls. -- Fixed overlapping vending machine & light switch in CrewModule_02. -- Fixed respawn shuttle maintaining an incorrect position after getting dispatched. -- Fixed selected mission carrying over to whichever level you choose in the campaign. -- Fixed diving suit's vision obstructing effect disappearing if you also wear a diving mask. -- Removed unnecessary extra light components from large and normal engine. -- Fixed "attempted to select a locked connection" error when a player joins mid-round after the path to the next biome has been unlocked. -- Fixed campaign map crush depth warnings being always calculated for the currently docked submarine, not taking a possible pending submarine switch into account. -- Fixed Hammerhead Spawns not targeting decoys. -- Fixed the abyss monsters not targeting "provocative" items, like flares, glowsticks, scooters etc. -- Fixed Hammerhead Matriarch constantly fleeing from divers. It's intentional that that the matriarch avoids the divers, but not as much. Now they should flee briefly only when shot by the player, making it possible for the divers to reach it (#5449). -- Fixed distant sonar waves not being visible in multiplayer. -- Fixed distant sonar waves being visible from too far away. -- Fixed the boss health bar vanishing too quickly in the multiplayer game mode. -- Fixed bots sometimes getting stuck while trying to find a safer room, if they fail to find any oxygen tanks. They should run to a safety instead. -- Fixed monsters moving weirdly in multiplayer game (only unstable). - -Modding: -- Fixed custom loading screen tips not showing up if the vanilla content package is enabled. -- Fixed crashing when loading a save where a stack contains more items than the maximum stack size for the item/container. - -Bots: -- Fixed bots reporting unnecessarily when they abort a cleaning up task (#5400). Also fixes (much more rare) unnecessary reporting with the other orders. -- Fixed some inconsistencies in the automatic crew selection logic used for assigning orders without specifying the target. -- Fixed bots putting multiple fuel rods in the reactor if there's more than one rod in the reactor (#5213). Fixed bots swapping out full fuel rods from the reactor (#5503). Both issues closely related. -- Fixed job specific autonomous objectives being broken in the sub test mode. -- Fixed bots taking items from fabricators and deconstructors (#5431). - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.8 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Increased the delay with which the boss health bar is faded from 10 to 60 seconds. -- Modding: Allow to define afflictions (types or identifiers) to trigger the OnDamaged status effects only from certain afflictions and not all that do the damage. If the afflictions property is not defined, no restrictions are used (works as it used to). -- Added MaxValueLength property to memory component. - -Fixes: -- Fixed networking errors when the server tries to send an update for a Holdable component that's not attachable, leading to various issues (disconnects, "failed to read ..." errors). -- Fixed "enter location" button not appearing in some levels where there's no outpost at the destination and a beacon station near the exit. -- Fixed event to heal Reaper's Tax not triggering in outposts. -- Fixed server starting the respawn countdown when a disconnected client whose character is still alive rejoins. -- Removed outdated steamclient.so file from the dedicated server (no longer needed because it's automatically installed by Steamworks). Should fix inability to host dedicated servers on Linux. -- Fixed job preferences not having an effect on who gets assigned as the captain. -- Fixed items taken from abandoned outposts reappearing when you leave and re-enter the outpost. -- Fixed crashing/disconnects when preloading content at the start of a round if random events contain character variants. In practice, mods that used character variants in random events occasionally prevented rounds from starting. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.7 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Bandit outfits aren't sold at outposts. -- Charybdis: Increased the attack cooldown from 3 to 4. Tweaked the texture. Adjusted the ragdoll and the animations. More tentacles. -- Molochs: Boosted the structural damage slightly. Increased the attack and damage ranges slightly to help the attacks to hit the target. -- Added black moloch mission variants. -- Icons for previous orders can now be removed from crew list by right-clicking on them. -- Diving suits have an effect on underwater scooter speed (slower movement when wearing an abyss suit, faster when wearing a combat suit). -- Abyss/combat diving suits aren't sold in outpost for the first quarter of the campaign. -- Nerfed nuclear shell's EMP effect. - -Fixes: -- Fixed entity IDs getting messed up when purchasing items in the MP campaign, which lead to disconnects with an "entity not found" error message. Happened because the server created the purchased items before loading the respawn shuttle, while the clients did it the other way around. -- Fixed clients not getting the prompt to download a custom sub they don't have unless they have permissions to edit server settings. -- Fixed edge of the chatbox stealing cursor focus when the chatbox is hidden (preventing firing turrets when the cursor is in the bottom-left corner of the screen). -- Fixed inconsistency in the way vertical velocity in/out signals are handled by the nav terminals. Previously "velocity_in" would interpret positive y as upwards, even though "velocity_y_out" outputs a negative value when going up. Now positive is always down (= corresponds with the "descent velocity" value displayed on the terminal). -- Fixed non-repeatable outpost events starting to repeat once all of them have been triggered. -- Fixed gate outpost still sometimes generating before the last level/biome. -- Reduced the amount of clown gear in the "Praise the Honkmother" mission to fit everything in the crate. -- Fixed boss health bars not appearing in multiplayer when damaging a boss monster with a turret. -- Fixed clients not getting notified when a path between biomes is unlocked, preventing them from proceeding without saving and reloading the campaign. -- Fixed crashing on startup with the error message "unable to load shared library 'freetype6' or one of its dependencies" on some Linux systems. -- Fixed monsters trying to follow the last target while in the idle state even when the target is outside of the allowed area (only unstable). -- Fixed multiple issues regarding bots targeting the reactor. -- Fixed OnDamaged status effect triggering from burns, poisons etc. Only afflictions of type "damage" can now trigger it. Fixes Moloch spawning a lot of particles after being hit with a nuclear shell (#5412). -- Fixed black moloch doing only 62.5% of the structure damage compared to the regular moloch. -- Fixes to R-29: fixed top docking port's control circuit, adjustments to pre-placed supplies, adjusted discharge coil power consumption, minor visual fixes. -- Fixed wall damage particles sometimes spawning at an incorrect position. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.6 (unstable) ---------------------------------------------------------------------------------------------------------- - -Fixes: -- Fixed bots trying to clean up items that have changed place and shouldn't be allowed to clean up anymore. Fixes #5400 -- Fixed "attempted to set SoundRange to NaN" error when a reactor's maximum power output is 0. -- Fixed nullref exception when forcing an item position correction upon interaction failure. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.5 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Moloch: adjust the sounds a bit. -- Added and adjusted sounds for Endworm and Charybdis. -- Increased the audio ranges for Watcher and Hammerhead Matriarch. -- More polished versions of the textures for Endworm and Charybdis. -- Visual tweaks to the boss health bars. -- Hide the boss health bar when the creature is not targeting the player. -- Allow a monster to attack the player even when it's in the restricted area (abyss for non-abyss creatures or non-abyss for abyss creatures) if the player has lately made some damage to the monster. -- Reduced knockback cooldown for submarine impacts (previously there was a 30 second cooldown before an impact could throw characters around again, now it's reduced to 5 seconds). -- Show an indicator when the campaign is saved. - -Fixes: -- Fixed frequent "unknown object header, previous header: CHAT_MESSAGE" networking errors. -- Fixed crash when a location changes it's type in the single player campaign. -- Fixes/improvements to item position syncing. When trying to pick up an item whose position has gotten desynced, the server should correct the item's position immediately. -- Fixed respawns not working in outpost levels. -- Fixed missing sonar icon for minerals for the sonar monitor. -- Fixed overlap for "Follow Submarine" tickbox and end round button in campaign mode. -- Fixed hints staying visible when the HUD is disabled. -- Fixed boss health bar showing up briefly when you damage a dead boss monster. -- Fixed crashing when a turret that spawns it's own projectiles (e.g. alien turret) is fired. -- Fixed crashing when you exit a multiplayer campaign round during the text that pops up at the beginning of a new campaign. -- Fixed monsters sometimes spawning very close (or even inside) the respawn shuttle. -- Fixed linked sub's file path not being saved in the sub editor. -- Fixed ruins sometimes getting placed too close to the start/end outpost. -- Fixed characters not getting crushed by pressure in sub test mode. -- Fixed crashing when accessing server settings of a server you've lost connection to. - -Modding: -- Fixed inability to load more than 5 wires per connection even if the connection is set to allow more. -- Added "MaxRadiation" parameter to radiation params. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.4 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Adjustments on Moloch. Improve the feedback. -- Certain large monsters' (endworm, charybdis, boss variants of molochs and hammerheads) health bars become visible at the top of the screen when you damage them. -- Readjusted abyss and combat diving suits. They are now essentially better versions of the normal diving suit (as opposed to just alternatives with their own pros and cons), making normal suits obsolete later in the campaign. Both suits now have a high resistance to pressure, although an abyss suit may still be required at the very end of the campaign. -- Replaced legacy small pumps with the new ones in Orca. -- Adjusted stun gun's effect. It basically works like incremental stun, but inversed: the strength increases rapidly to the max, after which we remove progressive stun and add full incremental stun that will wear off with time. -- Restrict the length of the text that can be entered as a sonar beacon's sonar label. -- The probability of disconnected wires in beacon stations is relative to the level's difficulty, and no wires are removed if the difficulty is less than 20. -- Added a hint for encountering ballast flora. -- Added submarine preview to campaign outpost submarine selection. -- Allow fabricating fresh fuel rods, welding fuel and coilgun ammunition using depleted ones. -- Abyss monsters only emit distant sonar "waves" while chasing the player, not always. - -Fixes: -- Fixed players being able to take the respawn shuttle with them from the levels in the multiplayer campaign, which would lead to "entity not found" errors during the next round. -- Fixed respawn shuttle always having the default crush depth of 3500 meters, making it unusable at later stages of the campaign. -- Fixed creaking hull sounds triggering when 500 meters above a non-upgraded sub's crush depth, even if the current sub can withstand more. -- Fixed Kastrull's drone airlock not flooding correctly. -- Don't restrict signal components' output length when the sub is being loaded. Fixes all outputs being restricted to 200 characters in subs from previous versions and output getting cut off when saving and loading the sub. -- Fixed crashing if you try to press the server log button in the lobby when connection to the server has been lost. -- Fixed item disappearing from the character's hand when you combine it with an item in a container in a way that doesn't fully deplete/remove it. -- Fixed gaps in the "backwall pipes" sprite. -- Fixed dedicated servers restricting player count to 1 less than the MaxPlayer setting. -- Fixed crashing when you try to preview a sub you don't have in the server lobby. -- Fixed "gate outpost" sometimes generating as abandoned outposts. -- Fixed clients being unable to vote for subs they don't have. -- Fixed a bunch of non-suitable items (such as devices that can't be deattached) being displayed in the "extra cargo" menu in the server lobby. -- Fixed Operate Weapons icon not updating when assigned again while targeting a weapon of different type. -- Fixed being able to assign the same order to a character multiple times with different options. -- Fixed highlighted client names in chat messages not opening the player info dialog when clicked. - -Bots: -- Fixed bots not knowing how to swap out welding fuel from diving gear and oxygen tanks from welding tools (#4380). -- Fixed bots sometimes yelling that they can't enter an airlock when the sub is docked. - -Modding: -- Fixed level editor crashing when it tries to place a wreck that contains linked subs in the level. -- Added "onlyplayertriggered" condition for status effects. Currently only implemented for OnDamaged. -- Monster events don't spawn monsters in wrecks that don't contain enemy spawnpoints. -- Fixed crashing if you try to create a decal with incorrect casing. -- Fixed affliction's periodic effects being unable to reference afflictions defined later in the affliction xml. -- Fixed crashes if radiation parameters aren't defined in the map generation xml. -- Fixed crashing if you save a campaign with a large map and try to load it with map generation parameters where the map is smaller. -- Fixed explosions not damaging level walls if their structure damage is set to 0. -- Fixed reduce affliction status effects using delta time even when "setvalue" is true. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.3 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Added respawning mid-round in the multiplayer campaign mode. Respawning gives you an affliction that can be healed for a cost at outposts. You can also choose not to respawn mid-round, and instead wait for the next round to spawn normally without the affliction, just like before. -- Added a distant sonar effect for the abyss monsters. -- Abyss diving suits protect from high pressure, consume oxygen tanks more slowly and reduce movement speed. -- Combat diving suits are less resistant to pressure, protect from damage and reduce movement speed less than the other types of suits. -- Make characters grabbable and the inventories accessible after a half a second delay. Fixes abusing the toy hammer to access NPC inventories. -- Adjustments on incremental stun, stun baton, and stun gun. -- Disabled beacon mission events (beacon missions are now purely optional side objectives). -- Made abandoned outposts a bit more common. -- Hunting grounds don't appear in the first quarter of the campaign map. -- No additional abyss monsters spawn in levels with a hunting grounds mission. -- Secure cabinets in abandoned outposts can now be accessed with the outpost NPCs' ID cards. -- Trying to pick up a diving suit when you're already wearing one swaps the suits. -- Monsters in abandoned outposts don't target the items/structures in the outpost or the sub. -- Made monster eggs glow to make them easier to spot in caves and abandoned outposts. -- Exploding oxygen/fuel tanks don't make other tanks explode. -- Added a delay to oxygen/fuel tank explosions. -- Show a warning on the sonar if the sub is 500 meters or less from crush depth. -- Disconnect wires from beacon stations instead of deleting the wires completely. -- The mid-round mission messages (e.g. "the monster is dead, navigate out...") are shown in the tab menu's mission tab. -- The tab menu can be closed with esc. -- When using an equipped item from a stack (e.g. a medical item), another item from the same stack is automatically equipped. -- Abyss monsters are now less aggressive in hunting other creatures: they shouldn't any longer attack outside of the abyss, unless they are chasing a target that was selected when it was in the abyss. Addresses #5163. -- Display the mission difficulty in the available missions list, the info tab, and the round summary. -- Added hints for falling unconscious, dying, and leaving the sub with an insufficient diving suit. -- Disabled hint stacking: hints are now ignored when there is an active hint on the screen, instead of being queued up when triggered. -- Added a link to the wiki to the main menu. -- Changed the camera animation at the start of the campaign to show the entire outpost. -- Drop empty/used oxygen tank from diving suit when trying to swap in a new one when the inventory is full. -- Added a submarine tab to the in-game tab menu. -- Changed the layout of the in-game tab menu: now the tabs are icons on the left side. - -Fixes: -- Removed duplicate damage modifiers from diving suit. #5204. -- Fixed a draw order issue in Endworm's armor plates (drawn over the head sprite). -- Fixed status effects with "set value" not actually setting the affliction strength but adding to the strength instead. -- Fixed affliction visual effects not working right when the effect's min and max strengths were equal (for example both 1). -- Fixed path unlock tooltips after the 1st biome displaying location reputation instead of coalition reputation. -- Fixed hunting grounds disappearing from the map if you complete the campaign without saving and loading (e.g. by teleporting straight to the end with console commands). -- Fixed path unlocking requiring a reputation _greater_ than the specified value, as opposed to greater or equal. -- Changed how the hole next to the end outpost is generated to prevent the outpost from blocking the hole. -- Fixed islands sometimes blocking the exit tunnels. -- Fixed bugged exit tunnel in the final level. -- Fixed junction boxes being unable to pass signals. -- Fixed locations with no connections sometimes generating on the campaign map. -- Fixed completing a hunting grounds mission not removing the hunting grounds from the map. -- Fixed fabricator's green progress indicator not being displayed when there's already an item in the output slot. -- Fixed fabricator displaying the "not enough room in the input inventory" error even if the items fit in the input inventory by stacking. -- Fixed signal check components being unable to output whitespace. -- Fixed inability to edit smoke detector's parameters in-game. -- Fixed smoke detectors outputting empty signals. -- Fixed "engineers are special" outpost event not giving a price discount. -- Fixed afflictions caused by status effects being multiplied by deltatime even when setvalue="true". The only vanilla statuseffect affected by this was incremental stun, which would stun the player for 1 frame instead of 1 second, but this may have affected some mods as well. -- Fixed errors when trying to load a beacon station with no reactor. -- Fixed terminal's welcome message getting cleared when using the test mode in the sub editor. -- Fixed inability to cut alien walls/hatches. -- Fixed non-ruin artifacts sometimes spawning on top of the sub. -- Fixed melee weapons failing to damage walls if the item is not inside the wall when the impact is registered. -- Allow engine propellers to do damage inside the sub. -- Fixed new lights being displayed as off in the sub editor until you toggle the lighting. -- Fixed stacking keybinds not being shown in the tooltip when hovering over a stack with just 2 items. -- Fixed water flow sounds activating before the particles. -- Fixed shuttles that are a part of a wreck or beacon station being visible on the sonar. -- Fixed all subs/shuttles being hidden on the sonar in PvP (as opposed to just the subs/shuttles of the enemy team). -- Fixed ID cards and duffel bags not being updated when a crew member is renamed. -- Fixed wiring interface label overlapping when using a high text scale. -- Fixed dismissing a player order in the crew list opening the moderation menu in multiplayer. -- Fixed top left buttons (crew list, command interface, info tab) not scaling when adjusting the HUD scale. -- Fixed issues with the hints for running out of oxygen and trying to shoot without aiming. -- Fixed maximum camera zoom increasing on lower resolutions. -- Fixed coilguns consuming ammo faster than they should when linked to multiple loaders. - -Bots: -- Fixed bots failing to fix leaks when they were not swimming (caused by a change in the previous unstable version). #5205. -- Fixed security officers standing idle next to the stunned target and doing nothing when they don't have handcuffs. Only happened while trying to arrest the target. -- Fixed multiple bots occasionally trying to operate the reactor at the same time (#5259). -- Fixed bots "stealing" stuff while cleaning up. Happened when the objective changed (= they decided or were ordered to do something else while cleaning up). Idle bots are no longer allowed to take items from purchased containers. #5138. -- Fixed bots running headlessly around while trying to find the container for items while following the clean up order. Now they should walk around instead and only run when the target container is found. -- Fixes and adjustments to security officer reactions for damage done by friendlies. -- Fixed bots sometimes not moving while targeting the player (caused by a change in v0.1300.0.1, doesn't happen in the release build). -- Bots no longer automatically unequip weapons after combat if they are outside of a friendly submarine. -- Fixed bots having difficulties in leaving the ruins via gaps (#4717). -- Allow bots to use gaps also to exit the sub, but only when following a player character. -- Fixed bots always trying to reach the closest item even when it's unreachable (#3332). -- Make bots find items faster. -- Fixed bots sometimes continuing their movement (e.g. walking towards a wall) when they fail to find the diving gear they need to continue with the go to objective (e.g. follow). - -Modding: -- Changed husk affliction's type to "alieninfection" because using "huskinfection" as both the identifier and type makes it impossible to add custom husk infections and reference just the custom one in conditionals or statuseffects. -- Fixed affliction statuseffects targeting NearbyItems or NearbyCharacters causing a crash. -- Corpses don't spawn in wrecks that contain no waypoints/spawnpoints. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.2 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- Added current player balance to tab menu. -- Added tab menu button to the HUD and modified the top left button layout. -- Captain and engineer hints now also self-assign 'steer' and 'operate reactor' orders, respectively. -- Removed hotkey for closing hints. -- Don't allow undocking when playing an abandoned outpost mission in mission mode. -- Hostage rescue missions fail if any of the hostages die. -- Reputation values are displayed in the tab menu. -- The requirements to unlock a path from biome to another a displayed on the campaign map. -- Powered the O2 generator in abandoned outposts. -- improved backwards compatibility with old campaign saves (place hunting grounds on paths, turn lairs into abandoned outposts). -- Locations turn back to their original type and destroyed hunting grounds reappear after finishing the campaign. -- Added a screen distortion effect for radiation sickness. -- Reworked exit points at uninhabited locations: there's a hole/tunnel above the start/end of the level the sub needs to enter to leave. -- Added a server setting for locking all default wiring in subs. -- Added favorite button to the server lobby. -- Show whether a server is player-hosted or dedicated in the server list. -- Show whether a server is public or private in the server lobby. - -Fixes: -- Fixed monsters steering towards abyss when idling. -- Fixed bots spamming "xxx has been resuscitated" when there's characters with minor injuries in the crew. -- Fixed bot count text not updating in the server lobby when the value is changed. -- Changed the way the nav terminal calculates the vertical velocity again. The previous method prevented the ballast from emptying/filling completely when using a very large/small ballast. -- Fixed items being unable to receive a signal that originated from the item itself (e.g. terminal output that gets processed somehow and sent back to the terminal). -- The "gate outposts" between biomes can never be abandoned. -- Fixed biome sometimes not changing in the passageway immediately after the "gate outpost". -- Fixed crashing when trying to toggle a spawnpoint's type past "Enemy" in the sub editor. -- Fixed command-spawned characters not getting the "job" tag on their id cards. -- Fixed repair icons appearing in abandoned outposts in multiplayer. -- Fixed players getting prompted to download subs when the server has disabled file transfers. -- Fixed mineral scanner not working in the abyss. -- Fixed bots sometimes failing to reach targets that are on the ground level. For example when trying to handcuff targets (This change causes the bots not to be able to reach and fix leaks while standing on ground. Now fixed in v0.1300.0.3.) -- Fixed unarmed bots with the fight intruders objective not reacting when attacked. -- Fixed a crash in the monster AI in the sub editor test mode. -- Monsters now ignore beacons. -- Fixed some waypoint issues in abandoned outposts. -- Added missing waypoints to BeaconStation1. There was no waypoints generated, which caused navigation issues with all AI controlled characters. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.1 (unstable) ---------------------------------------------------------------------------------------------------------- - -Changes: -- 3 new outpost mission types: clearing a nest, hostage rescue and assassination. -- The enemies in abandoned outposts are tougher and there's more of them in multiplayer. -- Improvements to abandoned outpost modules. -- Respawning is disabled in abandoned outposts. -- Gating progress between biomes: you need a certain amount of money or reputation before you can enter the next biome. -- Reworked Charybdis as another abyss monster (in addition to Endworm). -- Revisited husk animations, movement speeds, and general balance. Husks regenerate a lot and are a bit tougher than they use to be. Human husks can and will easily rise again, unless properly killed. -- Adjustments and fixes on the thresher attacks. -- Revisit mudraptors' attacks. Fixes unarmored mudraptors and mudraptor hatchlings acting weird when attacking characters in water. -- Lower the overall damage of all the hatchlings. -- Bots can now be renamed through the outpost crew management interface. -- Fabricators now display remaining time when fabricating. -- Endworm now groans when the tail is cut. -- Beacon stations' reactors don't deteriorate or consuming fuel to prevent the station from going back down when the player is travelling out from the level. -- The output length of all signal components is now restricted to 200 characters by default to prevent performance and networking issues if the output is set to an excessively long value (such as the entire dialog of the Bee Movie). The limit can be increased in the sub editor. -- Stunning still works on friendly characters even if friendly fire has been disabled on a server. -- Made radiation sickness's icon appear before it starts causing burns (instead of working the other way around). -- Made radiation sickness cause nausea. -- Added a checkbox to color component that toggles between RGBA and HSV input. -- Disabled NPC conversations in sub editor test mode. -- Added a tooltip when hovering over radiated area. -- Added a checkbox for the radiation feature to both singleplayer and multiplayer. -- Radiated outposts now turn into abandoned outposts instead of vanishing in thin air. -- Use ternary states for some of the server filters (thanks someone972!) -- Banning a player who's using Steam Family Sharing will now also ban the owner's account, solving ban evasion using this method. -- Added interactive submarine previews to the lobby and "New Game" screen. -- Implemented rudimentary text highlighting in mission descriptions. -- Added in-game hints, designed to help with new player onboarding. Can be disabled in the settings. - -Fixes: -- Attempt to fix crashes with the error message "failed to generate OpenAL/stream buffer" on Mac. -- Waypoint fixes in the abandoned outposts. -- Fixed bot reaction times and readjusted aiming delays. -- Fixed bots that follow you not always holding position in the combat mode. -- Fixed bots not being able to hit targets that lie on the ground. -- Fixed monsters sometimes targeting ruin rooms. -- Monsters now stop targeting characters that are far enough behind level geometry. Fixes them getting stuck while trying to reach targets that are not easily reachable. -- Fixes to the Endworm's behavior and ragdoll. -- Minor boost to the Endworm's attack on walls, major boost to the attack on characters. -- Fixed a crash when no valid limb was found for an affliction. Probably only happened with characters that already had some limbs severed. -- Fixed non-multiplied damage to limbs effectively always being clamped to 100, which means that no attack could do more than 100 damage per hit unless there's some damage modifier defined on the target limb. -- Fixed husk's mouth tentacles rendering on top of the left hand. Also fixed a minor texture bleeding on the waist. -- Fixed possible desync when multiple players use the crew management interface simultaneously. -- Fixed being able to drag order icons when spectating. -- Fixed non-interactable items being counted as owned in the store interface. -- Fixed abyss monsters not keeping in the depths and non-abyss monsters not avoiding the depths when they have attack targets. Now they should only attack the targets that come to their zone and continue pursuing the target until they either lose it or if the state changes from attack to something else. -- Fixed bots treating radiation sickness too eagerly (leading to wasted antirad). -- Added missing platforms to abandoned outpost modules. -- Fixed vanilla wrecks/modules/outposts being shown in the Workshop menu's publish tab. -- Fixed bioluminescent cave's hallucination effect never going fully away and made it treatable with haloperidol. -- Fixed characters getting impact damage from collisions with sensors. Caused characters to get stunned when they're thrown around by a monster while touching a level trigger (for instance, the branches in forest caves). -- Fixed held items not appearing in the characters hand after entering a new level in the campaign. -- Fixed hidden items being shown when searching for them in sub editor. -- Fixed crashing when trying to load a linked sub that contains no hulls. -- Fixed "hide incompatible" checkbox in the server list. -- Fixed one of the engineer variants having too many items in the toolbelt. -- Monster events don't spawn an additional endworm in the abyss if one has already been spawned by a hunting grounds mission. -- Fixed nav terminal ignoring velocity_in signals when the terminal hasn't been operated by anyone during the round. -- Fixed launching depth charges crashing the game. -- Fixed coilgun lights flickering when firing. -- Fixed ability to walk through the heavy doors in mining outposts. -- Fixed inability to move stacks of items to containers by double-clicking. -- Fixed crashing when trying to enter an abandoned outpost with a sub that has shuttles. -- Fixed monsters targeting entities outside of their allowed zone. They dropped the target when they reached the non-allowed zone, which caused indetermined behavior (fluctuating) at the border. -- Fixed monsters with the circling behavior sometimes not being able to reach the target because they were not targeting the closest target. -- Fixed Workshop mod download prompt looping and freezing when there's a hash mismatch after a mod has already been installed. - -Modding: -- Added AITrigger that can be used to trigger an ai state using the status effects (See Charybdis). -- Turned IsTraitor into a property so it can be accessed by status effects. - -Bots: -- Fixed non-security bots fleeing the enemy (in defensive combat state) even when they are ordered to fight intruders. - ---------------------------------------------------------------------------------------------------------- -v0.1300.0.0 (unstable) +v0.13.0.11 --------------------------------------------------------------------------------------------------------- Campaign changes: @@ -438,19 +7,39 @@ Campaign changes: - Beacon stations are shown on the campaign map. - Visual changes to the map to make it a bit more intuitive. - When you enter a level with a beacon station, you always get an optional side objective to restore it even if you haven't selected a beacon mission. -- Added radiation on the campaign map: the instensity of the radiation around Jupiter is slowly increasing, which is forcing Europans to delve deeper under the ice. In practice, the radiation gradually destroys the outposts starting from the left side of the map, making it more dangerous and costly to stay in these areas. The intention behind this is to prevent players from farming resources indefinitely in the low-difficulty areas of the game before proceeding further. +- Added radiation on the campaign map: the intensity of the radiation around Jupiter is slowly increasing, which is forcing Europans to delve deeper under the ice. In practice, the radiation gradually destroys the outposts starting from the left side of the map, making it more dangerous and costly to stay in these areas. The intention behind this is to prevent players from farming resources indefinitely in the low-difficulty areas of the game before proceeding further. +- Gating progress between biomes: you need a certain amount of money or reputation before you can enter the next biome. +- Reworked exit points at uninhabited locations: there's a hole/tunnel above the start/end of the level the sub needs to enter to leave. Abyss: -- Reintroduced Endworms. +- Reintroduced Endworm and Charybdis. - Added floating islands that contain caves and rare minerals to the Abyss. -Changes: -- Added abandoned outposts and a new abandoned outpost mission type. -- Added entity subcategories to the submarine editor (note that most of the vanilla items/structures aren't categorized yet in this build). +New player experience: +- Added in-game hints, designed to help with new player onboarding. Can be disabled in the settings. +- Added text highlighting to mission descriptions. +- Player-controlled characters get automatically assigned an appropriate order when the game starts to guide the player on what they should do and to make it easier to find the relevant device(s). +- Changed the camera animation at the start of the campaign to show the entire outpost. +- Display mission difficulty in the available missions list, the info tab, and the round summary. +- Show an indicator when the campaign is saved. + +Changes and additions: +- Added abandoned outposts. +- New mission types for abandoned outposts: destroying the outpost, clearing a nest, hostage rescue and assassination. +- Added entity subcategories to the submarine editor. +- Added interactive submarine previews to the server lobby and "New Game" screen. +- Added respawning mid-round in the multiplayer campaign mode. Respawning gives you an affliction that can be healed for a cost at outposts. You can also choose not to respawn mid-round, and instead wait for the next round to spawn normally without the affliction, just like before. - Reworked the impacts to the sub when it's hit by monsters. Increased the screen shake and stunning. There's now a 30 second cooldown for getting knocked down. Fixed the impact not triggering if the colliding limb is not big enough. -- Reworked attacks and effects for the following creatures: Moloch, Black Moloch, Hammerhead, Hammerhead Matriarch, and Golden Hammerhead. They now have bigger impact on the sub when they hit it. Black Moloch's emp damage is halved. +- Reworked attacks and effects for the following creatures: Moloch, Black Moloch, Hammerhead, Hammerhead Matriarch, and Golden Hammerhead. They now have a bigger impact on the sub when they hit it. Black Moloch's emp damage is halved. +- Added Abyss Diving Suits which slows down your movement speed but offers more protection against pressure and consumes oxygen more slowly than the normal suits. +- Added Combat Diving Suits which slow you down less than normal suits and offer more protection against damage. +- Added black moloch mission variants. - Moloch's shell now always breaks when shot with a railgun. +- Increased the audio ranges for Watcher and Hammerhead Matriarch. +- Overhauled tab menu: improved layout, added submarine and reputation tabs, current funds are displayed in the campaign mode. - Recreated waypoints for the vanilla subs. +- Bots can now be renamed through the outpost crew management interface. +- Certain large monsters' (endworm, charybdis, boss variants of molochs and hammerheads) health bars become visible at the top of the screen when you damage them. - Added EMP effect to nuclear shells. Increased the damage a bit. - Added a right click context menu option to copy debug console errors to clipboard. - Railgun shells now explode instead of piercing armor. Physicorium shells still go through armor. Make all railgun ammunition slightly more likely to break limb joints. @@ -458,12 +47,48 @@ Changes: - NPCs (non-bots) speak report related lines less than they used to. - The bleeding particles are now emitted from the last matching limb instead of the first. Readjusted particle emit frequency and scale. - Reduced Moloch's bleeding reductions. +- Trying to pick up a diving suit when you're already wearing one swaps the suits. +- Made monster eggs glow to make them easier to spot in caves and abandoned outposts. +- Exploding oxygen/fuel tanks don't make other tanks explode. +- Added a delay to oxygen/fuel tank explosions. +- Disconnect wires from beacon stations instead of deleting the wires completely. +- The probability of disconnected wires in beacon stations is relative to the level's difficulty, and no wires are removed if the difficulty is less than 20. +- Improved server filters: instead of only being able to search for servers that have a certain setting enabled/disabled, the filter can be set to "Any" (thanks someone972!). +- Show whether a server is player-hosted or dedicated in the server list. +- Show whether a server is public or private in the server lobby. +- Added a server setting for locking all default wiring in subs. +- Added favorite button to the server lobby. +- Banning a player who's using Steam Family Sharing will now also ban the owner's account, solving ban evasion using this method. +- Disabled NPC conversations in sub editor test mode. +- Beacon stations' reactors don't deteriorate or consume fuel to prevent the station from going back down when the player is travelling out from the level. +- The output length of all signal components is now restricted to 200 characters by default to prevent performance and networking issues if the output is set to an excessively long value (such as the entire dialog of the Bee Movie). The limit can be increased in the sub editor. +- Stunning still works on friendly characters even if friendly fire has been disabled on a server. +- Made radiation sickness's icon appear before it starts causing burns (instead of working the other way around). +- Made radiation sickness cause nausea. +- Added a screen distortion effect for radiation sickness. +- Added a checkbox to color component that toggles between RGBA and HSV input. +- Fabricators now display remaining time when fabricating. +- Revisited husk animations, movement speeds, and general balance. Husks regenerate a lot and are a bit tougher than they used to be. Human husks can and will easily rise again, unless properly killed. +- Adjustments and fixes on the thresher attacks. +- Revisit mudraptors' attacks. Fixes unarmored mudraptors and mudraptor hatchlings acting weird when attacking characters in water. +- Lower the overall damage of all the hatchlings. +- Added a link to the wiki to the main menu. +- Drop empty/used oxygen tank from diving suit when trying to swap in a new one when the inventory is full. +- When using an equipped item from a stack (e.g. a medical item), another item from the same stack is automatically equipped. +- The mid-round mission messages (e.g. "the monster is dead, navigate out...") are shown in the tab menu's mission tab. +- Make characters grabbable and the inventories accessible after a half a second delay. Fixes abusing the toy hammer to access NPC inventories. +- Allow fabricating fresh fuel rods, welding fuel and coilgun ammunition using depleted ones. +- Restrict the length of the text that can be entered as a sonar beacon's sonar label. Fixes: - Major improvements to the voice chat: higher audio quality, less intrusive radio effect, fixed clicks/distortion. -- Fixed clients' class preferences not being respected in all cases where they should, resulting some client getting a class that should be give to another client. +- Attempt to fix crashes with the error message "failed to generate OpenAL/stream buffer" on Mac. +- Fixed crashing on startup with the error message "unable to load shared library 'freetype6' or one of its dependencies" on some Linux systems. +- Removed outdated steamclient.so file from the dedicated server (no longer needed because it's automatically installed by Steamworks). Should fix inability to host dedicated servers on Linux. +- Fixed clients' job preferences not being respected in all cases where they should, resulting in some clients getting a job that should be give to another client. - Items can't be stacked in the equip slots (e.g. you can't hold and throw a stack of grenades). - Trying to pick up a stack of items with a full inventory doesn't pick up the item in both hand slots. +- Fixes/improvements to item position syncing. When trying to pick up an item whose position has gotten desynced, the server should correct the item's position immediately. - Fixed turrets getting cropped by the "wikiimage" console command. - Fixed items with nothing but a holdable component (e.g. medical items) being hidden when hiding wires in the sub editor. - Fixed ban list not displaying ban reasons or the duration of the ban. @@ -482,6 +107,63 @@ Fixes: - Fixed mouse cursor being switched to hand even when the spritesheet is not shown in the character editor. - Fixed monsters with low head/torso torques moving backwards when they try to turn around 180 degrees. - Fixed regular Moloch not bleeding correctly. +- Fixed Workshop mod download prompt looping and freezing when there's a hash mismatch after a mod has already been installed. +- Fixed ability to walk through the heavy doors in mining outposts. +- Fixed nav terminal ignoring velocity_in signals when the terminal hasn't been operated by anyone during the round. +- Fixed one of the engineer variants having too many items in the toolbelt. +- Fixed "hide incompatible" checkbox in the server browser. +- Fixed characters getting impact damage from collisions with sensors. Caused characters to get stunned when they're thrown around by a monster while touching a level trigger (for instance, the branches in forest caves). +- Fixed bioluminescent cave's hallucination effect never going fully away and made it treatable with haloperidol. +- Fixed bots treating radiation sickness too eagerly (leading to wasted antirad). +- Added missing platforms to abandoned outpost modules. +- Fixed non-interactable items being counted as owned in the store interface. +- Fixed husk's mouth tentacles rendering on top of the left hand. Also fixed a minor texture bleeding on the waist. +- Fixed possible desync when multiple players use the crew management interface simultaneously. +- Fixed a crash when no valid limb was found for an affliction. Probably only happened with characters that already had some limbs severed. +- Fixed non-multiplied damage to limbs effectively always being clamped to 100, which means that no attack could do more than 100 damage per hit unless there's some damage modifier defined on the target limb. +- Monsters now stop targeting characters that are far enough behind level geometry. Fixes them getting stuck while trying to reach targets that are not easily reachable. +- Fixed players getting prompted to download subs when the server has disabled file transfers. +- Fixed command-spawned characters not getting the "job" tag on their id cards. +- Fixed coilguns consuming ammo faster than they should when linked to multiple loaders. +- Fixed wiring interface labels overlapping when using a high text scale. +- Allow engine propellers to do damage inside the sub. +- Fixed new lights being displayed as off in the sub editor until you toggle the lighting. +- Fixed non-ruin artifacts sometimes spawning on top of the sub. +- Fixed terminal's welcome message getting cleared when using the test mode in the sub editor. +- Fixed fabricator displaying the "not enough room in the input inventory" error even if the items fit in the input inventory by stacking. +- Fixed signal check components being unable to output whitespace. +- Fixed inability to edit smoke detector's parameters in-game. +- Fixed smoke detectors outputting empty signals. +- Fixed "engineers are special" outpost event not giving a price discount. +- Fixed clients being unable to vote for subs they don't have. +- Fixed a bunch of non-suitable items (such as devices that can't be deattached) being displayed in the "extra cargo" menu in the server lobby. +- Fixed crashing if you try to press the server log button in the lobby when connection to the server has been lost. +- Fixed item disappearing from the character's hand when you combine it with an item in a container in a way that doesn't fully deplete/remove it. +- Fixed gaps in the "backwall pipes" sprite. +- Fixed dedicated servers restricting player count to 1 less than the MaxPlayer setting. +- Fixed Kastrull's drone airlock not flooding correctly. +- Replaced legacy small pumps with the new ones in Orca. +- Fixed monsters sometimes spawning very close (or even inside) the respawn shuttle. +- Fixed "attempted to set SoundRange to NaN" error when a reactor's maximum power output is 0. +- Fixed wall damage particles sometimes spawning at an incorrect position. +- Fixed black moloch doing only 62.5% of the structure damage compared to the regular moloch. +- Fixes to R-29: fixed top docking port's control circuit, adjustments to pre-placed supplies, adjusted discharge coil power consumption, minor visual fixes. +- Reduced the amount of clown gear in the "Praise the Honkmother" mission to fit everything in the crate. +- Fixed non-repeatable outpost events starting to repeat once all of them have been triggered. +- Fixed inconsistency in the way vertical velocity in/out signals are handled by the nav terminals. Previously "velocity_in" would interpret positive y as upwards, even though "velocity_y_out" outputs a negative value when going up. Now positive is always down (= corresponds with the "descent velocity" value displayed on the terminal). +- Fixed Hammerhead Spawns not targeting decoys. +- Fixed the abyss monsters not targeting "provocative" items, like flares, glowsticks, scooters etc. +- Fixed Hammerhead Matriarch constantly fleeing from divers. It's intentional that the matriarch avoids the divers, but not as much. Now they should flee briefly only when shot by the player, making it possible for the divers to reach it (#5449). +- Fixed camera shaking/vibrating when moving at high speed. +- Fixed monsters being able to attack through ruin walls. +- Fixed overlapping vending machine and light switch in CrewModule_02. +- Fixed respawn shuttle maintaining an incorrect position after getting dispatched. +- Fixed inventory tooltip not changing when the cursor is hovered on the slot and the condition of the item changes. +- Fixed waypoints not being able to find hulls that have been added since the sub was last saved in the sub editor, causing them to appear blue. +- Fixed resizable outpost hallway modules not having waypoints and thus causing navigation issues. +- Fixed water particle effects not showing up when water flows between certain rooms in Remora. +- Addressed the lag spikes occasionally caused by Spineling's spikes when they hit/get stuck to something. +- Fixed logbooks being empty in the wreck salvage missions. Bots: - Bots now warn when you are running low / out of oxygen or welding fuel tanks, turret ammunition, or reactor fuel. @@ -503,12 +185,30 @@ Bots: - You can now escape from NPCs by going far enough from them while they are pursuing you. - Fixed bots reacting to attackers that are outside of the submarine. - Fixed the "reportrange" parameter not working when the character is attacked. In practice only has effect on NPCs. -- Fixed report icons being shown also for other teams instead of just the own team. +- Fixed report icons being shown also for other teams instead of just one's own team. - Bots now target the closest limb instead of the main collider when they aim with the turret. With small creatures, this should now make any difference. With long creatures, it allows the bots to target the extremities of the body instead of always shooting at the main body. +- Fixed non-security bots fleeing the enemy (in defensive combat state) even when they are ordered to fight intruders. +- Bots no longer automatically unequip weapons after combat if they are outside of a friendly submarine. +- Fixed bots having difficulties in leaving the ruins via gaps. +- Allow bots to use gaps also to exit the sub, but only when following a player character. +- Fixed bots always trying to reach the closest item even when it's unreachable. +- Make bots find items faster. +- Fixed bots sometimes continuing their movement (e.g. walking towards a wall) when they fail to find the diving gear they need to continue with the go to objective (e.g. follow). +- Fixed security officers standing idle next to the stunned target and doing nothing when they don't have handcuffs. Only happened while trying to arrest the target. +- Fixed multiple bots occasionally trying to operate the reactor at the same time. +- Fixed bots "stealing" stuff while cleaning up. Happened when the objective changed (= they decided or were ordered to do something else while cleaning up). Idle bots are no longer allowed to take items from purchased containers. +- Fixed bots running headlessly around while trying to find the container for items while following the clean up order. Now they should walk around instead and only run when the target container is found. +- Fixes and adjustments to security officer reactions for damage done by friendlies. +- Fixed bots sometimes yelling that they can't enter an airlock when the sub is docked. +- Fixed bots taking items from fabricators and deconstructors. +- Fixed bots saying "Can't reach target [name]". Modding: -- The hit impact of a monster's attack can now be adjusted with the new "submarineimpactmultiplier" defined in the attack block. Note that this is a multipler to the actual impact, hence also the force applied on the attacking monster affects the final impact. +- Fixed custom loading screen tips not showing up if the vanilla content package is enabled. +- Fixed crashing when loading a save where a stack contains more items than the maximum stack size for the item/container. +- The hit impact of a monster's attack can now be adjusted with the new "submarineimpactmultiplier" defined in the attack block. Note that this is a multiplier to the actual impact, hence also the force applied on the attacking monster affects the final impact. - Explosions now have three new parameters: ignorecover, onlyinside, and onlyoutside. +- Fixed crashing/disconnects when preloading content at the start of a round if random events contain character variants. In practice, mods that used character variants in random events occasionally prevented rounds from starting. - Fixed crashing when attempting to play a music clip that isn't a valid ogg file or if the file is not found. - Fixed crashing when trying to spawn a character variant with custom inventory contents. - Renamed the ai parameter "Threshold" as "DamageThreshold". @@ -519,11 +219,27 @@ Modding: - The aim speed and accuracy of NPC characters can now be adjusted in the npc (spawn) definition. The Aim speed also affects melee attack speed. - Fixed OnSevered status effects launching also on the limb that the severed limb was attached to. - Added "bleedingnonstop" affliction, which is just the same as normal bleeding but it never wears off. -- Added and option to target the last matching limb insted of the first (StatusEffect.TargetType.Limb). Implemented targeting other limbs even when the status effect is triggered from the limb, which was previously only implemented for status effects that targeted character. See Endworm for an example. +- Added and option to target the last matching limb instead of the first (StatusEffect.TargetType.Limb). Implemented targeting other limbs even when the status effect is triggered from the limb, which was previously only implemented for status effects that targeted character. See Endworm for an example. - Fixed hidden limbs not being ignored in many cases where they should, which potentially could cause issues with some custom monsters. - Added "bleedparticlemultiplier" parameter in character definition, which can be used to increase/decrease the general amount of bleeding for the character in question. - Added an option to always ignore an ai target if it's not inside the same sub as the character. - Attacks can now "blink" limbs when they attack (Endworm). Blinking is a generic way to rotate limbs so that they "animate" (see Watcher's eye). +- Added AITrigger that can be used to trigger an ai state using the status effects (See Charybdis). +- Turned IsTraitor into a property so it can be accessed by status effects. +- Changed husk affliction's type to "alieninfection" because using "huskinfection" as both the identifier and type makes it impossible to add custom husk infections and reference just the custom one in conditionals or statuseffects. +- Fixed affliction statuseffects targeting NearbyItems or NearbyCharacters causing a crash. +- Corpses don't spawn in wrecks that contain no waypoints/spawnpoints. +- Monster events don't spawn monsters in wrecks that don't contain enemy spawnpoints. +- Fixed afflictions caused by status effects being multiplied by deltatime even when setvalue="true". The only vanilla statuseffect affected by this was incremental stun, which would stun the player for 1 frame instead of 1 second, but this may have affected some mods as well. +- Fixed errors when trying to load a beacon station with no reactor. +- Fixed level editor crashing when it tries to place a wreck that contains linked subs in the level. +- Added "onlyplayertriggered" condition for status effects. Currently only implemented for OnDamaged. +- Fixed crashing if you try to create a decal with incorrect casing. +- Fixed affliction's periodic effects being unable to reference afflictions defined later in the affliction xml. +- Fixed crashing if you save a campaign with a large map and try to load it with map generation parameters where the map is smaller. +- Fixed explosions not damaging level walls if their structure damage is set to 0. +- Fixed inability to load more than 5 wires per connection even if the connection is set to allow more. +- Allow to define afflictions (types or identifiers) to trigger the OnDamaged status effects only from certain afflictions and not all that do the damage. If the afflictions property is not defined, no restrictions are used (works as it used to). --------------------------------------------------------------------------------------------------------- v0.12.0.3 diff --git a/Libraries/Concentus/CSharp/Concentus/Concentus.NetStandard.csproj b/Libraries/Concentus/CSharp/Concentus/Concentus.NetStandard.csproj index 725dda808..8bdd4fac7 100644 --- a/Libraries/Concentus/CSharp/Concentus/Concentus.NetStandard.csproj +++ b/Libraries/Concentus/CSharp/Concentus/Concentus.NetStandard.csproj @@ -1,20 +1,15 @@ - - - - netstandard2.1 - AnyCPU;x64 - Concentus - Logan Stromberg - 1.1.6.0 - Copyright © Xiph.Org Foundation, Skype Limited, CSIRO, Microsoft Corp. - This package is a pure portable C# implementation of the Opus audio compression codec (see https://opus-codec.org/ for more details). This package contains the Opus encoder, decoder, multistream codecs, repacketizer, as well as a port of the libspeexdsp resampler. It does NOT contain code to parse .ogg or .opus container files or to manage RTP packet streams - - https://github.com/lostromb/concentus - - - - full - true - - - + + + + netstandard2.1 + AnyCPU;x64 + Concentus + Logan Stromberg + 1.1.6.0 + Copyright © Xiph.Org Foundation, Skype Limited, CSIRO, Microsoft Corp. + This package is a pure portable C# implementation of the Opus audio compression codec (see https://opus-codec.org/ for more details). This package contains the Opus encoder, decoder, multistream codecs, repacketizer, as well as a port of the libspeexdsp resampler. It does NOT contain code to parse .ogg or .opus container files or to manage RTP packet streams + + https://github.com/lostromb/concentus + + + diff --git a/Libraries/Farseer Physics Engine 3.5/Farseer.NetStandard.csproj b/Libraries/Farseer Physics Engine 3.5/Farseer.NetStandard.csproj index 96e8ca92c..69fbafa2f 100644 --- a/Libraries/Farseer Physics Engine 3.5/Farseer.NetStandard.csproj +++ b/Libraries/Farseer Physics Engine 3.5/Farseer.NetStandard.csproj @@ -1,40 +1,40 @@ - - - - netstandard2.1 - FarseerPhysics - Copyright Ian Qvist © 2013 - Farseer Physics Engine - - 3.5.0.0 - Ian Qvist - AnyCPU;x64 - - - - TRACE - portable - true - - - - - - - - - - - - - - - - - - - - - - - + + + + netstandard2.1 + FarseerPhysics + Copyright Ian Qvist © 2013 + Farseer Physics Engine + + 3.5.0.0 + Ian Qvist + AnyCPU;x64 + + + + TRACE + portable + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Libraries/GameAnalytics/GA_SDK_NETSTANDARD/GA_SDK_NETSTANDARD.csproj b/Libraries/GameAnalytics/GA_SDK_NETSTANDARD/GA_SDK_NETSTANDARD.csproj index aab701817..cd6803b0e 100644 --- a/Libraries/GameAnalytics/GA_SDK_NETSTANDARD/GA_SDK_NETSTANDARD.csproj +++ b/Libraries/GameAnalytics/GA_SDK_NETSTANDARD/GA_SDK_NETSTANDARD.csproj @@ -1,35 +1,35 @@ - - - - netstandard2.1 - GameAnalytics.NetStandard - GameAnalytics.Net - AnyCPU;x64 - Game Analytics - Copyright (c) 2016 Game Analytics - - - - TRACE;MONO - - - - TRACE;MONO - - - - TRACE;MONO - - - - TRACE;MONO - - - - - - - - - - + + + + netstandard2.1 + GameAnalytics.NetStandard + GameAnalytics.Net + AnyCPU;x64 + Game Analytics + Copyright (c) 2016 Game Analytics + + + + TRACE;MONO + + + + TRACE;MONO + + + + TRACE;MONO + + + + TRACE;MONO + + + + + + + + + + diff --git a/Libraries/Hyper.ComponentModel/Hyper.ComponentModel.NetStandard.csproj b/Libraries/Hyper.ComponentModel/Hyper.ComponentModel.NetStandard.csproj index 3e53cc156..4cd0d3594 100644 --- a/Libraries/Hyper.ComponentModel/Hyper.ComponentModel.NetStandard.csproj +++ b/Libraries/Hyper.ComponentModel/Hyper.ComponentModel.NetStandard.csproj @@ -1,16 +1,16 @@ - - - - netstandard2.1 - Pavel Nosovich - - Hyper.ComponentModel - Copyright (c) 2014 Pavel Nosovich - AnyCPU;x64 - - - - - - - + + + + netstandard2.1 + Pavel Nosovich + + Hyper.ComponentModel + Copyright (c) 2014 Pavel Nosovich + AnyCPU;x64 + + + + + + + diff --git a/Libraries/Lidgren.Network/Lidgren.NetStandard.csproj b/Libraries/Lidgren.Network/Lidgren.NetStandard.csproj index 4cf45b8e4..3e265503b 100644 --- a/Libraries/Lidgren.Network/Lidgren.NetStandard.csproj +++ b/Libraries/Lidgren.Network/Lidgren.NetStandard.csproj @@ -1,33 +1,33 @@ - - - - netstandard2.1 - Lidgren - - Lidgren.Network - Copyright (c) 2015 lidgren - 2012.1.7.0 - AnyCPU;x64 - - - - 1701;1702;3021 - - - - 1701;1702;3021 - - - - 1701;1702;3021 - - - - 1701;1702;3021 - - - - - - - + + + + netstandard2.1 + Lidgren + + Lidgren.Network + Copyright (c) 2015 lidgren + 2012.1.7.0 + AnyCPU;x64 + + + + 1701;1702;3021 + + + + 1701;1702;3021 + + + + 1701;1702;3021 + + + + 1701;1702;3021 + + + + + + + diff --git a/Libraries/MonoGame.Framework/Src/.gitignore b/Libraries/MonoGame.Framework/Src/.gitignore index b0bd399e1..f605f607e 100644 --- a/Libraries/MonoGame.Framework/Src/.gitignore +++ b/Libraries/MonoGame.Framework/Src/.gitignore @@ -1,93 +1,93 @@ -#OS junk files -[Tt]humbs.db -*.DS_Store - -#Output Linux Installer -Installers/Linux/tmp_deb/ -Installers/Linux/tmp_run/ -*.run -*.deb - -#Visual Studio files -*.pidb -*.userprefs -*.[Oo]bj -*.exe -*.pdb -*.user -*.aps -*.pch -*.vspscc -*.vssscc -*_i.c -*_p.c -*.ncb -*.suo -*.tlb -*.tlh -*.bak -*.[Cc]ache -*.ilk -*.log -*.lib -*.sbr -*.sdf -*.csproj.csdat -ipch/ -obj/ -[Bb]in -[Dd]ebug*/ -[Rr]elease*/ -Ankh.NoLoad -.vs/ -project.lock.json -/MonoGame.Framework/MonoGame.Framework.Net.WindowsUniversal.project.lock.json -/MonoGame.Framework/MonoGame.Framework.WindowsUniversal.project.lock.json -artifacts/ - -# JetBrains Rider -.idea/ - -#Tooling -_ReSharper*/ -*.resharper -[Tt]est[Rr]esult* - -#Visual Studio Rebracer extension, allows the user to automatically change the style configuration by project -rebracer.xml - -#Subversion files -.svn - -# Office Temp Files -~$* - -#monodroid private beta -monodroid*.msi - -#Unix temporary files -*~ - -# Output docs -Documentation/Output/ - -# Protobuild Generated Files -*.speccache -*.ncrunchproject -*.ncrunchsolution - -#Mac Package Files -*.pkg -*.mpack -**/packages - -#Nuget Packages -**/*.nupkg - -#Zip files -*.zip - -Installers/MacOS/Scripts/Framework/postinstall -IDE/MonoDevelop/MonoDevelop.MonoGame/templates/Common/MonoGame.Framework.dll.config - -ThirdParty/* +#OS junk files +[Tt]humbs.db +*.DS_Store + +#Output Linux Installer +Installers/Linux/tmp_deb/ +Installers/Linux/tmp_run/ +*.run +*.deb + +#Visual Studio files +*.pidb +*.userprefs +*.[Oo]bj +*.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +*.vssscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.[Cc]ache +*.ilk +*.log +*.lib +*.sbr +*.sdf +*.csproj.csdat +ipch/ +obj/ +[Bb]in +[Dd]ebug*/ +[Rr]elease*/ +Ankh.NoLoad +.vs/ +project.lock.json +/MonoGame.Framework/MonoGame.Framework.Net.WindowsUniversal.project.lock.json +/MonoGame.Framework/MonoGame.Framework.WindowsUniversal.project.lock.json +artifacts/ + +# JetBrains Rider +.idea/ + +#Tooling +_ReSharper*/ +*.resharper +[Tt]est[Rr]esult* + +#Visual Studio Rebracer extension, allows the user to automatically change the style configuration by project +rebracer.xml + +#Subversion files +.svn + +# Office Temp Files +~$* + +#monodroid private beta +monodroid*.msi + +#Unix temporary files +*~ + +# Output docs +Documentation/Output/ + +# Protobuild Generated Files +*.speccache +*.ncrunchproject +*.ncrunchsolution + +#Mac Package Files +*.pkg +*.mpack +**/packages + +#Nuget Packages +**/*.nupkg + +#Zip files +*.zip + +Installers/MacOS/Scripts/Framework/postinstall +IDE/MonoDevelop/MonoDevelop.MonoGame/templates/Common/MonoGame.Framework.dll.config + +ThirdParty/* diff --git a/Libraries/MonoGame.Framework/Src/MonoGame.Framework/Graphics/SpriteBatch.cs b/Libraries/MonoGame.Framework/Src/MonoGame.Framework/Graphics/SpriteBatch.cs index a2cc3d4e3..4b12f5c1f 100644 --- a/Libraries/MonoGame.Framework/Src/MonoGame.Framework/Graphics/SpriteBatch.cs +++ b/Libraries/MonoGame.Framework/Src/MonoGame.Framework/Graphics/SpriteBatch.cs @@ -7,23 +7,10 @@ using System.Text; namespace Microsoft.Xna.Framework.Graphics { - public interface ISpriteBatch - { - public void Draw(Texture2D texture, - Vector2 position, - Rectangle? sourceRectangle, - Color color, - float rotation, - Vector2 origin, - Vector2 scale, - SpriteEffects effects, - float layerDepth); - } - /// /// Helper class for drawing text strings and sprites in one or more optimized batches. /// - public class SpriteBatch : GraphicsResource, ISpriteBatch + public class SpriteBatch : GraphicsResource { #region Private Fields readonly SpriteBatcher _batcher; diff --git a/Libraries/SharpFont/Source/SharpFont/SharpFont.NetStandard.csproj b/Libraries/SharpFont/Source/SharpFont/SharpFont.NetStandard.csproj index a4477adaa..6f2368424 100644 --- a/Libraries/SharpFont/Source/SharpFont/SharpFont.NetStandard.csproj +++ b/Libraries/SharpFont/Source/SharpFont/SharpFont.NetStandard.csproj @@ -1,45 +1,45 @@ - - - - netstandard2.1 - SharpFont - SharpFont - Cross-platform FreeType bindings for C# - Robmaister - SharpFont - - Copyright (c) Robert Rouhani 2012-2016 - AnyCPU;x64 - - - - TRACE;DEBUG;SHARPFONT_PORTABLE - true - - - - TRACE;DEBUG;SHARPFONT_PORTABLE - true - 1701;1702;3021 - - - - TRACE;SHARPFONT_PORTABLE - true - - - - TRACE;SHARPFONT_PORTABLE - true - 1701;1702;3021 - - - - - - - - - - - + + + + netstandard2.1 + SharpFont + SharpFont + Cross-platform FreeType bindings for C# + Robmaister + SharpFont + + Copyright (c) Robert Rouhani 2012-2016 + AnyCPU;x64 + + + + TRACE;DEBUG;SHARPFONT_PORTABLE + true + + + + TRACE;DEBUG;SHARPFONT_PORTABLE + true + 1701;1702;3021 + + + + TRACE;SHARPFONT_PORTABLE + true + + + + TRACE;SHARPFONT_PORTABLE + true + 1701;1702;3021 + + + + + + + + + + + diff --git a/Libraries/XNATypes/XNATypes.csproj b/Libraries/XNATypes/XNATypes.csproj index 57fd8b083..b3b90d794 100644 --- a/Libraries/XNATypes/XNATypes.csproj +++ b/Libraries/XNATypes/XNATypes.csproj @@ -1,10 +1,10 @@ - - - - netstandard2.1 - AnyCPU;x64 - - - - - + + + + netstandard2.1 + AnyCPU;x64 + + + + + diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/common.props b/Libraries/webm_mem_playback/opus/win32/VS2015/common.props index 03cd45b0c..6c757d8b7 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/common.props +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/common.props @@ -1,82 +1,82 @@ - - - - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - Unicode - - - true - true - false - - - false - false - true - - - - Level3 - false - false - ..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - false - - - Console - - - true - Console - - - - - Guard - ProgramDatabase - NoExtensions - false - true - false - Disabled - false - false - Disabled - MultiThreadedDebug - MultiThreadedDebugDLL - true - false - - - true - - - - - false - None - true - true - false - Speed - Fast - Precise - true - true - true - MaxSpeed - MultiThreaded - MultiThreadedDLL - 16Bytes - - - false - - - + + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ + Unicode + + + true + true + false + + + false + false + true + + + + Level3 + false + false + ..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + false + + + Console + + + true + Console + + + + + Guard + ProgramDatabase + NoExtensions + false + true + false + Disabled + false + false + Disabled + MultiThreadedDebug + MultiThreadedDebugDLL + true + false + + + true + + + + + false + None + true + true + false + Speed + Fast + Precise + true + true + true + MaxSpeed + MultiThreaded + MultiThreadedDLL + 16Bytes + + + false + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj b/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj index fc2241116..ae420d508 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj @@ -1,399 +1,399 @@ - - - - - DebugDLL_fixed - Win32 - - - DebugDLL_fixed - x64 - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseDLL_fixed - Win32 - - - ReleaseDLL_fixed - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - Release - Win32 - - - Release - x64 - - - - Win32Proj - opus - {219EC965-228A-1824-174D-96449D05F88A} - - - - StaticLibrary - v142 - - - DynamicLibrary - v142 - - - DynamicLibrary - v142 - - - StaticLibrary - v142 - - - DynamicLibrary - v142 - - - DynamicLibrary - v142 - - - StaticLibrary - v142 - - - DynamicLibrary - v142 - - - DynamicLibrary - v142 - - - StaticLibrary - v142 - - - DynamicLibrary - v142 - - - DynamicLibrary - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\silk\fixed;..\..\silk\float;%(AdditionalIncludeDirectories) - DLL_EXPORT;%(PreprocessorDefinitions) - FIXED_POINT;%(PreprocessorDefinitions) - /arch:IA32 %(AdditionalOptions) - - - /ignore:4221 %(AdditionalOptions) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4244;%(DisableSpecificWarnings) - - - - - - - - - - - - - - - false - - - false - - - true - - - - - - - true - - - true - - - false - - - - - - - + + + + + DebugDLL_fixed + Win32 + + + DebugDLL_fixed + x64 + + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL_fixed + Win32 + + + ReleaseDLL_fixed + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + opus + {219EC965-228A-1824-174D-96449D05F88A} + + + + StaticLibrary + v142 + + + DynamicLibrary + v142 + + + DynamicLibrary + v142 + + + StaticLibrary + v142 + + + DynamicLibrary + v142 + + + DynamicLibrary + v142 + + + StaticLibrary + v142 + + + DynamicLibrary + v142 + + + DynamicLibrary + v142 + + + StaticLibrary + v142 + + + DynamicLibrary + v142 + + + DynamicLibrary + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\silk\fixed;..\..\silk\float;%(AdditionalIncludeDirectories) + DLL_EXPORT;%(PreprocessorDefinitions) + FIXED_POINT;%(PreprocessorDefinitions) + /arch:IA32 %(AdditionalOptions) + + + /ignore:4221 %(AdditionalOptions) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4244;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + false + + + false + + + true + + + + + + + true + + + true + + + false + + + + + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj.filters b/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj.filters index 47185c67d..97eb46551 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj.filters +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/opus.vcxproj.filters @@ -1,744 +1,744 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj b/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj index fcd971bb6..7ad4b5e21 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj @@ -1,171 +1,171 @@ - - - - - DebugDLL_fixed - Win32 - - - DebugDLL_fixed - x64 - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseDLL_fixed - Win32 - - - ReleaseDLL_fixed - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - Release - Win32 - - - Release - x64 - - - - - {219ec965-228a-1824-174d-96449d05f88a} - - - - - - - {016C739D-6389-43BF-8D88-24B2BF6F620F} - Win32Proj - opus_demo - - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + DebugDLL_fixed + Win32 + + + DebugDLL_fixed + x64 + + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL_fixed + Win32 + + + ReleaseDLL_fixed + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + + + + + {219ec965-228a-1824-174d-96449d05f88a} + + + + + + + {016C739D-6389-43BF-8D88-24B2BF6F620F} + Win32Proj + opus_demo + + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj.filters b/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj.filters index dbcc8ae92..2eb113ac8 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj.filters +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/opus_demo.vcxproj.filters @@ -1,22 +1,22 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj index e428bd3f7..4ba7c8ae5 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj @@ -1,171 +1,171 @@ - - - - - DebugDLL_fixed - Win32 - - - DebugDLL_fixed - x64 - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseDLL_fixed - Win32 - - - ReleaseDLL_fixed - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - {219ec965-228a-1824-174d-96449d05f88a} - - - - {1D257A17-D254-42E5-82D6-1C87A6EC775A} - Win32Proj - test_opus_api - - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + DebugDLL_fixed + Win32 + + + DebugDLL_fixed + x64 + + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL_fixed + Win32 + + + ReleaseDLL_fixed + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + {219ec965-228a-1824-174d-96449d05f88a} + + + + {1D257A17-D254-42E5-82D6-1C87A6EC775A} + Win32Proj + test_opus_api + + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj.filters b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj.filters index 070c8ab01..383d19f71 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj.filters +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_api.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj index cbf562183..8e4640094 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj @@ -1,171 +1,171 @@ - - - - - DebugDLL_fixed - Win32 - - - DebugDLL_fixed - x64 - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseDLL_fixed - Win32 - - - ReleaseDLL_fixed - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - {219ec965-228a-1824-174d-96449d05f88a} - - - - {8578322A-1883-486B-B6FA-E0094B65C9F2} - Win32Proj - test_opus_api - - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + DebugDLL_fixed + Win32 + + + DebugDLL_fixed + x64 + + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL_fixed + Win32 + + + ReleaseDLL_fixed + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + {219ec965-228a-1824-174d-96449d05f88a} + + + + {8578322A-1883-486B-B6FA-E0094B65C9F2} + Win32Proj + test_opus_api + + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj.filters b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj.filters index 588637e83..3036a4e70 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj.filters +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_decode.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4a0dd677-931f-4728-afe5-b761149fc7eb} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - + + + + + {4a0dd677-931f-4728-afe5-b761149fc7eb} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj index 5a313c31d..6804918a3 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj @@ -1,172 +1,172 @@ - - - - - DebugDLL_fixed - Win32 - - - DebugDLL_fixed - x64 - - - DebugDLL - Win32 - - - DebugDLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseDLL_fixed - Win32 - - - ReleaseDLL_fixed - x64 - - - ReleaseDLL - Win32 - - - ReleaseDLL - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - {219ec965-228a-1824-174d-96449d05f88a} - - - - {84DAA768-1A38-4312-BB61-4C78BB59E5B8} - Win32Proj - test_opus_api - - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - Application - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + DebugDLL_fixed + Win32 + + + DebugDLL_fixed + x64 + + + DebugDLL + Win32 + + + DebugDLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + ReleaseDLL_fixed + Win32 + + + ReleaseDLL_fixed + x64 + + + ReleaseDLL + Win32 + + + ReleaseDLL + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + {219ec965-228a-1824-174d-96449d05f88a} + + + + {84DAA768-1A38-4312-BB61-4C78BB59E5B8} + Win32Proj + test_opus_api + + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + Application + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj.filters b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj.filters index f04776380..4ed3bb9e7 100644 --- a/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj.filters +++ b/Libraries/webm_mem_playback/opus/win32/VS2015/test_opus_encode.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {546c8d9a-103e-4f78-972b-b44e8d3c8aba} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - + + + + + {546c8d9a-103e-4f78-972b-b44e8d3c8aba} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/Libraries/webm_mem_playback/opus/win32/genversion.bat b/Libraries/webm_mem_playback/opus/win32/genversion.bat index aea557393..1def7460b 100644 --- a/Libraries/webm_mem_playback/opus/win32/genversion.bat +++ b/Libraries/webm_mem_playback/opus/win32/genversion.bat @@ -1,37 +1,37 @@ -@echo off - -setlocal enableextensions enabledelayedexpansion - -for /f %%v in ('cd "%~dp0.." ^&^& git status ^>NUL 2^>NUL ^&^& git describe --tags --match "v*" --dirty 2^>NUL') do set version=%%v - -if not "%version%"=="" set version=!version:~1! && goto :gotversion - -if exist "%~dp0..\package_version" goto :getversion - -echo Git cannot be found, nor can package_version. Generating unknown version. - -set version=unknown - -goto :gotversion - -:getversion - -for /f "delims== tokens=2" %%v in (%~dps0..\package_version) do set version=%%v -set version=!version:"=! - -:gotversion - -set version=!version: =! -set version_out=#define %~2 "%version%" - -echo %version_out%> "%~1_temp" - -echo n | comp "%~1_temp" "%~1" > NUL 2> NUL - -if not errorlevel 1 goto exit - -copy /y "%~1_temp" "%~1" - -:exit - -del "%~1_temp" +@echo off + +setlocal enableextensions enabledelayedexpansion + +for /f %%v in ('cd "%~dp0.." ^&^& git status ^>NUL 2^>NUL ^&^& git describe --tags --match "v*" --dirty 2^>NUL') do set version=%%v + +if not "%version%"=="" set version=!version:~1! && goto :gotversion + +if exist "%~dp0..\package_version" goto :getversion + +echo Git cannot be found, nor can package_version. Generating unknown version. + +set version=unknown + +goto :gotversion + +:getversion + +for /f "delims== tokens=2" %%v in (%~dps0..\package_version) do set version=%%v +set version=!version:"=! + +:gotversion + +set version=!version: =! +set version_out=#define %~2 "%version%" + +echo %version_out%> "%~1_temp" + +echo n | comp "%~1_temp" "%~1" > NUL 2> NUL + +if not errorlevel 1 goto exit + +copy /y "%~1_temp" "%~1" + +:exit + +del "%~1_temp" diff --git a/Libraries/webm_mem_playback/webm_mem_playback/webm-mem-playback.vcxproj b/Libraries/webm_mem_playback/webm_mem_playback/webm-mem-playback.vcxproj index 5a3253ee6..6e90faa56 100644 --- a/Libraries/webm_mem_playback/webm_mem_playback/webm-mem-playback.vcxproj +++ b/Libraries/webm_mem_playback/webm_mem_playback/webm-mem-playback.vcxproj @@ -1,148 +1,148 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {D0097438-DA4F-4E6D-87AC-7D99DDD276B2} - vpxmemplayback - 10.0 - webm_mem_playback - - - - DynamicLibrary - true - v142 - MultiByte - - - DynamicLibrary - false - v142 - true - MultiByte - - - DynamicLibrary - true - v142 - MultiByte - - - DynamicLibrary - false - v142 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(ProjectName)_$(Platform) - - - - Level3 - Disabled - true - true - ..\libwebm_x86_64_vs15;..\libvpx_x86_64_vs15;%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - - Level3 - Disabled - true - true - %(AdditionalIncludeDirectories) - MultiThreadedDebug - - - %(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - true - ..\libwebm_x86_64_vs15;..\libvpx_x86_64_vs15;%(AdditionalIncludeDirectories) - - - true - true - %(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - true - ..\libwebm_x86_vs19;..\libvpx_x64_vs15;..\opus\include;%(AdditionalIncludeDirectories) - MultiThreaded - Speed - - - true - true - ../libvpx_x64_vs15/$(Platform)/$(Configuration)/vpxmt.lib;../libwebm_x64_vs19/Release/libwebm.lib;../opus/win32/VS2015/x64/Release/opus.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D0097438-DA4F-4E6D-87AC-7D99DDD276B2} + vpxmemplayback + 10.0 + webm_mem_playback + + + + DynamicLibrary + true + v142 + MultiByte + + + DynamicLibrary + false + v142 + true + MultiByte + + + DynamicLibrary + true + v142 + MultiByte + + + DynamicLibrary + false + v142 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(ProjectName)_$(Platform) + + + + Level3 + Disabled + true + true + ..\libwebm_x86_64_vs15;..\libvpx_x86_64_vs15;%(AdditionalIncludeDirectories) + + + %(AdditionalDependencies) + + + + + Level3 + Disabled + true + true + %(AdditionalIncludeDirectories) + MultiThreadedDebug + + + %(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + ..\libwebm_x86_64_vs15;..\libvpx_x86_64_vs15;%(AdditionalIncludeDirectories) + + + true + true + %(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + ..\libwebm_x86_vs19;..\libvpx_x64_vs15;..\opus\include;%(AdditionalIncludeDirectories) + MultiThreaded + Speed + + + true + true + ../libvpx_x64_vs15/$(Platform)/$(Configuration)/vpxmt.lib;../libwebm_x64_vs19/Release/libwebm.lib;../opus/win32/VS2015/x64/Release/opus.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + \ No newline at end of file