Switch to Barotrauma & too many misc changes to remember

This commit is contained in:
Regalis
2015-10-16 18:11:58 +03:00
parent 2bb5d41836
commit 838022fcd5
203 changed files with 540 additions and 419 deletions

View File

@@ -6,7 +6,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System.Collections.Generic;
namespace Subsurface
namespace Barotrauma
{
class EditCharacterScreen : Screen
{

View File

@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using System;
namespace Subsurface
namespace Barotrauma
{
class EditMapScreen : Screen
{

View File

@@ -2,10 +2,10 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using Subsurface.Lights;
using Barotrauma.Lights;
using System.Diagnostics;
namespace Subsurface
namespace Barotrauma
{
class GameScreen : Screen
{
@@ -288,7 +288,7 @@ namespace Subsurface
Submarine.DrawFront(spriteBatch);
GameMain.GameSession?.Level?.Draw(spriteBatch);
if (Level.Loaded!=null) Level.Loaded.Draw(spriteBatch);
spriteBatch.End();

View File

@@ -6,7 +6,7 @@ using Microsoft.Xna.Framework.Graphics;
using System;
using System.Collections.Generic;
namespace Subsurface
namespace Barotrauma
{
class LobbyScreen : Screen
{

View File

@@ -1,10 +1,10 @@
using System;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Networking;
using Barotrauma.Networking;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class MainMenuScreen : Screen
{

View File

@@ -2,14 +2,14 @@
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Networking;
using Barotrauma.Networking;
using FarseerPhysics;
using FarseerPhysics.Factories;
using FarseerPhysics.Dynamics;
using System.IO;
using System.Collections.Generic;
namespace Subsurface
namespace Barotrauma
{
class NetLobbyScreen : Screen
{

View File

@@ -1,6 +1,6 @@
using Microsoft.Xna.Framework.Graphics;
namespace Subsurface
namespace Barotrauma
{
class Screen
{

View File

@@ -2,7 +2,7 @@
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Networking;
using Barotrauma.Networking;
using FarseerPhysics;
using FarseerPhysics.Factories;
using FarseerPhysics.Dynamics;
@@ -10,7 +10,7 @@ using System.IO;
using System.Collections.Generic;
using RestSharp;
namespace Subsurface
namespace Barotrauma
{
class ServerListScreen : Screen
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Subsurface
namespace Barotrauma
{
class SettingsScreen : Screen
{