Commits

Branch selector

 v3

User selector

yushenglu

Datepicker

All time

Commit History

Commits on May 14, 2015

• changed csb names in ccs-res to shorter

  yushenglu

  committed
  60190a1

  Copy full SHA for 60190a1

Commits on Apr 2, 2015

• Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters

  yushenglu

  committed
  82c6e62

  Copy full SHA for 82c6e62

Commits on Apr 1, 2015

• Merge branch 'v3' of github.com:doomsdayer/cocos2d-x into v3

  yushenglu

  committed
  fcc890e

  Copy full SHA for fcc890e

• Delete CCNodeReader for Win8.1 project

  yushenglu

  committed
  01a091e

  Copy full SHA for 01a091e

Commits on Mar 30, 2015

• test commit1

  yushenglu

  committed
  60e2db1

  Copy full SHA for 60e2db1

• test commit

  yushenglu

  committed
  c93368c

  Copy full SHA for c93368c

Commits on Jan 21, 2015

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

  yushenglu

  committed
  bec9b0e

  Copy full SHA for bec9b0e

• Update the csb resources for current Cocos2d-x

  yushenglu

  committed
  304f28a

  Copy full SHA for 304f28a

Commits on Jan 20, 2015

• Removed the unused variable to make XCode compile pass.

  yushenglu

  committed
  858bafd

  Copy full SHA for 858bafd

• Submodule ccs-res go forward.

  yushenglu

  committed
  a35be89

  Copy full SHA for a35be89

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test

  yushenglu

  committed
  bfe767c

  Copy full SHA for bfe767c

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1

  yushenglu

  committed
  f274277

  Copy full SHA for f274277

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test

  yushenglu

  committed
  811c5e1

  Copy full SHA for 811c5e1

Commits on Jan 19, 2015

• When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works.

  yushenglu

  committed
  7fde1d0

  Copy full SHA for 7fde1d0

• Moved the version pair to 1st position of its map.

  yushenglu

  committed
  5dc87f4

  Copy full SHA for 5dc87f4

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test

  yushenglu

  committed
  bba8d64

  Copy full SHA for bba8d64

Commits on Jan 14, 2015

• layout component test

  yushenglu

  committed
  eb106d5

  Copy full SHA for eb106d5

Commits on Jan 5, 2015

• Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.

  Show description for 3c992fe
  yushenglu

  committed
  3c992fe

  Copy full SHA for 3c992fe

• Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader

  yushenglu

  committed
  ec540fc

  Copy full SHA for ec540fc

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

  yushenglu

  committed
  8415f10

  Copy full SHA for 8415f10

Commits on Jan 4, 2015

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

  yushenglu

  committed
  7e8d1bb

  Copy full SHA for 7e8d1bb

• Update the description when the csb reader version dismatches the reader version in Cocos2d-x

  yushenglu

  committed
  a7fb75d

  Copy full SHA for a7fb75d

Commits on Dec 31, 2014

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1

  yushenglu

  committed
  718cfb9

  Copy full SHA for 718cfb9

• Updated the version check description.

  yushenglu

  committed
  8903446

  Copy full SHA for 8903446

Commits on Dec 30, 2014

• revert the layoutComponent codes to prevent the demos crush.

  yushenglu

  committed
  9a0f302

  Copy full SHA for 9a0f302

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version

  Show description for e596104
  yushenglu

  committed
  e596104

  Copy full SHA for e596104

• prevent the crush of the cocosstudio demos

  yushenglu

  committed
  88f0a1e

  Copy full SHA for 88f0a1e

Commits on Dec 29, 2014

• Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader …

  Show description for 505a4e8
  yushenglu

  committed
  505a4e8

  Copy full SHA for 505a4e8

Commits on Dec 24, 2014

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader

  yushenglu

  committed
  7c34b06

  Copy full SHA for 7c34b06

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader

  yushenglu

  committed
  c647929

  Copy full SHA for c647929

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader

  Show description for fa5b4f8
  yushenglu

  committed
  fa5b4f8

  Copy full SHA for fa5b4f8

Commits on Dec 23, 2014

• Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader

  yushenglu

  committed
  d543f8f

  Copy full SHA for d543f8f

• submodule ccs-res go forward to newest

  yushenglu

  committed
  a781c97

  Copy full SHA for a781c97

• revert submodule ccs-res

  yushenglu

  committed
  58ba057

  Copy full SHA for 58ba057

• license in ArmatureNodeReader.h added.

  yushenglu

  committed
  2b7c0ed

  Copy full SHA for 2b7c0ed

Pagination

Previous

Next