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
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
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
pandamicro
0424ab2db5
Merge pull request #15222 from xiaofeng11/v3_depsUpdate
...
update deps
2016-03-11 16:20:09 +08:00
XiaoFeng
3acea03924
Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system
2016-03-11 15:44:28 +08:00
xiaofeng11
7b338c2f4c
Merge pull request #15223 from geron-cn/v3bugfixs
...
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
2016-03-11 13:34:21 +08:00
geron-cn
b3ee96ebd2
fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084
2016-03-11 12:56:58 +08:00
Ricardo Quesada
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
xiaofeng11
5f15489a62
Merge pull request #15220 from geron-cn/v3bugfixs
...
fix scrollview bugs
It's OK, merged
2016-03-11 09:36:15 +08:00
mogemimi
582835b670
Fix typos in the documentation
2016-03-11 00:34:32 +09:00
geron-cn
4247292c82
add test case for fix bugs
2016-03-10 18:06:54 +08:00
geron-cn
7824acc34e
fix scrollview bugs:
...
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
2016-03-10 18:06:20 +08:00
XiaoFeng
cce46195ca
Add websocket close test
2016-03-10 14:01:38 +08:00
xiaofeng11
d398083c9a
Merge pull request #15218 from geron-cn/v3bugfixs
...
fix bugs
It's OK, merged
2016-03-10 09:24:58 +08:00
geron-cn
0bd9d1638d
Squashed commit of the following:
...
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:58:17 2016 +0800
avoid warning
commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:52:43 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:51:02 2016 +0800
fix bugs:
- fix there is a bar dot after init a scrollview with scrollbar
- fix some time var can not auto hide after scroll
commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Mar 7 15:32:08 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Mar 7 15:30:47 2016 +0800
remove inline
commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Mar 4 10:48:41 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c
a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 18:43:40 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
2016-03-09 19:08:18 +08:00
xiaofeng11
b9b3049acb
Merge pull request #15213 from FrostPolaris/v3
...
Fix the bug that TextField may be set with a multi-line localized text.
It's OK, merged.
2016-03-09 18:34:03 +08:00
zilongshanren
c456ef985d
Merge pull request #15217 from CocosRobot/update_cocosfiles_1457514100
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-09 17:08:54 +08:00
CocosRobot
9bb29f4880
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-09 09:01:44 +00:00
pandamicro
849a2ee544
Merge pull request #15215 from minggo/firefox-remote-debug
...
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
minggo
e44f4d8d61
fix a typo
2016-03-09 16:07:57 +08:00
minggo
8079c55d88
fix bug that will lost incoming packets
2016-03-09 16:03:55 +08:00
beichen.liu
8f9233be00
Fix the bug that TextField may be set with a multi-line localized text.
2016-03-09 09:31:34 +08:00
xiaofeng11
fb779e5a50
Merge pull request #15207 from FrostPolaris/v3_localizeManage
...
Add missing include file in ProjectConfig.cpp.
It's OK, merged
2016-03-08 16:46:39 +08:00
beichen.liu
c599f071a4
Add missing include file in ProjectConfig.cpp.
2016-03-08 14:36:01 +08:00
Vladimir Perminov
2a201a5c4e
WinRT support key repeat and implement dispatchControlKey
2016-03-07 14:43:44 +03:00
Vladimir Perminov
8eec628e04
Desktop implement dispatchControlKey
...
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
2016-03-07 14:33:59 +03:00
Vladimir Perminov
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
Vladimir Perminov
b3b047e9ad
Label '\b' - Next char not change x position
...
Add TextFormatter for easy use '\n', '\r', '\b'
2016-03-07 14:07:36 +03:00
Vladimir Perminov
f2a5a5ef6b
StringUTF8 - Utf8 sequence
...
Store each utf8 chars as std::string, for easily manipulated
2016-03-07 13:59:53 +03:00
xiaofeng11
f2c999441a
Merge pull request #15190 from FrostPolaris/v3_localizeManage
...
Add localization arguments in simulator start args.
It's OK, merged
2016-03-07 10:59:20 +08:00
beichen.liu
c50d54339f
Add localization arguments in simulator start args.
2016-03-07 09:52:53 +08:00
zilongshanren
6a090a7c5d
Merge pull request #15185 from CocosRobot/update_cocosfiles_1457124969
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-05 08:33:31 +08:00
Ricardo Quesada
00e3189b68
Merge pull request #15186 from ricardoquesada/cmake_build_type
...
CMAKE_BUILD_TYPE has precedence over DEBUG_MODE
2016-03-04 14:11:29 -08:00
Ricardo Quesada
081dc312de
CMAKE_BUILD_TYPE has precedence over DEBUG_MODE
...
cmake fixes
2016-03-04 13:30:38 -08:00
CocosRobot
8f6da161d1
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 20:56:11 +00:00
Ricardo Quesada
21cd5d08f7
Merge pull request #15177 from ricardoquesada/cmake_fixes
...
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
Ricardo Quesada
6a31f43a27
compiles on Mac. adds missing libs and files
2016-03-04 10:47:19 -08:00
zilongshanren
79ccbf71a2
Merge pull request #15183 from CocosRobot/update_lua_bindings_1457079144
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-04 16:20:52 +08:00
CocosRobot
e31c918264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-04 08:14:39 +00:00
zilongshanren
7c56f0bc2c
Merge pull request #15181 from geron-cn/uitabcontrol
...
add tab control to js/lua binding generate
2016-03-04 16:08:04 +08:00
xiaofeng11
30b3551dcf
Merge pull request #15180 from chengstory/AddFirstSearchPath
...
Add first search path to command param.
It's OK for me, merged
2016-03-04 14:19:06 +08:00
geron-cn
9ba5dffb4c
add tab control to js/lua binding generate
2016-03-04 13:35:41 +08:00
zhangcheng
709d79ad14
Add first search path to command param.
2016-03-04 13:16:37 +08:00
zilongshanren
32303b5904
Merge pull request #15178 from CocosRobot/update_cocosfiles_1457063146
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 12:00:56 +08:00