Merge branch 'dev' of github.com:oxygine/oxygine-framework into dev

oxygine/src/DebugActor.cpp

@@ -74,6 +74,12 @@ namespace oxygine
             DebugActor::instance->detach();
     }
 
+    void DebugActor::setCorner(int corner)
+    {
+        if (DebugActor::instance)
+            DebugActor::instance->setCornerPosition(corner);
+    }
+
     void DebugActor::release()
     {
         instance = 0;

oxygine/src/DebugActor.h

@@ -24,6 +24,8 @@ namespace oxygine
         static void show();
         static void hide();
         static void release();
+        static void setCorner(int corner);
+        static void addDebugString(const char* format, ...);
         static std::string getDefaultName() { return "debug_actor"; }
 
         DebugActor();
@@ -32,7 +34,6 @@ namespace oxygine
         /**where to display DebugActor. 0 - top left, 1 - top right, 2 - bottom right, 3 - bottom left corner*/
         void setCornerPosition(int corner);
         //void addDebugString(const string &str);
-        static void addDebugString(const char* format, ...);
 
         /**function for debug. Helps you to find actor who handled TouchEvent*/
         void showTouchedActor(bool show);