Merge branch 'RB-2.2'

mgear-dev · Aug 31, 2017 · 56230cb · 56230cb
2 parents f3c3e2d + 8a5a680
commit 56230cb
Show file tree

Hide file tree

Showing 12 changed files with 6,631 additions and 5,270 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Originally mGear was design and develope by Jeremie Passerin , since 2013 Miquel
 
 MGEAR is under the terms of the MIT License
 
-Latest release: 2.2.3 ( Release Log: https://miquelcampos.github.io/mgear/releaseLog.html)
+*Latest release: 2.2.4 ( Release Log: https://miquelcampos.github.io/mgear/releaseLog.html)
 
 For the official release, with compiled solvers and example data please download mGear from: https://gumroad.com/l/mgear
 

diff --git a/SConstruct b/SConstruct
@@ -9,7 +9,7 @@ maya.SetupMscver()
 env = excons.MakeBaseEnv()
 
 
-version = (2, 2, 3)
+version = (2, 2, 4)
 versionstr = "%d.%d.%d" % version
 platname = {"win32": "windows", "darwin": "osx"}.get(sys.platform, "linux")
 outprefix = "platforms/%s/%s/%s/plug-ins" % (maya.Version(nice=True), platname, excons.arch_dir)

diff --git a/docs/source/releaseLog.rst b/docs/source/releaseLog.rst
@@ -1,6 +1,11 @@
 Release Log
 ===========
 
+2.2.4
+-----
+**Enhancements**
+	* Issue #50: Global scale and size of controllers.
+
 2.2.3
 -----
 **Enhancements**

diff --git a/scripts/mgear/maya/shifter/component/_templates/biped_guide.ma b/scripts/mgear/maya/shifter/component/_templates/biped_guide.ma