Commits

Branch selector

 v2

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 17, 2015

• Merge pull request #13886 from jianglong0156/pr_03

  Show description for 78c3643
  pandamicro

  committed
  78c3643

  Copy full SHA for 78c3643

• fix the layer touch recover, using the Scene:

  Show description for a4e8c3d
  

  happyzhaole

  authored and

  jianglong-zz

  committed
  a4e8c3d

  Copy full SHA for a4e8c3d

Commits on Sep 16, 2015

• Merge pull request #13873 from jianglong0156/pr_02

  Show description for 1063d48
  pandamicro

  committed
  1063d48

  Copy full SHA for 1063d48

• setFontSize and setText will call this->updateTexture(); , so don't need update twice. move the setText after setFontSize, it will update once

  

  happyzhaole

  authored and

  jianglong-zz

  committed
  37c79dc

  Copy full SHA for 37c79dc

• Merge pull request #13862 from jianglong0156/happy_merge_new

  Show description for fd9361a
  pandamicro

  committed
  fd9361a

  Copy full SHA for fd9361a

• fix the declare error,

  Show description for ea5f13a
  

  happyzhaole

  authored and

  jianglong-zz

  committed
  ea5f13a

  Copy full SHA for ea5f13a

• Merge pull request #13849 from jianglong0156/v2_box2dDeclareBug

  Show description for bc3dbed
  pandamicro

  committed
  bc3dbed

  Copy full SHA for bc3dbed

• fix the declare error,

  Show description for b17dd39
  jianglong-zz

  committed
  b17dd39

  Copy full SHA for b17dd39

Commits on Jul 29, 2015

• Merge pull request #13071 from raydelto/v2

  Show description for 0a49ebe
  pandamicro

  committed
  0a49ebe

  Copy full SHA for 0a49ebe

• Fixing typos

  raydelto

  committed
  4738031

  Copy full SHA for 4738031

Commits on Jun 16, 2015

• Merge pull request #12270 from ggggamer/v2

  Show description for 6958913
  zilongshanren

  committed
  6958913

  Copy full SHA for 6958913

Commits on Jun 10, 2015

• Bug fix

  ggggamer

  committed
  bbb1ccf

  Copy full SHA for bbb1ccf

Commits on May 22, 2015

• Merge pull request #11972 from ggggamer/v2

  Show description for 1863e69
  

  minggo

  committed
  1863e69

  Copy full SHA for 1863e69

• Some small performance change

  ggggamer

  committed
  f252709

  Copy full SHA for f252709

• Merge pull request #2 from cocos2d/v2

  Show description for 4f510b6
  

  ggggamer

  committed
  4f510b6

  Copy full SHA for 4f510b6

Commits on Apr 10, 2015

• [ci skip]update CHANGELOG

  

  minggo

  committed
  c7a53d4

  Copy full SHA for c7a53d4

• Merge pull request #11341 from WenhaiLin/v2-CCHttpClient

  Show description for 20542c0
  

  minggo

  committed
  20542c0

  Copy full SHA for 20542c0

Commits on Apr 8, 2015

• [V2 branch]Fixed HttpClient crash on 64bit system.

  WenhaiLin

  committed
  8b0871f

  Copy full SHA for 8b0871f

Commits on Apr 1, 2015

• Merge pull request #11247 from xiaofeng11/v2

  Show description for 9389f3c
  

  minggo

  committed
  9389f3c

  Copy full SHA for 9389f3c

• Remove unused member in CCNodeReader class

  xiaofeng11

  committed
  f9149aa

  Copy full SHA for f9149aa

• Merge pull request #11230 from xiaofeng11/v2

  Show description for 486f453
  

  minggo

  committed
  486f453

  Copy full SHA for 486f453

• convert tab to space & fix copyright year for CocoStudio

  xiaofeng11

  committed
  aee07d3

  Copy full SHA for aee07d3

Commits on Mar 31, 2015

• Merge branch 'v2' of github.com:xiaofeng11/cocos2d-x into v2

  xiaofeng11

  committed
  e5dcaab

  Copy full SHA for e5dcaab

• Add new CocoStudio file to iOS & Mac project

  xiaofeng11

  committed
  a72a992

  Copy full SHA for a72a992

• Merge pull request #5 from doomsdayer/v2

  Show description for 78e96c3
  xiaofeng11

  committed
  78e96c3

  Copy full SHA for 78e96c3

• proj files for WinRT Win8

  yushenglu

  committed
  88a6b40

  Copy full SHA for 88a6b40

• modify make file to add new files

  xiaofeng11

  committed
  8eb0bf6

  Copy full SHA for 8eb0bf6

• add CocoStudio.h & CocoStudio.cpp, move destroyCocosStudio function to CocoStudio

  xiaofeng11

  committed
  a903506

  Copy full SHA for a903506

• deprecated old singleton functions and unified all implement to getInstance & destroyInstance

  xiaofeng11

  committed
  88d7d0e

  Copy full SHA for 88d7d0e

• Add destroyInstance procedure to all singleton classes to provide cleanup function

  Show description for ff4fafc
  xiaofeng11

  committed
  ff4fafc

  Copy full SHA for ff4fafc

Commits on Mar 9, 2015

• Merge pull request #1 from cocos2d/v2

  Show description for 37d0a94
  

  ggggamer

  committed
  37d0a94

  Copy full SHA for 37d0a94

Commits on Mar 4, 2015

• Merge pull request #10505 from WenhaiLin/v2-batchnode-fix

  Show description for d16b7f2
  

  minggo

  committed
  d16b7f2

  Copy full SHA for d16b7f2

Commits on Feb 15, 2015

• Fixed the ccBlendFunc of CCSpriteBatchNode is incorrect after invoke CCSpriteBatchNode::setTexture.

  WenhaiLin

  committed
  722e4c0

  Copy full SHA for 722e4c0

Commits on Jan 16, 2015

• Merge pull request #10014 from navyxliu/v2

  Show description for 4a59407
  

  minggo

  committed
  4a59407

  Copy full SHA for 4a59407

Commits on Jan 15, 2015

• fix a typo to build extension for android.

  navyxliu

  committed
  36cc4b4

  Copy full SHA for 36cc4b4

Pagination

Previous

Next