Skip to content
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

update 2d-js #3

Closed
wants to merge 120 commits into from
Closed

update 2d-js #3

wants to merge 120 commits into from

Conversation

chuanweizhang2013
Copy link
Owner

No description provided.

pandamicro and others added 30 commits March 5, 2014 14:08
@pandamicro
Refactor #4240: Add Configuration to auto binding
e100124
@pandamicro
Refactor #4240: Bind singleton objects in JSB
cc4d578
@pandamicro
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
faf1b45 
Conflicts:
	frameworks/js-bindings/bindings/script/jsb_cocos2d.js
	tools/tojs/cocos2dx.ini
@pandamicro
Update -x and console
6d68a44
@pandamicro
Revert "Update -x and console"
f44c5a4 
This reverts commit 6d68a44.
@pandamicro
Refactor #4240: Fix bugs and remove duplicated defineGetterSetter fun…
abfe66d 
…ction
issue #4234: Checking whether '.jsc' file exists.
b15ad53
Merge pull request #35 from dumganhar/master
87e21a8 
issue #4234: Checking whether '.jsc' file exists.
update submodule
8a2ccf3
@pandamicro
Refactor #4240: Remove purge functions
09487bd
Merge pull request #34 from pandamicro/master
0aa6791 
Refactor #4240: Bind singleton objects in JSB
@CocosRobot
[AUTO] : updating jsbinding automatically
54a3ebe
Merge pull request #37 from CocosRobot/update_js_bindings_1394007726
0bea3e1 
[AUTO] : updating jsbinding automatically
Merge pull request #36 from lihex/master
bff905e 
update submodule
Updates cocos2d-x
b54751d
Updates bindings configuration.
ea13fc8
Updates template.
e7e0bca
[ci] Try OSX host.
57de5c2
[ci] Update run-script.sh
eca0196
[ci] xctool was installed. So don't install it again.
d3e4db1
[ci] Updates run-script.sh.
581a7bb
@pandamicro
Refactor #4240: Bind singleton objects of cocostudio in JSB
63a9758
@pandamicro
Refactor #4240: Refactor ccs.ObjectFactory
8e81a49
[ci] Adds shared xcscheme files.
9e8bdf9
Warning fixes.
77f84ec
@pandamicro
Feature #4236: Refactor TextDefinition in JSB to fit CSS style proper…
126ac96 
…ty names
Updates bindings-generator.
81bc06e
@pandamicro
Refactor #4237: Create jsb_create_apis.js file
1014b19
Merge pull request #39 from pandamicro/master
4263e6c 
Refactor #4240: Bind singleton objects of cocostudio in JSB
@CocosRobot
[AUTO] : updating jsbinding automatically
2f8cfad
pandamicro and others added 26 commits March 7, 2014 10:08
@pandamicro
Issue #4294: Fix bugs in Cocostudio Component test
8a23704 
	Add ComponentContainer class binding
@SmallAiTT
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
d217df7
@pandamicro
Issue #4294: Fix bugs in Cocostudio Armature test
b29e9b5 
	Add DecorativeDisplay class binding, bind cc.Bone::getColliderBodyList
@SmallAiTT
Issue #4277 : Change some apis to private.
f5f264e
@SmallAiTT
Issue #4294 : Add LoaderTest and PathTest into js-tests.
8358abf 
Bind some api about constants into jsb.
@dingpinglv
Merge pull request #59 from SmallAiTT/master
5cc549f 
Issue #4294 : Add LoaderTest and PathTest into js-tests. Bind some api about constants into jsb.
@samuele3hu2022
close #4284:Update the ‘cocos2d-x’ submodule
06ac650
@samuele3hu2022
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
45b5281 
…ug_fix
Updates cocos2d-x
fa941cf
@pandamicro
Issue #4294: Move cc.defineGetterSetter in jsb_cocos2d.js
578ffef
@pandamicro
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
bfa166f
@pandamicro
Issue #4294: Reverse move cc.defineGetterSetter in jsb_cocos2d.js
d43d44d
@pandamicro
update auto-bindings manually
516a64f
Updates template. Zoom in/out works ok, Set window size also works.
775d848
Merge pull request #61 from dumganhar/master
5123810 
Updates template. Zoom in/out works ok, Set window size also works.
@pandamicro
Issue #4294: Add eventManager.dispatchCustomEvent
f62797e
@dingpinglv
Merge pull request #60 from pandamicro/master
b16d143 
Issue #4294: Fix bugs in Cocostudio tests
@samuele3hu2022
Update the cocos2d-x submodule
f19954e
@samuele3hu2022
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
66788f4 
…ug_fix
@SmallAiTT
Issue #4277 : Fix bugs about js-moonwarriors.
1d3bf2c
@SmallAiTT
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
8ab7ed3
@samuele3hu2022
Update config files for bindings-generator
15f3d13
@dingpinglv
Merge pull request #62 from SmallAiTT/master
1ee4672 
Issue #4277 : Fix bugs about js-moonwarriors.
@samuele3hu2022
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into b…
1f750c3 
…ug_fix
@samuele3hu2022
Update config files for bindings-generator
94a8e84
Merge pull request #63 from samuele3hu/bug_fix
68799ff 
Update config files for bindings-generator
chuanweizhang2013 pushed a commit that referenced this pull request May 14, 2014
@cocoscodeide
Merge pull request #3 from cocos2d/master
6c4b977 
update js
chuanweizhang2013 pushed a commit that referenced this pull request May 20, 2014
@VisualSJ
Merge pull request #3 from cocos2d/master
3fa210c 
merge  from cocos2d
chuanweizhang2013 pushed a commit that referenced this pull request Jul 1, 2014
@pandamicro
Merge pull request #3 from joshuastray/fb_testcase
32a251d 
Feature #5610 : add a facebook sdk testcase
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.
7 participants
@chuanweizhang2013 @pandamicro @CocosRobot @xingsenma @SmallAiTT @samuele3hu2022 @dingpinglv