Merge pull request #32 from proepkes/develop

Develop

Author: proepkes

.gitignore

@@ -11,7 +11,6 @@
 *.userprefs
 
 # Build results
-[Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/

Engine/Common/Logging/Log.cs

@@ -3,11 +3,15 @@
 namespace Lockstep.Common.Logging
 {
     public static class Log
-    {                                                                                                  
-        public static LogSeverity LogSeverityLevel = 0;
+    {                                                                                                                                 
+        public static LogSeverity LogSeverityLevel = LogSeverity.Info | LogSeverity.Warn | LogSeverity.Error | LogSeverity.Exception;
 
         public static event EventHandler<LogEventArgs> OnMessage;
-     
+
+        public static void SetLogAllSeverities()
+        {
+            LogSeverityLevel = LogSeverity.Trace | LogSeverity.Info | LogSeverity.Warn | LogSeverity.Error | LogSeverity.Exception;
+        }
 
         public static void Warn(object sender, string message, params object[] args)
         {

Engine/CopySourceToUnity.cmd

@@ -0,0 +1,7 @@
+del ..\Unity\Assets\Integration\Lockstep.*
+xcopy "Game" "..\Unity\Assets\GitIgnored\Game\" /exclude:excludeList.txt /y /S
+xcopy "Common" "..\Unity\Assets\GitIgnored\Common\" /exclude:excludeList.txt /y /S
+xcopy "Core.Logic" "..\Unity\Assets\GitIgnored\Core.Logic\" /exclude:excludeList.txt /y /S
+xcopy "Core.State" "..\Unity\Assets\GitIgnored\Core.State\" /exclude:excludeList.txt /y /S
+xcopy "Network" "..\Unity\Assets\GitIgnored\Network\" /exclude:excludeList.txt /y /S
+xcopy "Network.Client" "..\Unity\Assets\GitIgnored\Network.Client\" /exclude:excludeList.txt /y /S

Engine/Core.Logic/Interfaces/Services/INavigationService.cs

@@ -5,13 +5,11 @@
 namespace Lockstep.Core.Logic.Systems.Debugging
 {
     public class VerifyNoDuplicateBackups : IExecuteSystem
-    {
-        private readonly ServiceContainer serviceContainer;
+    {                                                       
         private readonly IGroup<GameEntity> _backups;
 
-        public VerifyNoDuplicateBackups(Contexts contexts, ServiceContainer serviceContainer)
-        {
-            this.serviceContainer = serviceContainer;
+        public VerifyNoDuplicateBackups(Contexts contexts)
+        {                                                 
             _backups = contexts.game.GetGroup(GameMatcher.Backup);
         }
         public void Execute()