From 91fa25ecd259e7302a65f2338b5df43b9d0f1f8f Mon Sep 17 00:00:00 2001 From: Regalis Date: Fri, 20 Nov 2015 17:44:38 +0200 Subject: [PATCH] askjdnf --- Subsurface/Content/Map/StructurePrefabs.xml | 12 ------- .../Content/Particles/ParticlePrefabs.xml | 1 + .../Characters/HumanoidAnimController.cs | 6 ++-- Subsurface/Source/DebugConsole.cs | 2 +- Subsurface/Source/Sounds/SoundPlayer.cs | 2 +- Subsurface/changelog.txt | 30 ++++++++++++++++++ Subsurface_Solution.v12.suo | Bin 724992 -> 724992 bytes 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml index c0c311d07..5b7b2af85 100644 --- a/Subsurface/Content/Map/StructurePrefabs.xml +++ b/Subsurface/Content/Map/StructurePrefabs.xml @@ -48,18 +48,6 @@ - - - - - - - - diff --git a/Subsurface/Content/Particles/ParticlePrefabs.xml b/Subsurface/Content/Particles/ParticlePrefabs.xml index 457077a27..e8db4ff60 100644 --- a/Subsurface/Content/Particles/ParticlePrefabs.xml +++ b/Subsurface/Content/Particles/ParticlePrefabs.xml @@ -9,6 +9,7 @@ lifetime="2" growtime ="0.2" collideswithwalls="true" + collisionradius="30.0" velocitychange="0.0, -9.8"> diff --git a/Subsurface/Source/Characters/HumanoidAnimController.cs b/Subsurface/Source/Characters/HumanoidAnimController.cs index 2e60657b6..8244d80e6 100644 --- a/Subsurface/Source/Characters/HumanoidAnimController.cs +++ b/Subsurface/Source/Characters/HumanoidAnimController.cs @@ -196,9 +196,7 @@ namespace Barotrauma Limb rightLeg = GetLimb(LimbType.RightLeg); if (character.SelectedCharacter != null) DragCharacter(character.SelectedCharacter); - - - + float getUpSpeed = 0.3f; float walkCycleSpeed = head.LinearVelocity.X * walkAnimSpeed; if (stairs != null) @@ -261,7 +259,7 @@ namespace Barotrauma if (!onGround || (LowestLimb.SimPosition.Y - floorY > 0.5f && stairs == null)) return; - getUpSpeed = getUpSpeed * (head.SimPosition.Y - colliderPos.Y); + getUpSpeed = getUpSpeed * Math.Max(head.SimPosition.Y - colliderPos.Y, 0.1f); if (stairs != null) { diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs index dc3c86612..d5f9d2be1 100644 --- a/Subsurface/Source/DebugConsole.cs +++ b/Subsurface/Source/DebugConsole.cs @@ -53,7 +53,7 @@ namespace Barotrauma frame.Color = Color.White * 0.4f; frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f); - listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.8f, null, frame); + listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.9f, null, frame); textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black*0.6f, Color.White, Alignment.BottomLeft, Alignment.Left, null, frame); NewMessage("Press F3 to open/close the debug console", Color.Cyan); diff --git a/Subsurface/Source/Sounds/SoundPlayer.cs b/Subsurface/Source/Sounds/SoundPlayer.cs index 7b9d21872..b82a845f6 100644 --- a/Subsurface/Source/Sounds/SoundPlayer.cs +++ b/Subsurface/Source/Sounds/SoundPlayer.cs @@ -197,7 +197,7 @@ namespace Barotrauma //how fast the sub is moving, scaled to 0.0 -> 1.0 float movementFactor = 0.0f; - if (Submarine.Loaded!=null) + if (Submarine.Loaded != null) { movementFactor = (Submarine.Loaded.Speed == Vector2.Zero) ? 0.0f : Submarine.Loaded.Speed.Length() / 500.0f; diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt index 59f1566d0..c4863a76f 100644 --- a/Subsurface/changelog.txt +++ b/Subsurface/changelog.txt @@ -1,4 +1,34 @@ +--------------------------------------------------------------------------------------------------------- +v0.2.6 +--------------------------------------------------------------------------------------------------------- + +Multiplayer: + - major changes to the networking code: better lag compensation, more reliable item/character + syncing, lower bandwidth consumption + - spectator mode + +Submarine: + - overloading the electrical grid or the reactor may cause fires + +Characters: + - blood texture drawn on damaged limbs + - fixed limbs clipping through walls + - some new head sprites + +Items: + - underwater scooters + - water detector + - jumpsuits for engineers and mechanics + - new artifact with an effect that makes retrieving it much harder + - less obtrusive ''fow effect'' when wearing a diving suit or a mask + - fire extinguishers + - some new sprites + +Misc: + - fixed placing ladders and labels in sub editor + - fixed a couple of game-crashing bugs in submarine saving + --------------------------------------------------------------------------------------------------------- v0.2.5 --------------------------------------------------------------------------------------------------------- diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index 8ecac5e38b6a7ed538918d7078497a27fb720e05..620b8c7b6f760aeef13755cd9599dc070f0e7176 100644 GIT binary patch delta 486 zcmXAlPe>b45XRrkzFkeMh9FXkEeVPs7;u*wa*ZLn#w5 zZPofUA;cZ#1qiXi80q+JPb&(M=c1Wnc}eNi&rN(O^=$n7_uAHov4@VSA8&ep$;zVZ zx@|1HU|gqI6@injuy3eAa^H2bi5-Yc_lH$~7`}|FU=P%T^BFA~i$S*rof>uDmko}I zo{BZE5O3H9AM#Ha?JBwfyL*{F>?nWC7N0V7(2h0ErN3H@_2E3wr-B|;(NWy(%?#uC zzm1ekVB`PW>M*v*80VnN1g=7nUJu|aNYK<>Y$f}7S)Cd<#HGpYKiUtdxvmVqFT6V+ zd6d6(vmIGBN;ceFr)FeKocHf@xFaUTZ1AK=izW`rg5<}gg~8wl9(-qz*Ikzc9R4lW zA+De3tm?3E-BCbosfNq nlB6vc;Fy-;vPpflWeYggX<#mpl#I?8Oc_(ocvK+i{pS1y9UP*b delta 523 zcmXAlPe@cz6vpp4_r5od1Ty|%6phK55n2rP9@DG}9L8Bx6k-V`O*0~bNVX^<1{4}8 zN6T5f>A@U`7O#@mCPJFUYf(-@SR2EYxJfezTC@ynBXwR~_`&@S-#zC$x8x*BPQo%k zRL$-X2qF4?_!4G1t5?IpGzziF;sgzEDymvPUg3<=th1AESL!$P2Eta|3^ugTs3yb! z`}UZ_KYVORj@B=?Wc%#L`5E=EawK&gp4}Zwd1EQ~P_&&h%8MUh9B4SHVzz-ny7dby z)HDRhx9p**V_GFy&NmcqaHB6rd$CNYJnA13YZJ~wH)uF zvu}i}drF84AZY!&Ht1z;;@TzGMT9)f_uy$NjR&G$;Uhk|^RV+6Ib~23FN4!`n_tf| zv_6O(_Loo_{Vc