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

Control settings, more server settings, selecting character face

Browse Source
This commit is contained in:
Regalis
2015-10-28 19:07:17 +02:00
parent 9ed2963cd9
commit 948285f6ab
46 changed files with 789 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Item.cs
+9 -9
View File
@@ -727,7 +727,7 @@ namespace Barotrauma
namesBox.Text = relatedItem.JoinedNames;
namesBox.UserData = new ObjectProperty(property, relatedItem);
namesBox.OnEnter = EnterProperty;
namesBox.OnEnterPressed = EnterProperty;
namesBox.OnTextChanged = PropertyChanged;
y += 30;
@@ -754,7 +754,7 @@ namespace Barotrauma
}
propertyBox.UserData = objectProperty;
propertyBox.OnEnter = EnterProperty;
propertyBox.OnEnterPressed = EnterProperty;
propertyBox.OnTextChanged = PropertyChanged;
y = y + height+10;
}
@@ -879,8 +879,8 @@ namespace Barotrauma
bool pickHit = false, selectHit = false;
if (Screen.Selected == GameMain.EditMapScreen)
{
pickHit = picker.GetInputState(InputType.Select);
selectHit = picker.GetInputState(InputType.Select);
pickHit = picker.IsKeyHit(InputType.Select);
selectHit = picker.IsKeyHit(InputType.Select);
}
else
{
@@ -891,13 +891,13 @@ namespace Barotrauma
}
else if (forceActionKey)
{
if (ic.PickKey == InputType.ActionHit) pickHit = true;
if (ic.SelectKey == InputType.ActionHit) selectHit = true;
if (ic.PickKey == InputType.Use) pickHit = true;
if (ic.SelectKey == InputType.Use) selectHit = true;
}
else
{
pickHit = picker.GetInputState(ic.PickKey);
selectHit = picker.GetInputState(ic.SelectKey);
pickHit = picker.IsKeyHit(ic.PickKey);
selectHit = picker.IsKeyHit(ic.SelectKey);
}
}
@@ -925,7 +925,7 @@ namespace Barotrauma
if (picker.SelectedConstruction == this)
{
if (picker.GetInputState(InputType.Select)) picker.SelectedConstruction = null;
if (picker.IsKeyHit(InputType.Select)) picker.SelectedConstruction = null;
}
else if (selected)
{