Dawid Drozd
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
minggo
ae2837326b
Merge pull request #15516 from minggo/update-release-note
...
[ci skip]update changelog and release note
2016-04-27 15:02:30 +08:00
minggo
79d659e46b
update changelog and release note
2016-04-27 15:01:02 +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
minggo
fc5e537327
Merge pull request #15508 from xpol/remove-use-of-getFileData
...
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-27 09:38:30 +08:00
minggo
51fb49a522
Merge pull request #15512 from minggo/issue-15193
...
use fullpath to play background music
2016-04-27 09:37:45 +08:00
minggo
5fe4bd23ce
Merge pull request #15514 from mogemimi/add-missing-dllexport
...
Add CC_GUI_DLL to suppress warning C4275
2016-04-27 09:37:04 +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
minggo
b9184ac452
Merge pull request #15509 from minggo/issue-15449
...
remove unsupport flags
2016-04-26 16:03:58 +08:00
minggo
bad4ea4dc6
Merge pull request #15510 from xpol/fixes-use-of-deprecated-cc-wcslen
...
Fixes warning about deprecated cc_wcslen.
2016-04-26 16:02:57 +08:00
minggo
bb4a54b042
use fullpath to play background music
2016-04-26 15:59:30 +08:00
Xpol Wan
bd3c3a7c3d
remove default value for size argument.
2016-04-26 14:54:20 +08:00
Xpol Wan
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
minggo
2319860d38
remove unsupport flags
2016-04-26 14:08:23 +08:00
Xpol Wan
3f8910d80c
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-26 13:57:53 +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
2cc6ebc137
Merge pull request #15507 from CocosRobot/update_lua_bindings_1461642261
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 11:49:15 +08:00
CocosRobot
29da95494e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 03:47:27 +00: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
a6b59c40be
Merge pull request #15496 from treert/patch-2
...
[fix bug] reset UIGrayScale Shader when reload shaders
2016-04-26 11:44:20 +08:00
minggo
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
minggo
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
minggo
c8e2dc83d1
Merge pull request #15498 from ynaoto/v3
...
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +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
minggo
d5e4cc0b88
Merge pull request #15492 from mogemimi/fix-unused-variable-warning
...
Fix unused variable warning when building with Xcode
2016-04-25 15:50:58 +08:00
minggo
8792078bb4
Merge pull request #15500 from mogemimi/fix-warning-c4804
...
Fix compiler warning C4804 under Visual Studio
2016-04-25 13:59:15 +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
d2c46167c3
Fix compiler warning C4804 under Visual Studio
2016-04-25 10:46:33 +09:00
Naoto Yoshioka
d42cb71a27
Warn if fontDef.charID exceeds 16bits.
2016-04-25 01:02:50 +09:00
Steve Tranby
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
treert
2c4b634a50
reset UIGrayScale Shader when reload shaders
...
reset GLProgram for UIGrayScale Shader when reload shaders
2016-04-23 13:33:22 +08:00
NamJunHyone
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
NamJunHyone
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
mogemimi
71677ee286
Fix unused variable warning when building with Xcode
2016-04-22 20:25:32 +09:00
minggo
5aa83ef1cf
Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch
...
Fix warnings about signed/unsigned mismatch
2016-04-22 13:54:52 +08:00
Steve Tranby
0f0c9b627b
Add support for Unsigned with CCValue ( #13785 )
...
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
mogemimi
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
minggo
16c7a594c8
Merge pull request #14005 from wighawag/draw_node_shader_fix
...
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
minggo
2c75a4cf39
Merge pull request #15480 from mogemimi/remove-unary-operator
...
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
minggo
efe87b84db
Merge pull request #15478 from CocosRobot/update_lua_bindings_1461209678
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 15:41:10 +08:00
minggo
488ceb485d
Merge pull request #14547 from colajam93/fix-linux-clang-build
...
Add missing header
2016-04-21 15:38:53 +08:00
zilongshanren
8fd5ef232f
Merge pull request #15486 from CocosRobot/update_lua_bindings_1461222309
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 15:37:51 +08:00
CocosRobot
361e054d6d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 07:07:41 +00:00
minggo
7ccd05548e
Merge pull request #13936 from Shulepov/app_controller_synthesize_window
...
AppController: synthesize window #13285
2016-04-21 15:02:07 +08:00
minggo
6459c92ee7
Merge pull request #13950 from Almax27/patch-4
...
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
minggo
7de8f761d0
Merge pull request #14123 from jgod/patch-2
...
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
minggo
949112fdc2
Merge pull request #14321 from pandemosth/socketIO_issue_14287
...
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
minggo
fcd8aa30f4
Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed
...
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2016-04-21 14:17:44 +08:00