Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support/cocostudio
History
geron-cn 4f6fd3ef64 Squashed commit of the following: 
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 13:43:04 2016 +0800

    change enum to enum class
    use tabitem as pointer to replace _currentTabItemIndex

commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:44 2016 +0800

    Merge remote-tracking branch 'gero/tabview' into tabcontrol

commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:15 2016 +0800

    Squashed commit of the following:

    commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:35:06 2016 +0800

        fix

    commit e0eb069846a8ceb4b726c3c945801c944404b102
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:30:44 2016 +0800

        fix active deactive in tabcontrol

    commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 20:16:22 2016 +0800

        fix active -1

    commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 16:00:51 2016 +0800

        fix merge file

    commit cdd44f1c577ad190bc175896107a48fbb36b65bb
    Merge: 1658ad6 6bf55ed
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:57:48 2016 +0800

        Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

        # Conflicts:
        #	cocos/ui/CMakeLists.txt

    commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:27:31 2016 +0800

        configure for win8.1

    commit ec236bff711b72952d48ec4d8b9137b4812b7a72
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:20:23 2016 +0800

        configure for iOS mac twos android linux

    commit 9d6678a4388461a791abe968fa637df2fc6839d3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:02:17 2016 +0800

        add lack files

    commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 22:05:22 2016 +0800

        add test case for TabControl

    commit 97b8d8d87a37881b33ebe90478392150ef341b3e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 15:43:29 2016 +0800

        add const to getter setter

    commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 14:50:04 2016 +0800

        format the comments

    commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:51:06 2016 +0800

        remove reference

    commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:40:04 2016 +0800

        configure for win8.1

    commit c015ac54028534202f62ff85f9a9d4b62b12801e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:27:54 2016 +0800

        fix error

    commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:25:51 2016 +0800

        add interface

    commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:21:22 2016 +0800

        fix compile error for tw-os

    commit 3bfaa2976751e844a591ae5524bfd81249927c7c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:04:23 2016 +0800

        fix linux compile error

    commit fafe3ad660e644924fd02665b77e1df4076a4802
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:54:34 2016 +0800

        re-indent code with X-Code

    commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:37:51 2016 +0800

        add reader configure for android

    commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:22:00 2016 +0800

        format code, remove some warning

    commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:02:27 2016 +0800

        configure for mac project

    commit de21cea12c0a898ea95f9951022be85bdddeefaf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 18:28:10 2016 +0800

        add comment for apis

    commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 15:32:46 2016 +0800

        fix parse objects in container

    commit 53bcce68b053a5b918a29735fed393c210d9cc2c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 22:10:54 2016 +0800

        fix flatbuffer parse

    commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 18:26:07 2016 +0800

        Init ui::TabControl

commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:35:06 2016 +0800

    fix

commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:30:44 2016 +0800

    fix active deactive in tabcontrol

commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 20:16:22 2016 +0800

    fix active -1

commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 16:00:51 2016 +0800

    fix merge file

commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:57:48 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

    # Conflicts:
    #	cocos/ui/CMakeLists.txt

commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:27:31 2016 +0800

    configure for win8.1

commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:20:23 2016 +0800

    configure for iOS mac twos android linux

commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:02:17 2016 +0800

    add lack files

commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 22:05:22 2016 +0800

    add test case for TabControl

commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 15:43:29 2016 +0800

    add const to getter setter

commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 14:50:04 2016 +0800

    format the comments

commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:51:06 2016 +0800

    remove reference

commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:40:04 2016 +0800

    configure for win8.1

commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:27:54 2016 +0800

    fix error

commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:25:51 2016 +0800

    add interface

commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:21:22 2016 +0800

    fix compile error for tw-os

commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:04:23 2016 +0800

    fix linux compile error

commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:54:34 2016 +0800

    re-indent code with X-Code

commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:37:51 2016 +0800

    add reader configure for android

commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:22:00 2016 +0800

    format code, remove some warning

commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:02:27 2016 +0800

    configure for mac project

commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 18:28:10 2016 +0800

    add comment for apis

commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 15:32:46 2016 +0800

    fix parse objects in container

commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 22:10:54 2016 +0800

    fix flatbuffer parse

commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 18:26:07 2016 +0800

    Init ui::TabControl
 		2016-03-03 14:17:48 +08:00
..
ActionTimeline Squashed commit of the following: 2016-03-03 14:17:48 +08:00
WidgetReader Squashed commit of the following: 2016-03-03 14:17:48 +08:00
Android.mk Squashed commit of the following: 2016-03-03 14:17:48 +08:00
CCActionFrame.cpp
…
CCActionFrame.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCActionFrameEasing.cpp
…
CCActionFrameEasing.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionManagerEx.cpp Remove boring logs in cocos studio supporting module. 2015-11-27 14:43:25 +08:00
CCActionManagerEx.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCActionNode.cpp Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
CCActionNode.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionObject.cpp Fix ActionManagerEx some times crash when reload action frames. 2015-10-26 10:38:17 +08:00
CCActionObject.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmature.cpp Squashed commit of the following: 2016-02-29 13:53:00 -08:00
CCArmature.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmatureAnimation.cpp Merge pull request #14759 from pandamicro/hbmemory 2016-02-14 14:48:01 +08:00
CCArmatureAnimation.h Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
CCArmatureDataManager.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCArmatureDataManager.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCArmatureDefine.cpp
…
CCArmatureDefine.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBatchNode.cpp Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
CCBatchNode.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBone.cpp Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
CCBone.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCColliderDetector.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCColliderDetector.h Squashed commit of the following: 2016-02-29 13:53:00 -08:00
CCComAttribute.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComAttribute.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComAudio.cpp add PlayableFrame 2016-01-12 17:21:01 +08:00
CCComAudio.h add PlayableFrame 2016-01-12 17:21:01 +08:00
CCComBase.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComController.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComController.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComExtensionData.cpp Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCComExtensionData.h Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCComRender.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCComRender.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCDataReaderHelper.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCDataReaderHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDatas.cpp Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCDatas.h Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCDecorativeDisplay.cpp
…
CCDecorativeDisplay.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayFactory.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCDisplayFactory.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayManager.cpp Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
CCDisplayManager.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCInputDelegate.cpp
…
CCInputDelegate.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCProcessBase.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCProcessBase.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCSGUIReader.cpp Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCSGUIReader.h Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCSSceneReader.cpp Remove boring logs in cocos studio supporting module. 2015-11-27 14:43:25 +08:00
CCSSceneReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSkin.cpp fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
CCSkin.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSpriteFrameCacheHelper.cpp fix the issue #14113 2015-10-23 00:00:18 +08:00
CCSpriteFrameCacheHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTransformHelp.cpp
…
CCTransformHelp.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTween.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCTween.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCUtilMath.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCUtilMath.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CMakeLists.txt Squashed commit of the following: 2016-03-03 14:17:48 +08:00
CSLanguageDataBinary_generated.h Add FlatBuffers serialize function for language data used in Cocos Studio. 2016-02-24 14:59:37 +08:00
CSParse3DBinary_generated.h update for light3D 2015-09-29 18:33:28 +08:00
CSParseBinary_generated.h Squashed commit of the following: 2016-03-03 14:17:48 +08:00
CocoLoader.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CocoLoader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CocoStudio.cpp Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
CocoStudio.h add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
CocosStudioExport.h Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 2015-06-23 11:31:16 +08:00
CocosStudioExtension.cpp Editing code as comment. 2015-12-04 10:43:39 +08:00
CocosStudioExtension.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
DictionaryHelper.cpp fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
DictionaryHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
FlatBuffersSerialize.cpp Add FlatBuffers serialize function for language data used in Cocos Studio. 2016-02-24 14:59:37 +08:00
FlatBuffersSerialize.h Add FlatBuffers serialize function for language data used in Cocos Studio. 2016-02-24 14:59:37 +08:00
TriggerBase.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerBase.h Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerMng.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerMng.h GBKToUTF8 2015-06-17 13:16:06 +08:00
TriggerObj.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerObj.h GBKToUTF8 2015-06-17 13:16:06 +08:00
WidgetCallBackHandlerProtocol.cpp
…
WidgetCallBackHandlerProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00