mogemimi
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00
zilongshanren
3ae5b1075b
fix native control onEnter issue
2016-05-16 16:14:16 +08:00
minggo
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
zilongshanren
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
zilongshanren
8c046fea92
fix jsb 3.11 related issues
2016-05-05 10:20:00 +08:00
mogemimi
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
mogemimi
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
zilongshanren
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
minggo
2a4799758d
Merge pull request #15511 from xpol/signed-unsigned-mismatch
...
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
mogemimi
f395cadbac
Add CC_GUI_DLL to suppress warning C4275
2016-04-27 04:08:09 +09:00
Xpol Wan
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
Josh Bodily
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
mogemimi
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
Ricardo Quesada
b8eae430fb
Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
...
extend the RichText
2016-04-20 20:05:29 -07:00
Yukio Murakami
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
Ricardo Quesada
775db978da
fix: fix issue 15423 for v3.11
...
Github issue #15423
2016-04-20 08:41:20 -07:00
mogemimi
4dfdd159b7
Fix deprecation warning caused by PageView::getPages()
2016-04-21 00:28:34 +09:00
Ricardo Quesada
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
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
Stephen Phillips
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
Adrien de Sentenac
0030beca7a
Make PageView page turning event time tweak configurable.
2016-04-08 11:06:36 -04:00
zilongshanren
90087ae5a7
improve textfield code
2016-04-01 09:31:18 +08:00
zilongshanren
dcb7c58216
fix textField password bug
2016-04-01 00:52:55 +08:00
zilongshanren
016979af3b
fix TextField password issue
2016-03-30 18:19:28 +08:00
zilongshanren
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
zilongshanren
db00d4944c
Merge pull request #15293 from zilongshanren/fixDetachIME
...
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
Xpol Wan
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
zilongshanren
ff6b7080f5
fix systemFontDirty and lineBreakMode issue
2016-03-22 14:47:33 +08:00
zilongshanren
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
Xpol Wan
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +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
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
YooJaehong
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +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
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
mogemimi
582835b670
Fix typos in the documentation
2016-03-11 00:34:32 +09: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
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
geron-cn
9ba5dffb4c
add tab control to js/lua binding generate
2016-03-04 13:35:41 +08:00
zilongshanren
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
geron-cn
46f2e8c8b6
rename deactiveTabItem
2016-03-03 18:09:07 +08:00
zilongshanren
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
geron-cn
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 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
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 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
2016-03-03 14:17:48 +08:00
Ricardo Quesada
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
Ricardo Quesada
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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 16:54:04 2016 -0800
Merge branch 'v3' into cmake_android
commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:34:46 2016 -0800
Fix module name in Android template to match CMake project.
commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:27:45 2016 -0800
Add missing platform specific source file to CMake project.
commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:21:12 2016 -0800
Find AndroidNdkModules.cmake relative to android.toolchain.cmake.
commit a10075e2cb30af2e1f9a30da99efac880658ad6b
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:03:11 2016 -0800
Remove cpp-empty-test from project templates.
commit e070fcbf210b8628f75785e738202a80a95ac0ff
Author: WenhaiLin <wenhai.lin@chukong-inc.com>
Date: Mon Aug 31 09:56:03 2015 +0800
Fix CMake for Android Target
2016-03-02 16:51:54 -08:00
mogemimi
11f3f95a2c
Fix compile error on case-sensitive filesystems
2016-03-02 15:47:42 +09:00
zilongshanren
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
Ricardo Quesada
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 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
mogemimi
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
zilongshanren
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
mogemimi
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
zilongshanren
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
zilongshanren
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
Mikhail Shulepov
19e2434326
Scale9Sprite: allow to set custom GLProgram
2016-02-11 16:18:41 +03:00
zilongshanren
805be977fe
tweak PageView page turning event time.
2016-02-04 15:57:32 +08:00
zilongshanren
35b0112290
fix linux compile issue
2016-02-04 15:30:16 +08:00
zilongshanren
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
Wenhai Lin
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
zilongshanren
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
zilongshanren
b0d0a7a064
Merge pull request #14964 from zilongshanren/fix14909
...
fix pageview page turning event issue
2016-01-27 20:53:48 +08:00
zilongshanren
f853a43e04
Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32
...
Remove obsolete Win32 references.
2016-01-26 09:58:32 +08:00
sheldon.teerlink
60d640442f
Remove obsolete Win32 references.
2016-01-25 12:23:53 -07:00
zilongshanren
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
zilongshanren
dbf5b2c4a5
fix pageview page turning event issue
2016-01-25 11:53:40 +08:00
Ricardo Quesada
7582518424
default is word-wrap
2016-01-22 06:20:01 -08:00
Ricardo Quesada
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
Shane Smit
ace1e9d563
Fixed variable rename to _autoScrollTotalTime
2016-01-21 11:18:52 -07: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
zilongshanren
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
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
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
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
Ricardo Quesada
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
Ricardo Quesada
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
Neo Kim
df2aae0498
Add a setter for touch total time threshold in ScrollView
2016-01-18 19:25:08 +09:00
zilongshanren
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
zilongshanren
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
mogemimi
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
XiaoFeng
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
Ricardo Quesada
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
Liam
c92b563c28
fix layout backimage size error with neweset scale9sprite
2015-12-25 14:11:56 +08:00
Liam
d005bd18b7
remove error logic
2015-12-24 14:39:15 +08:00
zilongshanren
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
Liam
0cac519e5c
fix uiWidget clipping error with Node
2015-12-23 16:05:52 +08:00
zilongshanren
2a2f184449
refine code with DRY.
2015-12-23 14:43:25 +08:00
zilongshanren
847094ec7d
ui::loadingBar -> add flip logic back
2015-12-23 14:34:36 +08:00
zilongshanren
d4a5d0da44
rollback uislider
2015-12-22 20:03:56 +08:00
zilongshanren
ab77e8c520
Revert "loading bar use new scale9 feature"
...
This reverts commit a671bf7ce9
.
2015-12-22 19:53:24 +08:00
Liam
98a6558018
add interface for BMFont
2015-12-21 18:49:46 +08:00
ArisLittle
68e166568e
fix some minor typos in the comments
...
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
2015-12-21 14:26:50 +08:00
mogemimi
aac1558b75
Fix typos in documentation, comments and strings
2015-12-21 08:22:41 +09:00
pandamicro
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
zilongshanren
94ee0734a5
Merge pull request #14721 from newnon/v3.10_slider_missprint
...
slider misprint fix
2015-12-19 17:06:26 +08:00
zilongshanren
4fda883c3b
Merge pull request #14742 from xiaofeng11/v3.10
...
Fix TextField won't show security text when first time set password enable
2015-12-19 17:01:43 +08:00
Liam
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
XiaoFeng
d8817f3cbb
Fix TextField won't show security text when first time set password enable
2015-12-19 15:44:39 +08:00
zilongshanren
b480e9191d
Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support
...
Scale9Sprite cropped sprite frames support
2015-12-19 13:07:25 +08:00
Sergey
9e6657d6b2
fix scale9error error
2015-12-18 22:40:12 +03:00
mogemimi
12ece31121
Mark the old functions as CC_DEPRECATED_ATTRIBUTE
2015-12-19 01:21:56 +09:00
mogemimi
689ee1081a
Fix spelling of function name
2015-12-19 01:07:08 +09:00
pandamicro
4d9beb9d77
Merge pull request #14699 from WenhaiLin/v3-new-nothrow
...
Adds `std::nothrow` to the `new` statements
2015-12-18 14:38:28 +08:00
Sergey
98fe1d46cc
Scale9Sprite now fully support cropped sprite frames in both mode simple & slice
2015-12-18 00:32:59 +03:00
XiaoFeng
6c08dd920e
Fix TextField missing default password style text setting
2015-12-17 18:29:23 +08:00
Sergey
3e049f8049
slider misprint fix
2015-12-17 12:06:39 +03:00
Sergey
89f4a1208b
fix font for EditBox in iOS & Mac
2015-12-17 12:02:39 +03:00
Xpol Wan
41d4a41920
crystax-ndk-10.3.0 needs <stdint.h> to be included here.
2015-12-17 12:08:14 +08:00
Wenhai Lin
dfdc202171
refine
2015-12-16 15:08:48 +08:00
Wenhai Lin
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
Wenhai Lin
e5952ad440
Improved robustness in release mode
2015-12-16 11:53:59 +08:00
Liam
508d54ec3c
fix pageview child size
2015-12-14 15:29:02 +08:00
zilongshanren
0dd4433104
Merge pull request #14669 from zilongshanren/fixCustomSize
...
fix #12249
2015-12-14 13:56:50 +08:00
zilongshanren
6781c96fe0
Merge pull request #14661 from zilongshanren/v3.10
...
fix scale9sprite global zorder issue.
2015-12-14 13:56:29 +08:00
zilongshanren
838bd242ce
fix #12249
2015-12-14 11:53:09 +08:00
zilongshanren
3e64e09e69
fix memory leaks of stencileStateManager
2015-12-14 10:40:09 +08:00
zilongshanren
0f5aac5754
fix typo
2015-12-14 10:14:39 +08:00
zilongshanren
8c9b03112e
fix scale9sprite global zorder issue.
...
1. it also fix the positiong issue when call setScale9Enabled(false)
2015-12-14 10:09:06 +08:00
zilongshanren
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
Liam
4c5c6e6d9b
update for code format
2015-12-11 12:04:54 +08:00
Liam
8c2b4c78db
fix scrollview render error
2015-12-10 13:37:07 +08:00
Liam
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
zilongshanren
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
zilongshanren
e37e1909f2
don't remove optimize code for capInsets
2015-12-09 15:00:41 +08:00
zilongshanren
df44b164ef
change layout scale9 rendering type to simple
2015-12-09 14:38:53 +08:00
zilongshanren
4c99bdf04f
change imageview non-s9 to simple rendering type
2015-12-09 14:26:12 +08:00
zilongshanren
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
zilongshanren
9fd5985581
add simple rendering mode to slider
2015-12-09 11:32:52 +08:00
zilongshanren
a671bf7ce9
loading bar use new scale9 feature
2015-12-09 10:41:31 +08:00
zilongshanren
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +08:00
XiaoFeng
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
Liam
15072a6dd3
revert error changes
2015-12-07 16:21:12 +08:00
enh
a318e31222
We should not intercept touch event if scrollview's _direction is NONE
2015-12-06 22:51:22 +08:00
mogemimi
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
mogemimi
09c6e5d2f7
Replace 'Disabeld' with 'Disabled'
2015-12-05 18:59:54 +09:00
pandamicro
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
zilongshanren
73d00b9262
fix scale9sprite be culled unexpectedly
...
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00
fnz
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
fnz
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
zilongshanren
c50d686319
Merge pull request #14493 from xiaofeng11/v3_button
...
Fix button texture loaded mark has set to wrong value bug
2015-11-26 21:45:47 +08:00
zilongshanren
c3604aa865
Merge pull request #14470 from zilongshanren/fixListViewClippingIssue
...
Fix list view clipping issue
2015-11-26 13:51:51 +08:00
XiaoFeng
d744c167b7
Fix button texture loaded mark has set to wrong value bug
2015-11-26 13:49:32 +08:00
XiaoFeng
eb47d28266
Change component resource load logic, won't dependent on sprite edit in other studio combine PR
2015-11-25 20:07:50 +08:00
zilongshanren
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
zilongshanren
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
zilongshanren
759c0bbf31
rename CCStencilBitsManager to StencilStateManager
2015-11-25 14:24:27 +08:00
zilongshanren
5fef088695
refactor stencil state management code
2015-11-25 14:14:17 +08:00
XiaoFeng
27f6d6a6ba
Remove condition macro check.
2015-11-24 19:17:38 +08:00
zilongshanren
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
zilongshanren
8d1f1a9933
Merge pull request #14457 from zilongshanren/testEditBoxScaleSize
...
Fix edit box setPlaceholderFontName and scale font size issue
2015-11-24 11:33:52 +08:00
François Dupayrat
12df5ae1cc
Fix wrong variable use for setPlaceholderFontName
...
1. fix editbox scale not affect native font size
2015-11-23 11:49:22 +08:00
XiaoFeng
23d8b63fca
update header file to fix studio UI js binding compile error
2015-11-23 11:41:42 +08:00
zilongshanren
689c0f4af3
Merge pull request #14327 from wohaaitinciu/editbox-win32
...
Fix a fatal bug in EditBox implement for platform win32
2015-11-23 11:35:40 +08:00
zilongshanren
9328a7c1d0
fix scalesprite opacity issue.
...
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
2015-11-20 17:35:29 +08:00
Neo Kim
4829a037f7
Fix #14440
2015-11-20 15:57:26 +09:00
zilongshanren
7ea90c2d41
Merge pull request #14033 from m-yukio/feature/fixed-richtext
...
Support the new line element. Fixed a problem of UIRichText.
2015-11-19 11:05:08 +08:00
Jeff Wang
9cbcd00798
some properties should be set
2015-11-18 22:47:26 +08:00
zilongshanren
02b59f020e
Fix onEndEditing issue in script.
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
2015-11-18 15:05:13 +08:00
XiaoFeng
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
zilongshanren
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
zilongshanren
0b3a342222
Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets
...
Set focus for widgets
2015-11-17 11:24:27 +08:00
zilongshanren
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
XiaoFeng
e3c120eef4
Combine Studio change for compatible with 32 bit Mac System
2015-11-16 18:25:26 +08:00
Neo Kim
603d788fbf
PageView - Fix that page indicator was not working well in vertical page view.
2015-11-15 22:49:42 +09:00
Neo Kim
b0ae23d567
PageView - Add more comments
2015-11-15 22:49:42 +09:00
Neo Kim
ad134a6363
PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`.
2015-11-15 22:49:42 +09:00
Neo Kim
94637bef2f
PageView - Change to keep some of the original API names because it makes more sense.
2015-11-10 21:35:01 +09:00
Neo Kim
9cbbd283c7
PageView - Deprecate the APIs related to custom scroll threshold.
2015-11-10 21:35:01 +09:00
Neo Kim
049607b5d8
Replace tab indents to 4 spaces.
2015-11-10 21:03:51 +09:00
Jeff Wang
c1a64e9243
new implementation of EditBoxImpl-win32
2015-11-06 02:14:34 +08:00
mogemimi
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
zilongshanren
3e2094981f
add scale9sprite rendering type test
2015-10-30 14:01:01 +08:00
zilongshanren
f84c2de1e2
add sprite and scale9sprite batch test
2015-10-30 09:58:02 +08:00
zilongshanren
1417534194
add rendering type to scale9sprite
2015-10-29 23:13:36 +08:00
zilongshanren
7c82f9fe88
cache slice sprite calculation
2015-10-29 21:53:58 +08:00
zilongshanren
9a14ad5b14
fix a small bug related to non slice anchorPoint
2015-10-29 14:27:27 +08:00
zilongshanren
ccf4cb5a74
improve scale9sprite
2015-10-29 10:41:58 +08:00
Neo Kim
e59b7b74be
PageView - Add `scrollToItem()` having only one parameter.
2015-10-28 16:57:54 +09:00
Neo Kim
69b794d284
PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled.
2015-10-28 16:57:53 +09:00
Neo Kim
9ed617c978
PageView - Add API descriptions
2015-10-28 16:56:36 +09:00
Neo Kim
b72e4118f0
PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.
2015-10-28 16:56:36 +09:00
Neo Kim
e3fcd6722a
PageViewIndicator - Add some getter and setters.
2015-10-28 16:56:36 +09:00
Neo Kim
8abd1ab600
PageView - The indicator should be created before `ListView::init()`
2015-10-28 16:56:36 +09:00
Neo Kim
2d2d17172c
PageViewIndicator - Fix that indexes were upside down in vertical view.
2015-10-28 16:56:36 +09:00
Neo Kim
1897051664
PageView - Add `setDirection()` and `setIndicatorEnabled()` methods.
2015-10-28 16:56:36 +09:00
Neo Kim
eefdffc032
PageViewIndicator - Add `setDirection()` method.
2015-10-28 16:56:36 +09:00
Neo Kim
368a3048c4
PageView - Add `setIndicatorPosition()`.
2015-10-28 16:56:36 +09:00
Neo Kim
fc0fe976f7
PageView - Complete `handleReleaseLogic()` method.
2015-10-28 16:56:36 +09:00
Neo Kim
b19ed5a3b5
ScrollView - Change `moveInnerContainer()` to virtual method.
2015-10-28 16:56:36 +09:00
Neo Kim
b3f33de071
ListView - Change `calculateItemDestination()` to a class method.
2015-10-28 16:56:35 +09:00
Neo Kim
c684016ee6
PageView - Implementing page view indicator
2015-10-28 16:56:35 +09:00
Neo Kim
4dbfb79110
Add `onItemListChanged()`method.
2015-10-28 16:56:35 +09:00
Neo Kim
0ee09fcfce
PageView - Implement the page indicator
2015-10-28 16:56:35 +09:00
Neo Kim
30e2e46f20
PageView - Add `PageViewIndicator` which indicates current page among total pages.
2015-10-28 16:56:35 +09:00
Neo Kim
76acb91861
Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places.
2015-10-28 16:56:35 +09:00
Neo Kim
a2bc0d4859
ScrollViewBar - Change wording in comment.
2015-10-28 16:56:35 +09:00
Neo Kim
b9a4449494
PageView - Add `handleReleaseLogic()` for page view.
2015-10-28 16:56:35 +09:00
Neo Kim
46c0a43105
ScrollView - Use a vector in `scrollChildren()` instead of two floats.
2015-10-28 16:56:35 +09:00
Neo Kim
84d0625b93
ScrollView - Remove redundant codes.
2015-10-28 16:56:34 +09:00
Neo Kim
5de6aa78ec
ScrollView - Remove the return value of `scrollChildren()`.
2015-10-28 16:56:34 +09:00
Neo Kim
30d39af5fa
Refactor `jumpTo` methods to use `moveInnerContainer()`.
2015-10-28 16:56:34 +09:00
Neo Kim
e67250e162
ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one.
2015-10-28 16:56:34 +09:00
Neo Kim
97acf52cc8
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
2015-10-28 16:56:34 +09:00
Neo Kim
e567259826
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
2015-10-28 16:56:34 +09:00
mogemimi
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
dimon4eg
27d5ad920e
Update comment
2015-10-21 16:55:45 +03:00
dimon4eg
82bcbb0325
Revert: Fix crash in web view on android
2015-10-21 16:54:41 +03:00
dimon4eg
d317cd75e1
Improved code a bit
2015-10-16 11:28:34 +03:00
dimon4eg
ee3c000b43
Fix crash in web view on android
2015-10-15 16:43:53 +03:00
XiaoFeng
a6a3e24fdd
Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display.
2015-10-14 13:58:58 +08:00
mogemimi
daa29752db
Fix typo in UIEditBox
2015-10-12 13:57:50 +09:00
pandamicro
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
pandamicro
27fc6b24ee
Merge pull request #14080 from 1scaR1/v3
...
Fixed enabling of scale9 background in ccui.Layout
2015-10-10 09:39:09 +08:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
子龙山人
cdf6fa8a54
Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue
...
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
2015-10-09 08:27:18 +08:00
pandamicro
e32e8b95a4
Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar
...
fix crash in LoadingBar
2015-10-08 11:22:43 +08:00
Nikita
0042f9f5cd
Fixed background size if scale9 enabled in Layout
...
Fixes for issue: cocos2d#14001
2015-10-06 16:14:47 +03:00
pandamicro
1e298a2c1a
Merge pull request #14064 from MSOpenTech/v3-win10-fix
...
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-04 10:53:52 +08:00
Dale Stammen
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
mogemimi
9f768bc1ab
Add missing override keyword
2015-10-02 18:18:23 +09:00
dimon4eg
ec20b48775
fix crash in LoadingBar
2015-09-30 13:04:13 +03:00
dimon4eg
fe8c1a12b5
Fix for text field
2015-09-30 12:39:44 +03:00
dimon4eg
2785a4313f
Set focus for widgets
2015-09-30 12:31:33 +03:00
Neo Kim
423cbb83a9
Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable.
2015-09-30 16:55:48 +09:00
Yukio Murakami
bc4bd99863
Support the new line element. Fixed a problem that protrude from the drawing area.
2015-09-28 14:47:09 +09:00
zilongshanren
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
XiaoFeng
f5c88c32af
Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent
2015-09-23 10:55:01 +08:00
pandamicro
eec67ea13b
Merge pull request #13975 from zilongshanren/fixIssue11259
...
don't change Text's dimension when label scale.
2015-09-22 01:49:20 +08:00
子龙山人
f2190c79b9
Merge pull request #13835 from neokim/add_jump_to_item_to_listview
...
Add a feature of jumping to a specific item in list tview
2015-09-21 18:36:05 +08:00
zilongshanren
fd8cfd8ccb
don't change Text's dimension when label scale.
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
2015-09-21 17:03:29 +08:00
Neo Kim
b09a0bd0e3
Add a missing parameter in comment for document.
2015-09-21 17:07:32 +09:00
hanxi
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
pandamicro
1eeafed072
Merge pull request #13884 from yangws/v3
...
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 16:32:56 +08:00
Vincent Yang
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
andyque
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
Neo Kim
d9be26cd98
Use another dirty flag for list view layout other than 'Layout::_doLayoutDirty' because 'Layout::onEnter()' forces '_doLayoutDirty' to be true always. List view should have a way not to do layout in 'onEnter()'.
2015-09-16 16:21:11 +09:00
Mazyad Alabduljaleel
3090599f83
Oops, committed duplicate code by mistake
2015-09-16 10:12:07 +03:00
Mazyad Alabduljaleel
61980d1a8b
[refactor] Break down the file into separate files, because it exceeded 1 kLOC 🙀
...
[refactor] Consolidate `UITextView` and `UITextField` APIs.
[refactor] rename classes that start with `UI` to `CCUI`, since that prefix is reserved by Apple.
[bugfix] setting the placeholder for `CCUISingleLineTextField` was missing in `createSingleLineTextField`
[bugfix] In `MultiLineTextView`, if `placeholder` changed, there doesn't seem to be a deterministic way of updating the `placeholderLabel`. We are relying on `drawRect:`. Instead, `placeholder` is now a computed property on top of `placeholderLabel.text`.
[bugfix] If the user wants multi-line secure input, we should set it, since it is possible, right?
[minor] `[viewWithTag:999]` was used instead of calling the property itself.
[minor] `drawRect:` was used to load properties, when it is normally in the getter.
[minor] fix ObjC code style
2015-09-15 23:36:26 +03:00
Neo Kim
11d80f47f8
Refactor list view's layout refreshing logic.
2015-09-15 22:34:00 +09:00
Neo Kim
f58cbad6c2
Add 'jumpToItem()' to list view.
2015-09-15 22:33:50 +09:00
子龙山人
f2bee23696
Merge pull request #13789 from neokim/fix-13668
...
Fix for #13668
2015-09-15 18:28:24 +08:00
子龙山人
f5848290a2
Merge pull request #13673 from Almax27/patch-3
...
Removed ScrollView::_innerContainer pointer copy
2015-09-15 17:42:20 +08:00