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
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
Ricardo Quesada
c584e12712
Merge pull request #15276 from ricardoquesada/chipmunk7_debug_fix
...
fix: use correct call to get the B constraint in physics
2016-03-17 08:01:46 -07:00
Ricardo Quesada
c4658b0e50
fix: use correct call to get the B constraint in physics
...
Thanks @ivysnow
Github pull request #15138
2016-03-17 07:07:17 -07:00
zilongshanren
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
zilongshanren
86ea337efd
Merge pull request #15272 from cocos2d/revert-15245-fix-function-name
...
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:25 +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
zilongshanren
fde2da3152
Merge pull request #15269 from CocosRobot/update_lua_bindings_1458193848
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 13:54:37 +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
zilongshanren
a1846dea40
Merge pull request #15267 from zilongshanren/fix-bindings
...
add bindings
2016-03-17 13:46:37 +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
327ed3c58c
Merge pull request #15224 from Naruto/feature/fix_android_studio_build
...
fix cpp-tests proj.android-stdio build failed
2016-03-17 11:42:51 +08: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