df3b33cd59
Merge pull request #16457 from minggo/merge-v3.13
...
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
86563af08a
Add missing override keywords
2016-08-28 23:45:15 +09:00
6c9a05f831
PageView with custom 'scrollToPage' time ( #16390 )
...
* PageView with custom scrollToPage time
* fix compiler error
2016-08-25 15:48:01 +08:00
5bc3659a33
#Improve XML parse performance with rapidxml pure SAX parser ( #16419 )
...
* Update CCSAXParser.cpp
* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.
* put rapidxml to external
* Update deps
2016-08-24 16:37:03 -07:00
0d836b2cea
Fix pageview click turning event ( #16318 )
...
* fix pageView click turning event
* fix current PageIndx issue
2016-08-05 14:04:57 +08:00
08515f46e3
fix pageView click turning event ( #16310 )
2016-08-05 09:43:15 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
6eaf15a2c2
fix pageview turning event ( #16299 )
2016-08-04 09:51:54 +08:00
f8b2d8fe0f
fixed base URL for webview on android doesn't work ( #16279 )
...
fixed base URL for webview on android doesn't work
2016-08-02 16:49:24 +08:00
57e4963502
Merge pull request #15963 from Drakon-Cocos/PageViewIndicator
...
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
391d97d1dd
improve log info
2016-07-22 11:56:41 +08:00
d931c62649
Fix typos in documentation comments
2016-07-16 04:18:40 +09:00
98cc48bc62
Add missing override keyword
2016-07-13 15:03:53 +09:00
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
8bbeb01be4
Merge pull request #16025 from mogemimi/fix-doc-typo
...
Fix typos and other mistakes in docs
2016-07-04 09:33:29 +08:00
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
57900112c5
Fix format string warning when compiling with Android NDK
2016-07-03 17:19:17 +09:00
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
7302ad979a
Can set scroll to item duration in ListView and derived classes ( #15964 )
...
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)
* Parameter no more 'const'. Comments
2016-06-29 09:48:03 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
b6fa894f81
Fix page view indicator opacity for inactive pages
2016-06-25 18:49:13 +02:00
459b7f30c6
refactoring Android editbox setVisible API
...
fix set visible issue of android editbox
fix android lower case multiline
revert unkown changes
2016-06-23 18:18:39 +08:00
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
5fa57ae5c1
Merge pull request #15844 from halx99/patch-1
...
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
dafa8054bf
fix: missing properties for clone
...
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
dac9be5016
Various CMake improvements
...
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
da2ea7e08b
Merge pull request #15794 from TheCodez/cachetexture
...
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
2016-06-13 17:31:12 +08:00
7e1da2188c
ios supports LOWERCASE_ALL_CHARACTERS
2016-06-07 10:31:16 +08:00
7885f55ce5
Cache bas64 images
2016-06-06 16:32:50 +02:00
3b4f2c38dd
Merge pull request #15788 from minggo/editbox-capital-issue
...
[ci skip]not use capital letters by default
2016-06-06 14:00:32 +08:00
7e2f79ce8f
not use capital letters by default
2016-06-06 13:55:20 +08:00
07c5e528e7
ListView select item programmatically
2016-06-02 10:11:28 +04:00
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
5daaa6e49b
Adding setBounce to webview ( #15623 )
...
* Adding setBounce to webview
This makes the .bounces of the scrollview section of webview publically accessible
When set to true it stops the grey over scroll of webviews
* Adding empty function for setBounces to Android
* Adding empty setBounces function for tizen
* Adding comments for empty Android and Tizen setBounce functions
* Small comment text change
2016-05-24 18:27:59 +08:00
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
9223d1d917
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
...
fix tizen related issues
2016-05-18 17:20:19 +08:00
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00
3ae5b1075b
fix native control onEnter issue
2016-05-16 16:14:16 +08:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
8c046fea92
fix jsb 3.11 related issues
2016-05-05 10:20:00 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
2a4799758d
Merge pull request #15511 from xpol/signed-unsigned-mismatch
...
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
f395cadbac
Add CC_GUI_DLL to suppress warning C4275
2016-04-27 04:08:09 +09:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
b8eae430fb
Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
...
extend the RichText
2016-04-20 20:05:29 -07:00
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
775db978da
fix: fix issue 15423 for v3.11
...
Github issue #15423
2016-04-20 08:41:20 -07:00
4dfdd159b7
Fix deprecation warning caused by PageView::getPages()
2016-04-21 00:28:34 +09:00
4bb35f2219
fix: fix crash in win for rich text
...
use `std::locale()` when invoking `std::isXXX` function
to avoid crash
github issue #15423
2016-04-19 13:53:27 -07:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
7b35f31016
Fixed typo in UILayout using clipping rect x instead of y coordinate.
2016-04-15 13:45:21 +01:00
23d074ea34
Make PageView indicator more tunable:
...
-add possibility to change texture of index nodes
-add possibility to change color of index nodes
-add possibility to change scale of index nodes
2016-04-11 12:28:47 +03:00
0030beca7a
Make PageView page turning event time tweak configurable.
2016-04-08 11:06:36 -04:00
90087ae5a7
improve textfield code
2016-04-01 09:31:18 +08:00
dcb7c58216
fix textField password bug
2016-04-01 00:52:55 +08:00
016979af3b
fix TextField password issue
2016-03-30 18:19:28 +08:00
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
db00d4944c
Merge pull request #15293 from zilongshanren/fixDetachIME
...
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
ff6b7080f5
fix systemFontDirty and lineBreakMode issue
2016-03-22 14:47:33 +08:00
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
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
535d3b3c32
Merge pull request #15241 from newnon/v3_gl_program_imageview
...
GLProgram for ImageView
2016-03-17 11:39:58 +08:00
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
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
8541dead20
Cursor support for text field
2016-03-14 18:09:04 +03:00
980d5fec68
GLProgram for ImageView
2016-03-14 17:05:39 +03:00
1409adc07a
Merge pull request #15205 from mogemimi/fix-mojibake-and-typo
...
Fix typos in the documentation
2016-03-11 22:33:31 +08:00
582835b670
Fix typos in the documentation
2016-03-11 00:34:32 +09:00
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
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 b9b3049f2c9994b5a44bc46f2e8ca6b02fc
2016-03-09 19:08:18 +08:00
9ba5dffb4c
add tab control to js/lua binding generate
2016-03-04 13:35:41 +08:00
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
46f2e8c8b6
rename deactiveTabItem
2016-03-03 18:09:07 +08:00
93b7e4396b
Merge pull request #15150 from mogemimi/fix-incorrect-header-include
...
Fix compile error on case-sensitive filesystems
2016-03-03 15:53:38 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
11f3f95a2c
Fix compile error on case-sensitive filesystems
2016-03-02 15:47:42 +09:00
dbfb4c793c
Merge pull request #15132 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types
2016-03-02 11:31:56 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
9d8d003ac8
Merge pull request #15039 from Shulepov/scale9sprite_shaders_support
...
Scale9Sprite: allow to set custom shaders (fix #12753 )
2016-02-15 21:24:14 +08:00
57badc99aa
make UIEditBox code compatible with 32bit project
2016-02-15 17:38:54 +08:00
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
19e2434326
Scale9Sprite: allow to set custom GLProgram
2016-02-11 16:18:41 +03:00
805be977fe
tweak PageView page turning event time.
2016-02-04 15:57:32 +08:00
35b0112290
fix linux compile issue
2016-02-04 15:30:16 +08:00
a93bc88d31
add Mac Editbox multiline support.
...
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +08:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
ee31d2ad22
Merge pull request #14940 from mxenabled/stop_auto_scroll
...
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
2016-02-01 14:27:55 +08:00
b0d0a7a064
Merge pull request #14964 from zilongshanren/fix14909
...
fix pageview page turning event issue
2016-01-27 20:53:48 +08:00
f853a43e04
Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32
...
Remove obsolete Win32 references.
2016-01-26 09:58:32 +08:00
60d640442f
Remove obsolete Win32 references.
2016-01-25 12:23:53 -07:00
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
dbf5b2c4a5
fix pageview page turning event issue
2016-01-25 11:53:40 +08:00
7582518424
default is word-wrap
2016-01-22 06:20:01 -08:00
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
ace1e9d563
Fixed variable rename to _autoScrollTotalTime
2016-01-21 11:18:52 -07:00
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
841ad8ae99
Merge pull request #14716 from newnon/v3.10_editbox_ios_mac_fix
...
fix font for EditBox in iOS & Mac
2016-01-21 11:05:12 +08:00
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
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
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
6fdefeb7a7
Make ui::ScrollView::scrollTo* functions virtual
...
This mirrors the "jumpTo*" functions, which are already virtual
2016-01-20 17:07:22 -07:00
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
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
df2aae0498
Add a setter for touch total time threshold in ScrollView
2016-01-18 19:25:08 +09:00
cd7671088f
Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk
...
crystax-ndk-10.3.0 needs <stdint.h> to be included in cocos/ui/UIWebViewImpl-android.h.
2016-01-12 11:56:43 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
c92b563c28
fix layout backimage size error with neweset scale9sprite
2015-12-25 14:11:56 +08:00
d005bd18b7
remove error logic
2015-12-24 14:39:15 +08:00
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
0cac519e5c
fix uiWidget clipping error with Node
2015-12-23 16:05:52 +08:00
2a2f184449
refine code with DRY.
2015-12-23 14:43:25 +08:00
847094ec7d
ui::loadingBar -> add flip logic back
2015-12-23 14:34:36 +08:00
d4a5d0da44
rollback uislider
2015-12-22 20:03:56 +08:00
minggo