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

33551 Commits

Author SHA1 Message Date
yangxiao 74b480c1b6 fix setflip for batch sprite 2015-12-16 13:45:37 +08:00
pandamicro 4c8fdc760d Merge pull request #14684 from CocosRobot/update_lua_bindings_1450153784 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-15 12:32:11 +08:00
CocosRobot 8cb2ec6187 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-15 04:31:50 +00:00
pandamicro 6e20c3cc4f Merge pull request #14681 from pandamicro/v3.10 
Fix ComponentJS proxy management issue in JSB
 2015-12-15 12:26:12 +08:00
pandamicro 64276bd664 Fix ComponentJS proxy management issue in JSB 2015-12-15 11:48:44 +08:00
pandamicro 280a8e9d9c Merge pull request #14663 from xiaofeng11/v3.10 
Update all version number to v3.10
 2015-12-15 10:48:51 +08:00
pandamicro ca45f9f69d Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3.10 2015-12-15 10:45:42 +08:00
pandamicro 77ca89a0fa Merge pull request #14680 from MSOpenTech/winrt-v3.10-fixjs 
added missing _USRJSSTATIC preprocessor define for ARM builds
 2015-12-15 10:45:41 +08:00
pandamicro f417f2ac2d Auto generate bindings for v3.10 2015-12-15 10:44:18 +08:00
Dale Stammen 46b926a18e added missing _USRJSSTATIC preprocessor define for ARM builds 2015-12-14 14:55:33 -08:00
zilongshanren 6318634887 Merge pull request #14641 from liamcindy/v3_ui_controlButton 
fix controlButton test error
 2015-12-14 19:47:41 +08:00
Liam 4d89508377 update for controlButton size 2015-12-14 17:38:52 +08:00
pandamicro 0e7a02d025 Merge pull request #14670 from pandamicro/v3 
Fix evalString doesn't return result issue
 2015-12-14 17:26:34 +08:00
zilongshanren bc29bde5ae Merge pull request #14653 from liamcindy/v3_ui_pageView 
update pageview to support adjust child size
 2015-12-14 17:00:58 +08:00
xiaofeng11 9be87c2f87 Merge pull request #14672 from xiaofeng11/v3.10vc 
Fix 3d touch compile error in lower version Xcode
 2015-12-14 16:04:27 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +08:00
pandamicro d33062ac35 Merge pull request #14667 from chengstory/#24347 
Fix #24347
 2015-12-14 15:03:21 +08:00
肖峰 23bf815cfa Fix 3d touch compile error in lower version Xcode 2015-12-14 14:26:52 +08:00
zilongshanren 0dd4433104 Merge pull request #14669 from zilongshanren/fixCustomSize 
fix #12249
 2015-12-14 13:56:50 +08:00
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10 
fix scale9sprite global zorder issue.
 2015-12-14 13:56:29 +08:00
pandamicro 662c7fbec5 Made API consistent with old version 2015-12-14 13:55:17 +08:00
pandamicro cbce4d37c3 Merge pull request #14671 from ricardoquesada/more_js_fixes 
More js fixes
 2015-12-14 13:41:59 +08:00
zilongshanren 96db089b64 Merge pull request #14665 from zilongshanren/fixMemoryLeak 
fix memory leaks of stencileStateManager
 2015-12-14 13:34:17 +08:00
pandamicro 330b588215 Fix evalString doesn't return result issue 2015-12-14 13:13:54 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3 
Sync v3 and Fix win32 js project crash issue
 2015-12-14 13:12:42 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zhangcheng 436db6e932 Fix #24347 
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
 2015-12-14 11:20:26 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
xiaofeng11 1c53920a13 Merge pull request #14660 from chengstory/#24345 
Fix #24345
 2015-12-14 10:38:13 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
pandamicro 445442c964 Upgrade spider monkey to solve win32 js project crash issue 2015-12-14 10:27:11 +08:00
zilongshanren 0f5aac5754 fix typo 2015-12-14 10:14:39 +08:00
zilongshanren 8c9b03112e fix scale9sprite global zorder issue. 
1. it also fix the positiong issue when call setScale9Enabled(false)
 2015-12-14 10:09:06 +08:00
zilongshanren b87e638f26 Merge pull request #14656 from zilongshanren/v3.10 
fix bmfont size initialize error
 2015-12-13 22:22:05 +08:00
zilongshanren b1d700ad33 fix bmfont size error 2015-12-13 13:59:42 +08:00
pandamicro 1935e2a89b Merge pull request #14655 from CocosRobot/update_lua_bindings_1449976044 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-13 11:12:35 +08:00
CocosRobot 0473dd88fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-13 03:12:14 +00:00
pandamicro a80ca25d63 Merge pull request #14576 from mogemimi/fix-deprecation-warns-particle3d 
Fix deprecation warnings in PU
 2015-12-13 11:09:47 +08:00
pandamicro 2f4867c2af Merge pull request #14415 from mogemimi/fix-mismatch-include-guards 
Fix inconsistent header include guards
 2015-12-13 11:04:18 +08:00
pandamicro 07077f5c36 Merge pull request #14650 from mogemimi/fix-typo-extensions 
Fix typos in documentation and comments
 2015-12-13 11:03:24 +08:00
pandamicro 2ef0197534 Merge pull request #14643 from GuoLunHao/v3.10 
fix compile error and link error on ios/Mac platform
 2015-12-12 23:46:32 +08:00
pandamicro ee75603e74 Merge pull request #14642 from GuoLunHao/v3.10_setup 
add quiet option for Cocos Toolkit
 2015-12-12 23:45:21 +08:00
mogemimi 07673f71cd Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
mogemimi 8df13ad6f9 Replace non-ASCII characters in comments 2015-12-12 21:04:23 +09:00
mogemimi d27f50aaf2 Fix typos in documentation and comments 2015-12-12 21:04:22 +09:00
mogemimi 3bb9a37393 Fix deprecation warnings in PU 2015-12-12 17:50:32 +09:00
Ricardo Quesada c5058aa2f9 more conversions 2015-12-11 17:18:20 -08:00
Ricardo Quesada 47911e0c24 more js fixes 
fixes in how ref count is measured
opengl bindings converted to new API
 2015-12-11 15:18:09 -08:00
Ricardo Quesada 7e72a7110c Merge pull request #14651 from CocosRobot/update_lua_bindings_1449856025 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-11 09:56:08 -08:00
CocosRobot 71f9ead981 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-11 17:52:29 +00:00