CCRects converted with jsb does not create origin/size properties

.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -21,11 +21,11 @@ Thumbs.db
 *.ilk
 *.log
 [Bb]in
-[Dd]ebug*/
+[Dd]ebug/
 *.sbr
 *.sdf
 obj/
-[Rr]elease*/
+[Rr]elease/
 _ReSharper*/
 [Tt]est[Rr]esult*
 ipch/
@@ -61,8 +61,8 @@ build_*_vc10/
 *.xcscheme
 *.xcworkspacedata
 *.xcuserstate
+*.xccheckout
 xcschememanagement.plist
-build/
 .DS_Store
 ._.*
 xcuserdata/
@@ -80,11 +80,16 @@ Device-Release/
 
 # Ignore vim swaps
 *.swp
+*.swo
+
+# Ignore files created by create_project.py
+projects/
 
 # Ignore config files in javascript bindings generator
 tools/tojs/user.cfg
 # ... userconf.ini generated if running from tools/tojs
 tools/tojs/userconf.ini
+tools/tolua/userconf.ini
 # ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/
 tools/jenkins_scripts/mac/android/userconf.ini
 

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "tools/bindings-generator"]
 	path = tools/bindings-generator
-	url = https://github.com/cocos2d/bindings-generator.git
-[submodule "scripting/javascript/bindings/generated"]
-	path = scripting/javascript/bindings/generated
-	url = git://github.com/folecr/cocos2dx-autogen-bindings.git
+	url = git://github.com/cocos2d/bindings-generator.git
+[submodule "cocos/scripting/auto-generated"]
+	path = cocos/scripting/auto-generated
+	url = git://github.com/cocos2d-x/bindings-auto-generated.git
 [submodule "samples/Javascript/Shared"]
 	path = samples/Javascript/Shared
-	url = https://github.com/minggo/cocos2d-js-tests.git
-[submodule "external/emscripten"]
-	path = external/emscripten
-	url = https://github.com/kripken/emscripten.git
+	url = git://github.com/cocos2d/cocos2d-js-tests.git
 [submodule "tools/cocos2d-console"]
 	path = tools/cocos2d-console
-	url = https://github.com/cocos2d/cocos2d-console.git
+	url = git://github.com/cocos2d/cocos2d-console.git
+[submodule "plugin"]
+	path = plugin
+	url = https://github.com/cocos2d-x/plugin-x.git

.travis.yml

@@ -1,13 +1,15 @@
---- 
 language: cpp
-env: 
-  matrix: 
+env:
+  matrix:
   - GEN_JSB=YES
   - PLATFORM=linux DEBUG=1
-  - PLATFORM=nacl DEBUG=1
+  # Since switching to C++11 only the ARM version of the nactive client
+  # port currently builds.  TODO(sbc): Re-enable all architectures.
+  # Disabled travis-ci build for native client port since it doesn't support std::thread, std::mutex.
+  # - PLATFORM=nacl DEBUG=1 NACL_ARCH=arm
   - PLATFORM=android
-  - PLATFORM=emscripten DEBUG=1
-  global: 
+  # - PLATFORM=emscripten DEBUG=1
+  global:
   - secure: |-
       cHXOjAda+t2tmBVuVAiQfvhDN+unToO6hX1rc3dJeGDOk4rlQnylJacjA7o/
       enkWeHagbW2Ja4h7BxQz4h7dada8zEbIbEMK4VEHx6AWwQM+GIEqkJPv5g8k
@@ -20,12 +22,7 @@ env:
       Wsngwo3jlZtvuPfr3RNhqrz/liNIhKYnlw4KYJO90gMQ9ZQKRTlMv2BMiPw/
       9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
       X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
-script: 
-- export NACL_SDK_ROOT=$HOME/bin/nacl_sdk/pepper_canary
-- export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin
-- export NDK_ROOT=$HOME/bin/android-ndk
-- ./tools/travis-scripts/run-script.sh
-
-before_install: 
-- ./tools/travis-scripts/before-install.sh
-
+script:
+- tools/travis-scripts/run-script.sh
+before_install:
+- tools/travis-scripts/before-install.sh