This commit is contained in:
Regalis
2015-08-04 23:49:08 +03:00
parent 47678c34c4
commit 08c5117e8f
8 changed files with 58 additions and 15 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

+8 -1
View File
@@ -252,7 +252,14 @@ namespace Subsurface
break; break;
case "savemap": case "savemap":
if (commands.Length < 2) break; if (commands.Length < 2) break;
Submarine.SaveCurrent("Content/SavedMaps/" + string.Join(" ", commands.Skip(1))+".gz");
string fileName = string.Join(" ", commands.Skip(1));
if (fileName.Contains("../"))
{
DebugConsole.ThrowError("Illegal symbols in filename (../)");
return;
}
Submarine.SaveCurrent("Content/SavedMaps/" + fileName +".gz");
NewMessage("map saved", Color.Green); NewMessage("map saved", Color.Green);
break; break;
case "loadmap": case "loadmap":
+2 -2
View File
@@ -148,7 +148,7 @@ namespace Subsurface
new GUITextBlock(new Rectangle(0, 0, 0, 30), "Join Server", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]); new GUITextBlock(new Rectangle(0, 0, 0, 30), "Join Server", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
new GUITextBlock(new Rectangle(0, 30, 0, 30), "Name:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]); new GUITextBlock(new Rectangle(0, 30, 0, 30), "Your Name:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
clientNameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.JoinServer]); clientNameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.JoinServer]);
new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server IP:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]); new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server IP:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
@@ -164,7 +164,7 @@ namespace Subsurface
new GUITextBlock(new Rectangle(0, 0, 0, 30), "Host Server", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]); new GUITextBlock(new Rectangle(0, 0, 0, 30), "Host Server", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]);
new GUITextBlock(new Rectangle(0, 30, 0, 30), "Name:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]); new GUITextBlock(new Rectangle(0, 30, 0, 30), "Server Name:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]);
serverNameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.HostServer]); serverNameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.HostServer]);
new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server port:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]); new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server port:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]);
+4 -4
View File
@@ -149,7 +149,7 @@ namespace Subsurface
int columnX = 0; int columnX = 0;
new GUITextBlock(new Rectangle(columnX, 120, columnWidth, 30), "Selected submarine:", GUI.style, infoFrame); new GUITextBlock(new Rectangle(columnX, 120, columnWidth, 30), "Selected submarine:", GUI.style, infoFrame);
subList = new GUIListBox(new Rectangle(columnX, 150, columnWidth, 200), Color.White, GUI.style, infoFrame); subList = new GUIListBox(new Rectangle(columnX, 150, columnWidth, infoFrame.Rect.Height - 150 - 80), Color.White, GUI.style, infoFrame);
subList.OnSelected = SelectMap; subList.OnSelected = SelectMap;
if (Submarine.SavedSubmarines.Count > 0) if (Submarine.SavedSubmarines.Count > 0)
@@ -176,7 +176,7 @@ namespace Subsurface
//gamemode ------------------------------------------------------------------ //gamemode ------------------------------------------------------------------
new GUITextBlock(new Rectangle(columnX, 120, 0, 30), "Selected game mode: ", GUI.style, infoFrame); new GUITextBlock(new Rectangle(columnX, 120, 0, 30), "Selected game mode: ", GUI.style, infoFrame);
modeList = new GUIListBox(new Rectangle(columnX, 150, columnWidth, 200), GUI.style, infoFrame); modeList = new GUIListBox(new Rectangle(columnX, 150, columnWidth, infoFrame.Rect.Height - 150 - 80), GUI.style, infoFrame);
foreach (GameModePreset mode in GameModePreset.list) foreach (GameModePreset mode in GameModePreset.list)
{ {
@@ -297,11 +297,11 @@ namespace Subsurface
GUITextBlock jobText = new GUITextBlock(new Rectangle(0,0,0,20), job.Name, GUI.style, Alignment.Left, Alignment.Right, jobList); GUITextBlock jobText = new GUITextBlock(new Rectangle(0,0,0,20), job.Name, GUI.style, Alignment.Left, Alignment.Right, jobList);
jobText.UserData = job; jobText.UserData = job;
GUIButton upButton = new GUIButton(new Rectangle(0, 0, 20, 20), "u", GUI.style, jobText); GUIButton upButton = new GUIButton(new Rectangle(0, 0, 15, 15), "u", GUI.style, jobText);
upButton.UserData = -1; upButton.UserData = -1;
upButton.OnClicked += ChangeJobPreference; upButton.OnClicked += ChangeJobPreference;
GUIButton downButton = new GUIButton(new Rectangle(25, 0, 20, 20), "d", GUI.style, jobText); GUIButton downButton = new GUIButton(new Rectangle(25, 0, 15, 15), "d", GUI.style, jobText);
downButton.UserData = 1; downButton.UserData = 1;
downButton.OnClicked += ChangeJobPreference; downButton.OnClicked += ChangeJobPreference;
} }
+3
View File
@@ -234,6 +234,9 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="changelog.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Crawler\crawler.png"> <Content Include="Content\Characters\Crawler\crawler.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
+33
View File
@@ -0,0 +1,33 @@
---------------------------------------------------------------------------------------------------------
v0.1.1
---------------------------------------------------------------------------------------------------------
Multiplayer:
- player names are shown
- assigning jobs and selecting job preferences works now (jobs are assigned when the round starts)
- a menu that shows the crew members and their jobs and skills
- reduced lag spikes
- fixed a bug that caused disconnected players to stay in the player list
- server admin can see which player is the traitor
Items:
- plasma cutter / welding tool bugfixes and some light & sound effects
- stun grenades, detonators and c4 blocks work now
- captain's uniform
- items can be placed inside railgun shells (explosives for example)
- buttons can be attached and detached
- on-screen message when trying to use a button without the right ID card
- wire sprites don't overlap and "flicker" on top of each other anymore
- trying to set the color of a lightcomponent to an invalid value doesn't crash the game anymore
Submarine:
- some signs on the walls of Aegir to make navigation a bit easier
- moved the railgun and changed the rotation limits to increase it's area of effect while preventing
shooting at the windows
- fixed waypoint selection bug in submarine editor
- the ".gz" extension is automatically added when saving a map
Other:
- decreased fall/impact damage
- dead characters can be looted
+8 -8
View File
@@ -4,16 +4,16 @@ www.undertowgames.com/subsurface
Copyright © Undertow Games 2015 Copyright © Undertow Games 2015
Controls: Controls:
WASD - move WASD - move
Shift - run Shift - run
E - use/activate items and devices E - use/activate items and devices
Right click - aim with equipped item Right click - aim with equipped item
Left click - use equipped item Left click - use equipped item
Tab - select/deselect the chat box in multiplayer mode Tab - select/deselect the chat box in multiplayer mode
F3 - open/close console F3 - open/close console
See the wiki for more detailed info and instructions: See the wiki for more detailed info and instructions:
http://subsurface.wikia.com/wiki/Subsurface_Wiki http://subsurface.gamepedia.com
------------------------------------------------------------------------ ------------------------------------------------------------------------
Binary file not shown.