Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved compiler error when compiling a project that uses ObjCpp #1382

Open
wants to merge 105 commits into
base: v3.5.0
Choose a base branch
from
Open

Resolved compiler error when compiling a project that uses ObjCpp #1382

wants to merge 105 commits into from

Commits on Feb 3, 2016

  1. initial commit 

    Basic removal of some android files
    s1ddok authored and s1ddok committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    36038df View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2016

  1. CCLayoutBox now takes into account a transform of a node 

    issue cocos2d#1333
    s1ddok authored and s1ddok committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    93de923 View commit details
    Browse the repository at this point in the history

  2. Compiles for Mac

    s1ddok authored and s1ddok committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    86b74ad View commit details
    Browse the repository at this point in the history

  3. Metal rendering works now

    s1ddok authored and s1ddok committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    03cec7e View commit details
    Browse the repository at this point in the history

  4. TileMaps now server as an extension

    s1ddok authored and s1ddok committed Feb 6, 2016
    Configuration menu
    Copy the full SHA
    2e6cbc6 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2016

  1. CCScrollView improvements 

    Clean up android, add triggering delegate calls during programming
animations
    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    48ca679 View commit details
    Browse the repository at this point in the history

  2. CCTransition mechanism refactoring 

    It is possible now to create custom transitions without any
objc-runtime hacks
    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    7153714 View commit details
    Browse the repository at this point in the history

  3. Move CCMotionStreak to -ext

    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    9147323 View commit details
    Browse the repository at this point in the history

  4. CCClippingNode moved to -ext

    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    ba395a4 View commit details
    Browse the repository at this point in the history

  5. CCParticles moved to -ext

    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    bfde24b View commit details
    Browse the repository at this point in the history

  6. CCPackages moved to -ext

    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    88a0a76 View commit details
    Browse the repository at this point in the history

  7. CCParallaxNode moved to -ext

    s1ddok authored and s1ddok committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    5d2186e View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. New start-up code

    s1ddok authored and s1ddok committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    81b2107 View commit details
    Browse the repository at this point in the history

  2. Drop direct SSZipArchive dependency

    s1ddok authored and s1ddok committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    4c569fe View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. subproj commit

    s1ddok authored and s1ddok committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    22a4ec4 View commit details
    Browse the repository at this point in the history

  2. CCEffects moved to -ext

    s1ddok authored and s1ddok committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    169b65d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Remove unused files

    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    f569233 View commit details
    Browse the repository at this point in the history

  2. ObjectAL moved to -ext 

    ObjectAL is marked deprecated now by Apple. Somebody may prefer to use
AVAudioSession instead of pulling the whole code for ObjectAL
    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    a5970b8 View commit details
    Browse the repository at this point in the history

  3. CCBReader moved to -ext

    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    230bec1 View commit details
    Browse the repository at this point in the history

  4. CCPhysics moved to -ext, removed direct Chipmunk dependency 

    CCPhysics code is an ugly monster. Also, there is still a lot of
attention paid to Box2D, so no reason for including Chipmunk physics in
stock cocos2d package
    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    a58a72c View commit details
    Browse the repository at this point in the history

  5. CCLighting moved to -ext

    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    788ed57 View commit details
    Browse the repository at this point in the history

  6. Forgot about android. Completely.

    s1ddok authored and s1ddok committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    abcffbd View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. cocos2d-core compiles to TVOS now. 

    Temporary solution
    s1ddok authored and s1ddok committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    afef57a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2016

  1. remove OAL headers include

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    2943774 View commit details
    Browse the repository at this point in the history

  2. Remove android leftovers in CCTouch

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    8b567c1 View commit details
    Browse the repository at this point in the history

  3. Forget about CCTouch

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    0d7e90a View commit details
    Browse the repository at this point in the history

  4. Eliminate warnings

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    87f484b View commit details
    Browse the repository at this point in the history

  5. xcasset support for texture cache + refactoring

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    20181f0 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop-v3.x' into develop-v3.5

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    28b6267 View commit details
    Browse the repository at this point in the history

  7. exclude CCResponderTest from mac

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    81dc83f View commit details
    Browse the repository at this point in the history

  8. CCProgressNode moved to -ui

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    5d7ab7e View commit details
    Browse the repository at this point in the history

  9. New potentiometer control in -UI

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    6d05b22 View commit details
    Browse the repository at this point in the history

  10. head imports

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    4b32f33 View commit details
    Browse the repository at this point in the history

  11. remove -x related files

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    f7a27f7 View commit details
    Browse the repository at this point in the history

  12. remove templates from repo

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    9f2f966 View commit details
    Browse the repository at this point in the history

  13. remove dummy files

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    1964a81 View commit details
    Browse the repository at this point in the history

  14. More folder cleanup

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    f190854 View commit details
    Browse the repository at this point in the history

  15. clean-up

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    6064d26 View commit details
    Browse the repository at this point in the history

  16. Mac fixes

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    1679203 View commit details
    Browse the repository at this point in the history

  17. cocos2d#1271

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    185a517 View commit details
    Browse the repository at this point in the history

  18. template clean-up

    s1ddok authored and s1ddok committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    e5a2c75 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. Fix duplicating system methods

    s1ddok authored and s1ddok committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    64eb71c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2016

  1. a fix for Siri Dictation

    s1ddok authored and s1ddok committed Feb 26, 2016
    Configuration menu
    Copy the full SHA
    e4df9b3 View commit details
    Browse the repository at this point in the history

  2. cocos2d#1215

    s1ddok authored and s1ddok committed Feb 26, 2016
    Configuration menu
    Copy the full SHA
    64da625 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2016

  1. update cocos2d version

    s1ddok committed Feb 27, 2016
    Configuration menu
    Copy the full SHA
    1ebd554 View commit details
    Browse the repository at this point in the history

  2. fixes for extensions

    s1ddok committed Feb 27, 2016
    Configuration menu
    Copy the full SHA
    92dcc6e View commit details
    Browse the repository at this point in the history

  3. Update readme for 3.5

    s1ddok committed Feb 27, 2016
    Configuration menu
    Copy the full SHA
    0f62a1a View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @s1ddok
    s1ddok committed Feb 27, 2016
    Configuration menu
    Copy the full SHA
    d1a8d3e View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2016

  1. Merge CCNode private header into main

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    7251af9 View commit details
    Browse the repository at this point in the history

  2. Merge CCSprite private header

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    05bf8b4 View commit details
    Browse the repository at this point in the history

  3. Get rid of CCProgressNode private header + general header clean-up

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    7b5e475 View commit details
    Browse the repository at this point in the history

  4. Get rid of CCShader_Private

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    f7104cc View commit details
    Browse the repository at this point in the history

  5. Get rid of CCActiomManager_Private

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    fb3f66c View commit details
    Browse the repository at this point in the history

  6. Get rid of private CCTexture header

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    2df6e96 View commit details
    Browse the repository at this point in the history

  7. Simply move CCLabelBMF private header into the bottom of main one

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    c46b3ca View commit details
    Browse the repository at this point in the history

  8. Merged CCDirector headers

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    9ca335e View commit details
    Browse the repository at this point in the history

  9. Update read-me with grammer fixes and headers

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    1ca28a1 View commit details
    Browse the repository at this point in the history

  10. reorgonize CCDirector methods

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    f4fa0a2 View commit details
    Browse the repository at this point in the history

  11. Remove relative header

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    d3ff3b7 View commit details
    Browse the repository at this point in the history

  12. update -ext

    s1ddok authored and s1ddok committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    7a41874 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2016

  1. Fixed contentScale logic while parsing the tile map file

    @xmkevinchen
    xmkevinchen committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    b61f989 View commit details
    Browse the repository at this point in the history

  2. FIX the position setting of CCTMXLayer

    @xmkevinchen
    xmkevinchen committed Mar 4, 2016
    Configuration menu
    Copy the full SHA
    8d36ae4 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2016

  1. Fix for headers

    s1ddok authored and s1ddok committed Mar 5, 2016
    Configuration menu
    Copy the full SHA
    9768a5c View commit details
    Browse the repository at this point in the history

  2. Update wiki and readme

    s1ddok authored and s1ddok committed Mar 5, 2016
    Configuration menu
    Copy the full SHA
    d88bd93 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2016

  1. Merge pull request cocos2d#1362 from xmkevinchen/develop-v3.5 

    Fixed contentScale logic while parsing the tile map file
    @s1ddok
    s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    e08ae7b View commit details
    Browse the repository at this point in the history

  2. cocos2d#1351

    s1ddok authored and s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    b081ed9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/v3.4.9' into develop-v3.5

    s1ddok authored and s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    0f25028 View commit details
    Browse the repository at this point in the history

  4. Clean up the rest of android stuff

    s1ddok authored and s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    e33b972 View commit details
    Browse the repository at this point in the history

  5. Delete deprecated files

    s1ddok authored and s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    96a85ed View commit details
    Browse the repository at this point in the history

  6. delete useless assets

    s1ddok authored and s1ddok committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    c7a8c5e View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2016

  1. Simplifying font color setup 

    Repeat of PR in cocos2d#1320 that got lost due branch changes and GitHub limitations.
    @richardgroves
    richardgroves committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    7c3833a View commit details
    Browse the repository at this point in the history

  2. Merge pull request cocos2d#1365 from richardgroves/patch-3 

    Simplifying font color setup
    @s1ddok
    s1ddok committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    0214207 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. Remove circular import for Metal

    s1ddok authored and s1ddok committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    a7a4151 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. Adding explanations for -ext in ccConfig

    @oxeron
    oxeron committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    57c9bd6 View commit details
    Browse the repository at this point in the history

  2. Mostly header refactoring for using -ext

    @oxeron
    oxeron committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    116f8e8 View commit details
    Browse the repository at this point in the history

  3. Remove old CCEffectDropShadow_dist

    @oxeron
    oxeron committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    40adc52 View commit details
    Browse the repository at this point in the history

  4. Adding conditions in CCNoArc and CCSprite

    @oxeron
    oxeron committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    3465149 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. Getting rid oc CCBReader_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    99b5af6 View commit details
    Browse the repository at this point in the history

  2. Getting rid of CCEffect_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    b415a46 View commit details
    Browse the repository at this point in the history

  3. Getting rid of CCEffectStack_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    6d1b6df View commit details
    Browse the repository at this point in the history

  4. Getting rid of CCRenderTexture_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    5e2ab92 View commit details
    Browse the repository at this point in the history

  5. Getting rid of CCParticleSystem_Private.h and CCParticleSystemBase_Pr… 

    …ivate.h
    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    548f24a View commit details
    Browse the repository at this point in the history

  6. Getting rid of CCTiledMapLayer_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    2d50d32 View commit details
    Browse the repository at this point in the history

  7. Getting rid of CCAnimationManager_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    073890e View commit details
    Browse the repository at this point in the history

  8. Getting rid of CCLightNode_Private.h

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    d47ee4f View commit details
    Browse the repository at this point in the history

  9. 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
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    197697a View commit details
    Browse the repository at this point in the history

  10. Remove ANDROID from README and CCBReader

    @oxeron
    oxeron committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    81ad356 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2016

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

    Header modifications for -ext
    @s1ddok
    s1ddok committed Mar 12, 2016
    Configuration menu
    Copy the full SHA
    b675974 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2016

  1. Adding CCNodeTag to -ext

    @oxeron
    oxeron committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    73e4500 View commit details
    Browse the repository at this point in the history

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

    Adding CCNodeTag to -ext
    @s1ddok
    s1ddok committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    5495647 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2016

  1. SpriteBuilderTranslations renamed to CocosBuidlerTranslations

    @oxeron
    oxeron committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    3c2f9d3 View commit details
    Browse the repository at this point in the history

  2. SpriteBuilder renamed to CocosBuilder

    @oxeron
    oxeron committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    759b78d View commit details
    Browse the repository at this point in the history

  3. Strings.ccbLang files renamed to Strings.ccblang

    @oxeron
    oxeron committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    ea4251f View commit details
    Browse the repository at this point in the history

  4. Fixed CCTextField textField property always being nil on mac.

    @twomedia
    twomedia committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    242abaa View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2016

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

    Fixed CCTextField textField property always being nil on mac.
    @s1ddok
    s1ddok committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    2843d7b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

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

    SpriteBuilder renamed to CocosBuilder
    @s1ddok
    s1ddok committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    0696052 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2016

  1. Update README.md

    @s1ddok
    s1ddok committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    2ebdae1 View commit details
    Browse the repository at this point in the history

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.
    @cosimus
    cosimus committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    ca68911 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2016

  1. Corrected some typos 

    Converted tabs to spaces
Added some comments
    @cosimus
    cosimus committed May 15, 2016
    Configuration menu
    Copy the full SHA
    cf37436 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2016

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

    …atlases stored in the image asset folder.
    @danielgronlund
    danielgronlund committed May 21, 2016
    Configuration menu
    Copy the full SHA
    7a2a1f7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request cocos2d#1380 from danielgronlund/assets-sprite-atl… 

    …as-support

CCSpriteFrameCache support for loading sprite sheets from image assets.
    @s1ddok
    s1ddok committed May 21, 2016
    Configuration menu
    Copy the full SHA
    12e0eac View commit details
    Browse the repository at this point in the history

  3. Merge pull request cocos2d#1379 from actinism/v3.5.0 

    Compatibility with latest TexturePacker SpriteSheets Using PVR+zlib
    @s1ddok
    s1ddok committed May 21, 2016
    Configuration menu
    Copy the full SHA
    091ce39 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2016

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

    …graphics in an atlas sprite asset.
    @danielgronlund
    danielgronlund committed May 22, 2016
    Configuration menu
    Copy the full SHA
    c629f74 View commit details
    Browse the repository at this point in the history

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

    Fixes atlas asset loading bug.
    @s1ddok
    s1ddok committed May 22, 2016
    Configuration menu
    Copy the full SHA
    623a76c View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. Resolved compiler error when compiling a project that uses Objective-… 

    …C++ as well as Cocos2D-Objc. Also added an Objective-C++ test to cocos2d-tests; one involving a basic node hierarchy, the next involving a slightly more dicey manual visiting of a node with proper transforms, without necessarily adding it as a child of another node, using CCRenderer_Private.

This patch does *not necessarily* allow you to compile cocos2d in Objective-C++ mode.  It only ensures that you can use Objective-C++ in your project along with Cocos2D-Objc.

The Objective-C++ fix within CCRenderer_Private.h was suggested by @slembcke here: http://forum.spritebuilder.com/t/cocos3d-c-mm-files-compiler-issue/15570/4
    @logan-5
    logan-5 committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    b0bb5ef View commit details
    Browse the repository at this point in the history