Permalink
Commits on Jan 11, 2012
  1. Merge pull request #140 from araker/issue1264

    araker committed Jan 11, 2012
    Issue 1264, flipped tiles can be changed during runtime.
Commits on Jan 10, 2012
  1. Merge pull request #139 from araker/issue1254

    araker committed Jan 10, 2012
    Issue1254
  2. New patch for issue 1254, OpenGL buffers are completely destroyed and…

    araker committed Jan 10, 2012
    … recreated when layoutSubviews is called. This fixes a freezing error.
  3. Merge remote-tracking branch 'origin/develop' into issue1254

    araker committed Jan 10, 2012
    Conflicts:
    	cocos2d/Platforms/iOS/EAGLView.m
    	cocos2d/Platforms/iOS/ES1Renderer.m
Commits on Jan 4, 2012
  1. Merge pull request #137 from Shakthi/onExitTransitionDidStart

    ricardoquesada committed Jan 4, 2012
    Added onExitTransitionDidStart.
Commits on Jan 3, 2012
Commits on Dec 30, 2011
  1. fixes issue #1273

    ricardoquesada committed Dec 30, 2011
Commits on Dec 23, 2011
  1. Merge pull request #133 from effervescent/develop

    ricardoquesada committed Dec 23, 2011
    CCSprite transform order in CCSprite updateTransform
Commits on Dec 22, 2011
Commits on Dec 16, 2011
  1. fixed issue #1074

    ricardoquesada committed Dec 16, 2011
  2. Merge pull request #131 from cwinkler/develop

    ricardoquesada committed Dec 16, 2011
    Fixes #1074. CCLabelTTF LineWrap (Mac OS X)
  3. Fixes #1074. CCLabelTTF LineWrap

    cwinkler committed Dec 16, 2011
    CCLabelTTF now correctly displays CCLineBreakMode settings.
Commits on Nov 8, 2011
  1. Updated Changelog

    ricardoquesada committed Nov 8, 2011
  2. ARC improved changes

    ricardoquesada committed Nov 8, 2011
    Conflicts:
    
    	cocos2d/ccMacros.h
Commits on Nov 7, 2011
  1. ARC patch

    slembcke committed Nov 7, 2011
Commits on Nov 3, 2011
  1. Merge pull request #106 from akotiranta/set-priority-fix

    cocos2d
    cocos2d committed Nov 3, 2011
    Fixed setPriority to include to be added handlers.
Commits on Oct 25, 2011
  1. Merge pull request #120 from araker/issue1084

    araker committed Oct 25, 2011
    Issue 1084, 1139, when a touch handler is added inside a touch handler it
  2. Issue 1084, 1139, when a touch handler is added inside a touch handle…

    araker committed Oct 25, 2011
    …r it should be added first, before removed. Otherwise a released object can be added to the handler list.
  3. Merge pull request #119 from araker/issue1239

    araker committed Oct 25, 2011
    Update changelog and authors for issue 1239
  4. Merge pull request #95 from slycrel/develop

    araker committed Oct 25, 2011
    Adding in-memory TMX map creation
Commits on Oct 22, 2011
  1. Merge pull request #117 from araker/small_changes

    araker committed Oct 22, 2011
    small changes before creating new .tar.gz.
  2. small changes before creating new .tar.gz.

    araker committed Oct 22, 2011
    -batched particle systems now work correctly in retina. 
    -updated changelog with issue 1262
Commits on Oct 21, 2011
Commits on Oct 20, 2011
Commits on Oct 16, 2011
  1. Merge pull request #113 from araker/issue1262

    araker committed Oct 16, 2011
    fixed build error
  2. fixed build error

    araker committed Oct 16, 2011
  3. Merge pull request #112 from araker/issue1262

    araker committed Oct 16, 2011
    Issue 1262, tiles retrieved as sprite do not need to activate the sorting
Commits on Oct 11, 2011
  1. Merge pull request #111 from araker/last_changes

    araker committed Oct 11, 2011
    -fixed clang warning in spriteFrameCache