Merge branch 'master' into dev

# Conflicts:
#	oxygine/src/res/ResAtlas.cpp

oxygine/src/MemoryTexture.cpp

@@ -761,6 +761,8 @@ namespace oxygine
         if (pRect)
         {
             rect = *pRect;
+            OX_ASSERT(rect.getX() >= 0);
+            OX_ASSERT(rect.getY() >= 0);
             OX_ASSERT(rect.getX() + rect.getWidth() <= _image.w);
             OX_ASSERT(rect.getY() + rect.getHeight() <= _image.h);
         }

oxygine/src/res/CreateResourceContext.cpp

@@ -18,7 +18,7 @@ namespace oxygine
     LoadResourcesContext* LoadResourcesContext::get()
     {
         bool isMainThread = pthread_equal(_selfThread, pthread_self());
-        
+
         LoadResourcesContext* mtcontext = &MTLoadingResourcesContext::instance;
         LoadResourcesContext* scontext = &SingleThreadResourcesContext::instance;
         return isMainThread ? scontext : mtcontext;

oxygine/src/res/ResAtlasGeneric.cpp

@@ -370,25 +370,25 @@ namespace oxygine
                             MemoryTexture& mt = ad.mt;
                             ImageData tmp;
 
-                            if (bounds.getY() == 0)
+                            if (bounds.getY() == 0 && dest.pos.y != 0)
                             {
                                 tmp = mt.lock(Rect(dest.pos.x, dest.pos.y - 1, src.w, 1));
                                 operations::copy(src.getRect(Rect(0, 0, src.w, 1)), tmp);
                             }
 
-                            if (bounds.getHeight() == im.h)
+                            if (bounds.getHeight() == im.h && dest.getBottom() != mt.getHeight())
                             {
                                 tmp = mt.lock(Rect(dest.pos.x, dest.pos.y + src.h, src.w, 1));
                                 operations::copy(src.getRect(Rect(0, src.h - 1, src.w, 1)), tmp);
                             }
 
-                            if (bounds.getX() == 0)
+                            if (bounds.getX() == 0 && dest.pos.x != 0)
                             {
                                 tmp = mt.lock(Rect(dest.pos.x - 1, dest.pos.y, 1, src.h));
                                 operations::copy(src.getRect(Rect(0, 0, 1, src.h)), tmp);
                             }
 
-                            if (bounds.getWidth() == im.w)
+                            if (bounds.getWidth() == im.w && dest.getRight() != mt.getWidth())
                             {
                                 tmp = mt.lock(Rect(dest.pos.x + src.w, dest.pos.y, 1, src.h));
                                 operations::copy(src.getRect(Rect(src.w - 1, 0, 1, src.h)), tmp);

oxygine/src/res/Resources.cpp

@@ -280,7 +280,7 @@ namespace oxygine
 
         FS_LOG("xml loaded");
     }
-	
+
     void Resources::collect(resources& r)
     {
 #ifdef __S3E__

oxygine/src/res/Resources.h

@@ -64,7 +64,7 @@ namespace oxygine
 
         Resources();
         ~Resources();
-		
+
         /**Loads resources from xml file. Load could be called multiple times for different xml files.
         @param xml file paths
         @param options

readme/Android.txt

@@ -1,4 +1,8 @@
 1. Start from readme.txt
+
+step by step video tutorial:
+http://www.youtube.com/watch?v=d8eHHr_KHgQ
+
 2a. Examples folder have configured android project
 =================================================================================================
 How to build. Steps:

tools/resbuild/process_atlas.py

@@ -274,9 +274,17 @@ def pck(st, frames):
             sq += size[0] * size[1]
             min_w = max(min_w, size[0])
             min_h = max(min_h, size[1])
+        
+        max_w = st.max_w    
+        max_h = st.max_h
+        
+        if st.square:
+            min_w = min_h = max(min_w, min_h)
+            max_w = max_h = max(max_w, max_h)
+            
 
-        sizes_w = list(get_pow2list(st.npot, min_w, st.max_w))
-        sizes_h = list(get_pow2list(st.npot, min_h, st.max_h))
+        sizes_w = list(get_pow2list(st.npot, min_w, max_w))
+        sizes_h = list(get_pow2list(st.npot, min_h, max_h))
 
         for sw in sizes_w:
             for sh in sizes_h: