Update master to 3.2 Final#1261

Merged

pandamicro merged 318 commits intomasterfrom

Dec 31, 2014

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 5, 2014

issue #1089: module separation for opengl
jianglong0156
committed
Added a test case for cp.Body
joshuastray
committed

Commits on Nov 6, 2014

Fixed typos
joshuastray
committed
Fixed memory leak in bindings of cpSplittingPlane
joshuastray
committed
issue #1089: module separation for extension, and the template need to be modify, need to add sc->addRegisterCallback(register_cocos2dx_js_core); in delegate.cpp, wait other commit,
jianglong0156
committed
issue #1089: modify extension file path error
jianglong0156
committed
issue #1089: modify js-test , js-moonwarriors and templates
jianglong0156
committed
issue #1089: move the scale9sprite to ccui module
jianglong0156
committed
Revert "Fix Bug: PrebuiltRuntime ios version can't support portrait orientation."
cocoscodeide
committed

Commits on Nov 9, 2014

Update ChipmunkTest.js
Jialong Zhai
committed

Commits on Nov 10, 2014

update html5 ref
joshuastray
committed
Fixed typo of arguments number
joshuastray
committed
add setDefaultCollisionHandler of cp.Space in JSB
joshuastray
committed
Added test for setDefaultCollisionHandle
joshuastray
committed
Update jsb_cocos2d.js
sincntx
committed

Commits on Nov 12, 2014

Commits on Nov 13, 2014

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
jianglong0156
committed
remove up,left,right walls of defaultcolission test
joshuastray
committed
Merge pull request #1099 from joshuastray/cp_space
pandamicro
committed
Add properties for Arbiter
joshuastray
committed
issue #1108: add cleanScript and testcase, the testcase will be improved on next commit
jianglong0156
committed

Commits on Nov 14, 2014

Merge pull request #1095 from jianglong0156/jsbModule
pandamicro
committed
[AUTO] : updating jsbinding automatically
CocosRobot
committed
issue #1108: add restart game test case
jianglong0156
committed
Added pointQuery for cp.Space
joshuastray
committed
Added nearestPointQuery for cp.space
joshuastray
committed
Added segmentQuery for cp.space
joshuastray
committed
Added test for pointQuery, nearestPointQuery, segmentQuery
joshuastray
committed
Added bbQuery for cp.space
joshuastray
committed
issue #1108: improve restart method, it can run in the appDelegate.cpp, but can not run in js code
long
committed

Commits on Nov 17, 2014

Commits on Nov 19, 2014

Update the reference of submodule cocos2d-console.
zhangbin
committed
Merge pull request #1122 from natural-law/develop
dingpinglv
committed
Merge pull request #1111 from joshuastray/query
pandamicro
committed
Code IDE can't shut down runtime by sending "shutdownapp" command.
honghui
committed
fixed #1104: ccui ctor support multi arguments
joshuastray
committed
Merge remote-tracking branch 'cocos/develop' into constraint
joshuastray
committed
test for properties
joshuastray
committed
issue #1108: first step, the function of cc.game.restart
jianglong0156
committed
Merge branch 'develop' into restartGame
jianglong0156
committed
issue #1108:adjust the function name
jianglong0156
committed
Merge pull request #1124 from cocoscodeide/develop
dingpinglv
committed
fixed #1062: update addEventListener of ccui to support one argument
joshuastray
committed
issue #1108: finish restart game
jianglong0156
committed

Commits on Nov 20, 2014

Commits on Nov 22, 2014

Update license files for js moon warriors test case
pandamicro
committed

Commits on Nov 24, 2014

issue #1108: remove the include code
jianglong0156
committed
issue #1108:restart game test case finish
jianglong0156
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
jianglong0156
committed
Merge branch 'develop' into restartGame
jianglong0156
committed
Merge pull request #1107 from joshuastray/constraint
pandamicro
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
jianglong0156
committed
skip failed auto binding functions
joshuastray
committed

Commits on Nov 25, 2014

Add "addPostStepCallback" for cp.Space
joshuastray
committed
remove the tab
jianglong0156
committed
modify submodule commit
jianglong0156
committed
update cocos2d-console
jianglong0156
committed
issue #1116: move physicsSprite into the singal dir
jianglong0156
committed

Commits on Nov 26, 2014

Fix OpenGLTest/outline test
joshuastray
committed
fix typo of function name
joshuastray
committed

Commits on Nov 27, 2014

Merge pull request #1143 from joshuastray/develop-fix-outline-test
dingpinglv
committed

Commits on Dec 1, 2014

Commits on Dec 2, 2014

Merge pull request #1156 from CocosRobot/update_js_bindings_1417452430
pandamicro
committed
Change default compiler to gcc
joshuastray
committed
Merge pull request #1158 from cocoscodeide/develop
pandamicro
committed
Rebuilt SpiderMonkey with ndk r10c
joshuastray
committed
Fix travis adding NDK_TOOLCHAIN_VERSION=4.8
joshuastray
committed

Commits on Dec 3, 2014

Commits on Dec 5, 2014

Commits on Dec 9, 2014

Commits on Dec 10, 2014

Commits on Dec 11, 2014

Commits on Dec 12, 2014

Commits on Dec 15, 2014

Commits on Dec 16, 2014

Commits on Dec 17, 2014

Remove useless spider monkey arm64 lib
pandamicro
committed

Commits on Dec 18, 2014

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
pandamicro
committed

Commits on Dec 22, 2014

#1221: Enforce assets manager test case with script update
pandamicro
committed

Commits on Dec 26, 2014

update prebuilt runtime
honghui
committed

Commits on Dec 29, 2014

Commits on Dec 30, 2014