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

32295 Commits

Author SHA1 Message Date
ZhangMenghe 174d9cacf3 Modify name of engine in architecture graph 2015-07-29 10:05:01 +08:00
pandamicro 81842417c4 Merge pull request #13032 from xiaofeng11/v3 
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
 2015-07-29 09:54:43 +08:00
pandamicro cca95c3c51 Merge pull request #13041 from yangws/issue_10386 
Fixed #10386 : ui::TextField hitTest not working as expected.
 2015-07-29 09:52:06 +08:00
pandamicro dc931db932 Merge pull request #13069 from dmurtagh/debug_draw_patch 
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
 2015-07-29 09:51:43 +08:00
dualface d9c5600f41 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-29 09:17:53 +08:00
pandamicro f48dae09db Bind UIScrollViewBar 2015-07-29 00:11:52 +08:00
geron-cn fa5d70fc04 add SkeletonNode Nest test case 2015-07-28 23:49:25 +08:00
pandamicro 484d763a8d Merge pull request #13052 from CocosRobot/update_lua_bindings_1438054732 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-28 22:54:45 +08:00
pandamicro 9f39134669 Merge pull request #13058 from CocosRobot/update_cocosfiles_1438067509 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-28 22:49:53 +08:00
pandamicro f9df68a2fd Merge pull request #13063 from xiaofeng11/v3.7.1 
Fix parser compatible for layer project file
 2015-07-28 22:49:19 +08:00
pandamicro 36dc6956a8 Merge pull request #13066 from CocosRobot/update_lua_bindings_1438079662 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-28 22:45:10 +08:00
pandamicro 3df32331e2 Merge pull request #13064 from CocosRobot/update_cocosfiles_1438079560 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-28 22:44:39 +08:00
geron-cn d2de5b1c85 add test case for bug: #13060 and #13005 2015-07-28 19:18:58 +08:00
CocosRobot ac7729332a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 10:39:16 +00:00
pandamicro cc63ff5c03 Fix indent 2015-07-28 18:37:57 +08:00
CocosRobot 07686aa803 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 10:32:41 +00:00
pandamicro 8e883f9956 Merge pull request #13049 from jianglong0156/constructedWith3D#12404 
Some 3d classes can't be constructed with new in JS
 2015-07-28 18:31:04 +08:00
pandamicro 6c16a4b990 Add test cases for extended classes in JSB 2015-07-28 18:25:11 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
XiaoFeng faee3e7807 Fix parser compatible for layer project file 2015-07-28 18:11:07 +08:00
ZhangMenghe b77dec2b0a Add framework architecture figure to README 2015-07-28 17:31:14 +08:00
子龙山人 4eb18c89e1 Merge pull request #13061 from CocosRobot/update_lua_bindings_1438075003 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-28 17:29:19 +08:00
geron-cn 0275e3b773 fix set visible 2015-07-28 17:25:40 +08:00
CocosRobot c8f2514758 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 09:21:06 +00:00
pandamicro 66b21fb2a8 Merge pull request #12972 from yangws/issue_12145 
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
 2015-07-28 17:13:26 +08:00
Wenhai Lin c4112e1ce5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-28 17:02:30 +08:00
jianglong0156 f71f9b2b15 improve the code 2015-07-28 16:32:56 +08:00
geron-cn c9991aea81 fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible 2015-07-28 16:31:06 +08:00
WenhaiLin 9edd66d4a7 Label:support font that contains GB2312 char map. 2015-07-28 16:28:32 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
pandamicro 0d7f1e3672 Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function 2015-07-28 16:05:47 +08:00
pandamicro 0a31199a5b Fix widget onEnter override in JS may cause infinite recursion 2015-07-28 16:04:28 +08:00
WenhaiLin 102020d831 1.AudioEngine:support callback for preload feature. 
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
 2015-07-28 15:27:07 +08:00
CocosRobot 6e7c3c636f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 07:11:50 +00:00
pandamicro 3fa9463ec7 Fix manual bindings for changed API in spine 2015-07-28 15:11:20 +08:00
pandamicro 2d805b052b Merge pull request #13057 from natural-law/v3.7.1 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-28 15:10:15 +08:00
zhangbin 8bc96a10b4 Update the reference of submodule cocos2d-console. 2015-07-28 15:06:28 +08:00
pandamicro 605f181a4d Merge pull request #13056 from natural-law/v3.7.1 
[ci skip] Solve the error in lua template.
 2015-07-28 14:58:11 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +08:00
XiaoFeng bca6934786 Normalization function names 2015-07-28 14:05:56 +08:00
pandamicro ca54340982 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-28 13:00:10 +08:00
CocosRobot efd718ae7b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 03:44:49 +00:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
子龙山人 3a58668d71 Merge pull request #12744 from fusijie/fix_pageturndown 
Fix PageTurn3D
 2015-07-28 11:35:15 +08:00
Vincent Yang 14145e29a8 Fixed #9400 : Widget::setHighlighted does not work after setBright 2015-07-28 11:09:21 +08:00
jianglong0156 439bc8a99f add conversion cpp file into iOS project 2015-07-28 10:48:18 +08:00
jianglong0156 948628b800 add file in project file with android, linux wp8.1 2015-07-28 10:26:45 +08:00
jianglong0156 ec4d53fcf7 add 3d conversion 2015-07-28 10:08:58 +08:00
jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404 2015-07-28 09:59:35 +08:00