signmotion
|
7d139a3bc3
|
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
|
2013-09-22 23:50:54 +03:00 |
James Chen
|
513237d5f6
|
Fixing armature test crash.
|
2013-09-17 23:03:33 +08:00 |
2youyou2
|
57ec881727
|
support set tween key
|
2013-09-17 20:14:08 +08:00 |
2youyou2
|
07f72ac1b4
|
Change rotation range from(-180 -- 180) to (-infinity -- infinity)
|
2013-09-17 16:40:47 +08:00 |
2youyou2
|
a08ce3df73
|
change singleton class get method to getInstance
|
2013-09-16 15:16:05 +08:00 |
2youyou2
|
302555e711
|
standardizate code
|
2013-09-16 14:13:55 +08:00 |
2youyou2
|
b7b079c1c6
|
standardize code
|
2013-09-16 12:02:57 +08:00 |
2youyou2
|
77db15bd0d
|
change variables name
|
2013-09-15 20:24:25 +08:00 |
2youyou2
|
db4813f161
|
1.remove CC from class name
2.fix async loading
|
2013-09-15 19:08:45 +08:00 |
yinkaile
|
5e1f91d396
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
|
2013-09-14 19:54:49 +08:00 |
yinkaile
|
74bd8b09d6
|
update armature
|
2013-09-13 18:07:37 +08:00 |
samuele3hu
|
d8bd65b2e8
|
issue #2784:Add class constructor js-binding document
|
2013-09-13 16:46:31 +08:00 |
samuele3hu
|
a34ec99014
|
issue #2784:Add js-binding and lua-binding document
|
2013-09-13 11:41:20 +08:00 |
zhangcheng
|
1115d0d3f9
|
1. merge scenereader Armature merge to cocos2dx 3.0.
|
2013-09-09 19:51:26 +08:00 |