Commit Graph

1992 Commits

Author SHA1 Message Date
minggo d66b686bd8 Merge pull request #15816 from yalab/valuemap_reject_none
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
minggo 43ece2de34 remove unneeded test case 2016-06-16 11:00:15 +08:00
PooperPig 7214173e98 Added Particle Emitter Pause option, and tests (#15836)
* Added Particle Emitter Pause option, and tests

* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
子龙山人 51f4deee01 Add system label overflow (#15827)
* Add system font overflow

1. currently only iOS, Mac and Android platform are supported

add mac label overflow shrink

modify system font overflow test

fix warning and possible memory leaks

add ios system label overflow support

add iOS system font overflow support

fix iOS system font overflow

fix Mac System font overflow

add android system font clamp

add Android system font shrink

cleanup iOS shrink related code

fix Android system font clamp

add core text to project template

fix iOS tests project

fix mac and iOS shrink

improve iOS and Mac clamp feature

fix header file include path

* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
mogemimi 72dfa63294 Fix assertion failure when running Sprite Test 2016-06-12 03:45:38 +09:00
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
minggo 98bee7e12a remove unneeded test case and fix resource missing (#15804)
* remove unneeded test case and fix resource missing

* remove unneeded test case
2016-06-08 13:36:36 +08:00
mogemimi 69974ab06f Fix warnings caused by comparison between RefPtr and C++11's nullptr 2016-05-28 22:15:56 +09:00
Ricardo Quesada ff058eebc4 Merge pull request #15719 from ricardoquesada/issue_15594
fix: add code/resources to reproduce issue_15594
2016-05-26 20:40:38 -03:00
minggo 1116176362 Merge pull request #15720 from billyquith/v3
Grammar corrections
2016-05-26 11:00:53 +08:00
BQ 93ed59bfb3 English grammar corrections. 2016-05-25 15:25:38 +01:00
BQ 6097c3abd1 English grammar corrections.
Make brackets consistent.
2016-05-25 15:18:57 +01:00
Ricardo Quesada b830b7de4c fix: add code/resources to reproduce issue_15594
github issue #15594
2016-05-25 09:00:32 -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
Mikhail Shulepov 8d1aad0f96 Fix test cases with PVRTC textures loading on devices that don't support this formats 2016-05-23 18:10:00 +03:00
Vladimir Perminov b6d72e33d8 Fix password style text in UTF-16 (#15620)
* Fix password style text in UTF-16

Label used UTF-16 in internal.
Need string in UTF-8.

* Set correct char for Max and iOS

* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +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 c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
minggo 8b0c2110fd Merge pull request #15606 from minggo/websocket-test-issue
fix crash when back to parent test case
2016-05-11 09:28:42 +08:00
minggo b2a592ce36 fix crash when back to parent test case 2016-05-10 17:55:36 +08:00
minggo d7fea4b08b reduce loop times to be quicker on low performace devices 2016-05-10 16:19:58 +08:00
halx99 fc9880ab49 Add captureNode for cocos2d::utils (#15558)
* Add captureNode for cocos2d::utils

Add captureNode for cocos2d::utils and fix CC_DLL syntax.

* Add test case for utils::captureNode

Add test case for utils::captureNode.

* Store captured image to disk with RGB.

* Trigger jenkins check
2016-05-07 22:10:53 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
minggo 44958d7361 not add invalid search paths 2016-05-06 15:54:08 +08:00
minggo 8068c51d94 remove studio related test cases and resources (#15574)
* remove studio related test cases and resources

* remove unneeded files
2016-05-06 13:38:19 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08: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
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
xpol 43a94c0693 Add FileUtils::getContents(). (#15479)
* Add FileUtils::getContents().

* skip FileUtils::getContents() in binding generator config.

* use FileUtils::getContents in CCDataReaderHelper.

* obey the cocos2d-x coding style.

* Explicit constructor.

* More docs.

* More tests.

* Move FileError to FileUtils::Error.

* Fixes wrong buffer size for reading into string and vector.

* Update tests.

* Add note on padding for output buffers.

* FileUtils: implements old methods by using `getContents()`.

methods are:

* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()

and follow Android methods are now just calls FileUtils' ones.

* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()

* Fixes build error.

* FileUtils::getFileData: Return the size of data.

* Remove old methods form FileUtilsAndroid they are now done in FileUtils.

* Fixes for win32 code.

* Fixes build error in test and add more test.

* Better error message.

* Make template type name more readable.

* Update comments.

* Move internal functions to anonymous namespace.

* Refactor FileUtils test.

* Fix warning about compare signed and unsigned.

* Win32 and WinRT does not use text mode.

That is we don't need simulate convert CRLF to LF.

* Fixes for Win32 and WinRT.

* Update for Win32 and WinRT.

* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().

* Update for coding styles.

* More error strings.

* check read and malloc return codes.

* rename FileUtils::Error to FileUtils::Status.

* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.

* Fixes build error for winrt and cleanup FileUtils::Status.

* Try to fix the build error on Linux.

Status must defined in some header, so move FileUtils.h up.

* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
minggo d97275e0ad Merge pull request #15505 from dumganhar/issue-15495
fixed #15495: WebSocket crash on Director end (app exit),
2016-04-26 11:45:30 +08:00
minggo 86df9b535a Merge pull request #15493 from njh0602/somefix
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
NamJunHyone 6746aeb992 ignoreAnchorPointForPosition() -> set ~ from missing files 2016-04-25 20:43:42 +09:00
James Chen 45d68ad265 fixed #15495: WebSocket crash on Director end (app exit), WebSocketTest in cpp-tests needs to be updated. 2016-04-25 16:22:46 +08:00
Steve Tranby 510e7b831e csv support working test 2016-04-23 17:31:10 -06: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
AlwynC 4c7e4671d9 Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
mogemimi 85646b8d80 Fix warning C4305 while compiling AppDelegate with MSVC 2016-04-20 04:01:06 +09:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
mogemimi f51f9003bf Fix deprecation warnings in tests 2016-04-11 19:35:44 +09:00
Бесшапошников Никита 2246495cc3 Add test for page view indicator tune 2016-04-11 12:29:02 +03:00
minggo 08383628cc Merge pull request #15356 from minggo/crash
[ci skip]fix crash issue
2016-03-31 15:37:27 +08:00
minggo 8694a15a72 fix crash issue 2016-03-31 15:36:00 +08:00
minggo fb3032b6fe Merge pull request #15349 from minggo/menu_test
[ci skip]Menu test
2016-03-30 14:44:24 +08:00
minggo c1a79700ae don't set wrong string for atlas label 2016-03-30 14:28:33 +08:00
Ricardo Quesada c566dce581 fix: compile cpp-tests in release mode
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
2016-03-29 18:09:58 -07:00
minggo 3c676d9712 Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00