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

29015 Commits

Author SHA1 Message Date
minggo 6f568c6665 Merge pull request #11109 from CocosRobot/update_lua_bindings_1427185990 
[AUTO]: updating luabinding automatically
 2015-03-24 16:45:10 +08:00
VisualSJ 6590d34bda [ci skip] Add javascript notes... 
cocos/base/CCEventListener.h
  cocos/base/CCEventListenerAcceleration.h
  cocos/base/CCEventListenerController.h
  cocos/base/CCEventListenerCustom.h
  cocos/base/CCEventListenerFocus.h
  cocos/base/CCEventListenerKeyboard.h
  cocos/base/CCEventListenerMouse.h
  cocos/base/CCEventListenerTouch.h
  cocos/base/CCEventMouse.h
  cocos/base/CCEventTouch.h
 2015-03-24 16:37:09 +08:00
CocosRobot 08919a1445 [AUTO]: updating luabinding automatically 2015-03-24 08:35:26 +00:00
minggo e50a71609f Merge pull request #11071 from pipu/reconstruct_ColorFrame 
Reconstruct ColorFrame.
 2015-03-24 16:29:55 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
zhukaixy aa0193044b discard modify of lua_cocos2dx_3d_auto.cpp 2015-03-24 15:49:24 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
minggo 9cb02c800a Merge pull request #11102 from WenhaiLin/v3-doxygen 
[ci skip]Update comments
 2015-03-24 15:15:40 +08:00
minggo cc5419e7cd Merge pull request #11099 from andyque/add-jenkins-daily-build-status-icon-v3 
add Jenkins daily build status
 2015-03-24 15:14:08 +08:00
WenhaiLin 3b555be91a [ci skip]Update comments 2015-03-24 15:13:05 +08:00
andyque 7807bb0b6e add wp8 node status icon 2015-03-24 15:08:31 +08:00
andyque 1b053a6eb2 add wp8 build node 2015-03-24 14:54:08 +08:00
WenhaiLin 9e7e819eab [ci skip]Update comments 2015-03-24 14:43:54 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
andyque 27155afe43 fix format 2015-03-24 14:12:16 +08:00
minggo 8f9eb6ce22 Merge pull request #11097 from CocosRobot/update_lua_bindings_1427167387 
[AUTO]: updating luabinding automatically
 2015-03-24 14:01:35 +08:00
andyque 9516f19e6e add Jenkins daily build status 2015-03-24 13:47:12 +08:00
WenhaiLin 8ae81e6c7a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:43:09 +08:00
minggo 6cc8fb4348 Merge pull request #11092 from fusijie/cocosapi 
[ci skip]update headers' module name.
 2015-03-24 11:27:54 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
CocosRobot 9d886cc5f2 [AUTO]: updating luabinding automatically 2015-03-24 03:25:31 +00:00
minggo df532490d8 Merge pull request #11094 from andyque/add-daily-build-scripts 
[ci skip]add daily build
 2015-03-24 11:19:28 +08:00
minggo a935e7cc07 Merge pull request #11095 from minggo/add-documentation 
[ci skip]add more documentation
 2015-03-24 11:17:55 +08:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
andyque 920e30386e do cleanup 2015-03-24 11:13:23 +08:00
andyque b8bc7ce3f3 add daily build 2015-03-24 11:10:51 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00
minggo 9976885d37 Merge pull request #11079 from fusijie/cocosapi 
add comments.
 2015-03-24 09:50:19 +08:00
minggo 73a3051417 Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273 
[AUTO]: updating luabinding automatically
 2015-03-24 09:49:54 +08:00
minggo 13062a36fb Merge pull request #11088 from minggo/disable-travis-building 
[ci skip]Disable travis building
 2015-03-24 09:46:22 +08:00
minggo e234b1ed9a disable travis building 2015-03-24 09:45:03 +08:00
CocosRobot 0fb2aeb2b2 [AUTO]: updating luabinding automatically 2015-03-23 14:37:03 +00:00
minggo 2dfc0e11db Merge pull request #11081 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-23 22:18:34 +08:00
minggo 67e0cd20d2 Merge pull request #11080 from SuYaoHui/cocosapi 
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
 2015-03-23 22:18:00 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
minggo 7f60b1cea2 Merge pull request #11078 from calfjohn/v3 
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
 2015-03-23 22:16:56 +08:00
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