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

add CocosBuilder support for gles20 branch #885

Merged
merged 15 commits into from May 8, 2012
Merged

add CocosBuilder support for gles20 branch #885

merged 15 commits into from May 8, 2012

Commits on May 2, 2012

  1. Merge commit '14c91cba28119507c13868bc7e64e1868a91b6d1' into gles20

    @walzer
    walzer committed May 2, 2012
    Copy the full SHA
    f836437 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2012

  1. issue #1205, add CCBReader, CppReflection, CocosBuilderTestCase

    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    639a0df View commit details
    Browse the repository at this point in the history

  2. Merge commit '47789295059ace9f7fae01f2b001126903c004a1' into gles20

    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    a23cac4 View commit details
    Browse the repository at this point in the history

  3. add CocosBuilderTest into extension test. fix a bug in CCLayerGradien… 

    …t::updateColor
    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    59012ce View commit details
    Browse the repository at this point in the history

  4. update copyright and license declaration of CCCBReader relative files

    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    a9c5e97 View commit details
    Browse the repository at this point in the history

  5. issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCent… 

    …er to improve SET macro/assign var to parent.
    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    8acb2b5 View commit details
    Browse the repository at this point in the history

  6. issue #1205 update license declaration

    @walzer
    walzer committed May 3, 2012
    Copy the full SHA
    13fc45e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2012

  1. Merge commit 'd6b2fcb5a93935adec146ab154bab5448ce3dde9' into gles20

    @walzer
    walzer committed May 5, 2012
    Copy the full SHA
    8ce6d37 View commit details
    Browse the repository at this point in the history

  2. Merge commit 'e6c10e3331e6cc310e213823f3d1a8725bd72a44' into gles20

    @walzer
    walzer committed May 5, 2012
    Copy the full SHA
    1901fa6 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2012

  1. remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to… 

    … implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.
    @walzer
    walzer committed May 7, 2012
    2
    Copy the full SHA
    69a90b4 View commit details
    Browse the repository at this point in the history

  2. Merge commit '69a90b43a51124a5433d703e286c01e9d4627667' into gles20

    @walzer
    walzer committed May 7, 2012
    Copy the full SHA
    0959271 View commit details
    Browse the repository at this point in the history

  3. issue #1205, refactor the tricky cpp reflection to easier approach, a… 

    …dd cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android
    @walzer
    walzer committed May 7, 2012
    Copy the full SHA
    9afb3e5 View commit details
    Browse the repository at this point in the history

  4. Merge commit '095fd855014f712d7ca1e2bcb51ca642f5ec1fb2' into gles20

    @walzer
    walzer committed May 7, 2012
    Copy the full SHA
    a93c310 View commit details
    Browse the repository at this point in the history

  5. issue #1205, CCBReader works on both iOS & Android now; public APIs o… 

    …f CCBReader are reduced; ccb files in subfolder is supported.
    @walzer
    walzer committed May 7, 2012
    Copy the full SHA
    96fee42 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2012

  1. fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windo… 

    …ws support.
    @walzer
    walzer committed May 8, 2012
    Copy the full SHA
    24ebb9f View commit details
    Browse the repository at this point in the history