Make fonts use A8 textures.

Reduces VRAM usage.

.appveyor.yml

@@ -15,18 +15,17 @@ install:
     if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
     {
       cinst msbuild-sonarqube-runner;
-      cinst opencover.portable;
     }
 
 before_build:
 - cmd: py -3.5 -m pip install --user requests
 - cmd: py -3.5 Tools\download_godotsharp.py
 - cmd: py -3.5 RUN_THIS.py --no-prompt
-- cmd: nuget restore SpaceStation14.sln
+- cmd: nuget restore RobustToolbox.sln
 - ps: >
     if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
     {
-      SonarScanner.MSBuild.exe begin /k:"ss14" /d:"sonar.host.url=https://sonarqube.com" /d:"sonar.login=$env:sonarqubekey" /d:"sonar.organization=space-wizards" /d:"sonar.exclusions=SFML/**" /d:sonar.cs.nunit.reportsPaths="$(Get-Location)\nunitTestResult.xml" /d:sonar.cs.opencover.reportsPaths="$(Get-Location)\coverage_report.xml";
+      SonarScanner.MSBuild.exe begin /k:"ss14" /d:"sonar.host.url=https://sonarqube.com" /d:"sonar.login=$env:sonarqubekey" /o:"space-wizards" /d:"sonar.exclusions=SFML/**" /d:sonar.cs.nunit.reportsPaths="$(Get-Location)\nunitTestResult.xml";
     }
 
 platform: x64
@@ -35,27 +34,21 @@ configuration: Debug
 cache:
 - packages -> **\packages.config
 - Dependencies
-- SS14.Client.Godot\.mono\assemblies\GodotSharp.dll
-- SS14.Client.Godot\.mono\assemblies\LAST_MODIFIED
+- Robust.Client.Godot\.mono\assemblies\GodotSharp.dll
+- Robust.Client.Godot\.mono\assemblies\LAST_MODIFIED
 
 build:
-  project: SpaceStation14.sln
+  project: RobustToolbox.sln
   parallel: false
   verbosity: minimal
 
 build_script:
-- ps: msbuild SpaceStation14.sln /verbosity:minimal /nologo /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x64 /p:Configuration=Debug /p:AppVeyor=yes
+- ps: msbuild RobustToolbox.sln /verbosity:minimal /nologo /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x64 /p:Configuration=Debug /p:AppVeyor=yes
 
 test_script:
-- ps: >
-    if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -Eq "master")
-    {
-      OpenCover.Console.exe -register:user -target:"nunit3-console.exe" -targetargs:".\bin\UnitTesting\SS14.UnitTesting.dll --result:nunitTestResult.xml" -output:".\coverage_report.xml";
-    }
-    else
-    {
-      nunit3-console.exe .\bin\UnitTesting\SS14.UnitTesting.dll;
-    }
+- ps: nunit3-console.exe .\bin\UnitTesting\Robust.UnitTesting.dll;
+
+
 
 after_test:
 - ps: >

.gitignore

@@ -71,6 +71,9 @@ project.lock.json
 
 # MacOS finder makes these.
 .DS_Store
+# KDE Dolphin makes these, maybe it's even XDG standard, kinda hard to Google.
+# I do know it doesn't make them by merely opening the directory like some other file manager *cough* *cough*
+.directory
 
 # Created by NUnit.
 TestResult.xml

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "SS14.Shared.Bsdiff"]
-	path = SS14.Shared.Bsdiff
-	url = https://github.com/space-wizards/ss14.shared.bsdiff.git

.travis.yml

@@ -9,30 +9,33 @@ os:
 
 addons:
   apt:
-    sources:
-    - deadsnakes
+    #sources:
+    #- deadsnakes
 
     packages:
-    - python3.6
+    - python3.5
+    - python3-pip
 
 cache:
   directories:
   - packages/
   - Dependencies/
-  - SS14.Client.Godot/.mono/assemblies/
+  - Robust.Client.Godot/.mono/assemblies/
 
 #before_install:
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew update && brew upgrade python; fi
 
 before_script:
-- "if [ $TRAVIS_OS_NAME = linux ]; then pyenv shell 3.6; fi"
-- "pip3 install --user requests"
-- "nuget restore SpaceStation14.sln"
-- "python3.6 RUN_THIS.py --no-prompt"
+#- "pyenv versions"
+#- "if [ $TRAVIS_OS_NAME = linux ]; then pyenv shell 3.6; fi"
+#- "python3.6 -m pip --v"
+#- "python3.6 -m pip install --user --upgrade requests"
+- "python3.5 -m pip install --user requests"
+- "nuget restore RobustToolbox.sln"
+- "python3.5 RUN_THIS.py --no-prompt"
 - "Tools/download_godotsharp.py"
 
 script:
-- "msbuild /p:Configuration=Debug /p:Platform=x64 /p:HEADLESS=1 /nologo /m /p:AllowMissingMacNatives=yes SpaceStation14.sln /p:Python=python3.6"
-- "cd packages/NUnit.ConsoleRunner.3.7.0/tools"
-- "mono --debug nunit3-console.exe ../../../bin/UnitTesting/SS14.UnitTesting.dll"
+- "msbuild /p:Configuration=Debug /p:Platform=x64 /p:HEADLESS=1 /nologo /m /p:AllowMissingMacNatives=yes RobustToolbox.sln /p:Python=python3.5"
+- "mono --debug packages/nunit.consolerunner/3.9.0/tools/nunit3-console.exe bin/UnitTesting/Robust.UnitTesting.dll"
 

LICENSE-MIT.TXT

@@ -0,0 +1,19 @@
+ Copyright (c) 2019 Space Station 14 Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Lidgren.Network/Lidgren.Network.csproj

@@ -10,7 +10,7 @@
     <ApplicationIcon />
     <AssemblyKeyContainerName />
     <AssemblyName>Lidgren.Network</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <OutputType>Library</OutputType>
     <AppDesignerFolder />
     <RootNamespace>Lidgren.Network</RootNamespace>
@@ -34,6 +34,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugSymbols>True</DebugSymbols>
+    <DebugType Condition="'$(AppVeyor)' != 'yes'">portable</DebugType>
+    <DebugType Condition="'$(AppVeyor)' == 'yes'">full</DebugType>
     <Optimize>False</Optimize>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
@@ -46,6 +48,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugSymbols>True</DebugSymbols>
+    <DebugType Condition="'$(AppVeyor)' != 'yes'">portable</DebugType>
+    <DebugType Condition="'$(AppVeyor)' == 'yes'">full</DebugType>
     <Optimize>False</Optimize>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
@@ -56,7 +60,9 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType Condition="'$(AppVeyor)' != 'yes'">portable</DebugType>
+    <DebugType Condition="'$(AppVeyor)' == 'yes'">full</DebugType>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -285,4 +291,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

Lidgren.Network/NetConnection.Handshake.cs

@@ -130,7 +130,7 @@ namespace Lidgren.Network
 			om.Write(now);
 
 			WriteLocalHail(om);
-			
+
 			m_peer.SendLibrary(om, m_remoteEndPoint);
 
 			m_connectRequested = false;
@@ -285,7 +285,7 @@ namespace Lidgren.Network
 							}
 							else
 							{
-								m_remoteHailMessage = null; 
+								m_remoteHailMessage = null;
 							}
 
 							if (m_peerConfiguration.IsMessageTypeEnabled(NetIncomingMessageType.ConnectionApproval))
@@ -376,7 +376,7 @@ namespace Lidgren.Network
 							break;
 						case NetConnectionStatus.RespondedConnect:
 							// awesome
-				
+
 							NetIncomingMessage msg = m_peer.SetupReadHelperMessage(ptr, payloadLength);
 							InitializeRemoteTimeOffset(msg.ReadSingle());
 
@@ -453,7 +453,7 @@ namespace Lidgren.Network
 			}
 			return true;
 		}
-		
+
 		/// <summary>
 		/// Disconnect from the remote peer
 		/// </summary>

Lidgren.Network/NetPeer.Internal.cs

@@ -114,7 +114,13 @@ namespace Lidgren.Network
 				iep = new IPEndPoint(m_configuration.LocalAddress, m_configuration.Port);
 				EndPoint ep = (EndPoint)iep;
 
-				m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+				m_socket = new Socket(ep.AddressFamily, SocketType.Dgram, ProtocolType.Udp);
+				if (ep.AddressFamily == AddressFamily.InterNetworkV6)
+				{
+					// Disable IPv4 -> IPv6 mapping.
+					// SS14 handles IPv6 & IPv4 concurrently with a different net peer.
+					m_socket.SetSocketOption(SocketOptionLevel.IPv6, SocketOptionName.IPv6Only, true);
+				}
 				m_socket.ReceiveBufferSize = m_configuration.ReceiveBufferSize;
 				m_socket.SendBufferSize = m_configuration.SendBufferSize;
 				m_socket.Blocking = false;

Lidgren.Network/NetPeer.cs

@@ -2,6 +2,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using System.Net;
+using System.Net.Sockets;
 
 namespace Lidgren.Network
 {
@@ -27,8 +28,8 @@ namespace Lidgren.Network
 
 		/// <summary>
 		/// Signalling event which can be waited on to determine when a message is queued for reading.
-		/// Note that there is no guarantee that after the event is signaled the blocked thread will 
-		/// find the message in the queue. Other user created threads could be preempted and dequeue 
+		/// Note that there is no guarantee that after the event is signaled the blocked thread will
+		/// find the message in the queue. Other user created threads could be preempted and dequeue
 		/// the message before the waiting thread wakes up.
 		/// </summary>
 		public AutoResetEvent MessageReceivedEvent { get { return m_messageReceivedEvent; } }
@@ -102,9 +103,16 @@ namespace Lidgren.Network
 			m_connections = new List<NetConnection>();
 			m_connectionLookup = new Dictionary<IPEndPoint, NetConnection>();
 			m_handshakes = new Dictionary<IPEndPoint, NetConnection>();
-			m_senderRemote = (EndPoint)new IPEndPoint(IPAddress.Any, 0);
+			if (m_configuration.LocalAddress.AddressFamily == AddressFamily.InterNetworkV6)
+			{
+				m_senderRemote = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0);
+			}
+			else
+			{
+				m_senderRemote = (EndPoint)new IPEndPoint(IPAddress.Any, 0);
+			}
 			m_status = NetPeerStatus.NotRunning;
-			m_receivedFragmentGroups = new Dictionary<NetConnection, Dictionary<int, ReceivedFragmentGroup>>();	
+			m_receivedFragmentGroups = new Dictionary<NetConnection, Dictionary<int, ReceivedFragmentGroup>>();
 		}
 
 		/// <summary>
@@ -129,7 +137,7 @@ namespace Lidgren.Network
 			}
 
 			InitializeNetwork();
-			
+
 			// start network thread
 			m_networkThread = new Thread(new ThreadStart(NetworkLoop));
 			m_networkThread.Name = m_configuration.NetworkThreadName;

Lidgren.Network/NetUtility.cs

@@ -27,6 +27,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Lidgren.Network
 {
@@ -85,7 +86,8 @@ namespace Lidgren.Network
 			IPAddress ipAddress = null;
 			if (IPAddress.TryParse(ipOrHost, out ipAddress))
 			{
-				if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
+				if (ipAddress.AddressFamily == AddressFamily.InterNetwork
+				 || ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 				{
 					callback(ipAddress);
 					return;
@@ -123,16 +125,23 @@ namespace Lidgren.Network
 					}
 
 					// check each entry for a valid IP address
+					IPAddress bestAddress = null;
 					foreach (IPAddress ipCurrent in entry.AddressList)
 					{
-						if (ipCurrent.AddressFamily == AddressFamily.InterNetwork)
+						// Prefer IPv6 addresses.
+						if (ipCurrent.AddressFamily == AddressFamily.InterNetworkV6)
 						{
 							callback(ipCurrent);
 							return;
 						}
+
+						if (ipCurrent.AddressFamily == AddressFamily.InterNetwork)
+						{
+							bestAddress = ipCurrent;
+						}
 					}
 
-					callback(null);
+					callback(bestAddress);
 				}, null);
 			}
 			catch (SocketException ex)
@@ -148,6 +157,34 @@ namespace Lidgren.Network
 			}
 		}
 
+		public static async Task<IPAddress[]> ResolveAsync(string ipOrHost)
+		{
+			if (string.IsNullOrEmpty(ipOrHost))
+				throw new ArgumentException("Supplied string must not be empty", "ipOrHost");
+
+			ipOrHost = ipOrHost.Trim();
+
+			if (IPAddress.TryParse(ipOrHost, out var ipAddress))
+			{
+				if (ipAddress.AddressFamily == AddressFamily.InterNetwork
+				    || ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
+				{
+					return new[] {ipAddress};
+				}
+				throw new ArgumentException("This method will not currently resolve other than IPv4 or IPv6 addresses");
+			}
+
+			try
+			{
+				var entry = await Task.Factory.FromAsync(Dns.BeginGetHostEntry, Dns.EndGetHostEntry, ipOrHost, null);
+				return entry.AddressList;
+			}
+			catch (SocketException)
+			{
+				return null;
+			}
+		}
+
 		/// <summary>
 		/// Get IPv4 address from notation (xxx.xxx.xxx.xxx) or hostname
 		/// </summary>
@@ -161,7 +198,8 @@ namespace Lidgren.Network
 			IPAddress ipAddress = null;
 			if (IPAddress.TryParse(ipOrHost, out ipAddress))
 			{
-				if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
+				if (ipAddress.AddressFamily == AddressFamily.InterNetwork
+				 || ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 					return ipAddress;
 				throw new ArgumentException("This method will not currently resolve other than ipv4 addresses");
 			}
@@ -175,13 +213,22 @@ namespace Lidgren.Network
 					return null;
 
 				// check each entry for a valid IP address
+				IPAddress bestAddress = null;
 				foreach (IPAddress ipCurrent in entry.AddressList)
 				{
-					if (ipCurrent.AddressFamily == AddressFamily.InterNetwork)
+					if (ipCurrent.AddressFamily == AddressFamily.InterNetworkV6)
+					{
 						return ipCurrent;
+					}
+					
+					// Prefer IPv6 addresses.
+					if (ipCurrent.AddressFamily == AddressFamily.InterNetwork)
+					{
+						bestAddress = ipCurrent;
+					}
 				}
 
-				return null;
+				return bestAddress;
 			}
 			catch (SocketException ex)
 			{
@@ -391,6 +438,11 @@ namespace Lidgren.Network
 		/// </summary>
 		public static bool IsLocal(IPAddress remote)
 		{
+			if (remote.AddressFamily == AddressFamily.InterNetworkV6)
+			{
+				// TODO: Can this be made to work? Do we even care for SS14?
+				return false;
+			}
 			IPAddress mask;
 			IPAddress local = GetMyAddress(out mask);
 

MSBuild/Robust.DefineConstants.targets

@@ -8,12 +8,12 @@
     </When>
     <When Condition="'$(TargetOS)' == 'MacOS'" >
       <PropertyGroup>
-        <DefineConstants>$(DefineConstants);MACOS</DefineConstants>
+        <DefineConstants>$(DefineConstants);MACOS;UNIX</DefineConstants>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
+        <DefineConstants>$(DefineConstants);LINUX;UNIX</DefineConstants>
       </PropertyGroup>
     </Otherwise>
   </Choose>

MSBuild/Robust.Engine.targets

@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Target Name="CopyResourcesFromShared">
+    <ItemGroup>
+      <_ResourceFiles Include="$(SolutionDir)bin\Shared\Resources\**\*.*" />
+    </ItemGroup>
+    <RemoveDir Directories="$(OutputPath)Resources" />
+    <Copy SourceFiles="@(_ResourceFiles)" DestinationFolder="$(OutputPath)Resources\%(RecursiveDir)" />
+  </Target>
+  <Target Name="CopySS14Noise">
+    <Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) ../Tools/download_ss14_noise.py $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
+    <Warning Condition="'$(Platform)' != 'x64'" Text="Did not download ss14_noise because the platform is not set to x64. Only use this build for unit testing!" />
+  </Target>
+  <Target Name="CopyMiscDependencies">
+    <Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) ../Tools/download_misc_dependencies.py $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
+    <Warning Condition="'$(Platform)' != 'x64'" Text="Did not download misc dependencies because the platform is not set to x64. Only use this build for unit testing!" />
+  </Target>
+  <Target Name="DownloadGodotSharp">
+    <Exec Command="$(Python) ../Tools/download_godotsharp.py" CustomErrorRegularExpression="^Error" />
+  </Target>
+</Project>

MSBuild/SS14.Engine.targets

@@ -1,9 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Target Name="CopyResourcesFromShared">
-    <ItemGroup>
-      <_ResourceFiles Include="$(SolutionDir)bin\Shared\Resources\**\*.*" />
-    </ItemGroup>
-    <RemoveDir Directories="$(OutputPath)Resources" />
-    <Copy SourceFiles="@(_ResourceFiles)" DestinationFolder="$(OutputPath)Resources\%(RecursiveDir)" />
-  </Target>
-</Project>

Resources/.gitignore

@@ -0,0 +1,8 @@
+# .import files are made by Godot because the assets are exposed if using symlinks.
+# IF you need to persist a .import file because of something used Godot-side (GUI-side),
+# you can do a negation with !.
+*.import
+# Negation would be like this:
+#!/Textures/UserInterface/1pxwhite.png.import
+!/Scenes/SS14Window/closewindow.png.import
+/I_MADE_THE_SYMLINK

Resources/Prototypes/Engine/Entities/Clothing.yml

@@ -1,31 +0,0 @@
-- type: entity
-  id: __engine_janitor_suit
-  name: "[engine] Janitor Jumpsuit"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Items/janitorsuit.png
-
-  - type: Icon
-    texture: Items/janitorsuit.png
-
-  - type: BoundingBox
-  - type: Physics
-    mass: 5
-
-- type: entity
-  id: __engine_shoes
-  name: "[engine] shoes"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Items/janitorsuit.png
-
-  - type: Icon
-    texture: Items/shoes.png
-
-  - type: BoundingBox
-  - type: Physics
-    mass: 5

Resources/Prototypes/Engine/Entities/Containers.yml

@@ -1,15 +0,0 @@
-- type: entity
-  id: __engine_toolbox
-  name: "[engine] toolbox"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Items/toolbox_r.png
-
-  - type: Icon
-    texture: Items/toolbox_r.png
-
-  - type: BoundingBox
-  - type: Physics
-    mass: 5

Resources/Prototypes/Engine/Entities/Doors.yml

@@ -1,19 +0,0 @@
-- type: entity
-  id: __engine_door
-  name: "[engine] Real Fake Door"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    drawdepth: Objects
-    texture: Objects/door_ew.png
-
-  - type: Icon
-    texture: Objects/door_ew.png
-
-  - type: BoundingBox
-  - type: Collidable
-
-  placement:
-    snap:
-    - Wall

Resources/Prototypes/Engine/Entities/JanitorItems.yml

@@ -1,15 +0,0 @@
-- type: entity
-  id: __engine_mop
-  name: "[engine] mop"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Items/mop.png
-
-  - type: Icon
-    texture: Items/mop.png
-
-  - type: BoundingBox
-  - type: Physics
-  - type: Clickable

Resources/Prototypes/Engine/Entities/Lights.yml

@@ -1,23 +0,0 @@
-- type: entity
-  id: __engine_wall_light
-  name: "[engine] Wall Light"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Objects/wall_light.png
-
-  - type: Icon
-    texture: Objects/wall_light.png
-
-  - type: BoundingBox
-
-  - type: PointLight
-    radius: 8
-    energy: 1.2
-    offset: "0, -16"
-    color: "#DCDCC6"
-
-  placement:
-    snap:
-    - Wallmount

Resources/Prototypes/Engine/Entities/Mobs.yml

@@ -1,26 +0,0 @@
-- type: entity
-  id: __engine_human
-  name: "[engine] Urist McHuman"
-  save: false
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
-    scale: 2, 2
-    drawdepth: Mobs
-
-  - type: Icon
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
-
-  - type: BoundingBox
-    aabb: "0.15,-0.45,1.05,0.45"
-
-  - type: Physics
-    mass: 5
-
-  - type: Collidable
-    DebugColor: "#0000FF"
-

Resources/Prototypes/Engine/Entities/Tables.yml

@@ -1,18 +0,0 @@
-- type: entity
-  id: __engine_worktop
-  name: "[engine] worktop"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Objects/worktop_single.png
-
-  - type: Icon
-    texture: Objects/worktop_single.png
-
-  - type: BoundingBox
-    aabb: "-0.45,-1,0.95,1"
-    DebugColor: "#0000FF"
-
-  - type: Collidable
-

Resources/Prototypes/Engine/Entities/Wallmounted.yml

@@ -1,60 +0,0 @@
-- type: entity
-  id: __engine_extinguisher
-  name: "[engine] Extinguisher Cabinet"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Objects/fire_extinguisher.png
-
-  - type: Icon
-    texture: Objects/fire_extinguisher.png
-
-  placement:
-    mode: AlignWall
-    range: 200
-    nodes:
-    - 18
-    - 26
-    - 32
-    snap:
-    - Wallmount
-
-- type: entity
-  id: __engine_fire_alarm
-  name: "[engine] Fire Alarm"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Objects/fire_alarm_off.png
-
-  - type: Icon
-    texture: Objects/fire_alarm_off.png
-
-  placement:
-    mode: AlignWall
-    range: 180
-    nodes:
-    - 5
-    - 10
-    - 15
-    snap:
-    - Wallmount
-
-- type: entity
-  id: __engine_med_cabinet
-  name: "[engine] Medical Cabinet"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    texture: Objects/med_cabinet.png
-
-  - type: Icon
-    texture: Objects/med_cabinet.png
-
-  placement:
-    mode: AlignWall
-    snap:
-    - Wallmount

Resources/Prototypes/Engine/Entities/Walls.yml

@@ -1,22 +0,0 @@
-- type: entity
-  id: __engine_wall
-  name: "[engine] Wall"
-  components:
-  - type: Transform
-  - type: Clickable
-  - type: Sprite
-    drawdepth: Walls
-    texture: Tiles/wall_texture.png
-
-  - type: Icon
-    texture: Tiles/wall_texture.png
-
-  - type: BoundingBox
-  - type: Collidable
-  - type: Occluder
-    sizeX: 32
-    sizeY: 32
-
-  placement:
-    snap:
-    - Wall

Resources/Prototypes/Shaders/outline.yml

@@ -1,7 +1,15 @@
 - type: shader
   id: selection_outline
   kind: source
-  path: "/Shaders/outline.gdsl"
+  path: "/Shaders/outline.swsl"
+  params:
+    outline_width: 1
+    outline_color: "#FF000055"
+
+- type: shader
+  id: selection_outline_unshaded
+  kind: source
+  path: "/Shaders/outline_unshaded.swsl"
   params:
     outline_width: 1
     outline_color: "#FF000055"

Resources/Prototypes/Shaders/stockshaders.yml

@@ -3,3 +3,7 @@
   id: unshaded
   kind: canvas
   light_mode: unshaded
+
+- type: shader
+  id: shaded
+  kind: canvas

Resources/Scenes/OptionsMenu/OptionsMenu.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
 
 [node name="SS14Window" instance=ExtResource( 1 )]
 

Resources/Scenes/Placement/EntitySpawnItem.tscn

@@ -19,7 +19,7 @@ rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 3
-size_flags_vertical = 3
+size_flags_vertical = 1
 custom_styles/panel = SubResource( 1 )
 _sections_unfolded = [ "Grow Direction", "Mouse", "Rect", "Size Flags", "custom_styles" ]
 
@@ -75,6 +75,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
+rect_clip_content = true
 _sections_unfolded = [ "Mouse", "Rect" ]
 
 [node name="TextureRect" type="TextureRect" parent="HBoxContainer/TextureWrap" index="0"]
@@ -84,7 +85,6 @@ anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
 mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 4

Resources/Scenes/Placement/EntitySpawnPanel.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
 
 [node name="SS14Window" instance=ExtResource( 1 )]
 
@@ -40,7 +40,7 @@ margin_bottom = 310.0
 rect_min_size = Vector2( 200, 0 )
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = true
-mouse_filter = 2
+mouse_filter = 1
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 3
 size_flags_vertical = 1

Resources/Scenes/Placement/TileSpawnItem.tscn

@@ -19,7 +19,7 @@ rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 3
-size_flags_vertical = 3
+size_flags_vertical = 1
 custom_styles/panel = SubResource( 1 )
 _sections_unfolded = [ "Grow Direction", "Mouse", "Rect", "Size Flags", "custom_styles" ]
 

Resources/Scenes/Placement/TileSpawnPanel.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
 
 [node name="SS14Window" index="0" instance=ExtResource( 1 )]
 

Resources/Scenes/SS14Window/SS14Window.tscn

@@ -0,0 +1,53 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Engine/Scenes/SS14Window/closewindow.png" type="Texture" id=1]
+
+[sub_resource type="StyleBoxFlat" id=1]
+
+bg_color = Color( 0.234375, 0.234375, 0.234375, 1 )
+
+[node name="SS14Window" type="Panel"]
+margin_left = 100.0
+margin_top = 38.0
+margin_right = 878.0
+margin_bottom = 519.0
+
+[node name="Contents" type="MarginContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 0.0
+margin_top = 30.0
+margin_right = 0.0
+margin_bottom = 0.0
+rect_min_size = Vector2( 50, 50 )
+rect_clip_content = true
+mouse_filter = 2
+custom_constants/margin_right = 10
+custom_constants/margin_left = 10
+custom_constants/margin_bottom = 10
+custom_constants/margin_top = 10
+
+[node name="Header" type="Panel" parent="."]
+anchor_right = 1.0
+margin_bottom = 25.0
+mouse_filter = 2
+custom_styles/panel = SubResource( 1 )
+
+[node name="Header Text" type="Label" parent="Header"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = -25.0
+text = "Exemplary Window Title Here"
+align = 1
+valign = 1
+clip_text = true
+
+[node name="CloseButton" type="TextureButton" parent="Header"]
+anchor_left = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -25.0
+texture_normal = ExtResource( 1 )
+expand = true
+stretch_mode = 5
+

Resources/Scenes/SS14Window/closewindow.png.import

@@ -2,18 +2,19 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/closewindow.png-7b2f9cb6cf73c832ec12a5ebfba82490.stex"
+path="res://.import/closewindow.png-27200ff550a4cc91ea5c13546f44ca18.stex"
 
 [deps]
 
-source_file="res://Scenes/SS14Window/closewindow.png"
-dest_files=[ "res://.import/closewindow.png-7b2f9cb6cf73c832ec12a5ebfba82490.stex" ]
+source_file="res://Engine/Scenes/SS14Window/closewindow.png"
+dest_files=[ "res://.import/closewindow.png-27200ff550a4cc91ea5c13546f44ca18.stex" ]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=false
@@ -23,6 +24,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

Resources/Scenes/SpriteMirror/SpriteView.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://SpriteView.cs" type="Script" id=1]
+
+[node name="SpriteView" type="Control"]
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+script = ExtResource( 1 )
+

Resources/Shaders/Internal/default-sprite.swsl

@@ -0,0 +1,3 @@
+void fragment() {
+    COLOR = texture(TEXTURE, UV);
+}

Resources/Shaders/Internal/light.frag

@@ -0,0 +1,26 @@
+#version 330 core
+
+out vec4 FragColor;
+
+const float LIGHTING_HEIGHT = 1;
+
+// Position of the fragment, in world coordinates.
+in vec2 worldPosition;
+
+uniform vec4 lightColor;
+// Position of the light, in world coordinates.
+uniform vec2 lightCenter;
+uniform float lightRange;
+uniform float lightPower;
+
+void main()
+{
+    vec2 diff = worldPosition - lightCenter;
+    float dist = dot(diff, diff) + 1;
+
+    float val = clamp((1 - clamp(sqrt(dist) / lightRange, 0, 1)) * (1 / (sqrt(dist + 1))), 0, 1);
+
+    val *= lightPower;
+
+    FragColor = vec4(lightColor.rgb, val);
+}

Resources/Shaders/Internal/light.vert

@@ -0,0 +1,23 @@
+#version 330 core
+
+// Vertex position.
+layout (location = 0) in vec2 aPos;
+
+out vec2 worldPosition;
+
+uniform mat3 modelMatrix;
+
+layout (std140) uniform projectionViewMatrices
+{
+    mat3 projectionMatrix;
+    mat3 viewMatrix;
+};
+
+void main()
+{
+    vec3 transformed = modelMatrix * vec3(aPos, 1.0);
+    worldPosition = transformed.xy;
+    transformed = projectionMatrix * viewMatrix * transformed;
+
+    gl_Position = vec4(transformed, 1.0);
+}

Resources/Shaders/Internal/sprite.frag

@@ -0,0 +1,33 @@
+#version 330 core
+
+out vec4 FragColor;
+
+in vec2 UV;
+
+uniform sampler2D TEXTURE;
+uniform sampler2D lightMap;
+uniform vec4 modulate;
+
+layout (std140) uniform uniformConstants
+{
+    vec2 SCREEN_PIXEL_SIZE;
+    float TIME;
+};
+
+uniform vec2 TEXTURE_PIXEL_SIZE;
+
+[SHADER_HEADER_CODE]
+
+void main()
+{
+    vec4 FRAGCOORD = gl_FragCoord;
+
+    vec4 COLOR;
+
+    [SHADER_CODE]
+
+    vec2 lightSampleUv = (FRAGCOORD.xy * SCREEN_PIXEL_SIZE);
+    vec3 lightSample = texture(lightMap, lightSampleUv).rgb;
+
+    FragColor = COLOR * modulate * vec4(lightSample, 1);
+}

Resources/Shaders/Internal/sprite.vert

@@ -0,0 +1,47 @@
+#version 330 core
+
+// Vertex position.
+layout (location = 0) in vec2 aPos;
+// Texture coordinates.
+layout (location = 1) in vec2 tCoord;
+
+out vec2 UV;
+
+// Maybe we should merge these CPU side.
+// idk yet.
+uniform mat3 modelMatrix;
+layout (std140) uniform projectionViewMatrices
+{
+    mat3 projectionMatrix;
+    mat3 viewMatrix;
+};
+
+layout (std140) uniform uniformConstants
+{
+    vec2 SCREEN_PIXEL_SIZE;
+    float TIME;
+};
+
+// Allows us to do texture atlassing with texture coordinates 0->1
+// Input texture coordinates get mapped to this range.
+uniform vec4 modifyUV;
+
+[SHADER_HEADER_CODE]
+
+void main()
+{
+    vec3 transformed = projectionMatrix * viewMatrix * modelMatrix * vec3(aPos, 1.0);
+    vec2 VERTEX = transformed.xy;
+
+    [SHADER_CODE]
+
+    // Pixel snapping to avoid sampling issues on nvidia.
+    VERTEX += 1;
+    VERTEX /= SCREEN_PIXEL_SIZE*2;
+    VERTEX = floor(VERTEX + 0.5);
+    VERTEX *= SCREEN_PIXEL_SIZE*2;
+    VERTEX -= 1;
+
+    gl_Position = vec4(VERTEX, 0.0, 1.0);
+    UV = mix(modifyUV.xy, modifyUV.zw, tCoord);
+}

Resources/Shaders/outline.swsl

@@ -1,6 +1,8 @@
-shader_type canvas_item;
+//shader_type canvas_item;
 uniform float outline_width = 2.0;
-uniform vec4 outline_color: hint_color;
+// TODO: implement that hint_color thingy.
+//uniform vec4 outline_color: hint_color;
+uniform vec4 outline_color=vec4(1,0,0,0.33);
 
 void fragment() {
 	// I, for some reason, cannot put this comment in the top of the file.
@@ -55,5 +57,5 @@ void fragment() {
 	maxa = max(a, maxa);
 	mina = min(a, mina);
 
-	COLOR = mix(col, outline_color, maxa-mina);
+	COLOR = mix(col, outline_color, maxa-col.a);
 }

Resources/Shaders/outline_unshaded.swsl

@@ -0,0 +1,56 @@
+render_mode unshaded;
+uniform float outline_width = 2.0;
+// TODO: implement that hint_color thingy.
+//uniform vec4 outline_color: hint_color;
+uniform vec4 outline_color=vec4(1,0,0,0.33);
+
+void fragment() {
+	// I, for some reason, cannot put this comment in the top of the file.
+	// Taken from the godot-demo-projects repo.
+	//                              GODOT ENGINE
+	//                      http://www.godotengine.org
+	//
+	// ************************************************************************
+	//
+	// Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.
+	//
+	// Permission is hereby granted, free of charge, to any person obtaining
+	// a copy of this software and associated documentation files (the
+	// "Software"), to deal in the Software without restriction, including
+	// without limitation the rights to use, copy, modify, merge, publish,
+	// distribute, sublicense, and/or sell copies of the Software, and to
+	// permit persons to whom the Software is furnished to do so, subject to
+	// the following conditions:
+	//
+	// The above copyright notice and this permission notice shall be
+	// included in all copies or substantial portions of the Software.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+	// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+	// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+	// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+	// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+	//
+	//************************************************************************
+
+	vec4 col = texture(TEXTURE, UV);
+	vec2 ps = TEXTURE_PIXEL_SIZE;
+	float a;
+	float maxa = col.a;
+
+	a = texture(TEXTURE, UV + vec2(0, -outline_width)*ps).a;
+	maxa = max(a, maxa);
+
+	a = texture(TEXTURE, UV + vec2(0, outline_width)*ps).a;
+	maxa = max(a, maxa);
+
+	a = texture(TEXTURE, UV + vec2(-outline_width,0)*ps).a;
+	maxa = max(a, maxa);
+
+	a = texture(TEXTURE, UV + vec2(outline_width, 0)*ps).a;
+	maxa = max(a, maxa);
+
+	COLOR = mix(col, outline_color, maxa-col.a);
+}