pandamicro
|
d6cedb88ec
|
Remove JS::Persistent and move js object reference into JS scope
|
2016-01-24 19:47:26 +08:00 |
pandamicro
|
0daa846020
|
Improve gc test case and add cycle reference tests
t
Improve gc test case and add action cycle reference test
|
2016-01-24 19:47:24 +08:00 |
Justin Luong
|
6644781698
|
Merge remote-tracking branch 'upstream/v3'
|
2016-01-23 21:06:33 +10:00 |
CocosRobot
|
039286f814
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-22 14:25:59 +00:00 |
Ricardo Quesada
|
fccbcdef69
|
Merge pull request #14947 from ricardoquesada/rich_text_word_wrap
RichText with word wrapping working as expected
|
2016-01-22 06:20:25 -08:00 |
Ricardo Quesada
|
7582518424
|
default is word-wrap
|
2016-01-22 06:20:01 -08:00 |
James Chen
|
28a3f78c65
|
Adds missing <mutex>, <memory> include files in WebSocket.h
|
2016-01-22 18:10:24 +08:00 |
James Chen
|
b73b16d425
|
Adds isDestroy std::share_ptr variable to dectect whether websocket instance was destroyed.
|
2016-01-22 17:43:30 +08:00 |
James Chen
|
c3e0edde06
|
'closed' state has to be set before quit websocket thread.
|
2016-01-22 16:10:49 +08:00 |
James Chen
|
a64a789308
|
_readyState must be set to State::CLOSED and _delegate->onClose(this) must be invoked at the end of WebSocket::close.
|
2016-01-22 15:20:43 +08:00 |
James Chen
|
ed9ed6c92f
|
Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing.
|
2016-01-22 14:22:33 +08:00 |
Justin Luong
|
57d218421e
|
Merge remote-tracking branch 'upstream/v3'
|
2016-01-22 16:02:07 +10:00 |
Ricardo Quesada
|
25f78e490d
|
RichText with word wrapping working as expected
|
2016-01-21 21:44:45 -08:00 |
zilongshanren
|
bce913c46b
|
Merge pull request #14941 from mogemimi/add-const-to-equals
Mark equals() functions as const
|
2016-01-22 09:32:41 +08:00 |
Justin Luong
|
c4df3ccd10
|
please ignore just a test
|
2016-01-22 11:05:43 +10:00 |
mogemimi
|
37b0d7c217
|
Mark equals() functions as const
|
2016-01-22 06:09:27 +09:00 |
Shane Smit
|
ace1e9d563
|
Fixed variable rename to _autoScrollTotalTime
|
2016-01-21 11:18:52 -07:00 |
Shane Smit
|
8be86577ff
|
Add stopAnimatedContentOffset() to extension::ScrollView
Immediately stops the animated scroll initiated by setContentOffsetInDuration()
|
2016-01-21 10:33:47 -07:00 |
CocosRobot
|
4b214fd528
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-21 07:40:58 +00:00 |
zilongshanren
|
be7c8c7553
|
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
Fix when add two ActionTimeLine object in one node, play state is wrong
|
2016-01-21 15:35:30 +08:00 |
Ricardo Quesada
|
ec2d29ed16
|
Merge pull request #14930 from ricardoquesada/rich_text_fixes
adds JS tests for RichText
|
2016-01-20 22:47:35 -08:00 |
xiaofeng11
|
015994da37
|
Merge pull request #14926 from geron-cn/scroll_bar
add scrollview bar parse for cocostudio in reader
|
2016-01-21 13:09:34 +08:00 |
geron-cn
|
7b405b29bc
|
fix code indent
|
2016-01-21 11:33:13 +08:00 |
Ricardo Quesada
|
4c11432781
|
fixed bold
|
2016-01-20 19:08:31 -08:00 |
zilongshanren
|
d9af70f913
|
Merge pull request #14600 from enhhh/enh_v3
We should not intercept touch event if scrollview's _direction is NONE
|
2016-01-21 10:58:20 +08:00 |
zilongshanren
|
790c7b4b79
|
Merge pull request #14891 from mogemimi/fix-extra-tokens-warning
Fix warning: extra tokens at end of #ifdef directive
|
2016-01-21 10:51:01 +08:00 |
zilongshanren
|
4d128a83f4
|
Merge pull request #14659 from elvman/resizable_window
Resizable window
|
2016-01-21 10:49:33 +08:00 |
zilongshanren
|
8fda08abcd
|
Merge pull request #14755 from mogemimi/fix-redefinition-warning
Fix OpenGL macro redefinition warning in JS bindings/Mac
|
2016-01-21 10:46:58 +08:00 |
zilongshanren
|
2ed4965b6d
|
Merge pull request #14751 from newnon/v3_get_version_windows
getVersion win32 implementation
|
2016-01-21 10:42:19 +08:00 |
Ricardo Quesada
|
60d273e31b
|
underline and strikethrough working ok on system fonts
|
2016-01-20 18:41:59 -08:00 |
zilongshanren
|
2fbf4c1539
|
Merge pull request #14932 from CocosRobot/update_lua_bindings_1453343722
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-21 10:41:00 +08:00 |
CocosRobot
|
4dab20b715
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-21 02:37:23 +00:00 |
zilongshanren
|
fd0ed05f18
|
Merge pull request #14902 from mogemimi/update-docs-to-v3
Update docs to reflect latest API changes
|
2016-01-21 10:35:27 +08:00 |
zilongshanren
|
c824b6e74a
|
Merge pull request #14931 from CocosRobot/update_cocosfiles_1453343619
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-01-21 10:34:49 +08:00 |
zilongshanren
|
e1e87c0205
|
Merge pull request #14914 from steerlink/font_family
Add ability to get the font family
|
2016-01-21 10:34:13 +08:00 |
CocosRobot
|
f3cd516926
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-01-21 02:33:41 +00:00 |
zilongshanren
|
c642014d1e
|
Merge pull request #14927 from mogemimi/fix-unsigned-comparison-warn
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
|
2016-01-21 10:32:56 +08:00 |
zilongshanren
|
061c6c7c6f
|
Merge pull request #14907 from neokim/feature/scroll_view_touch_total_time_threshold
Add a setter for touch total time threshold in ScrollView
|
2016-01-21 10:31:31 +08:00 |
geron-cn
|
be6fd6a2ee
|
format code indent
|
2016-01-21 10:27:37 +08:00 |
Ricardo Quesada
|
7735a75651
|
adds JS tests for RichText
|
2016-01-20 17:59:13 -08:00 |
Shane Smit
|
6fdefeb7a7
|
Make ui::ScrollView::scrollTo* functions virtual
This mirrors the "jumpTo*" functions, which are already virtual
|
2016-01-20 17:07:22 -07:00 |
Shane Smit
|
c8ecab84a3
|
Add stopAutoScroll() to ui::ScrollView
Immediately stops inner container scroll initiated by any of the "scrollTo*" member functions
|
2016-01-20 17:05:52 -07:00 |
mogemimi
|
9c5eecacc7
|
Update docs to reflect latest API changes
|
2016-01-21 01:08:32 +09:00 |
mogemimi
|
639bf3f682
|
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
|
2016-01-20 23:59:45 +09:00 |
mogemimi
|
73793a8317
|
Fix macro redefinition warning in JS bindings/Mac
|
2016-01-20 23:17:24 +09:00 |
geron-cn
|
87434e2774
|
add scrollview bar parse for cocostudio in reader
|
2016-01-20 21:13:59 +08:00 |
geron-cn
|
e2a3fb4a04
|
update ccs-res for scroll bar test
|
2016-01-20 21:12:52 +08:00 |
zilongshanren
|
6718fa3ea2
|
Merge pull request #14925 from CocosRobot/update_lua_bindings_1453285654
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-20 18:32:37 +08:00 |
CocosRobot
|
b3bb4a9b27
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-20 10:30:04 +00:00 |
zilongshanren
|
c675c74c29
|
Merge pull request #14924 from CocosRobot/update_cocosfiles_1453285559
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-01-20 18:26:41 +08:00 |