mogemimi
8b703a8d12
Fix implicit conversion warning ( #16598 )
...
* Fix implicit conversion warning
* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
mogemimi
63b3043dc0
Remove extra semicolon after member function definition ( #16595 )
2016-09-20 14:43:48 +08:00
mogemimi
afe8b05da8
Remove semicolons before method bodies ( #16566 )
2016-09-14 10:44:00 -07:00
mogemimi
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
Sachin Garg
84f6863214
getSlidBallRenderer methods to allow more customization of UISlider ( #16532 )
...
* getSlidBallRenderer methods to allow more customization of UISlider look and feel.
* Added const to declaration of getSlidBallRenderer methods for UISlider.
2016-09-09 10:01:14 +08:00
Allen Lee
7c298bdcd7
misspelling check on cocos directory ( #16522 )
...
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
minggo
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
minggo
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
mogemimi
86563af08a
Add missing override keywords
2016-08-28 23:45:15 +09:00
Alfonso Grillo
6c9a05f831
PageView with custom 'scrollToPage' time ( #16390 )
...
* PageView with custom scrollToPage time
* fix compiler error
2016-08-25 15:48:01 +08:00
halx99
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
James Chen
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
Jeff Wang
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
minggo
57e4963502
Merge pull request #15963 from Drakon-Cocos/PageViewIndicator
...
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
mogemimi
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
halx99
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
mogemimi
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
minggo
391d97d1dd
improve log info
2016-07-22 11:56:41 +08:00
mogemimi
d931c62649
Fix typos in documentation comments
2016-07-16 04:18:40 +09:00
mogemimi
98cc48bc62
Add missing override keyword
2016-07-13 15:03:53 +09:00
mogemimi
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
mogemimi
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
minggo
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
mogemimi
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
mogemimi
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
minggo
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
mogemimi
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
mogemimi
57900112c5
Fix format string warning when compiling with Android NDK
2016-07-03 17:19:17 +09:00
mogemimi
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
mogemimi
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
Drakon-Cocos
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
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
Alfonso Grillo
b6fa894f81
Fix page view indicator opacity for inactive pages
2016-06-25 18:49:13 +02:00
zilongshanren
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
zilongshanren
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
mogemimi
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
mogemimi
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
minggo
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
minggo
5fa57ae5c1
Merge pull request #15844 from halx99/patch-1
...
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
mogemimi
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
halx99
dafa8054bf
fix: missing properties for clone
...
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
Adrien de Sentenac
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
minggo
7e1da2188c
ios supports LOWERCASE_ALL_CHARACTERS
2016-06-07 10:31:16 +08:00
TheCodez
7885f55ce5
Cache bas64 images
2016-06-06 16:32:50 +02:00
minggo
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
minggo
7e2f79ce8f
not use capital letters by default
2016-06-06 13:55:20 +08:00
Alexander Shniperson
07c5e528e7
ListView select item programmatically
2016-06-02 10:11:28 +04:00
Ricardo Quesada
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
Ricardo Quesada
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
mogemimi
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
alecmilne
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
zilongshanren
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
zilongshanren
9223d1d917
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
...
fix tizen related issues
2016-05-18 17:20:19 +08:00
zilongshanren
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
mogemimi
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
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