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
Ricardo Quesada bc11e24019 Squashed commit of the following: 
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 13:11:40 2016 -0800

    binary file 82

commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:56:39 2016 -0800

    fore multiple in windows phone 8.1 too

commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:50:45 2016 -0800

    force multiple

commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 10:44:40 2016 -0800

    compiles

commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 09:37:24 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Feb 27 01:11:13 2016 -0800

    correct paths for win8.1

commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 22:46:58 2016 -0800

    projects works on win32

commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:57:10 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:26:55 2016 -0800

    trying to make it compile on win32

commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 10:28:12 2016 -0800

    quick hack to make it compile...

    ...autogenerated files will fix it.

commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 09:20:59 2016 -0800

    Squashed commit of the following:

    commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 20:10:13 2016 -0800

        compiles.. sort of

    commit a7990e2888d5ef1e43b811148b23c0b899105ab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:55:24 2016 -0800

        more chipmunk fixes

    commit 1174f6ec8201324161d7946af0f493b136a56690
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:36:15 2016 -0800

        more chipmunk fixes

    commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
    Merge: f942c5a 0594d3c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:29:27 2016 -0800

        Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed

    commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:28:51 2016 -0800

        correct path for chipmunk

    commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 18:44:05 2016 -0800

        compiles on ios

    commit 379503399c384ad77d25d68a2f83b71a829b1c04
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:51:36 2016 -0800

        chipmunk include fixes

    commit 95839fb7b406a32255853294b016d8c15aec1ed6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:09:04 2016 -0800

        fixes for cmake + mac

    commit 39449ea3b7efccae2946785c1c11433d964ee480
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:51:25 2016 -0800

        correct includes

    commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:35:40 2016 -0800

        fixes chipmunk with cmake

    commit 337f21f9466703722847635301d841ace9b757cb
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:42:01 2016 -0800

        updates android and linux projects

    commit 7111a9993b97f78cf73206804b25665c21a59ca8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:18:26 2016 -0800

        cosmetic changes

    commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:53:41 2016 -0800

        chipmunk autogenerated files

    commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:47:41 2016 -0800

        compatibility both in JS (to reduce space)

        and in C for (C++ users)

    commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:10:02 2016 -0800

        mooooore fixes

    commit 9ab23014093677e8eda69b105f50410b8c792aa3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:30:58 2016 -0800

        doesn't crash with collision handler

    commit 69275a16817a038244bbaaff9e82a011b6729cb2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:16:29 2016 -0800

        adds missing space functions

    commit a6b97bbc76cb9ab293356bb7451cfa858353f589
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 22:22:27 2016 -0800

        queries... better

    commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 19:48:41 2016 -0800

        adds more missing functions

        fixes other chipmunk JS issues

    commit 3797a033896d059da58a05ce0de832ed9c150eff
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 18:30:21 2016 -0800

        yep... poly works ok

    commit d1bb57776891605b9d3e4fb90736c6869d96b944
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:29 2016 -0800

        neede compat files

    commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:04 2016 -0800

        query working!

    commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:57:03 2016 -0800

        almost there

    commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:18:46 2016 -0800

        fixes return values

    commit 7218778da846e1e36a510c0a19a5ee76f91db032
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 20:36:14 2016 -0800

        cpMomentForSegment is manual since parameter 4 is optional

        in chipmunk 6, but not in 7

    commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 17:29:28 2016 -0800

        yeah... process the arguments correctly

        works both for functions and auto_classes

    commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 16:49:00 2016 -0800

        compiles and links

        fixes some issues with the queries.
        returns shapes instad of the queryInfo

    commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 15:03:18 2016 -0800

        adds removeCollisionHandler and other fixes

    commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 18 20:59:24 2016 -0800

        compiles... doesn't work yet

    commit bd64de81713fb2d7652a538d667d73f05f5d9320
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 17 18:17:39 2016 -0800

        WIP: chipmunk bindings
 		2016-02-29 13:53:00 -08:00
..
ActionTimeline Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
WidgetReader Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
Android.mk update for light3d reader 2015-11-03 13:34:21 +08:00
CCActionFrame.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrame.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCActionFrameEasing.cpp Platform fixed 2014-09-09 16:50:02 -07:00
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 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
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 Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComExtensionData.h Refine components to improve performance 2015-09-18 14:34:02 +08: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 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCDatas.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCDecorativeDisplay.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
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 remove unneeded codes 2014-08-26 18:19:28 +08:00
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 c_str() calls 2016-02-04 11:52:14 +09:00
CCSGUIReader.h GBKToUTF8 2015-06-17 13:16:06 +08: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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
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 update for light3d reader 2015-11-03 13:34:21 +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 add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +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 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
WidgetCallBackHandlerProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00