vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-31 19:02:03 +02:00
parent dcb6de32c0 cbe80a3097
commit 69337cd9e3
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/Character.cs
+1 -1
View File
@@ -123,7 +123,7 @@ namespace Barotrauma
Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition); Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition);
if (moveCam) if (moveCam)
{ {
if (DebugConsole.IsOpen || GUI.PauseMenuOpen || DisableControls || if (DebugConsole.IsOpen || GUI.PauseMenuOpen || IsUnconscious ||
(GameMain.GameSession?.CrewManager?.CrewCommander != null && GameMain.GameSession.CrewManager.CrewCommander.IsOpen)) (GameMain.GameSession?.CrewManager?.CrewCommander != null && GameMain.GameSession.CrewManager.CrewCommander.IsOpen))
{ {
if (deltaTime > 0.0f) cam.OffsetAmount = 0.0f; if (deltaTime > 0.0f) cam.OffsetAmount = 0.0f;
Barotrauma/BarotraumaClient/Source/GameMain.cs
+1
View File
@@ -406,6 +406,7 @@ namespace Barotrauma
GUIComponent.UpdateMouseOn(); GUIComponent.UpdateMouseOn();
DebugConsole.Update(this, (float)Timing.Step); DebugConsole.Update(this, (float)Timing.Step);
paused = paused || DebugConsole.IsOpen;
if (!paused) if (!paused)
{ {
Barotrauma/BarotraumaClient/Source/PlayerInput.cs
+3
View File
@@ -143,6 +143,8 @@ namespace Barotrauma
{ {
timeSinceClick += deltaTime; timeSinceClick += deltaTime;
if (GameMain.Instance.IsActive)
{
oldMouseState = mouseState; oldMouseState = mouseState;
mouseState = latestMouseState; mouseState = latestMouseState;
UpdateVariable(); UpdateVariable();
@@ -162,6 +164,7 @@ namespace Barotrauma
timeSinceClick = 0.0; timeSinceClick = 0.0;
} }
} }
}
public static void UpdateVariable() public static void UpdateVariable()
{ {
README.md
+1 -1
View File
@@ -16,6 +16,6 @@ Before downloading the source code, please read the [EULA](EULA.txt).
### Windows ### Windows
- [Visual Studio](https://www.visualstudio.com/vs/community/) with C# 6.0 support (VS 2015 or later recommended) - [Visual Studio](https://www.visualstudio.com/vs/community/) with C# 6.0 support (VS 2015 or later recommended)
### Linux ### Linux
- [Mono 5.4](www.mono-project.com) - [Mono 5.4](http://www.mono-project.com)
- [MonoDevelop 6](http://www.monodevelop.com/) - [MonoDevelop 6](http://www.monodevelop.com/)
- *Note: See http://community.monogame.net/t/installing-monogame-3-6-on-linux/8811 to get this version of MonoDevelop if your distro's package distribution suite is outdated.* - *Note: See http://community.monogame.net/t/installing-monogame-3-6-on-linux/8811 to get this version of MonoDevelop if your distro's package distribution suite is outdated.*