Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,568 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

20 Commits

Author SHA1 Message Date
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 2013-12-19 17:05:59 +08:00
yinkaile 6ff45b09e7 Merge branch 'newRenderer' into Array 
Conflicts:
	cocos/editor-support/cocostudio/CCArmature.cpp
	cocos/editor-support/cocostudio/CCArmature.h
	cocos/editor-support/cocostudio/CCBatchNode.cpp
	cocos/editor-support/cocostudio/CCColliderDetector.cpp
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-17 18:06:11 +08:00
youyou 81cdbea9c8 change Array to Vector, Dictionary to Map 2013-12-16 14:34:09 +08:00
youyou 1bdf1a44a1 1.change blendfunc method 
2.support custom easing
 2013-12-13 15:02:09 +08:00
boyu0 7cbce905bf issue #3162: delete duplicate functions. 2013-12-11 16:12:14 +08:00
Ricardo Quesada 23222923bf Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
youyou e17b9d839b 1.add TEST_EASING 
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
 2013-12-06 13:40:49 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
yinkaile 677cf00355 fix compiler warning 2013-11-11 15:29:24 +08:00
yinkaile 5ba1e4ce10 1.remove compiler wornings 
2.change void Bone::removeFromParent(bool recursion);  to void Bone::removeFromParent();
 2013-11-11 14:50:30 +08:00
2youyou2 12d6bc1722 1. change CCARRAY_FOREACH to range-based loop 2013-11-06 15:25:44 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null 
2. Remove CocoStudio/Armature files
 2013-11-05 15:32:13 +08:00
2youyou2 a9054ba14a 1.add method to set collider filter 2013-11-01 14:36:44 +08:00
yinkaile 8fa8b9f844 update develop 2013-10-30 09:41:40 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00