Skip to content

Commit

Permalink
v0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Regalis committed Aug 4, 2015
1 parent 47678c3 commit 08c5117
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 15 deletions.
Binary file modified Subsurface/Content/Items/Clothes/captainLegs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion Subsurface/Source/DebugConsole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,14 @@ public static void ExecuteCommand(string command, Game1 game)
break;
case "savemap":
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);
break;
case "loadmap":
Expand Down
4 changes: 2 additions & 2 deletions Subsurface/Source/Screens/MainMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public MainMenuScreen(Game1 game)

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]);

new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server IP:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
Expand All @@ -164,7 +164,7 @@ public MainMenuScreen(Game1 game)

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]);

new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server port:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.HostServer]);
Expand Down
8 changes: 4 additions & 4 deletions Subsurface/Source/Screens/NetLobbyScreen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public NetLobbyScreen()
int columnX = 0;

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;

if (Submarine.SavedSubmarines.Count > 0)
Expand All @@ -176,7 +176,7 @@ public NetLobbyScreen()
//gamemode ------------------------------------------------------------------

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)
{
Expand Down Expand Up @@ -297,11 +297,11 @@ public override void Select()
GUITextBlock jobText = new GUITextBlock(new Rectangle(0,0,0,20), job.Name, GUI.style, Alignment.Left, Alignment.Right, jobList);
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.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.OnClicked += ChangeJobPreference;
}
Expand Down
3 changes: 3 additions & 0 deletions Subsurface/Subsurface.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="changelog.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Crawler\crawler.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
33 changes: 33 additions & 0 deletions Subsurface/changelog.txt
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions Subsurface/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ www.undertowgames.com/subsurface
Copyright © Undertow Games 2015

Controls:
WASD - move
Shift - run
E - use/activate items and devices
Right click - aim with equipped item
Left click - use equipped item
Tab - select/deselect the chat box in multiplayer mode
F3 - open/close console
WASD - move
Shift - run
E - use/activate items and devices
Right click - aim with equipped item
Left click - use equipped item
Tab - select/deselect the chat box in multiplayer mode
F3 - open/close console

See the wiki for more detailed info and instructions:
http://subsurface.wikia.com/wiki/Subsurface_Wiki
http://subsurface.gamepedia.com

------------------------------------------------------------------------

Expand Down
Binary file modified Subsurface_Solution.v12.suo
Binary file not shown.

0 comments on commit 08c5117

Please sign in to comment.