Permalink
Commits on May 7, 2014
  1. Merge pull request #371 from dingpinglv/Iss4975_Spine

    dingpinglv committed May 7, 2014
    Issue #4975: integrate spine into -html5 v2.2.3
Commits on Apr 28, 2014
  1. Merge pull request #370 from ShengxiangChen/master

    dingpinglv committed Apr 28, 2014
    spine for cocos2d-html5
  2. spine for cocos2d-html5

    ShengxiangChen committed Apr 28, 2014
Commits on Apr 14, 2014
  1. Merge pull request #368 from VisualSJ/master

    dingpinglv committed Apr 14, 2014
    Fixed a bug.TextureCacheTest addImageAsync parameter error
Commits on Mar 28, 2014
  1. Merge pull request #367 from dingpinglv/Iss_ReplacePConst

    dingpinglv committed Mar 28, 2014
    Closed #4581: update DrawPrimitivesTest.js
Commits on Mar 7, 2014
  1. Merge pull request #366 from xingsenma/master

    dingpinglv committed Mar 7, 2014
    issue #4174 add richText
  2. issue #4174 add richText

    xingsenma committed Mar 7, 2014
Commits on Mar 3, 2014
  1. Merge pull request #347 from natural-law/MyBranch

    dingpinglv committed Mar 3, 2014
    Solve a crash of WatermelonWithMe
  2. Modify the resource files for the new implementation of method CCAnim…

    zhangbin committed Mar 3, 2014
    …ationCache::addAnimationsWithDictionary().
Commits on Feb 14, 2014
  1. Merge pull request #313 from ucchen/master

    linshun committed Feb 14, 2014
    add setAnimationListener test
Commits on Feb 13, 2014
  1. add setAnimationListener test

    ucchen committed Feb 13, 2014
Commits on Feb 7, 2014
  1. Merge pull request #312 from dingpinglv/Iss311_RestoreOpenGLTest

    dingpinglv committed Feb 7, 2014
    Fixed #311: This isn't a typo in OpenGLTest.js, it's my mistake.
Commits on Feb 5, 2014
  1. Merge pull request #311 from dingpinglv/FixOpenGLTestBug

    dingpinglv committed Feb 5, 2014
    Fixed a typo in OpenGLTest.js
Commits on Jan 26, 2014
  1. Merge pull request #308 from pandamicro/master

    dingpinglv committed Jan 26, 2014
    Fixed #3860: Rename plist frame names to avoid name conflicts
Commits on Jan 23, 2014
  1. Merge pull request #306 from pandamicro/master

    dingpinglv committed Jan 23, 2014
    Issue #3806: Test case for SAXParser added
Commits on Jan 22, 2014
  1. Merge pull request #304 from xingsenma/master

    dingpinglv committed Jan 22, 2014
    issue #3767 add drawNode test for canvas
Commits on Jan 16, 2014
  1. Merge pull request #303 from pandamicro/master

    dingpinglv committed Jan 16, 2014
    Fixed #3659: Add retina support to moon warriors simulator
Commits on Jan 14, 2014
  1. Merge pull request #302 from pandamicro/master

    dingpinglv committed Jan 14, 2014
    Move CCFormatHelper’s content into CCCommon.js
Commits on Jan 7, 2014
  1. Merge pull request #299 from xingsenma/master

    dingpinglv committed Jan 7, 2014
    issue #3419 fix bug for TriggerTest.
Commits on Jan 6, 2014
  1. Merge pull request #297 from dingpinglv/Iss3501_ReleasingV2.2.2

    dingpinglv committed Jan 6, 2014
    Fixed #3501: modify some codes for NPM