diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index 6700832dd..eaf9142f9 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -417,14 +417,11 @@ PreserveNewest - - PreserveNewest - PreserveNewest Designer - + PreserveNewest @@ -637,19 +634,10 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest Designer - - PreserveNewest - PreserveNewest @@ -701,9 +689,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -945,10 +930,7 @@ PreserveNewest - - PreserveNewest - - + PreserveNewest diff --git a/Subsurface/Barotrauma.csproj.user b/Subsurface/Barotrauma.csproj.user index df35fcf91..1782abafa 100644 --- a/Subsurface/Barotrauma.csproj.user +++ b/Subsurface/Barotrauma.csproj.user @@ -9,7 +9,7 @@ en-US false - ProjectFiles + ShowAllFiles diff --git a/Subsurface/Content/Items/Weapons/explosives.png b/Subsurface/Content/Items/Weapons/explosives.png deleted file mode 100644 index 3fcdcc650..000000000 Binary files a/Subsurface/Content/Items/Weapons/explosives.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/explosives.xml b/Subsurface/Content/Items/Weapons/explosives.xml index 03eb44db1..efa25895c 100644 --- a/Subsurface/Content/Items/Weapons/explosives.xml +++ b/Subsurface/Content/Items/Weapons/explosives.xml @@ -6,7 +6,7 @@ pickdistance="150" price="100"> - + @@ -23,7 +23,7 @@ pickdistance="150" price="50"> - + diff --git a/Subsurface/Content/Items/Weapons/harpoon.png b/Subsurface/Content/Items/Weapons/harpoon.png deleted file mode 100644 index ed2671531..000000000 Binary files a/Subsurface/Content/Items/Weapons/harpoon.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/harpoongun.png b/Subsurface/Content/Items/Weapons/harpoongun.png deleted file mode 100644 index 79397f19f..000000000 Binary files a/Subsurface/Content/Items/Weapons/harpoongun.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/railgun.xml b/Subsurface/Content/Items/Weapons/railgun.xml index b2b55ed65..5c9680dfe 100644 --- a/Subsurface/Content/Items/Weapons/railgun.xml +++ b/Subsurface/Content/Items/Weapons/railgun.xml @@ -64,7 +64,7 @@ pickdistance="200" price="100"> - + diff --git a/Subsurface/Content/Items/Weapons/railgunshell.png b/Subsurface/Content/Items/Weapons/railgunshell.png deleted file mode 100644 index f03df6d36..000000000 Binary files a/Subsurface/Content/Items/Weapons/railgunshell.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/spear.png b/Subsurface/Content/Items/Weapons/spear.png deleted file mode 100644 index 9ae136cb8..000000000 Binary files a/Subsurface/Content/Items/Weapons/spear.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/stunbaton.ogg b/Subsurface/Content/Items/Weapons/stunbaton.ogg deleted file mode 100644 index 0efb8d0d6..000000000 Binary files a/Subsurface/Content/Items/Weapons/stunbaton.ogg and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/stunbaton.png b/Subsurface/Content/Items/Weapons/stunbaton.png deleted file mode 100644 index 2ea699413..000000000 Binary files a/Subsurface/Content/Items/Weapons/stunbaton.png and /dev/null differ diff --git a/Subsurface/Content/Items/Weapons/weapons.png b/Subsurface/Content/Items/Weapons/weapons.png new file mode 100644 index 000000000..398e17bd0 Binary files /dev/null and b/Subsurface/Content/Items/Weapons/weapons.png differ diff --git a/Subsurface/Content/Items/Weapons/weapons.xml b/Subsurface/Content/Items/Weapons/weapons.xml index 5d5bb074a..fa95d3ecc 100644 --- a/Subsurface/Content/Items/Weapons/weapons.xml +++ b/Subsurface/Content/Items/Weapons/weapons.xml @@ -7,7 +7,7 @@ pickthroughwalls="true" price="50"> - + @@ -22,7 +22,7 @@ pickdistance="200" price="500"> - + @@ -47,12 +47,12 @@ price="200" tags="smallitem"> - + - + @@ -64,7 +64,7 @@ pickdistance="150" price="100"> - + @@ -88,7 +88,7 @@ tags="smallitem,loadable" price="50"> - + diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs index 4cc19993e..a78f5f2cc 100644 --- a/Subsurface/Source/Characters/Character.cs +++ b/Subsurface/Source/Characters/Character.cs @@ -394,7 +394,7 @@ namespace Barotrauma { for (ushort i = 0; i < Info.PickedItemIDs.Count; i++ ) { - if (i == 0) continue; + if (Info.PickedItemIDs[i] == 0) continue; Item item = FindEntityByID(Info.PickedItemIDs[i]) as Item; if (item == null) continue; diff --git a/Subsurface/Source/EventInput/EventInput.cs b/Subsurface/Source/EventInput/EventInput.cs index e28362515..1e51273fa 100644 --- a/Subsurface/Source/EventInput/EventInput.cs +++ b/Subsurface/Source/EventInput/EventInput.cs @@ -165,11 +165,18 @@ namespace EventInput (int)Marshal.GetFunctionPointerForDelegate(hookProcDelegate)); hIMC = ImmGetContext(window.Handle); +#elif LINUX + window.TextInput += ReceiveInput; #endif initialized = true; } + private static void ReceiveInput(object sender, TextInputEventArgs e) + { + OnCharEntered(e.Character); + } + public static void OnCharEntered(char character) { if (CharEntered != null) CharEntered(null, new CharacterEventArgs(character, 0)); diff --git a/Subsurface/Source/GUI/GUIButton.cs b/Subsurface/Source/GUI/GUIButton.cs index bb22f51fe..235bbecbf 100644 --- a/Subsurface/Source/GUI/GUIButton.cs +++ b/Subsurface/Source/GUI/GUIButton.cs @@ -54,6 +54,19 @@ namespace Barotrauma get { return textBlock.TextColor; } set { textBlock.TextColor = value; } } + + public override SpriteFont Font + { + get + { + return (textBlock==null) ? GUI.Font : textBlock.Font; + } + set + { + if (textBlock == null) return; + base.Font = value; + } + } public string Text { diff --git a/Subsurface/Source/GameMain.cs b/Subsurface/Source/GameMain.cs index 3046fe462..40c510c6d 100644 --- a/Subsurface/Source/GameMain.cs +++ b/Subsurface/Source/GameMain.cs @@ -101,6 +101,8 @@ namespace Barotrauma { Graphics = new GraphicsDeviceManager(this); + Window.Title = "Barotrauma"; + Instance = this; Config = new GameSettings("config.xml"); diff --git a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs index 9b5e727af..5178374bb 100644 --- a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs +++ b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs @@ -143,11 +143,13 @@ namespace Barotrauma if (Level.Loaded.AtEndPosition) { endShiftButton.Text = "Enter " + Map.SelectedLocation.Name; + endShiftButton.Font = GUI.SmallFont; endShiftButton.Draw(spriteBatch); } else if (Level.Loaded.AtStartPosition) { endShiftButton.Text = "Enter " + Map.CurrentLocation.Name; + endShiftButton.Font = GUI.SmallFont; endShiftButton.Draw(spriteBatch); } diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs index f48d5977a..1212000c3 100644 --- a/Subsurface/Source/Items/Item.cs +++ b/Subsurface/Source/Items/Item.cs @@ -582,11 +582,6 @@ namespace Barotrauma if (body.LinearVelocity != Vector2.Zero && body.LinearVelocity.Length() > 1000.0f) { body.ResetDynamics(); - if (body.SimPosition.Length() > 1000.0f) - { - Remove(); - return; - } } body.ApplyForce(buoyancy - body.LinearVelocity * volume); diff --git a/Subsurface/Source/Map/Explosion.cs b/Subsurface/Source/Map/Explosion.cs index 256d9d1cb..3c3e77a60 100644 --- a/Subsurface/Source/Map/Explosion.cs +++ b/Subsurface/Source/Map/Explosion.cs @@ -1,4 +1,5 @@ -using FarseerPhysics; + +using FarseerPhysics; using Microsoft.Xna.Framework; using Barotrauma.Lights; using System; @@ -79,17 +80,7 @@ namespace Barotrauma if (force == 0.0f && attack.Stun == 0.0f && attack.GetDamage(1.0f) == 0.0f) return; - Hull hull = Hull.FindHull(displayPosition); - - foreach (Item item in Item.ItemList) - { - if (item.body == null || item.CurrentHull != hull) continue; - - Vector2 dir = (item.SimPosition == simPosition) ? Rand.Vector(1.0f) : Vector2.Normalize(item.SimPosition - simPosition); - float distFactor = 1.0f - Vector2.Distance(item.SimPosition, simPosition) / attack.Range; - - item.body.ApplyLinearImpulse(dir * distFactor * force); - } + //Hull hull = Hull.FindHull(displayPosition); foreach (Character c in Character.CharacterList) { diff --git a/Subsurface/Source/Map/Levels/Level.cs b/Subsurface/Source/Map/Levels/Level.cs index 44b91ef75..8d8fc3c50 100644 --- a/Subsurface/Source/Map/Levels/Level.cs +++ b/Subsurface/Source/Map/Levels/Level.cs @@ -962,6 +962,8 @@ namespace Barotrauma bodies.Clear(); bodies = null; + loaded = null; + //vertexBuffer.Dispose(); //vertexBuffer = null; } diff --git a/Subsurface/Source/PlayerInput.cs b/Subsurface/Source/PlayerInput.cs index 2ca454954..6cb886594 100644 --- a/Subsurface/Source/PlayerInput.cs +++ b/Subsurface/Source/PlayerInput.cs @@ -309,23 +309,6 @@ namespace Barotrauma if (timeSinceClick < doubleClickDelay) doubleClicked = true; timeSinceClick = 0.0; } - -#if LINUX - foreach (Keys key in keyboardState.GetPressedKeys()) - { - if (!oldKeyboardState.IsKeyUp(key)) continue; - - char Character = (char)key; - - if (keyboardState.IsKeyUp(Keys.LeftShift) && keyboardState.IsKeyUp(Keys.RightShift)) - { - Character = char.ToLower(Character); - } - - EventInput.EventInput.OnCharEntered(Character); - } -#endif - } } } diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index dc61639bc..2860880c5 100644 Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ