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

31422 Commits

Author SHA1 Message Date
Ricardo Quesada 642ccac5dc Merge pull request #12927 from ricardoquesada/spine-2.3 
Adds support for Spine runtime 2.3
 2015-07-29 13:33:15 -07:00
Ricardo Quesada 7431acf3e0 Merge pull request #2 from pandamicro/spine 
Fix manual bindings for changed API in spine
 2015-07-29 11:28:42 -07:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
 2015-07-29 21:01:56 +08:00
pandamicro 347854e8d3 Add Audio Control test case 2015-07-29 20:48:11 +08:00
pandamicro 07fdea50de Refine C++ test case 2015-07-29 20:47:38 +08:00
pandamicro da4e062614 Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
pandamicro fa6c6de0b9 Merge pull request #13091 from VisualSJ/v3-13063 
Update js parser (timelineParser-2.x.js)
 2015-07-29 20:42:51 +08:00
VisualSJ 179266240f Update js parser (timelineParser-2.x.js) 2015-07-29 19:49:54 +08:00
pandamicro ff7d01376e Merge pull request #13087 from natural-law/v3 
[ci skip] Move web folder from js template folder to engine folder in Cocos Framework.
 2015-07-29 17:51:39 +08:00
zhangbin c8ff43133f Move web folder from js template folder to engine folder in Cocos Framework. 2015-07-29 17:22:26 +08:00
pandamicro 3dadc77850 Merge pull request #13086 from natural-law/v3 
[ci skip] Solve the error in .cocos-project.json of js-tests.
 2015-07-29 17:12:38 +08:00
zhangbin e30d84bca0 Solve the error in .cocos-project.json of js-tests. 2015-07-29 17:10:19 +08:00
pandamicro 36b7ba5b75 Merge pull request #13081 from natural-law/v3 
Remove unused config in android project of js-tests.
 2015-07-29 17:00:26 +08:00
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
子龙山人 2345669a96 Merge pull request #13078 from CocosRobot/update_lua_bindings_1438152852 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-29 16:17:02 +08:00
子龙山人 9947e69261 Merge pull request #13082 from CocosRobot/update_lua_bindings_1438155589 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-29 15:51:50 +08:00
CocosRobot 8c642d966f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 07:45:19 +00:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
zhangbin 6fe880bee5 Remove unused config in android project of js-tests. 2015-07-29 15:35:59 +08:00
CocosRobot 7a6664ab1f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 06:58:36 +00:00
子龙山人 96d44e1078 Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312 
Label:support font that contains GB2312 char map.
 2015-07-29 14:51:17 +08:00
子龙山人 a46c4be912 Merge pull request #13039 from WenhaiLin/v3.8-audioengine-preload 
AudioEngine:support callback for preload feature.
 2015-07-29 14:15:05 +08:00
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
pandamicro 3089ac302e Refine ui bindings and JS constants 2015-07-29 13:06:49 +08:00
pandamicro c81ba3c148 Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios 
Fixed: #12645 iOS: depth/stencil buffers attributes are ignored
 2015-07-29 11:09:56 +08:00
pandamicro 4cd0ced683 Merge pull request #12805 from super626/animate3d 
fix #11487 animate3d bugs
 2015-07-29 11:09:03 +08:00
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 f48dae09db Bind UIScrollViewBar 2015-07-29 00:11:52 +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 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
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
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
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
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