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
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
1bf56d5a78
use std::atof() instead
2016-05-03 15:50:06 +08: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
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
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
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
bd3c3a7c3d
remove default value for size argument.
2016-04-26 14:54:20 +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
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
6459c92ee7
Merge pull request #13950 from Almax27/patch-4
...
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
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
095f404738
Merge pull request #14735 from linguofeng/patch-2
...
CCFileUtils-apple.mm Grammatical errors
2016-04-20 11:00:38 +08:00
e16d016c46
Merge pull request #15452 from 1scaR1/fix_osx_sandbox
...
Implement createDirectory for apple platform.
2016-04-20 10:26:45 +08:00
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
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
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
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
6cc80f28fc
Merge pull request #15096 from fnz/volume_control
...
Set music volume control as default
2016-04-18 16:48:55 +08:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
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
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
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
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
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
768f02bae3
revert pch.cpp for windows 8.1 and windows 10.
2016-03-21 11:00:32 +08:00
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
2bb4847848
Merge pull request #15251 from xpol/detect-apple-platforms
...
Detect Apple platforms
2016-03-18 13:44:24 +08:00
4bbfb56983
Try fixes binding generator error.
2016-03-18 10:21:38 +08:00
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
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
0211c372b4
Update comment.
2016-03-16 13:30:11 +08:00
bfb97739e2
Detect Apple platforms correctly.
2016-03-16 13:15:41 +08:00
0d67d5d533
fix unneeded define that breaks some libraries to build on windows
2016-03-14 16:58:01 +03:00
5c1a272178
Remove comment // S_FALSE is succeeded
2016-03-13 19:30:13 +03:00
3e16236a95
WICImageLoader incorrect use S_FALSE constant
2016-03-07 15:48:49 +03:00
8c8c741213
Wrong log message if use tga image
2016-03-07 15:41:20 +03:00
2a201a5c4e
WinRT support key repeat and implement dispatchControlKey
2016-03-07 14:43:44 +03:00
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
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
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
2016-03-02 16:51:54 -08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
ce8f85f33e
set music volume control as default
2016-02-22 11:43:01 +03:00
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
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
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
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
2b1511096e
Fix ValueVector read type error.
2016-02-16 17:01:54 +08:00
53cbc2d32b
Fix value type error when read value of bool type from .plist file.
2016-02-16 16:50:54 +08:00
014f8e107f
fix: ensure calling opengl only when app is active
2016-02-13 11:17:55 +03:00
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
bf1b9df495
Add missing 'override' keywords
2016-02-08 17:22:17 +09:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
56e5cf2101
Fixes indent.
2016-01-27 13:43:55 +08:00
d8bf7fa767
Remove unnecessary memory copy when saving string.
2016-01-27 13:40:19 +08:00
ea9dda052b
Better name for data to be saved.
2016-01-27 13:39:31 +08:00
f3aef10d33
Should be const reference for data/string args to be written.
2016-01-27 11:22:46 +08:00
c75cfcbbfa
Export WICImageLoader form DLL
2016-01-21 15:35:51 -07:00
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
4d128a83f4
Merge pull request #14659 from elvman/resizable_window
...
Resizable window
2016-01-21 10:49:33 +08:00
2ed4965b6d
Merge pull request #14751 from newnon/v3_get_version_windows
...
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
74f9f3fd0e
Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient
...
Remove CocosPlayClient
2016-01-20 18:24:16 +08:00
a64be12646
added missing getFileSize() method for winrt
2016-01-19 12:36:10 -08:00
718d2c690b
Remove CocosPlayClient
2016-01-18 17:58:04 +08:00
b14a3730ca
Fix warning: extra tokens at end of #ifdef directive
2016-01-17 03:17:00 +09:00
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
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
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
492389fd5b
Update CCPlatformConfig.h
2015-12-28 16:03:48 -08:00
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
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
bac68bd0b8
getVersion win32 implementation
2015-12-20 00:09:45 +03:00
278bbb77c5
CCFileUtils-apple.mm Grammatical errors
...
`termniate` -> `terminate`
2015-12-18 17:34:52 +08:00
b30553e933
WebP loading improvements WebP loaded as premultiplied alpha if it have alpha
2015-12-17 12:07:56 +03:00
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
fc84306bcb
Always update design resolution
2015-12-14 01:20:38 +02:00
4b33d730de
Calculate frame size with zoom factor
2015-12-14 00:53:46 +02:00
718422c1d9
Set frame size on window resize
2015-12-14 00:20:29 +02:00
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
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
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
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
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
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
60624b8fd5
fix Keyboard fails to hide on iOS.
...
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
2015-11-28 15:37:58 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
f0cc8e7f25
Fix keyboard won't dismiss on iOS issue
2015-11-27 15:44:35 +08:00
c0f7ecfcde
User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr
2015-11-25 09:49:19 +08:00
722f20c4b6
Update implement remove condition macro check.
2015-11-24 18:29:58 +08:00
f4d317f1fd
Combine Studio change for get program file full path.
2015-11-19 15:21:14 +08:00
acd3b5cbc4
Combine Studio change for openGL related operation
2015-11-17 13:38:42 +08:00
8695fbe711
Merge pull request #14172 from njh0602/somefix2
...
Add virtual keyword.
2015-11-11 14:17:27 +08:00
ac06c9f8bb
Merge pull request #14260 from pyrosphere/add-app-version
...
Added Application::getVersion() to get the app version.
2015-11-11 14:13:42 +08:00
f604f66539
Update only frame size on window resize
2015-11-11 04:42:58 +02:00
eb8b761381
Add option to create resizable window
2015-11-11 01:17:48 +02:00
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
fec8a5db02
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
2015-11-06 13:05:40 +07:00
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
7fe2b87574
CREATE_FUNC macro NULL -> nullptr
2015-10-31 20:18:39 +09:00
61ce3e8a03
Fixed warnings about missing override in CCApplication for iOS/Mac
2015-10-30 10:02:07 +00:00
11fc969ecb
Fixed inconsistency in getVersion() when no version is available on Android
2015-10-29 17:14:32 +00:00
9aa1f7138d
Added override keyword to getVersion
2015-10-29 08:36:03 +00:00
04fa7a8902
Added Application::getVersion() to get the app version.
2015-10-28 17:57:57 +00:00
7b758fd780
Fixed text may display of incomplete when Label create with system font on Mac.
2015-10-28 12:06:58 +08:00
d2d60e36d2
Merge pull request #14222 from TheCodez/fix_memoryleak
...
Fix memory leak in Enhance-API
2015-10-27 17:22:11 +08:00
561b15e260
Fix memory leak in Enhance-API
2015-10-24 14:26:59 +02:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
a7e5946b7d
Merge pull request #14154 from Dimon4eg/fix-crash-in-web-view-on-android
...
Fix crash in web view on android
2015-10-22 10:35:00 +08:00
7e43e28ca2
Fix crash in java code only
2015-10-21 16:55:25 +03:00
4012dd8455
Fix naming typos
2015-10-21 15:56:47 +09:00
d8e10981db
added check to see if app is already visible
2015-10-20 10:38:42 -07:00
34831d48ce
Fix memory leak in GLViewImpl
2015-10-19 19:46:45 +09:00
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
fdebb373b1
updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5
2015-10-16 15:36:34 -07:00
f49d467465
Add virtual keyword.
2015-10-17 04:46:37 +09:00
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
4c7edd457e
set _hasPremultipliedAlpha to false
2015-10-13 15:45:24 +08:00
5b35796093
Merge pull request #14091 from yangws/v3
...
Fix textfield input Chinese error with specific IME on Android.
2015-10-12 14:54:56 +08:00
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
90ef4be103
Fix textfield input chinese error with specific IME on Android.
2015-10-09 12:06:22 +08:00
7fd2ad7548
remove unneeded final temp string
2015-10-08 11:47:11 +08:00
c787e2c1b0
Merge pull request #14073 from mogemimi/fix-compiler-warning
...
Fix -Wformat-security warning on Xcode
2015-10-08 11:01:15 +08:00
8c04c01953
Fix -Wformat-security warning on Xcode
2015-10-05 19:53:03 +09:00
49e8abbc58
added #if _MSC_VER < 1900
2015-10-04 09:32:48 -07:00
b38eec4d47
Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice
...
Fix crash (integer overflow) in Device::getTextureDataForText (ios)
2015-10-04 11:00:07 +08:00
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
5c0d6691ca
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
2015-09-25 14:50:20 +08:00
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
40a6789765
Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm)
...
There was the problem when “height” and “width” were typecast to short
integer. So for values more than sizeof(short) we had integer overflow.
Steps to reproduce:
Create simple application with EditBox. Start it. Add 1000 (just
example) characters at a time to the EditBox. Method
Device::getTextureDataForText will be called and there will be integer
overflow for “height” and “width”. As a result application will crash
later.
2015-09-22 13:25:43 +03:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
deacab9222
Merge pull request #13990 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
d5151952bb
fixed compiler warning
2015-09-21 10:43:28 -07:00
9246d50a7f
Merge pull request #13234 from perminovVS/v3-dev-check-create-window
...
glfwCreateWindow not guarantee create
2015-09-20 23:22:47 +08:00
83db28ac9e
Added const qualifier to CC_PROPERTY get method
...
This macro is inconsistent with others, get methods should be const.
2015-09-19 01:54:52 +01:00
7ac0b861c9
Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point
...
FileUtilsWin32 removeDirectory correct remove file begins with point
2015-09-18 18:14:20 +08:00
6a975fe641
Merge pull request #13599 from perminovVS/winrt-mouse-support
...
WinRT support mouse
2015-09-18 17:26:15 +08:00
06b74695c2
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
...
Fix bags, can't open file on windows platforms, if this contains utf8
chars
2015-09-17 23:30:32 +03:00
fdacdcae07
FileUtilsWin32 removeDirectory correct remove file begins with point
...
Need check fileName . and .. for delete folders and files begin name.
2015-09-17 22:36:43 +03:00
583e780e29
Correct all templates
2015-09-17 22:09:41 +03:00
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
ea585f4b7d
Fix compile problems.
2015-09-16 09:34:24 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
556175df1e
add iOS EditBox multiline support
...
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
f9c20caa67
Merge pull request #13603 from perminovVS/correct-key-code
...
Desktop and WinRT use correct keyboard codes
2015-09-04 14:39:44 +08:00
ab5b634976
Merge pull request #13625 from frranck/patch-4
...
Update CCImage.cpp
2015-09-03 00:10:16 +08:00
527e254617
Remove glfwError
2015-09-02 18:41:23 +03:00
c1ac27fffb
glfwError no static member
2015-09-02 15:02:23 +03:00
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
8e195723e6
Update CCImage.cpp
...
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
2015-08-30 09:40:15 +02:00
b5688f504c
Desktop and WinRT use correct keyboard codes
...
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
2015-08-27 23:46:24 +03:00
bf40c1acd1
WinRT support mouse event
...
Mouse event implemented similar Desktop version.
Left button send mouse event and touch.
Support other mouse button and scroll wheel.
2015-08-27 21:34:25 +03:00
b5c289c622
WinRT support Show/Hide mouse cursor
2015-08-27 21:19:59 +03:00
30d52d1394
Fix #13591
2015-08-27 17:12:07 +09:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
09a1211c96
use isWindowsPhone() to check for Windows Phone platform
2015-08-26 09:47:59 -07:00
4cb3d88232
added isWindowsPhone() to correctly detect Windows 10 phone
2015-08-26 09:19:28 -07:00
fcae139857
removed old WP8_SHADER_COMPILER defines
2015-08-26 08:50:11 -07:00
24282e6e55
Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode
...
Correct use and convert unicode from utf8. WinRT
2015-08-24 11:36:30 +08:00
c47de9d04f
make new render surface current after device lost
2015-08-20 13:26:03 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
ee7b9377de
removed old wp8 code that breaks Win10 WACK tests
2015-08-17 18:40:07 -07:00
24d06bb1c9
More use StringUtf8ToWideChar and PlatformStringFromString
2015-08-17 23:04:05 +03:00
a16d04fb53
CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated
2015-08-16 13:08:00 +03:00
d70a21aa25
Correct use and convert unicode from utf8
...
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
2015-08-16 12:51:41 +03:00
a0c270234b
Replace tab with spaces
2015-08-14 21:17:51 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
be1d3ccc67
Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue
...
fix ui::TextField status error.
2015-08-12 13:57:10 +08:00
763976d50c
fix ui::TextField status error.
...
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.
2. Reorder the event handling in ui::TextField.
2015-08-12 11:05:07 +08:00
f3f67a10f9
Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
...
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
b2bf8469f0
Fix EditBox turning black when soft keyboard hide.
...
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.
But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
2015-08-11 11:42:37 +08:00
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
ba02d9df1d
fix engine crash because of wrong initialisation on some android device
2015-08-07 16:37:41 +08:00
0d778386f4
Merge pull request #13208 from dabingnn/v3_fixViewportCompile
...
Make viewport constructor more compile friendly
2015-08-06 17:45:23 +08:00
Adrien de Sentenac