Skip to content

Update master to 3.2 Final #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
Parent: Master
merged 318 commits into from
Dec 31, 2014
Merged

Update master to 3.2 Final #1261

merged 318 commits into from
Dec 31, 2014

Conversation

@pandamicro
Copy link
Contributor

No description provided.

jianglong0156 and others added 30 commits November 5, 2014 17:20
issue #1089: module separation for opengl
1858870
Added a test case for cp.Body
cef018f
Fixed typos
f9098ef
Fixed memory leak in bindings of cpSplittingPlane
2bdca09
issue #1089: module separation for extension, and the template need t…
dfa3356 
…o be modify, need to add sc->addRegisterCallback(register_cocos2dx_js_core); in delegate.cpp, wait other commit,
issue #1089: modify extension file path error
73c5892
issue #1089: modify js-test , js-moonwarriors and templates
ad8e87d
issue #1089: move the scale9sprite to ccui module
4bd4978
@cocoscodeide
Revert "Fix Bug: PrebuiltRuntime ios version can't support portrait o…
5cb8d2f 
…rientation."
@dingpinglv
Merge pull request #1090 from joshuastray/fix-color-picker-crash
00d9937 
Fix color picker crash
@dingpinglv
Merge pull request #1096 from cocoscodeide/revert-1081-develop
b6a31c6 
Revert "Fix Bug: PrebuiltRuntime ios version can't support portrait orie...
Update README.md
5ae2efc
Update ChipmunkTest.js
405b69e
@dingpinglv
Merge pull request #1083 from joshuastray/shape
e6c7c7f 
add missing properties of cp.SegmentShape and cp.PolyShape
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into bbb
c3d095e 
Conflicts:
	samples/js-tests/src/ChipmunkTest/ChipmunkTest.js
Update ChipmunkTest.js
47af413
update html5 ref
893988f
Fixed typo of arguments number
f222ecf
add setDefaultCollisionHandler of cp.Space in JSB
3feae98
Added test for setDefaultCollisionHandle
e045859
@sincntx
Update jsb_cocos2d.js
4beeb08
@dingpinglv
Merge pull request #1100 from sincntx/develop
099c5dd 
cc.rectOverlapsRect bug fix
update cocos console ref
a69e94d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
62cbe03 
…jsbModule

Conflicts:
	frameworks/js-bindings/bindings/script/jsb_ext_create_apis.js
issue #1089: ext api already separate different part into other dir. …
6abe277 
…the ccui.Button.prototype changed had already modify in last commit
close #1089: modify all suggestion of code .
23065cc
@pandamicro
Issue #1104: [JSB] Fix ccui.CheckBox's _ctor function
f5dc95f
add properties for joints
9c36c60
@dingpinglv
Merge pull request #1092 from joshuastray/cp_body
4e78250 
Cp body
Merge remote-tracking branch 'cocos/develop' into develop
07e75a2
pandamicro and others added 28 commits December 25, 2014 11:10
@pandamicro
Update EngineVersion
ab086af
@pandamicro
Update submodules
1c6ae5a
@pandamicro
Merge pull request #1230 from pandamicro/develop
896f359 
Update EngineVersion
@pandamicro
Rename FileUtils::getByteArrayFromFile to getDataFromFile
b7cc65e
@pandamicro
Merge pull request #1231 from pandamicro/develop
390283f 
Rename FileUtils::getByteArrayFromFile to getDataFromFile
update prebuilt runtime
b7c2a7e
@pandamicro
Fix property API issues
5885248
@dingpinglv
modified some test cases
baaa13c
@dingpinglv
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
bb835c0 
…Iss2416_Renderer
@dingpinglv
Merge pull request #1241 from dingpinglv/Iss2416_Renderer
474939b 
Fixed: modfied some codes for coverage more test
@pandamicro
Update submodules
ac67b63
@pandamicro
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
4652296 
…develop
@pandamicro
Merge pull request #1242 from pandamicro/develop
1b9287b 
Fix property API issues
@pandamicro
Merge pull request #1238 from cocoscodeide/develop
9afb7fb 
update prebuilt runtime
@CocosRobot
[AUTO] : updating jsbinding automatically
5ef6a75
@pandamicro
Merge pull request #1244 from CocosRobot/update_js_bindings_1419821612
5c3f0db 
[AUTO] : updating jsbinding automatically
@pandamicro
Fixed spine API usage in test case
99c388a
@pandamicro
3.2 release docs
f1c11d6
@pandamicro
Update cocos2d-x for Timeline issue
f02af3f
@pandamicro
Update submodule
8a84cb0
@pandamicro
Update html5 engine
f69ac73
@pandamicro
Merge pull request #1247 from pandamicro/develop
23f26f2 
Prepare for 3.2 release
@dingpinglv
Update the reference of cocos2d-html5
7214f1a
@dingpinglv
Merge pull request #1248 from dingpinglv/develop
91029f1 
Update the reference of cocos2d-html5
@cpjolicoeur
Fix typos
71555b7
@pandamicro
Merge pull request #1249 from cpjolicoeur/patch-1
e501a5f 
Fix typos
Update the reference of submodule cocos2d-console.
9ba8906
@dingpinglv
Merge pull request #1253 from natural-law/develop
bf16c23 
Update the reference of submodule cocos2d-console.
pandamicro added a commit that referenced this pull request Dec 31, 2014
@pandamicro
Merge pull request #1261 from cocos2d/develop
0d45851 
Update master to 3.2 Final
@pandamicro pandamicro merged commit 0d45851 into master Dec 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@pandamicro @cocoscodeide @dingpinglv @sincntx @CocosRobot @VisualSJ @livingyang @simondel @cpjolicoeur