Commit Graph

10 Commits

Author SHA1 Message Date
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
	cocos/base/CCConfiguration.h
2015-03-30 11:50:01 +08:00
andyque 602093e474 fix extra @ symbol in Base group 2015-03-27 12:01:20 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi
[ci skip]add comments.
2015-03-25 09:49:52 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
VisualSJ b5fa6d2e95 [ci skip] Add javascript notes...
cocos/2d/CCMotionStreak.h
  cocos/2d/CCParticleBatchNode.h
  cocos/2d/CCParticleExamples.h
  cocos/2d/CCParticleSystem.h
  cocos/2d/CCParticleSystemQuad.h
  cocos/2d/CCTransition.h
  cocos/2d/CCTransitionPageTurn.h
  cocos/base/CCConfiguration.h
  cocos/base/CCTouch.h
2015-03-23 20:27:13 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00