Merge branch 'master' of https://bitbucket.org/Regalis11/repo

Conflicts: Subsurface/Subsurface.csproj Subsurface_Solution.v12.suo
2015-06-14 18:18:24 +03:00
parent fed1155537 566d54197a
commit d668ad0ede
86 changed files with 1503 additions and 631 deletions
@@ -94,7 +94,7 @@ namespace Subsurface
        public override void Select()
        {
            base.Select();
-
+            
            GUIComponent.MouseOn = null;
            characterMode = false;
             //CreateDummyCharacter();
@@ -197,7 +197,7 @@ namespace Subsurface
                }

                dummyCharacter.ControlLocalPlayer(cam, false);
-                dummyCharacter.Control(cam);
+                dummyCharacter.Control((float)deltaTime, cam);
            }
            else
            {