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

28090 Commits

Author SHA1 Message Date
minggo e86e954abf add doxygen comment for CCVector.h 2015-03-23 22:13:04 +08:00
Huabing.Xu e3231db0c0 Merge pull request #11083 from dabingnn/v3_comments 
[ci skip]update comments Vec2/3/4.h TransformUtils.h
 2015-03-23 21:50:33 +08:00
Huabing.Xu 92b110ce25 [ci skip]update comments Vec2/3/4.h TransformUtils.h 2015-03-23 21:49:36 +08:00
Huabing.Xu b14cf9b775 Merge pull request #11082 from dabingnn/v3_comments 
V3 comments
 2015-03-23 21:48:00 +08:00
Huabing.Xu 044c954155 [ci skip] update comments CCGLGroupCommand.h 2015-03-23 21:36:01 +08:00
Huabing.Xu 027106c9ee [ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h 2015-03-23 21:19:02 +08:00
Zhe Wang 8e2e1e5723 Add comments of async load, to avoid confusions of developers. 2015-03-23 20:58:16 +08:00
Zhe Wang 0adedc7a75 Update CHANGELOG 
fix some typos and English syntax error. Well, my English is also poor. Native English speakers, please feel free to pull request to this changelog if you find something wrong.
 2015-03-23 20:51:08 +08:00
Huabing.Xu 126186e413 [ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h 2015-03-23 20:30:37 +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
Huabing.Xu 2dde1e69e3 Merge branch 'v3' into v3_comments 2015-03-23 20:00:31 +08:00
Jacky 7f41b091e0 add comments. 2015-03-23 18:39:27 +08:00
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
calfjohn 657f270855 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-23 17:50:53 +08:00
calfjohn ff0e852044 Add document for Texture2D\TextureAtlas\TextureCache 2015-03-23 17:50:22 +08:00
minggo 2923ad6cd6 Merge pull request #11076 from CocosRobot/update_lua_bindings_1427099413 
[AUTO]: updating luabinding automatically
 2015-03-23 16:34:17 +08:00
minggo 3f9862d008 Merge pull request #11075 from CocosRobot/update_lua_bindings_1427099254 
[AUTO]: updating luabinding automatically
 2015-03-23 16:33:07 +08:00
CocosRobot 9f17ed6bed [AUTO]: updating luabinding automatically 2015-03-23 08:32:54 +00:00
CocosRobot 01930b408e [AUTO]: updating luabinding automatically 2015-03-23 08:29:35 +00:00
minggo 3180f21640 Merge pull request #11068 from minggo/add-documentation 
[ci skip]update document for CCValue.h
 2015-03-23 16:25:38 +08:00
minggo 47b7bcf01f Merge pull request #11072 from andyque/fix-doxygen-release-tool 
[ci skip]fix doxygen document generate tool restore doxygen.config file
 2015-03-23 16:24:48 +08:00
minggo c587d19e8b Merge pull request #11059 from SuYaoHui/cocosapi 
add comments.
 2015-03-23 16:24:22 +08:00
minggo 4143eae713 Merge pull request #11061 from fusijie/cocosapi 
add comments.
 2015-03-23 16:23:51 +08:00
minggo 073910fd1a Merge pull request #11074 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-23 16:11:09 +08:00
zhangbin e457cb47d7 Update the reference of submodule cocos2d-console. 2015-03-23 16:09:43 +08:00
pipu 787225ce21 Make _alpha of ColorFrame become deprecated attribute. 2015-03-23 15:45:32 +08:00
andyque 360098c2cf fix doxygen document generate tool restore doxygen.config file unexpectly 2015-03-23 14:35:38 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +08:00
minggo 341c560378 Merge pull request #11070 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-23 12:05:20 +08:00
zhangbin 5e86152b15 Update the reference of submodule cocos2d-console. 2015-03-23 12:04:14 +08:00
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo ffd8ae1b42 [ci skip]update CMakeLists.txt 2015-03-23 11:33:03 +08:00
minggo 27c4104ca7 Merge pull request #11049 from MSOpenTech/v3-wp8-shaders 
Edit V3 updated precompiled shaders for WP8
 2015-03-23 11:28:18 +08:00
minggo f51b8cb951 Merge pull request #11069 from CocosRobot/update_lua_bindings_1427080728 
[AUTO]: updating luabinding automatically
 2015-03-23 11:24:10 +08:00
CocosRobot ef631d743c [AUTO]: updating luabinding automatically 2015-03-23 03:20:47 +00:00
minggo 7e7cef3556 Merge pull request #11066 from super626/v3 
Fix android switch back and foreground bug
 2015-03-23 11:15:17 +08:00
minggo 81c7b84746 [ci skip]update CHANGELOG 2015-03-23 11:11:49 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
XiaoYang fcf6cab884 Merge pull request #262 from tangziwen/v3_abc 
fix UVAnimation test while switching back to foreground
 2015-03-23 10:38:11 +08:00
Dale Stammen 63f3bf1a37 Merge branch 'v3' into v3-wp8-shaders 2015-03-22 19:20:05 -07:00
tangziwen e213cd1747 fix UVAnimation test while switching back to foreground 2015-03-23 10:19:00 +08:00
minggo 3e0d5f2772 Merge pull request #11065 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-23 10:15:26 +08:00
zhangbin eb95bbce02 Update the reference of submodule cocos2d-console. 2015-03-23 10:10:35 +08:00
minggo 3d3bfa3cdb Merge pull request #11026 from pipu/update_TestAnimation_resources 
Update resources of Test TestTimelineProjectNode.
 2015-03-23 09:35:14 +08:00
Zhe Wang 2d6d7f42f5 Update CHANGELOG 
fix a typo, Romanian languange -> Romanian language
 2015-03-21 22:47:00 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
Huabing.Xu bbfc7dab26 Merge pull request #11048 from samuele3hu/v3_src 
[ci skip]Update plugin submodule for v3.5
 2015-03-21 14:56:02 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
samuele3hu 84c81750be Update plugin submodule for v3.5 2015-03-21 14:05:50 +08:00