69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
dbc083b924
Merge pull request #15939 from halx99/patch-2
...
Optimize, remove unnecessory truncate.
2016-06-24 09:54:57 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
459b7f30c6
refactoring Android editbox setVisible API
...
fix set visible issue of android editbox
fix android lower case multiline
revert unkown changes
2016-06-23 18:18:39 +08:00
cd93612746
Optimize, remove unnecessory truncate.
2016-06-23 16:01:05 +08:00
08898db883
Merge pull request #15831 from j-jorge/premultiplied-alpha-config
...
Add a config option to enable or disable the premultiplied alpha code.
2016-06-23 13:57:41 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
324931a242
Merge pull request #15919 from zilongshanren/fix-android-system-fontname
...
fix system font creation on Android platform
2016-06-22 18:10:13 +08:00
783dfb3f14
fix system font name on Android ttf creation
2016-06-22 16:54:01 +08:00
9fd190d283
Merge pull request #15916 from dumganhar/fix/AssetsManager
...
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
6b9c76fd93
should use full path to check directory
2016-06-22 10:19:35 +08:00
6fb3946c51
Add a config option to enable or disable the premultiplied alpha code.
2016-06-20 18:05:11 +02:00
84db1ac294
fix downloader build issue for Android API 23
...
fixes #15823
2016-06-17 22:32:49 +09:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
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
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
fc44d0deed
Merge pull request #15850 from minggo/hide-virtual-button
...
[ci skip]hide virtual button correctly
2016-06-15 18:38:59 +08:00
7bf13f34cd
hide virtual button correctly
2016-06-15 18:33:52 +08:00
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
d94dc7edc0
hide virtual button if has focus
2016-06-15 18:19:06 +08:00
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
a8c6011f66
use android sdk 19
2016-06-15 18:06:53 +08:00
8634773be3
hide virtual button by default
2016-06-15 17:55:26 +08:00
d7b495c3d1
Merge pull request #15838 from MagicXrEv/rename-end-functions
...
lua binding : Rename end() to endToLua().
2016-06-15 16:24:34 +08:00
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
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
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
598be0840c
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-10 14:53:11 +09:00
07e0c1cbf9
Fix typo in method name: 'destory' -> 'destroy'
2016-06-09 09:25:06 +09:00
93d87ad19e
android supports LOWERCASE_ALL_CHARACTERS
2016-06-07 12:41:22 +08:00
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
75227a5c0e
[desktop]fix the bug the depth test is disabled when application size changed
2016-06-02 16:18:31 +08:00
7243b00cad
add a new create method to create resizable window
2016-06-02 15:48:16 +08:00
a4a357db69
Remove unnecessary sinf, cosf, tanf and sqrtf macros
2016-05-31 02:39:40 +09:00
c647a95656
Fix C4267 and C4309 warnings when compiling for Windows 10 UWP
2016-05-29 14:43:28 +09:00
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
3ea46c617f
It mute warning on android clang.
2016-05-27 15:39:33 +09:00
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
13003d9a78
Merge pull request #15727 from dumganhar/editbox-fix
...
Make sure closeKeyboard run on UI thread
2016-05-26 18:08:03 +08:00
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
d42b99b10b
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 15:49:57 +08:00
cf883b5c0f
UI thread check.
2016-05-26 12:02:23 +08:00
a472ab2931
Make sure closeKeyboard run on UI thread
2016-05-26 11:57:57 +08:00
5321a2fc7a
Removes unused package import for Cocos2dxSound.java.
2016-05-26 11:15:44 +08:00
1285954cd9
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 10:25:45 +08:00
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
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
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
c6034787e4
Merge pull request #15664 from mogemimi/replace-ccassert-macro
...
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
a54251b854
Merge pull request #15659 from mogemimi/use-const-reference
...
Use const references whenever possible
2016-05-18 11:55:55 +08:00
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
3e396fedab
Merge pull request #15617 from pandamicro/v3
...
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
c96bd9a4df
Resolve local reference leak and function order
2016-05-17 12:06:28 +08:00
16878a53b1
Suppress MSVC warning C4800
2016-05-13 11:44:17 +09:00
6b59dc24c7
Add Image::setPNGPremultipliedAlphaEnabled
2016-05-11 16:36:21 +08:00
1cbbde5d8b
Fix android LocalStorage return null for empty string value
2016-05-11 11:57:54 +08:00
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
79b9a191d0
declare explicitly FileUtilsApple destructor
2016-05-09 21:50:52 +09:00
d086965683
Merge pull request #15598 from minggo/android-package-name
...
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
7c1e60f0b7
Prevent memory leak: force drain on autoreleased `data`.
2016-05-05 08:00:28 -06:00
9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
e2c38ed87f
make std::isnan work for winrt
2016-05-05 10:29:31 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
6260c67941
Merge pull request #15549 from minggo/issue_15525
...
use std::atof() instead
2016-05-04 09:38:42 +08:00
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
8585120abb
glfwCreateWindow not guarantee create
...
Need check glfwCreateWindow and show info, if there is a problem
2015-08-05 23:06:16 +03:00
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
881adf6f36
Merge pull request #13217 from jianglong0156/fixTextFieldBug
...
fix textfield and editbox can not input emoticon
2015-08-05 17:41:19 +08:00
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
5f9a3b97fb
fix viewport constructor error in old compiler to make it more compatible.
2015-08-05 10:57:27 +08:00
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
f74438372c
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
...
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
20d445ad1a
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
2015-07-29 16:11:27 +08:00
6de387b3ac
fix Mac system font crash issue
2015-07-29 15:20:31 +08:00
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
c81ba3c148
Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios
...
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-29 11:09:56 +08:00
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
31bd25a5e9
Merge pull request #12762 from yangws/issue_10759
...
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-21 10:47:55 +08:00
371053305e
Merge pull request #12915 from yangws/issue_12887
...
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after…
2015-07-20 14:01:21 +08:00
14a419d725
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
2015-07-20 11:14:06 +08:00
66dadea0cd
Rollback log level
2015-07-17 15:56:51 +08:00
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
3d06ca297f
Merge pull request #10255 from WenhaiLin/v3-activitylife-fix
...
Fixed game awaked by the clock on Android
2015-07-13 22:34:22 +08:00
22b4f5a11e
Merge pull request #12238 from lite3/patch-3
...
remove old path When added existing new searchPath
2015-07-13 22:16:50 +08:00
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
8ab1dce2a0
Merge pull request #12778 from yangws/issue_9586
...
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
2015-07-13 11:03:24 +08:00
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +08:00
142d354485
[ci skip]Replace tab with spaces.
2015-07-10 21:03:43 +08:00
b459940bb8
[ci skip]Replace tab with spaces.
2015-07-10 20:47:21 +08:00
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
34aa7a0bb1
Remove unused variable.
2015-07-10 16:40:02 +08:00
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +08:00
d55c0c64c5
add std::nothrow
2015-07-08 15:19:17 +08:00
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
f126eb3267
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
...
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-03 15:42:45 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
363da2beab
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-02 12:07:24 +03:00
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
e574c38a6b
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
...
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 22:26:54 +08:00
ed029d264f
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 18:40:39 +08:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
f617d6f1aa
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
...
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 15:27:43 +08:00
79aa300448
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 13:42:32 +08:00
b275ce2283
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 13:38:06 +08:00
55b86b2e14
add more docs for samsung enhanced API
2015-06-19 18:09:42 +08:00
c249f7cb69
keep old behavior
2015-06-15 19:48:12 +08:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
86b6ea702a
Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix
...
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:48:42 +08:00
518de1ff57
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:42:45 +08:00
d0db40c4a6
Merge pull request #12080 from linshun/v3
...
issue #12078 added audio, network, physics, platform and storage group.
2015-06-15 12:45:11 +08:00
19ef0e0983
Fix indent
2015-06-12 13:01:13 +08:00
0f64a2d192
removed obsolete override of setViewPortInPoints
2015-06-11 07:59:52 -07:00
03814a569d
Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix
...
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-11 14:30:36 +08:00
6dfe937cae
Merge pull request #11892 from dabingnn/v3FrameBufferObject
...
V3 frame buffer object
2015-06-11 14:04:30 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
79b3d70b60
fix bug #12200
...
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
2015-06-09 18:43:46 +08:00
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
6fec9c40b0
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-09 15:07:35 +08:00
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +08:00
f1d879f7ed
remove old path When added existing new searchPath
2015-06-08 13:34:45 +08:00
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
6216e74a38
Merge pull request #12165 from gyf19/v3
...
HttpClient Android supports gzip
2015-06-04 22:00:13 +08:00
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
38c9490f4d
don't delete rendering thread. SpiderMonkey needs to stay on same thread
2015-06-03 09:19:05 -07:00
164e4c8314
HttpClient Android supports gzip
2015-06-03 19:41:14 +08:00
883f250f6a
Merge pull request #12137 from WenhaiLin/v3-text-line-height
...
Fixed the text line height calculation is wrong with system font on Android.
2015-06-03 16:24:38 +08:00
88697bf136
Remove unused function.
2015-06-02 16:38:06 +08:00
67d0088103
Fixed the text line height calculation is wrong with system font on Android.
2015-06-02 16:23:40 +08:00
2c611693c6
Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness
...
Improve UserDefault's robustness on Android.
2015-06-02 10:11:19 +08:00
9d8225aae8
Improve UserDefault's robustness on Android.
2015-06-01 15:09:11 +08:00
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
039c0036be
Merge pull request #12072 from iris-wy/v3
...
Add enhance service API
2015-05-29 15:32:06 +08:00
05d33ac0c8
removed old WP8 files
2015-05-28 14:08:25 -07:00
ef39251d14
issue #12078 : added platform group
2015-05-28 15:47:40 +08:00
bbfc33dfd2
format
...
format
2015-05-28 11:03:49 +08:00
9e477303f1
delete useless TAG
...
delete useless TAG
2015-05-28 10:55:10 +08:00
0007799794
modify Enhance API
...
modify Enhance API
2015-05-28 10:47:12 +08:00
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
4501a53cfa
Added MP3 support to simple audio engine
2015-05-27 10:57:26 -07:00
999de9072a
Merge pull request #12003 from minggo/remove-unneeded-function
...
remove uneeded function
2015-05-25 16:33:38 +08:00
db0caf68c6
remove uneeded function
2015-05-25 09:50:48 +08:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
aa7876aefc
remove deprecated methods
2015-05-20 07:55:10 -07:00
cada493685
remove deprecated methods
2015-05-20 07:51:52 -07:00
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
bfb3fbb1c0
Revert _checkPath
2015-05-17 19:24:57 +03:00
295e8532d2
FileUtilsWin32 correct use all unicode version winapi
...
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile
And use common convert to wide char.
2015-05-17 12:40:14 +03:00
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
68ec7c8ca1
Add enhance service API
...
Add enhance service API
2015-05-15 14:29:22 +08:00
5e776381aa
Merge pull request #11820 from Dimon4eg/v3
...
Fix crash in web view if illegal character in url (Android only)
2015-05-15 10:12:54 +08:00
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
8577055d5a
Implement localStorage.clear on Android
2015-05-14 10:40:25 +08:00
9d7e5e5edc
Fix crash in web view if illegal character in url (Android only)
2015-05-13 14:56:07 +03:00
134355d763
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
...
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
2015-05-13 20:52:32 +09:00
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
26c9be7881
Add FileUtils::getSuitableFOpen[window-universal]
2015-05-04 16:06:04 +08:00
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
1950498b0a
Replace tab with space.
2015-04-29 18:41:10 +08:00
1d9ff11837
VideoPlayer:Fixed can't play video on Android 2.3.x
2015-04-29 18:32:59 +08:00
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
c0b2433bb5
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
2015-04-27 15:45:23 +08:00
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
ac8755868d
need to call Cleanup() if app is terminating
2015-04-22 19:13:12 -07:00
b78f830ed8
cleaned up Draw()
2015-04-22 19:11:42 -07:00
4119b0f10d
cleaned up Draw()
2015-04-22 19:11:29 -07:00
22daece170
made Cleanup() public
2015-04-22 19:08:11 -07:00
c3335551b8
added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
2015-04-22 19:07:48 -07:00
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
aec086a473
convert BGR and RGB to GUID_WICPixelFormat24bppRGB
2015-04-21 18:16:54 -07:00
516966a96f
check for PixelFormat::DEFAULT
2015-04-21 18:11:56 -07:00
0c47df5df2
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
2015-04-21 06:21:32 -07:00
83b68ef693
added comment on how back button event is handled
2015-04-20 18:36:58 -07:00
50f381f070
added CCLOG message to describe how to handle Windows Phone back button event
2015-04-20 18:30:52 -07:00
4169ebf5c8
Windows Phone 8.1 back button and terminate app support
2015-04-20 10:43:34 -07:00
e00b0dfbd9
Merge branch 'v3' into v3-winrt-backbutton
2015-04-20 08:17:16 -07:00
2476f2b52d
fixed win32 application return code
2015-04-20 18:27:21 +08:00
dc768dbd8c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
2015-04-20 10:06:48 +08:00
ec378b612e
added listener if back button event not handled by app
2015-04-19 18:53:10 -07:00
a97d5c5370
added support for hardware back button on Windows Phone 8.1
2015-04-19 16:31:30 -07:00
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
f1f0c5a653
start of back button support
2015-04-17 15:47:52 -07:00
79f312d101
call pause on correct thread
2015-04-17 09:31:02 -07:00
2ccff5671a
fix for encoding images with WIC
2015-04-17 09:20:23 -07:00
d3a06de6d6
remove system zlib dependency since we use our own prebuilt version of
...
zlib now.
2015-04-17 17:24:33 +08:00
1f491cf656
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
...
Conflicts:
build/cocos2d-wp8.sln
2015-04-16 17:04:07 +08:00
97f150a89f
Merge pull request #11452 from MSOpenTech/v3-remove-wp8
...
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
b1c9c34c19
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:19:38 -07:00
7d22e49642
only needed if _MSC_VER < 1900
2015-04-15 09:18:48 -07:00
68430ce4fa
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:18:23 -07:00
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
2dd88e8be5
Fixed JNI illegal start byte error
2015-04-15 18:20:52 +08:00
8c2413aa54
Add submodule js-bindings & html5.
2015-04-14 15:20:46 +08:00
272bb35246
Merge branch 'v3' into v3-wp8-fix
2015-04-08 07:29:45 -07:00
24c0c8d811
fix wp8 compile issue
2015-04-08 18:01:56 +08:00
4d9e376a18
Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
...
Log message can't detect image format
2015-04-08 10:52:56 +08:00
f962e14b43
replace const_cast with mutable in path getters;
...
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
ba06886e01
GLViewImpl initWithRect bug size
...
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)
Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
2015-04-06 14:24:22 +03:00
3931273a58
Log message can't detect image format
...
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.
Log message if format unknown
2015-04-04 13:19:47 +03:00
fc92acf587
remove interlevel argument.
2015-04-03 16:43:39 +09:00
98371e4fbb
Merge pull request #11267 from WenhaiLin/v3-at01
...
Disable MessageBox when the device does not have an accelerometer on WinRT.
2015-04-03 11:53:07 +08:00
fdba25cdde
Disable MessageBox when the device does not have an accelerometer on WinRT
2015-04-03 11:51:00 +08:00
d8b6a0aaf9
removed unused method
2015-04-02 09:11:19 -07:00
47b338e4e6
fix deprecated warnings
2015-04-02 09:08:26 -07:00
957bf48790
fire foreground and background events
2015-04-02 09:07:44 -07:00
aaae566b7b
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
2015-04-02 23:35:56 +08:00
b7279524d6
Win32 correct rename file
...
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
2015-03-31 13:52:40 +03:00
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
3d772df930
Add comment
2015-03-27 14:43:24 +08:00
17bd26e9d4
Add comments
2015-03-27 11:39:31 +08:00
f13065a038
[ci skip]Update comments
2015-03-25 11:07:11 +08:00
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
89f9ae044d
[ci skip]Update comments
2015-03-24 20:29:13 +08:00
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
2caff4e64d
[ci skip]Update comments
2015-03-24 14:12:58 +08:00
1450dfbc7b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen
2015-03-24 11:26:10 +08:00
4973de2b25
add more doxygen document
2015-03-24 11:15:40 +08:00
14574bdd41
add doxygen comment of CCFileUtils.h
2015-03-24 10:34:44 +08:00
78a8ba7f98
[ci skip]Update comments
2015-03-23 22:17:59 +08:00
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
fc94659fd5
updated precompiled shaders for WP8
2015-03-20 23:50:48 -07:00
a29a298ec3
fix wrong comment
2015-03-20 09:49:34 +08:00
0648ac7ca0
Merge pull request #11004 from SuYaoHui/cocosapi
...
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
5e236fd753
progressTimer,ApplicationProtocol
2015-03-19 21:42:31 +08:00
8e32933dd3
Merge pull request #10340 from seobyeongky/network_bugfix2
...
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +08:00
c295952c71
NodeGrid,Config,NS,ApplicationProtocol
2015-03-19 21:03:28 +08:00
2aec39ad56
Added Bulgarian language.
2015-03-17 15:14:02 +02:00
65c83378d0
Merge branch 'v3' into v3-wp8-fix
2015-03-16 20:22:28 -07:00
f7d5a16734
Merge pull request #10873 from konopka/fix_compiler_override_warnings
...
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
e2a5eb2f9f
updated to Angle ddbf057c52
2015-03-16 08:18:26 -07:00
f25be54e95
Merge pull request #10671 from kpkhxlgy0/v3
...
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
3194da4e7d
Merge pull request #10720 from darkdukey/hide_cursor
...
Hide cursor
2015-03-13 10:48:15 -07:00
a2274162b5
merged
2015-03-12 10:06:53 +09:00
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
0d65dd13be
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-09 21:20:17 +09:00
a9479a1585
updated WP8 precompiled shaders
2015-03-08 21:42:27 -07:00
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
215fe8a0c9
Windows network path fix
2015-03-05 11:10:03 +03:00
Ricardo Quesada