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

11558 Commits

Author SHA1 Message Date
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10 
V3.10
 2016-03-29 11:23:11 +08:00
Wenhai Lin 392d1e858f Merge pull request #15314 from WenhaiLin/v3-0323 
Refine 'CCFontXXXX'
 2016-03-25 21:55:00 +08:00
Wenhai Lin c3a8cabe5d refine 2016-03-25 21:21:09 +08:00
minggo ffdfcd4aa9 Merge pull request #15311 from MSOpenTech/v3-winrt 
Win10 UWP and Windows 8.1 fixes for v3.11
 2016-03-25 09:42:13 +08:00
Wenhai Lin a93cbe8a32 Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
Wenhai Lin 66576f19dc Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt 
Fix memory leak in FontFNT
 2016-03-24 19:59:14 +08:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
Dale Stammen 12e34ca9d4 updated to v3.11 2016-03-23 12:13:44 -07:00
Dale Stammen bd72d7a6de updated chipmunk include path 2016-03-23 12:12:44 -07:00
zilongshanren db00d4944c Merge pull request #15293 from zilongshanren/fixDetachIME 
fix systemFontDirty and lineBreakMode issue
 2016-03-23 16:37:53 +08:00
mogemimi de0582844e Fix memory leak in FontFNT 2016-03-23 15:17:05 +09:00
minggo 3c676d9712 Merge pull request #15037 from Shulepov/spriteframecache_pixel_format 
SpriteFrameCache: take pixelFormat into account if specified
 2016-03-23 09:48:35 +08:00
CocosRobot 6e12d8c98a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 12:58:39 +00:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +08:00
Xpol Wan ae3fbcce79 Manually fixes include path for generated code. 2016-03-22 16:08:28 +08:00
Xpol Wan 71f0537734 Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths 2016-03-22 16:07:02 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren ff6b7080f5 fix systemFontDirty and lineBreakMode issue 2016-03-22 14:47:33 +08:00
CocosRobot 35645d8c26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 06:24:54 +00:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
zilongshanren a15a39095f fix system font dirty issue 2016-03-21 22:31:23 +08:00
CocosRobot 97130dc084 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-21 12:56:42 +00:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 768f02bae3 revert pch.cpp for windows 8.1 and windows 10. 2016-03-21 11:00:32 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
minggo dcb3aa20c1 Merge pull request #15237 from njh0602/somefix 
remove unnecessary scope operator
 2016-03-18 18:31:53 +08:00
CocosRobot e2f820df25 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-18 09:11:18 +00:00
zilongshanren 7993ad93d2 fix jsb API inconsistency. 
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
 2016-03-18 16:18:40 +08:00
zilongshanren 56878bd441 Merge pull request #14532 from xpol/refactor-utf-module 
Overhaul UTF modules and add full set of UTFs conversion functions.
 2016-03-18 14:00:47 +08:00
zilongshanren 6ce5ee24b4 Merge pull request #15274 from zilongshanren/fixJsBindings-deprecated 
fix polygon api typo
 2016-03-18 13:44:40 +08:00
zilongshanren 2bb4847848 Merge pull request #15251 from xpol/detect-apple-platforms 
Detect Apple platforms
 2016-03-18 13:44:24 +08:00
Xpol Wan 4bbfb56983 Try fixes binding generator error. 2016-03-18 10:21:38 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
zilongshanren 11ed05a0be Merge pull request #15245 from mogemimi/fix-function-name 
Fix incorrect function name of getTrianglesCount
 2016-03-17 16:08:40 +08:00
CocosRobot c250ac8bfd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 05:53:10 +00:00
zilongshanren 034410f5c5 Merge pull request #15259 from mxenabled/steerlink/ccnode_do_enumerate 
Enumerate getChildren() instead of _children.
 2016-03-17 13:47:57 +08:00
mogemimi 2f75effe96 Add backwards compatibility for 'getTriaglesCount' 2016-03-17 14:22:09 +09:00
zilongshanren d6f9ed93d6 add bindings 2016-03-17 11:56:48 +08:00
zilongshanren f5119a8dea Merge pull request #15262 from CocosRobot/update_lua_bindings_1458186037 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-17 11:44:02 +08:00
CocosRobot 69960024e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 03:42:52 +00:00
zilongshanren ad7ac83128 Merge pull request #15240 from newnon/v3_not_needed_define 
fix unneeded define that breaks some libraries to build on windows
 2016-03-17 11:40:51 +08:00
zilongshanren 535d3b3c32 Merge pull request #15241 from newnon/v3_gl_program_imageview 
GLProgram for ImageView
 2016-03-17 11:39:58 +08:00
zilongshanren 00ec3690b2 Merge pull request #15242 from newnon/v3_cursor_support_for_textfield 
Cursor support for text field
 2016-03-17 11:39:11 +08:00
zilongshanren 18992b0404 Merge pull request #15252 from xiaofeng11/v3_studioRef 
Remove cocos2dx.h reference from all cocos studio related files
 2016-03-17 11:38:20 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working 
(android, iOS tested)
 2016-03-17 10:26:53 +09:00
sheldon.teerlink c54513bb13 Enumerate getChildren() instead of _children. 2016-03-16 15:03:33 -06:00
XiaoFeng 0a657cd219 Remove cocos2dx.h reference from all cocos studio related files 2016-03-16 14:02:08 +08:00
Xpol Wan 0211c372b4 Update comment. 2016-03-16 13:30:11 +08:00