Code

update js #51

Code

Merged

cocoscodeide merged 84 commits intococoscodeide:mastercocoscodeide/cocos2d-js:masterfrom chuanweizhang2013:masterchuanweizhang2013/cocos2d-js:masterCopy head branch name to clipboardJul 1, 2014

+3,316-2,220

Commits

Commits on Jun 25, 2014

• Update plugin ref

  pandamicro

  committed
  f89549d

  Copy full SHA for f89549d

• Merge branch 'plugin_fb' of https://github.com/cocos2d/cocos2d-js into plugin_fb

  pandamicro

  committed
  6a8329c

  Copy full SHA for 6a8329c

• feature #5592 add Facebook to pluginX

  wuzhiming

  committed
  6681069

  Copy full SHA for 6681069

• Merge pull request #1 from wuzhiming/plugin_fb

  Show description for 2d7478d
  pandamicro

  committed
  2d7478d

  Copy full SHA for 2d7478d

• Feature #5592: Add PluginFacebook lib

  pandamicro

  committed
  d2c251c

  Copy full SHA for d2c251c

• Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb

  Show description for 0e03e11
  pandamicro

  committed
  0e03e11

  Copy full SHA for 0e03e11

• Feature #5592: Fix sdk import issue

  pandamicro

  committed
  2d90db4

  Copy full SHA for 2d90db4

• Update plugin ref

  pandamicro

  committed
  9665693

  Copy full SHA for 9665693

• Feature #5610 : add a facebook sdk testcase

  

  joshuastray

  committed
  38836cf

  Copy full SHA for 38836cf

Commits on Jun 26, 2014

• Update plugin ref

  pandamicro

  committed
  4ab7c81

  Copy full SHA for 4ab7c81

• Merge pull request #2 from cocos2d/master

  Show description for 9c61c52
  pandamicro

  committed
  9c61c52

  Copy full SHA for 9c61c52

• Merge pull request #3 from joshuastray/fb_testcase

  Show description for 32a251d
  pandamicro

  committed
  32a251d

  Copy full SHA for 32a251d

• Feature #5592: Reorder info.plist

  pandamicro

  committed
  152407c

  Copy full SHA for 152407c

• Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb

  pandamicro

  committed
  be50882

  Copy full SHA for be50882

• feature #5592 add Facebook to pluginX finish Facebook user

  wuzhiming

  committed
  2fbe643

  Copy full SHA for 2fbe643

• feature #5592 add Facebook to pluginX remove Facebook sdk

  wuzhiming

  committed
  cc56295

  Copy full SHA for cc56295

• Merge pull request #4 from wuzhiming/plugin_fb

  Show description for 690b9fa
  pandamicro

  committed
  690b9fa

  Copy full SHA for 690b9fa

• Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb

  Show description for 45b1ff1
  pandamicro

  committed
  45b1ff1

  Copy full SHA for 45b1ff1

• Update plugin ref

  pandamicro

  committed
  c473f39

  Copy full SHA for c473f39

• Feature #5592: Refactor Test cases of PluginX

  pandamicro

  committed
  919d0e4

  Copy full SHA for 919d0e4

• Feature #5592: Reorganize reference for jsb_pluginx.js

  pandamicro

  committed
  9f6ca16

  Copy full SHA for 9f6ca16

• Feature #5592: Complete fb share test code

  pandamicro

  committed
  afa33b9

  Copy full SHA for afa33b9

• Update plugin ref

  pandamicro

  committed
  cb27c4f

  Copy full SHA for cb27c4f

• feature #5592 add Facebook to pluginX add sample to test-case

  wuzhiming

  committed
  4285d31

  Copy full SHA for 4285d31

• Feature #5592: Fix an issue in AnalyticsTest

  pandamicro

  committed
  a0b7797

  Copy full SHA for a0b7797

• feature #5592 add Facebook to pluginX add sample to test-case

  wuzhiming

  committed
  c3686e1

  Copy full SHA for c3686e1

Commits on Jun 27, 2014

• Feature #5592: Improve share test case

  pandamicro

  committed
  4ee0c1e

  Copy full SHA for 4ee0c1e

• Merge pull request #5 from wuzhiming/plugin_fb

  Show description for 3ca0e18
  pandamicro

  committed
  3ca0e18

  Copy full SHA for 3ca0e18

• Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb

  pandamicro

  committed
  070c7ed

  Copy full SHA for 070c7ed

• Update plugin ref

  pandamicro

  committed
  3a35a4a

  Copy full SHA for 3a35a4a

• feature #5592 add Facebook to pluginX add sample to test-case

  wuzhiming

  committed
  ceae2e5

  Copy full SHA for ceae2e5

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into plugin_fb

  pandamicro

  committed
  71f3e2e

  Copy full SHA for 71f3e2e

Commits on Jun 28, 2014

• 1:feature #5592 add Facebook to pluginX add sample to test-case

  Show description for 01f256d
  wuzhiming

  committed
  01f256d

  Copy full SHA for 01f256d

• Fix jsb_debugger issue

  pandamicro

  committed
  d5bd52c

  Copy full SHA for d5bd52c

• Update plugin ref

  pandamicro

  committed
  559c30b

  Copy full SHA for 559c30b

• Merge pull request cocos2d#509 from pandamicro/plugin_fb

  Show description for 3025af4
  dingpinglv

  committed
  3025af4

  Copy full SHA for 3025af4

• Feature #4977: Improve JS test case for AssetsManager

  pandamicro

  committed
  0b54f54

  Copy full SHA for 0b54f54

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  pandamicro

  committed
  8c83d76

  Copy full SHA for 8c83d76

• Merge cocos2d-x v3 branch and fix issues

  pandamicro

  committed
  bd8f283

  Copy full SHA for bd8f283

• Merge pull request cocos2d#510 from wuzhiming/plugin_fb

  Show description for 513dfc9
  dingpinglv

  committed
  513dfc9

  Copy full SHA for 513dfc9

• Merge pull request cocos2d#511 from pandamicro/master

  Show description for d57b65d
  dingpinglv

  committed
  d57b65d

  Copy full SHA for d57b65d

• [AUTO] : updating jsbinding automatically

  CocosRobot

  committed
  f2ee8e2

  Copy full SHA for f2ee8e2

• Fixed #5617: Add new ease functions in JSB

  pandamicro

  committed
  558529a

  Copy full SHA for 558529a

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  pandamicro

  committed
  399bb2c

  Copy full SHA for 399bb2c

• Fixed #5603: Add setUserData and getUserData in JSB

  pandamicro

  committed
  135bb3b

  Copy full SHA for 135bb3b

• feature #5592: fix fabook test bug

  

  joshuastray

  committed
  321f8f9

  Copy full SHA for 321f8f9

• Fixed #5603: Fix comment

  pandamicro

  committed
  a3be6f3

  Copy full SHA for a3be6f3

• Merge pull request cocos2d#512 from CocosRobot/update_js_bindings_1403940172

  Show description for deb4237
  dingpinglv

  committed
  deb4237

  Copy full SHA for deb4237

• Fix Travis compile issue

  pandamicro

  committed
  c051e5d

  Copy full SHA for c051e5d

• Try fixing Travis compile issue

  pandamicro

  committed
  c1f0257

  Copy full SHA for c1f0257

• add CCPool into extensions add the the back button

  wuzhiming

  committed
  e501fd1

  Copy full SHA for e501fd1

• Succeed to fix Android Travis compile issue

  pandamicro

  committed
  c13288c

  Copy full SHA for c13288c

• Issue #5618: replace (g|s)etSize with (g|s)etContentSize in UI Test

  

  joshuastray

  committed
  840fae5

  Copy full SHA for 840fae5

• feature #5592: fix android api 19 -> 10

  

  joshuastray

  committed
  9bb1c7c

  Copy full SHA for 9bb1c7c

• Issue #5618: add (g|s)etSize in ccui.Widget.prototype

  

  joshuastray

  committed
  68fa65e

  Copy full SHA for 68fa65e

• Merge pull request cocos2d#513 from pandamicro/master

  Show description for 02b80ed
  dingpinglv

  committed
  02b80ed

  Copy full SHA for 02b80ed

• Fixed #5619: Support ObjectPool in JSB

  pandamicro

  committed
  30730af

  Copy full SHA for 30730af

• Fixed #5620: Change logic of cc.audioEngine.end() in JSB

  pandamicro

  committed
  0ea5cf4

  Copy full SHA for 0ea5cf4

• Fixed #4977: Fix issues in AssetsManager js test and upgrade manifest to new version

  pandamicro

  committed
  278324a

  Copy full SHA for 278324a

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  pandamicro

  committed
  6b73adc

  Copy full SHA for 6b73adc

• Merge pull request cocos2d#514 from wuzhiming/master2

  Show description for 19b4dde
  dingpinglv

  committed
  19b4dde

  Copy full SHA for 19b4dde

• Merge pull request cocos2d#516 from pandamicro/master

  Show description for 6ea30cc
  dingpinglv

  committed
  6ea30cc

  Copy full SHA for 6ea30cc

Commits on Jun 29, 2014

• Merge pull request #4 from cocos2d/master

  Show description for e1d2f75
  VisualSJ

  committed
  e1d2f75

  Copy full SHA for e1d2f75

Commits on Jun 30, 2014

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  

  joshuastray

  committed
  7753e3c

  Copy full SHA for 7753e3c

• Issue #5624: pluginx - facebook

  VisualSJ

  committed
  aa50168

  Copy full SHA for aa50168

• issue #5592 : fix AndroidManifest.xml for facebook plugin

  

  joshuastray

  committed
  ac47a72

  Copy full SHA for ac47a72

• issue #5592: fix isLogined

  

  joshuastray

  committed
  467470f

  Copy full SHA for 467470f

• Issue #5625: fixed a bug about cc._formatString

  VisualSJ

  committed
  f78e3a7

  Copy full SHA for f78e3a7

• Fixed #5620: Change logic of cc.audioEngine.end() in JSB

  VisualSJ

  committed
  fc64755

  Copy full SHA for fc64755

• Feature #5592: Add call back to FacebookShareTest

  pandamicro

  committed
  7a95669

  Copy full SHA for 7a95669

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  pandamicro

  committed
  1c9d524

  Copy full SHA for 1c9d524

• Merge pull request cocos2d#515 from joshuastray/master

  Show description for 4426f1c
  dingpinglv

  committed
  4426f1c

  Copy full SHA for 4426f1c

• Merge pull request cocos2d#519 from VisualSJ/master

  Show description for 9d86125
  dingpinglv

  committed
  9d86125

  Copy full SHA for 9d86125

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  pandamicro

  committed
  6088464

  Copy full SHA for 6088464

• Update the reference of submodule cocos2d-console.

  

  zhangbin

  committed
  d93c2a4

  Copy full SHA for d93c2a4

• Fixed #5557: Added specific and jsb only API definitions in comment for cocos code ide usage

  pandamicro

  committed
  1371593

  Copy full SHA for 1371593

• Update submodules

  pandamicro

  committed
  0ba04fe

  Copy full SHA for 0ba04fe

• Merge pull request cocos2d#521 from natural-law/master

  Show description for 190e2c6
  dingpinglv

  committed
  190e2c6

  Copy full SHA for 190e2c6

• Fixed #5629: Fix buoyancy test issue with unreleased collision handler

  Show description for e50566e
  pandamicro

  committed
  e50566e

  Copy full SHA for e50566e

• Issue #5592: Facebook plugin

  VisualSJ

  committed
  fef753a

  Copy full SHA for fef753a

• Merge pull request cocos2d#520 from pandamicro/master

  Show description for cdbf7ce
  dingpinglv

  committed
  cdbf7ce

  Copy full SHA for cdbf7ce

• Merge pull request cocos2d#522 from VisualSJ/master

  Show description for 94a12b3
  dingpinglv

  committed
  94a12b3

  Copy full SHA for 94a12b3

Commits on Jul 1, 2014

• Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

  chuanweizhang2013

  committed
  f4c9ce5

  Copy full SHA for f4c9ce5

• Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js

  chuanweizhang2013

  committed
  5593e7c

  Copy full SHA for 5593e7c