fba4bead70
fix memory leak
2016-05-03 11:24:22 +08:00
c8d570c310
fix tizen template api-version issue
2016-05-03 11:22:34 +08:00
675fe8e811
fix template project running
2016-05-03 11:02:22 +08:00
d41207e99a
avoid remove event listener multiple times
2016-05-03 10:56:03 +08:00
e11a7fdfe5
Merge pull request #15539 from minggo/issue-15329
...
use Ref::release() to release Ref instance
2016-05-03 09:39:14 +08:00
9f678f2f27
Merge pull request #15541 from cocos2d/fix-doxygen-mistakes
...
Fix doxygen format mistakes in enum class Platform
2016-05-03 09:38:58 +08:00
65f9c4dae8
Merge pull request #15543 from mogemimi/fix-shadow-warning
...
Fix shadow variable warning in GameNode3DReader
2016-05-03 09:34:43 +08:00
6433172fae
Fix shadow variable warning in GameNode3DReader
2016-05-02 10:57:03 +09:00
a640f007ef
Fix doxygen format mistakes in enum class Platform
...
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
2016-04-30 15:20:24 +08:00
b2b774b66b
fix tizen lua template
2016-04-29 17:59:10 +08:00
915ea19e2e
fix tizen cpp template settings
2016-04-29 17:28:38 +08:00
3d09e529ee
use Ref::release() to release Ref instance
2016-04-29 17:11:36 +08:00
22c8efcb64
Merge pull request #15535 from xpol/improve-getFileData
...
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 13:53:57 +08:00
86faae0cee
Merge pull request #15533 from MSOpenTech/v3-winrt-templates
...
V3: added missing winrt template code for inplace EditBox
2016-04-29 10:07:12 +08:00
2f6869b94a
Merge pull request #15534 from slackmoehrle/v3.11-release-notes-changes
...
started Release Notes changes for v3.11
2016-04-29 09:49:38 +08:00
a18ea0036c
added step for incrementing dependency version number
2016-04-28 21:46:53 -04:00
f111583214
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
...
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
0c427541c0
updated OpenSSL section
2016-04-28 20:15:41 -04:00
b1da4b9c80
started Release Notes changes for v3.11
2016-04-28 15:17:55 -04:00
8f37130569
added missing winrt template code for inplace EditBox
2016-04-28 08:37:55 -07:00
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
27b9510f2c
Upgrade web engine to v3.11 beta and fix issues with js-tests
2016-04-28 16:12:29 +08:00
d8d6e55756
Fix clipping node memory management issue
2016-04-28 15:14:03 +08:00
e6b6d6971d
Merge pull request #15529 from ricardoquesada/fix_15221
...
fix: removes `friend class Game`
2016-04-28 10:58:55 +08:00
e3ffd34bc3
Merge pull request #15528 from CocosRobot/update_lua_bindings_1461808426
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-28 10:08:09 +08:00
16818295f3
Merge pull request #15527 from CocosRobot/update_cocosfiles_1461808353
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-28 10:07:37 +08:00
c432b23ef6
fix: removes `friend class Game`
...
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
198acb9466
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-28 01:56:50 +00:00
011523cb56
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-28 01:52:35 +00: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
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
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
79d659e46b
update changelog and release note
2016-04-27 15:01:02 +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
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
51fb49a522
Merge pull request #15512 from minggo/issue-15193
...
use fullpath to play background music
2016-04-27 09:37:45 +08:00
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
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
b9184ac452
Merge pull request #15509 from minggo/issue-15449
...
remove unsupport flags
2016-04-26 16:03:58 +08:00
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
bb4a54b042
use fullpath to play background music
2016-04-26 15:59:30 +08:00
bd3c3a7c3d
remove default value for size argument.
2016-04-26 14:54:20 +08:00
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
2319860d38
remove unsupport flags
2016-04-26 14:08:23 +08:00
3f8910d80c
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-26 13:57:53 +08:00
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
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
29da95494e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 03:47:27 +00:00
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