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

35520 Commits

Author SHA1 Message Date
mogemimi de0582844e Fix memory leak in FontFNT 2016-03-23 15:17:05 +09:00
minggo 247a92ffd3 update third party lib version 2016-03-23 09:52:56 +08: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
Ricardo Quesada 2feddcf95a Merge pull request #15248 from cocos2d/slackmoehrle-patch-1 
added roadmap
 2016-03-22 18:22:59 -07:00
zilongshanren c3ae69aac8 Merge pull request #15302 from CocosRobot/update_cocosfiles_1458651326 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-22 21:04:36 +08:00
zilongshanren 19c013f16e Merge pull request #15303 from CocosRobot/update_lua_bindings_1458651389 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-22 21:01:39 +08:00
CocosRobot 6e12d8c98a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 12:58:39 +00:00
CocosRobot 970d5f09ff [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 12:55:27 +00:00
zilongshanren 9b7ff03442 Merge pull request #15301 from xpol/update-binding-generator 
Update binding generator
 2016-03-22 20:52:46 +08:00
Xpol Wan 8d9cdeae7b Update binding generator 
with fixes for generated include path for headers that not in cocos directory (e.g. extensions ).
 2016-03-22 20:49:54 +08:00
zilongshanren 8eb683310d Merge pull request #15295 from CocosRobot/update_cocosfiles_1458635195 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-22 19:52:22 +08:00
zilongshanren 8f30d01156 Merge pull request #15286 from xpol/remove-uncessary-search-paths 
Removed unnecessary search paths.
 2016-03-22 19:51:59 +08:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +08:00
CocosRobot c7cbe2dda3 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 08:26:39 +00:00
minggo 4b47750e1f Merge pull request #15171 from xiaofeng11/v3_jsFix 
[ci skip] js-test bug fix
 2016-03-22 16:24:31 +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
zilongshanren 43db5c052d Merge pull request #15292 from CocosRobot/update_lua_bindings_1458627759 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-22 14:28:56 +08:00
CocosRobot 35645d8c26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 06:24:54 +00:00
zilongshanren 989a44a23d Merge pull request #15291 from cocos2d/revert-15261-uiedit_programmatically_attachable 
[ci rebuild]Revert "UIEditBox attachWithIME, detachWithIME make working"
 2016-03-22 14:18:58 +08:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
zilongshanren 3a600e3d4a Merge pull request #15287 from zilongshanren/fix-label-issues 
fix system font dirty issue
 2016-03-22 13:08:49 +08:00
zilongshanren a15a39095f fix system font dirty issue 2016-03-21 22:31:23 +08:00
zilongshanren 937ccf51b1 Merge pull request #15285 from CocosRobot/update_lua_bindings_1458564868 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-21 21:40:26 +08:00
zilongshanren 8389badc9d Merge pull request #15284 from CocosRobot/update_cocosfiles_1458564787 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-21 21:40:16 +08:00
CocosRobot 97130dc084 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-21 12:56:42 +00:00
CocosRobot a9a9a39ff2 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-21 12:53:09 +00:00
zilongshanren 5a9a2e9749 Merge pull request #15281 from xpol/single-include-search-path 
Single include search path
 2016-03-21 20:51:02 +08:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan a66c2060b5 Also check the #import statement for m and mm files. 2016-03-21 20:12:15 +08:00
Xpol Wan be688d33c4 Remove debug print [ci skip] 2016-03-21 15:08:45 +08:00
Xpol Wan 764389036d Try fix win32 path issue. 2016-03-21 15:01:01 +08:00
Xpol Wan d063f26173 Add some debug print in linter script. 2016-03-21 14:16:17 +08:00
Xpol Wan 56f2aff34c Replace '\\' with '/' when scan source files. 2016-03-21 13:53:15 +08:00
Xpol Wan bd2d7c3ee7 Always use posixpath. 2016-03-21 13:35:40 +08:00
Xpol Wan c6c2e42a51 include include path check in Jenkins build script. 2016-03-21 11:41:17 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 6dcd7d51c3 Update include-linter.py excludes pch.cpp and include .m and .mm. 2016-03-21 11:01:23 +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
Xpol Wan 0001ac18f1 Add a include linter script. 
It has follow:

1. lint mode: check include lines of all .h .hpp .inl .c .cpp files in cocos directory, find any included cocos2d-x files using #include "???" path not search from cocos directory.
2. fix mode: when run with -f (or --fix), it will fixes these include path.
3. when running in lint mode, it exit with code 1 if any issues found, this can be used in CI scripts to check commits and PRs.
 2016-03-20 21:50:25 +08:00
minggo dcb3aa20c1 Merge pull request #15237 from njh0602/somefix 
remove unnecessary scope operator
 2016-03-18 18:31:53 +08:00
zilongshanren ebb0f9361c Merge pull request #15278 from CocosRobot/update_lua_bindings_1458292141 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-18 17:17:50 +08:00
CocosRobot e2f820df25 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-18 09:11:18 +00:00
zilongshanren 850c8be9a8 Merge pull request #15277 from zilongshanren/fixIssue15275 
fix jsb API inconsistency.
 2016-03-18 17:05:58 +08: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