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

28501 Commits

Author SHA1 Message Date
Huabing.Xu 18ac6039d7 Merge pull request #10984 from CocosRobot/update_lua_bindings_1426753617 
[AUTO]: updating luabinding automatically
 2015-03-19 17:53:08 +08:00
Huabing.Xu 18da1ceef7 [ci skip]update releaseNotes 2015-03-19 17:38:52 +08:00
samuele3hu 5a5acc624a issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32 2015-03-19 17:31:57 +08:00
samuele3hu 1eb1057875 Update comments of some header files 2015-03-19 16:59:21 +08:00
samuele3hu 31b34ddf77 Update comments of some header files 2015-03-19 16:45:53 +08:00
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
XiaoYang dfe9e45d50 Merge pull request #259 from lvlonggame/camera_culling_crash 
fix: Camera culling crash
 2015-03-19 16:30:00 +08:00
CocosRobot 0afd385412 [AUTO]: updating luabinding automatically 2015-03-19 08:29:09 +00:00
minggo d4766e934c Merge pull request #10982 from natural-law/v3 
[ci skip] Solve the error format of comments in header files.
 2015-03-19 16:22:51 +08:00
XiaoYang 28e2b8719a Merge pull request #260 from tangziwen/v3_abc 
add particle-perf for win rt
 2015-03-19 16:17:46 +08:00
tangziwen f60649b39f add particle-perf for win rt 2015-03-19 16:09:16 +08:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
lvlong 9e3ae9bfb5 remove get window size. 2015-03-19 15:24:58 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
lvlong 9c0b618046 Merge branch 'v3' of github.com:super626/cocos2d-x into camera_culling_crash 2015-03-19 15:04:18 +08:00
lvlong 7f18c9809c fix :camera-culling MoveTo 2015-03-19 15:02:38 +08:00
yangxiao 0106c1184e add pu for performance test 2015-03-19 15:00:07 +08:00
yangxiao b6a29d80de 3d particle performance test 2015-03-19 14:43:29 +08:00
XiaoYang 9665557e66 Merge pull request #258 from songchengjiang/v3 
add particle3D performance Test
 2015-03-19 13:48:04 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
songchengjiang 9329ba1b37 add particle3D performance Test 2015-03-19 12:32:53 +08:00
minggo a8d29b6122 Merge pull request #10970 from CocosRobot/update_lua_bindings_1426737203 
[AUTO]: updating luabinding automatically
 2015-03-19 11:56:41 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate 
[ci skip] added js annotate to classes
 2015-03-19 11:56:07 +08:00
CocosRobot f2c49b3311 [AUTO]: updating luabinding automatically 2015-03-19 03:55:42 +00:00
minggo 194510dacc Merge pull request #10969 from pipu/parse_csd_position 
Fix that parse position from .csd file.
 2015-03-19 11:53:31 +08:00
minggo b3d9b72f27 Merge pull request #10944 from pipu/manage_actiontimelinedata_reference 
Manage reference count of ActiontimelineData object.
 2015-03-19 11:53:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 11:52:44 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +08:00
minggo 74de66a286 Merge pull request #10964 from CocosRobot/update_lua_bindings_1426687157 
[AUTO]: updating luabinding automatically
 2015-03-19 11:49:54 +08:00
pipu 46741e1035 Fix that parse position from .csd file. 2015-03-19 11:22:11 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
CocosRobot b7881eab88 [AUTO]: updating luabinding automatically 2015-03-18 14:02:42 +00:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo 8306aaaab2 Merge pull request #10955 from dabingnn/v3_comments 
[ci skip] update comments CCRenderCommand.h
 2015-03-18 21:48:47 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
minggo a9f13148f4 Merge pull request #10961 from minggo/add-documentation 
[ci skip]update document for ccUtils.h
 2015-03-18 21:46:20 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
minggo 7f825d3dae update document for ccUtils.h 2015-03-18 21:45:00 +08:00
VisualSJ 3576df4b89 Add javascript notes... 
cocos/base/CCDirector.h
 2015-03-18 21:39:50 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
minggo bf0d48e483 Merge pull request #10957 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 21:33:13 +08:00
minggo 0267faa7d1 Merge pull request #10958 from minggo/add-documentation 
[ci skip]update document for CCUserDefault.h
 2015-03-18 21:27:13 +08:00
minggo 85811bd710 update document for CCUserDefault.h 2015-03-18 21:24:31 +08:00