Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,679 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1047 Commits

Author SHA1 Message Date
minggo 8c9019b128 Merge pull request #15848 from minggo/hide-virtual-button 
[ci skip]hide virtual button if has focus
 2016-06-15 18:20:53 +08:00
minggo d94dc7edc0 hide virtual button if has focus 2016-06-15 18:19:06 +08:00
minggo 3807a2f678 Merge pull request #15847 from minggo/hide-virtual-button 
[ci skip]hide virtual button by default
 2016-06-15 18:08:00 +08:00
minggo a8c6011f66 use android sdk 19 2016-06-15 18:06:53 +08:00
minggo 8634773be3 hide virtual button by default 2016-06-15 17:55:26 +08:00
minggo d7b495c3d1 Merge pull request #15838 from MagicXrEv/rename-end-functions 
lua binding : Rename end() to endToLua().
 2016-06-15 16:24:34 +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
子龙山人 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
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +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
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
mogemimi 07e0c1cbf9 Fix typo in method name: 'destory' -> 'destroy' 2016-06-09 09:25:06 +09:00
minggo 93d87ad19e android supports LOWERCASE_ALL_CHARACTERS 2016-06-07 12:41:22 +08:00
minggo 9322ecc937 Merge pull request #15768 from minggo/issue-15738 
add a new create method to create resizable window
 2016-06-03 09:28:40 +08:00
minggo 75227a5c0e [desktop]fix the bug the depth test is disabled when application size changed 2016-06-02 16:18:31 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
mogemimi a4a357db69 Remove unnecessary sinf, cosf, tanf and sqrtf macros 2016-05-31 02:39:40 +09:00
mogemimi c647a95656 Fix C4267 and C4309 warnings when compiling for Windows 10 UWP 2016-05-29 14:43:28 +09:00
minggo 74fe77a367 Merge pull request #15737 from yalab/slicent_warning_android_clang 
It mute warning on android clang.
 2016-05-27 16:46:50 +08:00
yalab 3ea46c617f It mute warning on android clang. 2016-05-27 15:39:33 +09:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
zilongshanren 13003d9a78 Merge pull request #15727 from dumganhar/editbox-fix 
Make sure closeKeyboard run on UI thread
 2016-05-26 18:08:03 +08:00
zilongshanren 517cb9e437 Merge pull request #15729 from dumganhar/editbox-fix-2 
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
 2016-05-26 17:24:09 +08:00
James Chen d42b99b10b fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread. 2016-05-26 15:49:57 +08:00
James Chen cf883b5c0f UI thread check. 2016-05-26 12:02:23 +08:00
James Chen a472ab2931 Make sure closeKeyboard run on UI thread 2016-05-26 11:57:57 +08:00
James Chen 5321a2fc7a Removes unused package import for Cocos2dxSound.java. 2016-05-26 11:15:44 +08:00
James Chen 1285954cd9 Try catch IllegalStateException in Cocos2dxMusic.java. 2016-05-26 10:25:45 +08:00
Shulepov 758425cfd5 Refactor CCFileUtils-apple to remove code duplication (#15645) 
* Refactor CCFileUtils-apple to remove code duplication of conversion from CCValue to NSObject and vise versa

* CCFileUtilsApple: rename helper functions
 2016-05-23 18:26:19 +08:00
halx99 86d148c24c change if (fontName.c_str()) to if(!fontName.empty()) 
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
 2016-05-20 23:10:28 +08:00
Greg Rynkowski 21fc67b358 Enable WebView's local storage on Android 
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.

Solution:
Enable local storage of android.webkit.WebView in Android.

References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
 2016-05-19 14:43:35 +01:00
minggo c6034787e4 Merge pull request #15664 from mogemimi/replace-ccassert-macro 
Replace CCAssert macros with CCASSERT
 2016-05-18 11:57:18 +08:00
minggo a54251b854 Merge pull request #15659 from mogemimi/use-const-reference 
Use const references whenever possible
 2016-05-18 11:55:55 +08:00
mogemimi 320ec027f7 Replace CCAssert macros with CCASSERT 2016-05-18 01:49:35 +09:00
minggo 3e396fedab Merge pull request #15617 from pandamicro/v3 
Some modifications merged from Creator
 2016-05-17 13:43:41 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
pandamicro c96bd9a4df Resolve local reference leak and function order 2016-05-17 12:06:28 +08:00
mogemimi 16878a53b1 Suppress MSVC warning C4800 2016-05-13 11:44:17 +09:00
pandamicro 6b59dc24c7 Add Image::setPNGPremultipliedAlphaEnabled 2016-05-11 16:36:21 +08:00
pandamicro 1cbbde5d8b Fix android LocalStorage return null for empty string value 2016-05-11 11:57:54 +08:00
minggo f4a7ba836c Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple 
fix build failed using FileUtilsApple on Application code.
 2016-05-10 12:07:16 +08:00
Naruto TAKAHASHI 79b9a191d0 declare explicitly FileUtilsApple destructor 2016-05-09 21:50:52 +09:00
minggo d086965683 Merge pull request #15598 from minggo/android-package-name 
[ci skip]set correct package name
 2016-05-09 18:17:28 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
Steve Tranby 7c1e60f0b7 Prevent memory leak: force drain on autoreleased `data`. 2016-05-05 08:00:28 -06:00
minggo 9218329968 Merge pull request #15569 from minggo/issue-15522 
Fix compile error isnan -> std::isnan
 2016-05-05 11:36:24 +08:00
minggo e2c38ed87f make std::isnan work for winrt 2016-05-05 10:29:31 +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
minggo 6260c67941 Merge pull request #15549 from minggo/issue_15525 
use std::atof() instead
 2016-05-04 09:38:42 +08:00
Adrien de Sentenac 1a76c9ea3b Add OBB (zip) support (#15515) 
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.

* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
 2016-05-04 09:21:35 +08:00
pandamicro 3d6bddd2c7 Merge pull request #15465 from cezheng/fix/several_network_bugs 
[BugFixes]Several serious bug fixes related to network/asset_manager
 2016-05-03 17:37:32 +08:00
minggo 1bf56d5a78 use std::atof() instead 2016-05-03 15:50:06 +08:00
Zhe Wang 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
Xpol Wan 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
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 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
Xpol Wan bd3c3a7c3d remove default value for size argument. 2016-04-26 14:54:20 +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
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
minggo 6459c92ee7 Merge pull request #13950 from Almax27/patch-4 
Added CC_PROPERTY const qualifier
 2016-04-21 14:56:01 +08:00
Ce Zheng d848292860 make android downloader taskQueue thread 
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
 2016-04-20 13:42:00 +09:00
minggo 095f404738 Merge pull request #14735 from linguofeng/patch-2 
CCFileUtils-apple.mm Grammatical errors
 2016-04-20 11:00:38 +08:00
minggo e16d016c46 Merge pull request #15452 from 1scaR1/fix_osx_sandbox 
Implement createDirectory for apple platform.
 2016-04-20 10:26:45 +08:00
Julien Jorge a3f28a18df Uniformize image support macro usage. 
All images format implementation but WIC test the value of a CC_USE_<FORMAT>
preprocessor macro to verify if the implementation must be available or not.
WIC support is checked against the definition of the macro only,
independently of its value, thus making the implementation available even
if CC_USE_WIC = 0.

This commit makes the tests of the CC_USE_WIC macro identical to the tests
of the other similar image format macros.
 2016-04-19 14:15:43 +02:00
Бесшапошников Никита a3717b6907 Add error logging of incorrect directory creating. 2016-04-19 10:17:31 +03:00
minggo 5c567c54b4 Merge pull request #15198 from perminovVS/v3-dev-wrong-log-detect-image-type 
Wrong log message if use tga image
 2016-04-19 11:00:55 +08:00
minggo f3fd111200 Merge pull request #14944 from mxenabled/josh/export_wicimageloader 
Export WICImageLoader form DLL
 2016-04-18 18:33:39 +08:00
Бесшапошников Никита e555ed5b9e Implement createDirectory for apple platform. 2016-04-18 12:52:20 +03:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. (#15236) 2016-04-18 17:15:56 +08:00
minggo 6cc80f28fc Merge pull request #15096 from fnz/volume_control 
Set music volume control as default
 2016-04-18 16:48:55 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
xpol 3780064a82 Allow inherit form platform fileutils (#15304) 
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.

* Removed objc from CCFileUtils-apple.h

define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.

* Smart pointers heal us all.

* Add config macro in ccConfig.h and prefix with CC_.

* enabled by default.
* use #if rather than #ifndef.

* Do not deprecate setBundle.
 2016-04-14 11:59:24 +08:00
minggo d8764ab730 Merge pull request #15200 from perminovVS/v3-dev-wic-image-loader-bad-hresult 
WICImageLoader incorrect use S_FALSE constant
 2016-04-07 17:31:15 +08:00
minggo 43a70f0a92 Merge pull request #15342 from xpol/allow-easy-decrypt-plist-files 
Allow plist and other ValueMap files be (easy) decrypted.
 2016-04-07 11:02:20 +08:00
Xpol Wan cd1c26ecd1 Allow plist and other ValueMap files be (easy) decrypted. 
The origin implementation of `FileUtilsApple::getValueMapFromFile()` reads the contents of file and parse it by calling one Apple API.
This make it harder to decrypt user encrypted plist files.

This commit use the `FileUtils::getDataFromFile()` to get read file data first then use `getValueMapFromData()`
to parse it into a ValueMap. Where `FileUtils::getDataFromFile()` can be overwrite by user's decoding file utils (say `DecodingFileUtils`).

I know that user's `DecodingFileUtils` can also overwrite `getValueMapFromFile`, but this pr make the author of `DecodingFileUtils` less suffering.
 2016-03-29 21:39:16 +08:00
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +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 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 768f02bae3 revert pch.cpp for windows 8.1 and windows 10. 2016-03-21 11:00:32 +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 2bb4847848 Merge pull request #15251 from xpol/detect-apple-platforms 
Detect Apple platforms
 2016-03-18 13:44:24 +08:00
Xpol Wan 4bbfb56983 Try fixes binding generator error. 2016-03-18 10:21:38 +08:00
zilongshanren ad7ac83128 Merge pull request #15240 from newnon/v3_not_needed_define 
fix unneeded define that breaks some libraries to build on windows
 2016-03-17 11:40:51 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working 
(android, iOS tested)
 2016-03-17 10:26:53 +09:00
Xpol Wan 0211c372b4 Update comment. 2016-03-16 13:30:11 +08:00
Xpol Wan bfb97739e2 Detect Apple platforms correctly. 2016-03-16 13:15:41 +08:00
Sergey 0d67d5d533 fix unneeded define that breaks some libraries to build on windows 2016-03-14 16:58:01 +03:00
Vladimir Perminov 5c1a272178 Remove comment // S_FALSE is succeeded 2016-03-13 19:30:13 +03:00
Vladimir Perminov 3e16236a95 WICImageLoader incorrect use S_FALSE constant 2016-03-07 15:48:49 +03:00
Vladimir Perminov 8c8c741213 Wrong log message if use tga image 2016-03-07 15:41:20 +03:00
Vladimir Perminov 2a201a5c4e WinRT support key repeat and implement dispatchControlKey 2016-03-07 14:43:44 +03:00
Vladimir Perminov 8eec628e04 Desktop implement dispatchControlKey 
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
 2016-03-07 14:33:59 +03: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 2a8d84e7f9 Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
Victor K ce8f85f33e set music volume control as default 2016-02-22 11:43:01 +03:00
Ricardo Quesada 37db8407f1 Merge pull request #14867 from dumganhar/refactor-websocket 
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
 2016-02-21 06:59:59 -08:00
zilongshanren d28acbf2fe Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen 
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
 2016-02-19 15:36:06 +08:00
zilongshanren 5072e11bac Merge pull request #15069 from chengstory/FixRealBoolValueError 
Fix value type error when read value of bool type from .plist file.
 2016-02-19 14:07:29 +08:00
James Chen 7d43e35741 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket 2016-02-17 14:56:32 +08:00
zhangcheng 2b1511096e Fix ValueVector read type error. 2016-02-16 17:01:54 +08:00
zhangcheng 53cbc2d32b Fix value type error when read value of bool type from .plist file. 2016-02-16 16:50:54 +08:00
Mikhail Shulepov 014f8e107f fix: ensure calling opengl only when app is active 2016-02-13 11:17:55 +03:00
Mikhail Shulepov ab17455b18 fix: ensure drawing in main thread (layoutSubviews may be called in web thread due to banners) 2016-02-13 11:16:35 +03:00
mogemimi bf1b9df495 Add missing 'override' keywords 2016-02-08 17:22:17 +09:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
Xpol Wan 56e5cf2101 Fixes indent. 2016-01-27 13:43:55 +08:00
Xpol Wan d8bf7fa767 Remove unnecessary memory copy when saving string. 2016-01-27 13:40:19 +08:00
Xpol Wan ea9dda052b Better name for data to be saved. 2016-01-27 13:39:31 +08:00
Xpol Wan f3aef10d33 Should be const reference for data/string args to be written. 2016-01-27 11:22:46 +08:00
Josh Bodily c75cfcbbfa Export WICImageLoader form DLL 2016-01-21 15:35:51 -07:00
zilongshanren 790c7b4b79 Merge pull request #14891 from mogemimi/fix-extra-tokens-warning 
Fix warning: extra tokens at end of #ifdef directive
 2016-01-21 10:51:01 +08:00
zilongshanren 4d128a83f4 Merge pull request #14659 from elvman/resizable_window 
Resizable window
 2016-01-21 10:49:33 +08:00
zilongshanren 2ed4965b6d Merge pull request #14751 from newnon/v3_get_version_windows 
getVersion win32 implementation
 2016-01-21 10:42:19 +08:00
zilongshanren 74f9f3fd0e Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient 
Remove CocosPlayClient
 2016-01-20 18:24:16 +08:00
Dale Stammen a64be12646 added missing getFileSize() method for winrt 2016-01-19 12:36:10 -08:00
Wenhai Lin 718d2c690b Remove CocosPlayClient 2016-01-18 17:58:04 +08:00
mogemimi b14a3730ca Fix warning: extra tokens at end of #ifdef directive 2016-01-17 03:17:00 +09:00
James Chen f9e8ae0f09 WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test). 2016-01-13 21:14:38 +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
肖峰 770f3d7f8e Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK 2015-12-29 18:31:20 +08:00
Ricardo Quesada 492389fd5b Update CCPlatformConfig.h 2015-12-28 16:03:48 -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
肖峰 728682d68e Fix variable type mismatch. 2015-12-25 17:18:15 +08:00
肖峰 dea99211fb Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10 2015-12-25 11:44:11 +08: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
Sergey bac68bd0b8 getVersion win32 implementation 2015-12-20 00:09:45 +03:00
linguofeng 278bbb77c5 CCFileUtils-apple.mm Grammatical errors 
`termniate` -> `terminate`
 2015-12-18 17:34:52 +08:00
Sergey Perepelitsa b30553e933 WebP loading improvements WebP loaded as premultiplied alpha if it have alpha 2015-12-17 12:07:56 +03:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
肖峰 23bf815cfa Fix 3d touch compile error in lower version Xcode 2015-12-14 14:26:52 +08:00
Elviss Strazdins fc84306bcb Always update design resolution 2015-12-14 01:20:38 +02:00
Elviss Strazdins 4b33d730de Calculate frame size with zoom factor 2015-12-14 00:53:46 +02:00
Elviss Strazdins 718422c1d9 Set frame size on window resize 2015-12-14 00:20:29 +02:00
Ricardo Quesada f6c2758801 Merge pull request #14409 from xiaofeng11/v3_combine_opengl 
Combine Studio change for openGL related operation
 2015-12-03 23:03:40 -08:00
Ricardo Quesada 0e34a864b2 Merge pull request #14528 from xiaofeng11/v3_3dtouch 
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
 2015-12-03 22:21:48 -08:00
pandamicro e23432c6fa Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android 
Fix Downloader bug iOS & Android
 2015-12-03 18:46:43 +08:00
肖峰 5dfc8f6a26 Remove default arguments 2015-12-02 11:02:27 +08:00
xiaofeng11 18666a9b41 Merge pull request #14393 from xiaofeng11/v3_combine_3d 
Combine Studio change for 3d components
 2015-12-02 09:47:12 +08:00
Ce Zheng d174a98afa Add a buffer queue for Android Downloader to prevent out of memory 
When the AssetManagerEx start downloading, it used to create all the
download tasks all at once. When the app has a large number of asset
files, it is likely to crash due to out of memory when creating
threads for each of the download tasks. This commit adds a buffer
queue to the downloader to use the `countOfMaxProcessingTasks`
property from hints, preventing all the tasks from starting all at once.
 2015-12-01 16:25:50 +09:00