Commits on May 22, 2016
  1. @s1ddok

    Merge pull request #1381 from danielgronlund/atlas-assets-fix

    Fixes atlas asset loading bug.
    s1ddok committed May 22, 2016
  2. @danielgronlund

    Fixes issue that caused graphics loading to fail when only using @1x

    …graphics in an atlas sprite asset.
    danielgronlund committed May 22, 2016
Commits on May 21, 2016
  1. @s1ddok

    Merge pull request #1379 from actinism/v3.5.0

    Compatibility with latest TexturePacker SpriteSheets Using PVR+zlib
    s1ddok committed May 21, 2016
  2. @s1ddok

    Merge pull request #1380 from danielgronlund/assets-sprite-atlas-support

    CCSpriteFrameCache support for loading sprite sheets from image assets.
    s1ddok committed May 21, 2016
  3. @danielgronlund

    Added method for loading sprite sheets and sprite frames from sprite …

    …atlases stored in the image asset folder.
    danielgronlund committed May 21, 2016
Commits on May 15, 2016
  1. Corrected some typos

    Converted tabs to spaces
    Added some comments
    Marco Fabian committed May 15, 2016
Commits on Apr 27, 2016
  1. Added new ccz header support from TexturePacker

    On behalf from latest TexturePacker added his code changes from website, for details on contentprotection see: https://www.codeandweb.com/texturepacker/contentprotection
    
    Original ZipUtils could not handle pvr.ccz version 2 correctly (wrong byte header), currently version 3 (pvr.ccz = pvr+zlib) works fine.
    Marco Fabian committed Apr 27, 2016
Commits on Apr 3, 2016
  1. @s1ddok

    Update README.md

    s1ddok committed Apr 3, 2016
Commits on Mar 23, 2016
  1. @s1ddok

    Merge pull request #1372 from oxeron/develop-v3.5-ext

    SpriteBuilder renamed to CocosBuilder
    s1ddok committed Mar 23, 2016
Commits on Mar 22, 2016
  1. @s1ddok

    Merge pull request #1373 from twomedia/develop-v3.5

    Fixed CCTextField textField property always being nil on mac.
    s1ddok committed Mar 22, 2016
Commits on Mar 21, 2016
  1. @twomedia
  2. @oxeron
  3. @oxeron
  4. @oxeron
Commits on Mar 15, 2016
  1. @s1ddok

    Merge pull request #1371 from oxeron/develop-v3.5-ext

    Adding CCNodeTag to -ext
    s1ddok committed Mar 15, 2016
  2. @oxeron

    Adding CCNodeTag to -ext

    oxeron committed Mar 15, 2016
Commits on Mar 12, 2016
  1. @s1ddok

    Merge pull request #1370 from oxeron/develop-v3.5-ext

    Header modifications for -ext
    s1ddok committed Mar 12, 2016
Commits on Mar 11, 2016
  1. @oxeron
  2. @oxeron

    Getting rid of CCPackage_private.h (+1 squashed commit)

    Squashed commits:
    [bc26607] Getting rid of CCPackageManager_private.h
    This one was easy code was already in CCPackageManager.m
    oxeron committed Mar 11, 2016
  3. @oxeron
  4. @oxeron
  5. @oxeron
  6. @oxeron
  7. @oxeron
  8. @oxeron
  9. @oxeron

    Getting rid of CCEffect_Private.h

    oxeron committed Mar 10, 2016
  10. @oxeron
Commits on Mar 10, 2016
  1. @oxeron
  2. @oxeron
  3. @oxeron
  4. @oxeron
Commits on Mar 9, 2016
  1. Remove circular import for Metal

    s1ddok committed Mar 9, 2016
Commits on Mar 7, 2016
  1. @s1ddok

    Merge pull request #1365 from richardgroves/patch-3

    Simplifying font color setup
    s1ddok committed Mar 7, 2016
  2. @richardgroves

    Simplifying font color setup

    Repeat of PR in #1320 that got lost due branch changes and GitHub limitations.
    richardgroves committed Mar 7, 2016
Commits on Mar 6, 2016
  1. delete useless assets

    s1ddok committed Mar 6, 2016