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 js #51

Merged
merged 84 commits into from
Jul 1, 2014
Merged

update js #51

merged 84 commits into from
Jul 1, 2014

Conversation

chuanweizhang2013
Copy link

No description provided.

pandamicro and others added 30 commits June 25, 2014 10:59
@pandamicro
Update plugin ref
f89549d
@pandamicro
Merge branch 'plugin_fb' of https://github.com/cocos2d/cocos2d-js int…
6a8329c 
…o plugin_fb
@wuzhiming
feature #5592 add Facebook to pluginX
6681069
@pandamicro
Merge pull request #1 from wuzhiming/plugin_fb
2d7478d 
feature #5592 add Facebook to pluginX
@pandamicro
Feature #5592: Add PluginFacebook lib
d2c251c
@pandamicro
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js …
0e03e11 
…into plugin_fb

Conflicts:
	build/cocos2d_jsb_samples.xcodeproj/project.pbxproj
@pandamicro
Feature #5592: Fix sdk import issue
2d90db4
@pandamicro
Update plugin ref
9665693
Feature #5610 : add a facebook sdk testcase
38836cf
@pandamicro
Update plugin ref
4ab7c81
@pandamicro
Merge pull request #2 from cocos2d/master
9c61c52 
Sync Cocos2d-JS master
@pandamicro
Merge pull request #3 from joshuastray/fb_testcase
32a251d 
Feature #5610 : add a facebook sdk testcase
@pandamicro
Feature #5592: Reorder info.plist
152407c
@pandamicro
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js …
be50882 
…into plugin_fb
@wuzhiming
feature #5592 add Facebook to pluginX finish Facebook user
2fbe643
@wuzhiming
feature #5592 add Facebook to pluginX remove Facebook sdk
cc56295
@pandamicro
Merge pull request #4 from wuzhiming/plugin_fb
690b9fa 
feature #5592 add Facebook to pluginX   finish Facebook user
@pandamicro
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js …
45b1ff1 
…into plugin_fb

Conflicts:
	samples/js-tests/project/proj.ios/Info.plist
@pandamicro
Update plugin ref
c473f39
@pandamicro
Feature #5592: Refactor Test cases of PluginX
919d0e4
@pandamicro
Feature #5592: Reorganize reference for jsb_pluginx.js
9f6ca16
@pandamicro
Feature #5592: Complete fb share test code
afa33b9
@pandamicro
Update plugin ref
cb27c4f
@wuzhiming
feature #5592 add Facebook to pluginX add sample to test-case
4285d31
@pandamicro
Feature #5592: Fix an issue in AnalyticsTest
a0b7797
@wuzhiming
feature #5592 add Facebook to pluginX add sample to test-case
c3686e1
@pandamicro
Feature #5592: Improve share test case
4ee0c1e
@pandamicro
Merge pull request #5 from wuzhiming/plugin_fb
3ca0e18 
feature #5592 add Facebook to pluginX  add sample to test-case
@pandamicro
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js …
070c7ed 
…into plugin_fb
@pandamicro
Update plugin ref
3a35a4a
pandamicro and others added 28 commits June 28, 2014 17:55
@pandamicro
Fixed #5619: Support ObjectPool in JSB
30730af
@pandamicro
Fixed #5620: Change logic of cc.audioEngine.end() in JSB
0ea5cf4
@pandamicro
Fixed #4977: Fix issues in AssetsManager js test and upgrade manifest…
278324a 
… to new version
@pandamicro
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
6b73adc
@dingpinglv
Merge pull request cocos2d#514 from wuzhiming/master2
19b4dde 
add CCPool into extensions   add the missing back button
@dingpinglv
Merge pull request cocos2d#516 from pandamicro/master
6ea30cc 
Fix issues
@VisualSJ
Merge pull request #4 from cocos2d/master
e1d2f75 
merge
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
7753e3c
@VisualSJ
Issue #5624: pluginx - facebook
aa50168
issue #5592 : fix AndroidManifest.xml for facebook plugin
ac47a72
issue #5592: fix isLogined
467470f
@VisualSJ
Issue #5625: fixed a bug about cc._formatString
f78e3a7
@VisualSJ
Fixed #5620: Change logic of cc.audioEngine.end() in JSB
fc64755
@pandamicro
Feature #5592: Add call back to FacebookShareTest
7a95669
@pandamicro
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
1c9d524
@dingpinglv
Merge pull request cocos2d#515 from joshuastray/master
4426f1c 
Issue #5618: replace (g|s)etSize with (g|s)etContentSize in UI Test
@dingpinglv
Merge pull request cocos2d#519 from VisualSJ/master
9d86125 
Issue #5624: pluginx - facebook
@pandamicro
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
6088464
Update the reference of submodule cocos2d-console.
d93c2a4
@pandamicro
Fixed #5557: Added specific and jsb only API definitions in comment f…
1371593 
…or cocos code ide usage
@pandamicro
Update submodules
0ba04fe
@dingpinglv
Merge pull request cocos2d#521 from natural-law/master
190e2c6 
Update the reference of submodule cocos2d-console.
@pandamicro
Fixed #5629: Fix buoyancy test issue with unreleased collision handler
e50566e 
and improve all Chipmunk test cases
@VisualSJ
Issue #5592: Facebook plugin
fef753a
@dingpinglv
Merge pull request cocos2d#520 from pandamicro/master
cdbf7ce 
Improvement and bug fixes
@dingpinglv
Merge pull request cocos2d#522 from VisualSJ/master
94a12b3 
Issue #5592: Facebook plugin
@chuanweizhang2013
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
f4c9ce5
@chuanweizhang2013
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
5593e7c
cocoscodeide added a commit that referenced this pull request Jul 1, 2014
@cocoscodeide
Merge pull request #51 from chuanweizhang2013/master
adae180 
update js
@cocoscodeide cocoscodeide merged commit adae180 into cocoscodeide:master Jul 1, 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.
7 participants
@chuanweizhang2013 @cocoscodeide @pandamicro @wuzhiming @dingpinglv @CocosRobot @VisualSJ