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

32870 Commits

Author SHA1 Message Date
Liam c93d40869c fix simulator crash when sprite3d resource is error 2015-07-29 16:52:40 +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
子龙山人 a814076d93 Merge pull request #24 from WenhaiLin/v3.7.1-sf-macfix 
Label:The texture of system font should be cropped when the height is not enough to show the entire string on Mac.
 2015-07-29 16:16:25 +08:00
WenhaiLin 20d445ad1a Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac. 2015-07-29 16:11:27 +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
andyque 6de387b3ac fix Mac system font crash issue 2015-07-29 15:20:31 +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
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +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
tangziwen ba39a57d7a Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-07-29 13:29:01 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +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
yangxiao ad80c11235 sync render state 2015-07-29 10:35:37 +08:00
yangxiao 5d677d49bb clamp sin value to -1, 1 2015-07-29 10:35:01 +08:00
geron-cn 7e05538521 ADD SKELETON NEST TEST CASE 2015-07-29 10:23: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 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