Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts

Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Chat.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
	apps/openmw/mwmp/Cell.cpp
	apps/openmw/mwmp/DedicatedActor.cpp
	apps/openmw/mwmp/DedicatedPlayer.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/Main.cpp
	components/openmw-mp/Base/BaseActor.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
	components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp

apps/openmw/mwgui/charactercreation.cpp

@@ -705,10 +705,22 @@ namespace MWGui
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Review);
         }
+        /*
+            Start of tes3mp change (major)
+
+            Servers have control over character generation in multiplayer, which is why
+            the automatic transition to the next character generation menu has been
+            commented out here
+        */
+        /*
         else if (mCreationStage >= currentStage)
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode((GuiMode)nextMode);
         }
+        */
+        /*
+            End of tes3mp change (major)
+        */
         else
         {
             mCreationStage = currentStage;

apps/openmw/mwmp/LocalPlayer.cpp

@@ -49,7 +49,6 @@ LocalPlayer::LocalPlayer()
     charGenState.isFinished = false;
 
     difficulty = 0;
-    enforcedLogLevel = -1;
     physicsFramerate = 60.0;
     consoleAllowed = false;
     bedRestAllowed = true;

apps/openmw/mwmp/LocalPlayer.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 14.01.16.
-//
-
 #ifndef OPENMW_LOCALPLAYER_HPP
 #define OPENMW_LOCALPLAYER_HPP
 
@@ -21,7 +17,7 @@ namespace mwmp
 
         void update();
 
-        bool processCharGen(); // return true if CGStage::current == CGStage::end
+        bool processCharGen();
         bool hasFinishedCharGen();
 
         void updateStatsDynamic(bool forceUpdate = false);

apps/openmw/mwmp/Main.cpp

@@ -212,6 +212,7 @@ void Main::frame(float dt)
 
 void Main::updateWorld(float dt) const
 {
+
     if (!mLocalPlayer->processCharGen())
         return;
 

components/openmw-mp/Base/BasePlayer.hpp

@@ -258,6 +258,7 @@ namespace mwmp
             isWerewolf = false;
             displayCreatureName = false;
             resetStats = false;
+            enforcedLogLevel = -1;
         }
 
         BasePlayer()

components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 17.03.16.
-//
-
 #include "PacketPlayerSkill.hpp"
 
 #include <components/openmw-mp/NetworkMessages.hpp>