Renames SS14.* to Robust.* (#793)

RobustToolbox projects should be named Robust.* 

This PR changes the RobustToolbox projects from SS14.* to Robust.*

Updates SS14.* prefixes/namespaces to Robust.*
Updates SpaceStation14.sln to RobustToolbox.sln
Updates MSBUILD/SS14.* to MSBUILD/Robust.*
Updates CSProject and MSBuild references for the above
Updates git_helper.py
Removes Runserver and Runclient as they are unusable
This commit is contained in:
Silver
2019-04-15 20:24:59 -06:00
committed by GitHub
parent 3aec6eb561
commit 25926a17b7
693 changed files with 3347 additions and 3346 deletions

View File

@@ -21,7 +21,7 @@ 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")
{
@@ -34,19 +34,19 @@ 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: nunit3-console.exe .\bin\UnitTesting\SS14.UnitTesting.dll;
- ps: nunit3-console.exe .\bin\UnitTesting\Robust.UnitTesting.dll;

View File

@@ -20,7 +20,7 @@ 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
@@ -31,11 +31,11 @@ before_script:
#- "python3.6 -m pip --v"
#- "python3.6 -m pip install --user --upgrade requests"
- "python3.5 -m pip install --user requests"
- "nuget restore SpaceStation14.sln"
- "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.5"
- "mono --debug packages/nunit.consolerunner/3.9.0/tools/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"

View File

Before

Width:  |  Height:  |  Size: 750 KiB

After

Width:  |  Height:  |  Size: 750 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -1,7 +1,7 @@
using Godot;
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
/// <summary>
/// Wraps a Godot control so we get access to its virtual functions.

View File

@@ -3,7 +3,7 @@
// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
[assembly: AssemblyTitle("SS14.Client.Godot")]
[assembly: AssemblyTitle("Robust.Client.Godot")]
[assembly: AssemblyDescription("SS14 Client glue code to connect the main client to Godot.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\MSBuild\SS14.Properties.targets" />
<Import Project="..\MSBuild\Robust.Properties.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}</ProjectGuid>
<OutputType>Library</OutputType>
<OutputPath>.mono\temp\bin\$(Configuration)</OutputPath>
<RootNamespace>SS14.Client.Godot</RootNamespace>
<AssemblyName>SS14.Client.Godot</AssemblyName>
<RootNamespace>Robust.Client.Godot</RootNamespace>
<AssemblyName>Robust.Client.Godot</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<BaseIntermediateOutputPath>.mono\temp\obj</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)</IntermediateOutputPath>
@@ -56,6 +56,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\MSBuild\SS14.Engine.targets" />
<Import Project="..\MSBuild\Robust.Engine.targets" />
<Target Name="BeforeBuild" DependsOnTargets="DownloadGodotSharp" />
</Project>
</Project>

View File

@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Client.Godot", "SS14.Client.Godot.csproj", "{8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Godot", "Robust.Client.Godot.csproj", "{8AF31169-49B1-4A12-B8F4-2A0674A9E7CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@@ -4,8 +4,8 @@ using System.Reflection;
using System.Collections.Generic;
using Environment = System.Environment;
// NOT SS14.Client.Godot so you can still use Godot.xxx without a using statement.
namespace SS14.Client.GodotGlue
// NOT Robust.Client.Godot so you can still use Godot.xxx without a using statement.
namespace Robust.Client.GodotGlue
{
/// <summary>
/// AutoLoad Node that starts the rest of the SS14 Client through <see cref="ClientEntryPoint"/>.
@@ -44,7 +44,7 @@ namespace SS14.Client.GodotGlue
Assembly.LoadFile(System.IO.Path.Combine(path, "../bin/Client/ICSharpCode.SharpZipLib.dll"));
Started = true;
SS14Assembly = Assembly.LoadFrom("../bin/Client/SS14.Client.exe");
SS14Assembly = Assembly.LoadFrom("../bin/Client/Robust.Client.exe");
var entryType = typeof(ClientEntryPoint);
foreach (var type in SS14Assembly.GetTypes())
{

View File

@@ -4,7 +4,7 @@ using System;
// in fact, it hard crashes.
// So we use these tiny dummies to register signals.
// It's not clean but do you have a better idea?
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public abstract class BaseGodotSignalSubscriber : Godot.Reference
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber0 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber1 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber2 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber3 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber4 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class GodotSignalSubscriber5 : BaseGodotSignalSubscriber
{

View File

@@ -1,6 +1,6 @@
using Godot;
namespace SS14.Client.GodotGlue
namespace Robust.Client.GodotGlue
{
public class SpriteView : Control
{

View File

@@ -45,7 +45,7 @@ texture_format/etc=false
texture_format/etc2=false
binary_format/64_bits=true
custom_template/release=""
custom_template/debug="/home/pjbriers/builds_shared/win/SS14.Client.exe"
custom_template/debug="/home/pjbriers/builds_shared/win/Robust.Client.exe"
application/icon=""
application/file_version=""
application/product_version=""
@@ -73,4 +73,4 @@ texture_format/etc=false
texture_format/etc2=false
binary_format/64_bits=true
custom_template/release=""
custom_template/debug="/home/pjbriers/builds_shared/linux/SS14.Client.x86_64"
custom_template/debug="/home/pjbriers/builds_shared/linux/Robust.Client.x86_64"

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -10,7 +10,7 @@ config_version=3
[application]
config/name="SS14.Client.Godot"
config/name="Robust.Client.Godot"
run/main_scene="res://MainScene.tscn"
config/use_custom_user_dir=true
boot_splash/image="res://Art/bootsplash.png"

View File

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

View File

@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using SS14.Client.GameObjects.Components.Animations;
using SS14.Client.GameObjects.EntitySystems;
using SS14.Client.Graphics;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC;
using SS14.Shared.Utility;
using Robust.Client.GameObjects.Components.Animations;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
namespace SS14.Client.Animations
namespace Robust.Client.Animations
{
/// <summary>
/// A animation represents a way to animate something, using keyframes and such.

View File

@@ -1,7 +1,7 @@
using System;
using SS14.Client.Graphics.Clyde;
using Robust.Client.Graphics.Clyde;
namespace SS14.Client.Audio
namespace Robust.Client.Audio
{
public sealed class AudioStream
{

View File

@@ -1,24 +1,24 @@
using System;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameStates;
using SS14.Client.Interfaces.State;
using SS14.Client.Interfaces.Utility;
using SS14.Client.Player;
using SS14.Client.State.States;
using SS14.Shared.Enums;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Network;
using SS14.Shared.Network.Messages;
using SS14.Shared.Players;
using SS14.Shared.Utility;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameStates;
using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.Utility;
using Robust.Client.Player;
using Robust.Client.State.States;
using Robust.Shared.Enums;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Network.Messages;
using Robust.Shared.Players;
using Robust.Shared.Utility;
namespace SS14.Client
namespace Robust.Client
{
/// <inheritdoc />
public class BaseClient : IBaseClient
@@ -88,7 +88,7 @@ namespace SS14.Client
OnRunLevelChanged(ClientRunLevel.Connecting);
_net.ClientConnect(ip, port, PlayerNameOverride ?? _configManager.GetCVar<string>("player.name"));
}
/// <inheritdoc />

View File

@@ -1,21 +1,21 @@
using System;
using System.Collections.Generic;
using SS14.Client.Interfaces.Console;
using SS14.Client.Log;
using SS14.Client.Utility;
using SS14.Shared.Console;
using SS14.Shared.Interfaces.Log;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Maths;
using SS14.Shared.Network;
using SS14.Shared.Network.Messages;
using SS14.Shared.Reflection;
using SS14.Shared.Utility;
using Robust.Client.Interfaces.Console;
using Robust.Client.Log;
using Robust.Client.Utility;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.Log;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Network;
using Robust.Shared.Network.Messages;
using Robust.Shared.Reflection;
using Robust.Shared.Utility;
namespace SS14.Client.Console
namespace Robust.Client.Console
{
public class AddStringArgs : EventArgs
{

View File

@@ -1,10 +1,10 @@
using SS14.Client.Interfaces.Console;
using SS14.Shared.Configuration;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Configuration;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
internal sealed class CVarCommand : SharedCVarCommand, IConsoleCommand
{

View File

@@ -3,11 +3,11 @@
// Couldn't think of a better name sorry.
using System;
using SS14.Client.Interfaces.Console;
using SS14.Shared.Console;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.Maths;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
class ClearCommand : IConsoleCommand
{

View File

@@ -5,35 +5,35 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.Console;
using SS14.Client.Interfaces.Debugging;
using SS14.Client.Interfaces.Graphics;
using SS14.Client.Interfaces.Graphics.Lighting;
using SS14.Client.Interfaces.Placement;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.Interfaces.State;
using SS14.Client.Interfaces.UserInterface;
using SS14.Client.State.States;
using SS14.Client.UserInterface;
using SS14.Client.UserInterface.Controls;
using SS14.Client.UserInterface.CustomControls;
using SS14.Shared.Console;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Transform;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.Interfaces.Resources;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using SS14.Shared.Prototypes;
using SS14.Shared.Utility;
using SS14.Shared.ViewVariables;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.Debugging;
using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Client.Interfaces.Placement;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.State.States;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.Interfaces.Resources;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
internal class DumpEntitiesCommand : IConsoleCommand
{

View File

@@ -1,10 +1,10 @@
using SS14.Client.Interfaces.Console;
using SS14.Shared.Console;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
class HelpCommand : IConsoleCommand
{

View File

@@ -1,13 +1,13 @@
using SS14.Client.Interfaces.Console;
using SS14.Shared.Log;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
class LogSetLevelCommand : IConsoleCommand
{

View File

@@ -1,7 +1,7 @@
using SS14.Client.Interfaces.Console;
using Robust.Client.Interfaces.Console;
using System;
namespace SS14.Client.Console.Commands
namespace Robust.Client.Console.Commands
{
class QuitCommand : IConsoleCommand
{

View File

@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using SS14.Client.Interfaces.Console;
using Robust.Client.Interfaces.Console;
namespace SS14.Client.Console
namespace Robust.Client.Console
{
public interface IClientConsole : IDisposable
{

View File

@@ -1,17 +1,17 @@
using SS14.Client.GameObjects;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Debugging;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using SS14.Shared.Prototypes;
using Robust.Client.GameObjects;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.Debugging;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace SS14.Client.Debugging
namespace Robust.Client.Debugging
{
public class DebugDrawing : IDebugDrawing
{

View File

@@ -1,35 +1,35 @@
using SS14.Client.Console;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameStates;
using SS14.Client.Interfaces.Graphics;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Lighting;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Client.Interfaces.Input;
using SS14.Client.Interfaces.Map;
using SS14.Client.Interfaces.Placement;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.Interfaces.State;
using SS14.Client.Interfaces.UserInterface;
using SS14.Client.Interfaces.Utility;
using SS14.Client.Log;
using SS14.Client.State.States;
using SS14.Shared.ContentPack;
using SS14.Shared.Input;
using SS14.Shared.Interfaces;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Log;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Serialization;
using SS14.Shared.Interfaces.Timers;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Network.Messages;
using SS14.Shared.Prototypes;
using SS14.Shared.Utility;
using Robust.Client.Console;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameStates;
using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.Map;
using Robust.Client.Interfaces.Placement;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Interfaces.Utility;
using Robust.Client.Log;
using Robust.Client.State.States;
using Robust.Shared.ContentPack;
using Robust.Shared.Input;
using Robust.Shared.Interfaces;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Log;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Interfaces.Timers;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network.Messages;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -37,16 +37,16 @@ using System.IO;
using System.Reflection;
using System.Threading;
using JetBrains.Annotations;
using SS14.Client.ResourceManagement;
using SS14.Client.Utility;
using SS14.Client.ViewVariables;
using SS14.Shared;
using SS14.Shared.Asynchronous;
using SS14.Shared.Interfaces.Resources;
using Robust.Client.ResourceManagement;
using Robust.Client.Utility;
using Robust.Client.ViewVariables;
using Robust.Shared;
using Robust.Shared.Asynchronous;
using Robust.Shared.Interfaces.Resources;
namespace SS14.Client
namespace Robust.Client
{
// Gets automatically ran by SS14.Client.Godot.
// Gets automatically ran by Robust.Client.Godot.
[UsedImplicitly]
internal sealed partial class GameController : IGameControllerInternal
{
@@ -70,7 +70,7 @@ namespace SS14.Client
[Dependency] private readonly IConfigurationManager _configurationManager;
[Dependency] private readonly IResourceCacheInternal _resourceCache;
[Dependency] private readonly IResourceManager _resourceManager;
[Dependency] private readonly ISS14Serializer _serializer;
[Dependency] private readonly IRobustSerializer _serializer;
[Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IClientNetManager _networkManager;
[Dependency] private readonly IMapManager _mapManager;
@@ -93,7 +93,7 @@ namespace SS14.Client
[Dependency] private readonly IDiscordRichPresence _discord;
private IClyde _clyde;
private IFontManagerInternal _fontManager;
private void Startup()
{
@@ -271,7 +271,7 @@ namespace SS14.Client
{
if (commandLineArgs.Contains("--self-contained"))
{
// Self contained mode. Data is stored in a directory called user_data next to SS14.Client.exe.
// Self contained mode. Data is stored in a directory called user_data next to Robust.Client.exe.
var exeDir = Assembly.GetExecutingAssembly().Location;
if (string.IsNullOrEmpty(exeDir))
{

View File

@@ -1,6 +1,6 @@
using System;
namespace SS14.Client
namespace Robust.Client
{
// This is probably a terrible folder to put this but I can't think of anything else.
public class FrameEventArgs : EventArgs

View File

@@ -1,14 +1,14 @@
using System;
using Godot;
using SS14.Client.GodotGlue;
using SS14.Client.Input;
using SS14.Client.Interfaces;
using SS14.Client.Utility;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Timing;
using Robust.Client.GodotGlue;
using Robust.Client.Input;
using Robust.Client.Interfaces;
using Robust.Client.Utility;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
namespace SS14.Client
namespace Robust.Client
{
internal partial class GameController : ClientEntryPoint
{

View File

@@ -1,6 +1,6 @@
using SS14.Client.Input;
using Robust.Client.Input;
namespace SS14.Client
namespace Robust.Client
{
internal sealed partial class GameController
{

View File

@@ -1,69 +1,69 @@
using SS14.Client.Console;
using SS14.Client.Debugging;
using SS14.Client.GameObjects;
using SS14.Client.GameStates;
using SS14.Client.Graphics.Lighting;
using SS14.Client.Input;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.Debugging;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameStates;
using SS14.Client.Interfaces.Graphics.Lighting;
using SS14.Client.Interfaces.Input;
using SS14.Client.Interfaces.Map;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.Interfaces.State;
using SS14.Client.Interfaces.UserInterface;
using SS14.Client.Log;
using SS14.Client.Map;
using SS14.Client.Player;
using SS14.Client.Reflection;
using SS14.Client.ResourceManagement;
using SS14.Client.State;
using SS14.Client.UserInterface;
using SS14.Shared.Configuration;
using SS14.Shared.ContentPack;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Log;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Physics;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.Interfaces.Serialization;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.Interfaces.Timers;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Network;
using SS14.Shared.Physics;
using SS14.Shared.Prototypes;
using SS14.Shared.Serialization;
using SS14.Shared.Timing;
using SS14.Shared.Timers;
using Robust.Client.Console;
using Robust.Client.Debugging;
using Robust.Client.GameObjects;
using Robust.Client.GameStates;
using Robust.Client.Graphics.Lighting;
using Robust.Client.Input;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.Debugging;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameStates;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.Map;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.State;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Log;
using Robust.Client.Map;
using Robust.Client.Player;
using Robust.Client.Reflection;
using Robust.Client.ResourceManagement;
using Robust.Client.State;
using Robust.Client.UserInterface;
using Robust.Shared.Configuration;
using Robust.Shared.ContentPack;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Log;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.Interfaces.Timers;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Physics;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
using Robust.Shared.Timers;
using System;
using System.Collections.Generic;
using System.Reflection;
using SS14.Client.Interfaces.Graphics;
using SS14.Client.Graphics;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Graphics.Clyde;
using SS14.Client.Interfaces.Placement;
using SS14.Client.Placement;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Client.Interfaces.Utility;
using SS14.Client.Utility;
using SS14.Client.Graphics.Overlays;
using SS14.Client.ViewVariables;
using SS14.Shared.Asynchronous;
using SS14.Shared.Interfaces.Resources;
using SS14.Shared.Exceptions;
using SS14.Shared.Map;
using Robust.Client.Interfaces.Graphics;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Graphics.Clyde;
using Robust.Client.Interfaces.Placement;
using Robust.Client.Placement;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.Utility;
using Robust.Client.Utility;
using Robust.Client.Graphics.Overlays;
using Robust.Client.ViewVariables;
using Robust.Shared.Asynchronous;
using Robust.Shared.Interfaces.Resources;
using Robust.Shared.Exceptions;
using Robust.Shared.Map;
namespace SS14.Client
namespace Robust.Client
{
// Partial of GameController to initialize IoC and some other low-level systems like it.
internal sealed partial class GameController
@@ -74,7 +74,7 @@ namespace SS14.Client
RegisterReflection();
Logger.Debug("IoC Initialized!");
// We are not IoC-managed (SS14.Client.Godot spawns us), but we still want the dependencies.
// We are not IoC-managed (Robust.Client.Godot spawns us), but we still want the dependencies.
IoCManager.InjectDependencies(this);
var proxy = (GameControllerProxy) IoCManager.Resolve<IGameControllerProxy>();
@@ -86,7 +86,7 @@ namespace SS14.Client
// Shared stuff.
IoCManager.Register<ILogManager, LogManager>();
IoCManager.Register<IConfigurationManager, ConfigurationManager>();
IoCManager.Register<ISS14Serializer, SS14Serializer>();
IoCManager.Register<IRobustSerializer, RobustSerializer>();
IoCManager.Register<IPrototypeManager, PrototypeManager>();
IoCManager.Register<INetManager, NetManager>();
IoCManager.Register<IEntitySystemManager, EntitySystemManager>();
@@ -194,9 +194,9 @@ namespace SS14.Client
// Gets a handle to the shared and the current (client) dll.
IoCManager.Resolve<IReflectionManager>().LoadAssemblies(new List<Assembly>(2)
{
// Do NOT register SS14.Client.Godot.
// Do NOT register Robust.Client.Godot.
// At least not for now.
AppDomain.CurrentDomain.GetAssemblyByName("SS14.Shared"),
AppDomain.CurrentDomain.GetAssemblyByName("Robust.Shared"),
Assembly.GetExecutingAssembly()
});
}

View File

@@ -1,13 +1,13 @@
using System;
using System.Linq;
using System.Runtime.Remoting.Channels;
using SS14.Client.Interfaces;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Timing;
using Robust.Client.Interfaces;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Timing;
namespace SS14.Client
namespace Robust.Client
{
internal partial class GameController
{

View File

@@ -1,6 +1,6 @@
using SS14.Client.Interfaces;
using Robust.Client.Interfaces;
namespace SS14.Client
namespace Robust.Client
{
internal sealed partial class GameController
{

View File

@@ -1,15 +1,15 @@
using SS14.Client.GameObjects.Components;
using SS14.Client.GameObjects.Components.Animations;
using SS14.Client.GameObjects.Components.UserInterface;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Transform;
using SS14.Shared.GameObjects.Components.UserInterface;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Physics;
using Robust.Client.GameObjects.Components;
using Robust.Client.GameObjects.Components.Animations;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class ClientComponentFactory : ComponentFactory
{

View File

@@ -1,16 +1,16 @@
using System;
using System.Collections;
using System.Collections.Generic;
using SS14.Client.Interfaces.GameObjects;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
/// <summary>
/// Manager for entities -- controls things like template loading and instantiation

View File

@@ -1,17 +1,17 @@
using System;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Network.Messages;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Network.Messages;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class ClientEntityNetworkManager : IEntityNetworkManager
{
[Dependency] private readonly IClientNetManager _network;
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
/// <summary>
/// Sends a message to the relevant system(s) server side.
/// </summary>

View File

@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SS14.Client.Animations;
using SS14.Shared.GameObjects;
using SS14.Shared.Utility;
using Robust.Client.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility;
namespace SS14.Client.GameObjects.Components.Animations
namespace Robust.Client.GameObjects.Components.Animations
{
/// <summary>
/// Plays back <see cref="Animation"/>s on entities.

View File

@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Appearance;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.IoC;
using SS14.Shared.Serialization;
using SS14.Shared.Utility;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Appearance;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public sealed class AppearanceComponent : SharedAppearanceComponent
{

View File

@@ -1,9 +1,9 @@
using SS14.Shared.GameObjects;
using SS14.Shared.Maths;
using SS14.Shared.Serialization;
using SS14.Shared.ViewVariables;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
/// <summary>
/// Holds an Axis Aligned Bounding Box (AABB) for the entity. Using this component adds the entity

View File

@@ -1,16 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Physics;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using SS14.Shared.Physics;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class CollidableComponent : Component, ICollidableComponent
{

View File

@@ -1,13 +1,13 @@
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using SS14.Shared.Serialization;
using SS14.Shared.ViewVariables;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class EyeComponent : Component
{

View File

@@ -1,13 +1,13 @@
using SS14.Client.Graphics;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Shared.GameObjects;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Serialization;
using SS14.Shared.Utility;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class IconComponent : Component
{

View File

@@ -1,12 +1,12 @@
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects;
using SS14.Shared.Input;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Map;
using SS14.Shared.ViewVariables;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Input;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
// Notice: Most actual logic for clicking is done by the game screen.
public class ClickableComponent : Component, IClientClickableComponent

View File

@@ -1,10 +1,10 @@
using SS14.Client.GameObjects.EntitySystems;
using SS14.Shared.GameObjects;
using SS14.Shared.Input;
using SS14.Shared.Serialization;
using SS14.Shared.ViewVariables;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.Input;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects.Components
namespace Robust.Client.GameObjects.Components
{
/// <summary>
/// Defines data fields used in the <see cref="InputSystem"/>.

View File

@@ -1,17 +1,17 @@
using System;
using SS14.Client.Interfaces.Graphics.Lighting;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Shared.Enums;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using SS14.Shared.Utility;
using SS14.Shared.ViewVariables;
using ObjectSerializer = SS14.Shared.Serialization.ObjectSerializer;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
using ObjectSerializer = Robust.Shared.Serialization.ObjectSerializer;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class PointLightComponent : Component
{

View File

@@ -1,14 +1,14 @@
using SS14.Client.Interfaces.Graphics.Lighting;
using SS14.Shared.GameObjects;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using SS14.Shared.Serialization;
using SS14.Client.Graphics.ClientEye;
using SS14.Shared.GameObjects.Components.Transform;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.ViewVariables;
using Robust.Client.Interfaces.Graphics.Lighting;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Client.Graphics.ClientEye;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class OccluderComponent : Component, IComponentDebug
{

View File

@@ -1,10 +1,10 @@
using System;
using SS14.Shared.GameObjects;
using SS14.Shared.Log;
using SS14.Shared.Maths;
using SS14.Shared.ViewVariables;
using Robust.Shared.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
/// <summary>
/// Contains physical properties of the entity. This component registers the entity

View File

@@ -1,18 +1,18 @@
using SS14.Client.Graphics;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.Resource;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using Robust.Client.Graphics;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.Resource;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using System;
using System.Collections.Generic;
using System.Linq;
using SS14.Shared.Enums;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class ParticleSystemComponent : Component, IParticleSystemComponent, IRenderableComponent
{

View File

@@ -1,15 +1,15 @@
/*
using SS14.Client.Graphics;
using SS14.Client.Graphics.Sprites;
using SS14.Client.Graphics.Render;
using SS14.Client.Interfaces.Resource;
using SS14.Shared.IoC;
using Robust.Client.Graphics;
using Robust.Client.Graphics.Sprites;
using Robust.Client.Graphics.Render;
using Robust.Client.Interfaces.Resource;
using Robust.Shared.IoC;
using System;
using System.Text;
using SS14.Client.ResourceManagement;
using SS14.Shared.Maths;
using Robust.Client.ResourceManagement;
using Robust.Shared.Maths;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class SpeechBubble
{

View File

@@ -1,30 +1,30 @@
using SS14.Client.Graphics;
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Graphics.Shaders;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Client.Utility;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.Renderable;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Maths;
using SS14.Shared.Prototypes;
using SS14.Shared.Serialization;
using SS14.Shared.Utility;
using Robust.Client.Graphics;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Client.Utility;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Renderable;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.ViewVariables;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.ViewVariables;
using VS = Godot.VisualServer;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public sealed class SpriteComponent : SharedSpriteComponent, ISpriteComponent, IClickTargetComponent,
IComponentDebug
@@ -1301,7 +1301,7 @@ namespace SS14.Client.GameObjects
serializer.DataFieldCached(ref color, "color", Color.White);
serializer.DataFieldCached(ref _directional, "directional", true);
serializer.DataFieldCached(ref _visible, "visible", true);
// TODO: Writing?
if (!serializer.Reading)
{

View File

@@ -1,17 +1,17 @@
using SS14.Client.Graphics;
using SS14.Client.Graphics.Sprites;
using SS14.Client.Interfaces.Resource;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using SS14.Shared.Utility;
using Robust.Client.Graphics;
using Robust.Client.Graphics.Sprites;
using Robust.Client.Interfaces.Resource;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using SS14.Shared.Maths;
using Robust.Shared.Maths;
using YamlDotNet.RepresentationModel;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class WearableAnimatedSpriteComponent : AnimatedSpriteComponent
{
@@ -21,7 +21,7 @@ namespace SS14.Client.GameObjects
public Sprite NotWornSprite { get; set; }
public bool IsCurrentlyCarried { get; set; }
public string CarriedSprite { get; set; }
public override Type StateType => typeof(WearableAnimatedSpriteComponentState);
/// <inheritdoc />
@@ -113,7 +113,7 @@ namespace SS14.Client.GameObjects
var transform = Owner.GetComponent<ITransformComponent>();
var worldPos = transform.WorldPosition;
var renderPos = worldPos * CluwneLib.Camera.PixelsPerMeter;
spriteToRender.Position = new Vector2(renderPos.X, renderPos.Y);
if (worldPos.X + bounds.Left + bounds.Width < topLeft.X

View File

@@ -1,13 +1,13 @@
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Client.Utility;
using SS14.Shared.GameObjects.Components.Transform;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Utility;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
internal class GodotTransformComponent : TransformComponent, IGodotTransformComponent
{

View File

@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Components.UserInterface;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Reflection;
using SS14.Shared.IoC;
using SS14.Shared.Serialization;
using IComponent = SS14.Shared.Interfaces.GameObjects.IComponent;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using IComponent = Robust.Shared.Interfaces.GameObjects.IComponent;
namespace SS14.Client.GameObjects.Components.UserInterface
namespace Robust.Client.GameObjects.Components.UserInterface
{
public class ClientUserInterfaceComponent : SharedUserInterfaceComponent
{
@@ -86,7 +86,7 @@ namespace SS14.Client.GameObjects.Components.UserInterface
boundInterface.Open();
_openInterfaces[wrapped.UiKey] = boundInterface;
}
internal void Close(object uiKey, bool remoteCall)
{
if (!_openInterfaces.TryGetValue(uiKey, out var boundUserInterface))

View File

@@ -1,9 +1,9 @@
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using System;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class VelocityComponent : Component, IVelocityComponent
{

View File

@@ -1,8 +1,8 @@
using SS14.Client.GameObjects.Components.Animations;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using Robust.Client.GameObjects.Components.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
internal sealed class AnimationPlayerSystem : EntitySystem
{

View File

@@ -1,7 +1,7 @@
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.GameObjects;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
sealed class AppearanceSystem : EntitySystem
{

View File

@@ -1,7 +1,7 @@
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
class AppearanceTestSystem : EntitySystem
{

View File

@@ -1,24 +1,24 @@
using SS14.Client.Audio;
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Client.Utility;
using SS14.Shared.Audio;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Map;
using Robust.Client.Audio;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Client.Utility;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using System.Collections.Generic;
using System.IO;
using SS14.Client.Interfaces.Graphics;
using SS14.Shared.Utility;
using Robust.Client.Interfaces.Graphics;
using Robust.Shared.Utility;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
public class AudioSystem : EntitySystem
{

View File

@@ -1,26 +1,26 @@
using SS14.Client.Graphics;
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.EntitySystemMessages;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Client.Graphics;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.EntitySystemMessages;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using SS14.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.Prototypes;
using SS14.Shared.Utility;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class EffectSystem : EntitySystem
{

View File

@@ -1,16 +1,16 @@
using System;
using SS14.Client.GameObjects.Components;
using SS14.Client.Interfaces.Input;
using SS14.Client.Player;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Input;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Players;
using Robust.Client.GameObjects.Components;
using Robust.Client.Interfaces.Input;
using Robust.Client.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Players;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
/// <summary>
/// Client-side processing of all input commands through the simulation.

View File

@@ -1,12 +1,12 @@
using SS14.Client.Interfaces.Resource;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.IoC;
using Robust.Client.Interfaces.Resource;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using System;
using System.Collections.Generic;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
public class ParticleSystem : EntitySystem
{

View File

@@ -1,11 +1,11 @@
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.IoC;
using System;
using System.Collections.Generic;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
internal class PhysicsSystem : EntitySystem
{

View File

@@ -1,8 +1,8 @@
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
public class SpriteSystem : EntitySystem
{

View File

@@ -1,18 +1,18 @@
using SFML.System;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Client.Interfaces.Player;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
namespace SS14.Client.GameObjects.EntitySystems
namespace Robust.Client.GameObjects.EntitySystems
{
internal class TransformSystem : EntitySystem
{

View File

@@ -1,7 +1,7 @@
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects.Components;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class GodotComponentFactory : ClientComponentFactory
{

View File

@@ -1,6 +1,6 @@
using SS14.Shared.GameObjects;
using Robust.Shared.GameObjects;
namespace SS14.Client.GameObjects
namespace Robust.Client.GameObjects
{
public class PlayerAttachedMsg : ComponentMessage
{

View File

@@ -1,21 +1,21 @@
using System.Collections.Generic;
using SS14.Client.Interfaces;
using SS14.Client.Interfaces.GameObjects;
using SS14.Client.Interfaces.GameStates;
using SS14.Shared.GameStates;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Log;
using SS14.Shared.Network.Messages;
using SS14.Client.Player;
using SS14.Shared.Configuration;
using SS14.Shared.Interfaces.Configuration;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.Timing;
using SS14.Shared.Utility;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameStates;
using Robust.Shared.GameStates;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network.Messages;
using Robust.Client.Player;
using Robust.Shared.Configuration;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace SS14.Client.GameStates
namespace Robust.Client.GameStates
{
public class ClientGameStateManager : IClientGameStateManager
{
@@ -150,7 +150,7 @@ namespace SS14.Client.GameStates
{
targetBufferSize = 2 + bufSz; // only need to buffer last and cur
}
if (CalculateNextStates(_timing.CurTick, out var curState, out var nextState, targetBufferSize))
{
if (_logging)
@@ -191,7 +191,7 @@ namespace SS14.Client.GameStates
var lastTick = new GameTick(curTick.Value - 1);
var nextTick = new GameTick(curTick.Value + 1);
nextState = null;
for (var i = 0; i < _stateBuffer.Count; i++)
{
var state = _stateBuffer[i];

View File

@@ -1,14 +1,14 @@
using SS14.Client.Graphics;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays;
using SS14.Client.Interfaces.Console;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Client.Interfaces.ResourceManagement;
using SS14.Client.ResourceManagement;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using Robust.Client.Graphics;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.ResourceManagement;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace SS14.Client.GameStates
namespace Robust.Client.GameStates
{
internal class NetGraphOverlay : Overlay
{
@@ -74,9 +74,9 @@ namespace SS14.Client.GameStates
overlayMan.RemoveOverlay(nameof(NetGraphOverlay));
console.AddLine("Disabled network overlay.");
}
return false;
}
}
}
}
}

View File

@@ -1,19 +1,19 @@
using System;
using SS14.Client.GameObjects;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders;
using SS14.Client.Interfaces.Console;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Interfaces.Graphics.Overlays;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
using SS14.Shared.Maths;
using SS14.Shared.Prototypes;
using Robust.Client.GameObjects;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace SS14.Client.GameStates
namespace Robust.Client.GameStates
{
internal class NetInterpOverlay : Overlay
{
@@ -50,13 +50,13 @@ namespace SS14.Client.GameStates
// if not on screen, or too small, continue
if (!aabb.Translated(transform.WorldPosition).Intersects(viewport) || aabb.IsEmpty())
continue;
var timing = IoCManager.Resolve<IGameTiming>();
timing.InSimulation = true;
var boxOffset = transform.LerpDestination - transform.LocalPosition;
var boxPosWorld = transform.WorldPosition + boxOffset;
timing.InSimulation = false;
worldHandle.DrawLine(transform.WorldPosition, boxPosWorld, Color.Yellow);

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SS14.Client.Graphics
namespace Robust.Client.Graphics
{
static class CanvasLayers
{

View File

@@ -1,11 +1,11 @@
using System;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Client.Utility;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Utility;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace SS14.Client.Graphics.ClientEye
namespace Robust.Client.Graphics.ClientEye
{
public class Eye : IEye, IDisposable
{

View File

@@ -1,16 +1,16 @@
using System;
using SS14.Client.Interfaces.Graphics;
using SS14.Client.Interfaces.Graphics.ClientEye;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Client.Interfaces.Graphics;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace SS14.Client.Graphics.ClientEye
namespace Robust.Client.Graphics.ClientEye
{
public sealed class EyeManager : IEyeManager, IDisposable
{
// If you modify this make sure to edit the value in the SS14.Shared.Audio.AudioParams struct default too!
// If you modify this make sure to edit the value in the Robust.Shared.Audio.AudioParams struct default too!
// No I can't be bothered to make this a shared constant.
public const int PIXELSPERMETER = 32;

View File

@@ -1,10 +1,10 @@
using SS14.Client.Interfaces;
using SS14.Client.Utility;
using SS14.Shared.IoC;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using Robust.Client.Interfaces;
using Robust.Client.Utility;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace SS14.Client.Graphics.ClientEye
namespace Robust.Client.Graphics.ClientEye
{
/// <summary>
/// A fixed eye is an eye which is fixed to one point, its position.

View File

@@ -5,12 +5,12 @@ using System.Linq;
using System.Runtime.CompilerServices;
using OpenTK;
using OpenTK.Audio.OpenAL;
using SS14.Client.Audio;
using SS14.Client.Interfaces.Graphics;
using SS14.Shared.Log;
using Vector2 = SS14.Shared.Maths.Vector2;
using Robust.Client.Audio;
using Robust.Client.Interfaces.Graphics;
using Robust.Shared.Log;
using Vector2 = Robust.Shared.Maths.Vector2;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -1,7 +1,7 @@
using System;
using System.IO;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -2,9 +2,9 @@ using System;
using System.IO;
using System.Text;
using JetBrains.Annotations;
using SS14.Shared.Utility;
using Robust.Shared.Utility;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -2,9 +2,9 @@ using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using OpenTK.Graphics.OpenGL4;
using SS14.Shared.Utility;
using Robust.Shared.Utility;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -2,12 +2,12 @@
using System.Buffers;
using System.Collections.Generic;
using OpenTK.Graphics.OpenGL4;
using SS14.Shared.Interfaces.Map;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using SS14.Shared.Utility;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

View File

@@ -4,22 +4,22 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using OpenTK.Graphics.OpenGL4;
using SS14.Client.GameObjects;
using SS14.Client.Graphics.ClientEye;
using SS14.Client.Graphics.Drawing;
using SS14.Client.Graphics.Overlays;
using SS14.Client.Graphics.Shaders;
using SS14.Client.Interfaces.GameObjects.Components;
using SS14.Client.ResourceManagement;
using SS14.Shared.Enums;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Log;
using SS14.Shared.Map;
using SS14.Shared.Maths;
using SS14.Shared.Timers;
using SS14.Shared.Utility;
using Robust.Client.GameObjects;
using Robust.Client.Graphics.ClientEye;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Timers;
using Robust.Shared.Utility;
namespace SS14.Client.Graphics.Clyde
namespace Robust.Client.Graphics.Clyde
{
internal partial class Clyde
{

Some files were not shown because too many files have changed in this diff Show More