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
zilongshanren
561fa96a00
Merge pull request #15261 from rouddyNeo/uiedit_programmatically_attachable
...
UIEditBox attachWithIME, detachWithIME make working
2016-03-17 11:37:33 +08:00
YooJaehong
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
Denna Lawrence
737455fda6
Add optional alpha parameter to Color4B and Color4F constructors
2016-03-16 16:08:49 -06: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
Xpol Wan
d6b2f08b30
The CC_TARGET_OS_* in xcodeproj are now not needed.
2016-03-16 13:20:53 +08:00
Xpol Wan
bfb97739e2
Detect Apple platforms correctly.
2016-03-16 13:15:41 +08:00
Slack-Moehrle
181adbc17b
added roadmap
...
added roadmap
2016-03-15 10:41:35 -04:00
xiaofeng11
c9306a053f
Merge pull request #15238 from Dimon4eg/fix-annoying-log
...
fix annoying "callBackName cannot be found" log
It's ok, merged.
2016-03-15 09:29:52 +08:00
mogemimi
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
Sergey
8541dead20
Cursor support for text field
2016-03-14 18:09:04 +03:00
Sergey
980d5fec68
GLProgram for ImageView
2016-03-14 17:05:39 +03:00
Sergey
0d67d5d533
fix unneeded define that breaks some libraries to build on windows
2016-03-14 16:58:01 +03:00
zilongshanren
03d68a6537
Merge pull request #15226 from CocosRobot/update_lua_bindings_1457707343
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-14 21:41:17 +08:00
dimon4eg
b7779180b1
fix annoying "callBackName cannot be found" log
2016-03-14 12:11:23 +02:00
NamJunHyone
98cbc6c359
remove unnecessary scope operator
2016-03-14 18:33:58 +09:00
pandamicro
45bbc8a1ae
Merge pull request #15235 from xiaofeng11/v3_cmDllWin32
...
More fix to compile libjscocos2dx as dll under win32
2016-03-14 14:05:06 +08:00
XiaoFeng
06ac05259b
More fix to compile libjscocos2dx as dll under win32
2016-03-14 12:06:14 +08:00
Vladimir Perminov
5c1a272178
Remove comment // S_FALSE is succeeded
2016-03-13 19:30:13 +03:00
Steve K. Chiu
4769890d4e
Fix calculation of outLength
...
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
zilongshanren
f32cc6bee6
Merge pull request #15225 from CocosRobot/update_lua_bindings_1457707072
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 23:39:46 +08:00
CocosRobot
8c6ace46d7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:44:35 +00:00
CocosRobot
16edf90f70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:40:00 +00:00
zilongshanren
1409adc07a
Merge pull request #15205 from mogemimi/fix-mojibake-and-typo
...
Fix typos in the documentation
2016-03-11 22:33:31 +08:00
zilongshanren
5a3a4c356f
Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
...
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
Vladimir Perminov
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
Naruto TAKAHASHI
cf38b1fbfd
fix build failed of gradle
2016-03-11 19:23:26 +09:00
pandamicro
0424ab2db5
Merge pull request #15222 from xiaofeng11/v3_depsUpdate
...
update deps
2016-03-11 16:20:09 +08:00