afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
c7af8e3e74
Merge pull request #15987 from ricardoquesada/issue14017test
...
fix: add test case for issue #14017
2016-06-28 17:58:51 -07:00
a6305cc1f7
fix: add test case for issue #14017
...
Add test case for issue #14017
2016-06-28 17:32:13 -07:00
ed30993f59
fix: add testcase for issue #14050 fix
2016-06-28 17:08:56 -07:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
d7cb7676bc
Merge pull request #15966 from mogemimi/improve-refptr
...
Improve RefPtr to avoid casting when possible
2016-06-27 10:07:54 +08:00
a287e696c9
Improve RefPtr to avoid casting when possible
2016-06-26 21:39:43 +09:00
bc51528301
Fix typo in FileUtils::Status enum
2016-06-25 12:58:55 +09:00
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
d643b306ef
Remove cocos studio tests in JS-tests
2016-06-24 13:50:24 +08:00
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
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
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
ff71ffae84
fix: not crash after removing a physics body right after...
...
adding it.
2016-06-22 14:12:27 -07: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
8366983a01
fix js ui test missing UITest.json
2016-06-22 17:01:53 +08:00
beee9a664e
SocketIOTest: url fix
2016-06-22 12:10:19 +08:00
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07:00
d9b3ef55ae
Merge pull request #15880 from ricardoquesada/issue-15776
...
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
c387f953fa
fix: TextureCache ASSERTS if image is invalid
...
Github issue #15776
2016-06-17 16:07:33 -07:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
b80a81fc7c
removed incorrect AppBundle info
2016-06-16 06:09:59 -07: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
d12d19dbbe
Merge pull request #15857 from minggo/issue-15833
...
remove unneeded test case
2016-06-16 14:13:59 +08:00
43ece2de34
remove unneeded test case
2016-06-16 11:00:15 +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
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +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
72dfa63294
Fix assertion failure when running Sprite Test
2016-06-12 03:45:38 +09:00
598be0840c
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-10 14:53:11 +09:00
98bee7e12a
remove unneeded test case and fix resource missing ( #15804 )
...
* remove unneeded test case and fix resource missing
* remove unneeded test case
2016-06-08 13:36:36 +08:00
097eebdb50
Testcase for CCS 1.6 animations with only one frame ( #15714 )
...
* Testcase for CCS 1.6 animations with only one frame
* Removed extra comma
* Removed conflict garbage
* Removed old code
* Create new Test section Cocos Studio > Issues
* update ccs-res submodule
* Fixed Back button visibility
2016-06-06 09:32:33 +08:00
69974ab06f
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-28 22:15:56 +09:00
ff058eebc4
Merge pull request #15719 from ricardoquesada/issue_15594
...
fix: add code/resources to reproduce issue_15594
2016-05-26 20:40:38 -03:00
0be6645004
fix: 15594 compiles on android
...
github issue #15594
2016-05-26 19:25:39 -03:00
8bd4ddf081
fix: compile on linux, android and windows
2016-05-26 16:02:24 -03:00
1116176362
Merge pull request #15720 from billyquith/v3
...
Grammar corrections
2016-05-26 11:00:53 +08:00
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
b830b7de4c
fix: add code/resources to reproduce issue_15594
...
github issue #15594
2016-05-25 09:00:32 -03:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
8d1aad0f96
Fix test cases with PVRTC textures loading on devices that don't support this formats
2016-05-23 18:10:00 +03:00
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
50acf4c94b
Merge pull request #15660 from minggo/assetsmanager-test-issue
...
[ci skip]make AssetsManagerExTest can connect to the url
2016-05-17 17:15:45 +08:00
8c9138601c
make AssetsManagerExTest can connect to the url
2016-05-17 16:41:07 +08:00
d7d52c1996
Merge pull request #15638 from MSOpenTech/v3-winrt-fix
...
V3: Winrt added updated .filters file for Windows 8.1 Universal cpp-tests project
2016-05-17 10:39:44 +08:00
f0343bf219
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
2016-05-13 22:13:05 -04:00
cad762a4f9
added updated .filters file
2016-05-13 07:33:51 -07:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
cf305a56b1
removed missing files from project
2016-05-10 21:41:39 -07:00
8b0c2110fd
Merge pull request #15606 from minggo/websocket-test-issue
...
fix crash when back to parent test case
2016-05-11 09:28:42 +08:00
b2a592ce36
fix crash when back to parent test case
2016-05-10 17:55:36 +08:00
d7fea4b08b
reduce loop times to be quicker on low performace devices
2016-05-10 16:19:58 +08: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
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
44958d7361
not add invalid search paths
2016-05-06 15:54:08 +08:00
8068c51d94
remove studio related test cases and resources ( #15574 )
...
* remove studio related test cases and resources
* remove unneeded files
2016-05-06 13:38:19 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +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
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
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
d97275e0ad
Merge pull request #15505 from dumganhar/issue-15495
...
fixed #15495 : WebSocket crash on Director end (app exit),
2016-04-26 11:45:30 +08:00
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
6746aeb992
ignoreAnchorPointForPosition() -> set ~ from missing files
2016-04-25 20:43:42 +09:00
45d68ad265
fixed #15495 : WebSocket crash on Director end (app exit), WebSocketTest in cpp-tests needs to be updated.
2016-04-25 16:22:46 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
b8eae430fb
Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
...
extend the RichText
2016-04-20 20:05:29 -07:00
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
4c7e4671d9
Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. ( #15194 )
2016-04-20 17:25:31 +08:00
85646b8d80
Fix warning C4305 while compiling AppDelegate with MSVC
2016-04-20 04:01:06 +09:00
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
4d7bf1f827
updated expiration dates of all winrt test app and template certificates
2016-04-19 09:07:30 -07:00
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
f51f9003bf
Fix deprecation warnings in tests
2016-04-11 19:35:44 +09:00
2246495cc3
Add test for page view indicator tune
2016-04-11 12:29:02 +03:00
08383628cc
Merge pull request #15356 from minggo/crash
...
[ci skip]fix crash issue
2016-03-31 15:37:27 +08:00
8694a15a72
fix crash issue
2016-03-31 15:36:00 +08:00
fb3032b6fe
Merge pull request #15349 from minggo/menu_test
...
[ci skip]Menu test
2016-03-30 14:44:24 +08:00
c1a79700ae
don't set wrong string for atlas label
2016-03-30 14:28:33 +08:00
c566dce581
fix: compile cpp-tests in release mode
...
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
2016-03-29 18:09:58 -07:00
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
cf38b1fbfd
fix build failed of gradle
2016-03-11 19:23:26 +09:00
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
4247292c82
add test case for fix bugs
2016-03-10 18:06:54 +08:00
cce46195ca
Add websocket close test
2016-03-10 14:01:38 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08: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
19caf2d276
Merge branch 'v3' into add-listview-cellreuse-tests
2016-03-01 16:40:07 +08:00
7ec4450fc0
add js ListView item reuse tests
2016-03-01 15:22:32 +08:00
552d7d0132
add vertical list cell reuse tests
2016-03-01 13:44:42 +08:00
b3b08271e6
improve Listview item demo
2016-03-01 10:37:48 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
a839d5818e
add horizontal cell reuse ListView
2016-03-01 00:07:49 +08:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
fb7044c535
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-17 20:52:30 +03:00
c26fe122ad
SpriteFrameCacheTest: test for PixelFormat
2016-02-12 19:06:16 +03:00
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
2016-02-08 11:25:37 -08:00
a93bc88d31
add Mac Editbox multiline support.
...
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +08:00
74e7bd2083
fix win32 compile error
2016-01-26 09:52:53 +08:00
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
be7c8c7553
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
...
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
be6fd6a2ee
format code indent
2016-01-21 10:27:37 +08:00
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08:00
e2a3fb4a04
update ccs-res for scroll bar test
2016-01-20 21:12:52 +08:00
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
41c0881ab5
SpriteTest fix
...
* Image is Ref class, please new & release it. Don't allocate it on stack.
* Fixes complicated logic of getting string from file.
2016-01-15 00:55:10 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
eab1de0f1e
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
2016-01-13 16:34:04 +08:00
e3c50caf11
add test case for PlayableFrame
2016-01-13 15:25:31 +08:00
e1d0d7f722
Merge pull request #14854 from zilongshanren/fixScale9GrayShader
...
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08: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
7d943f200f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
2797277de8
Revert "fix scale9sprite gray state opacity issue."
2016-01-07 17:07:27 +08:00
1910f79b2f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
81428737c9
fix compilation errors
2016-01-05 09:51:37 +08:00
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +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
88196a4879
Both Image/blocks9ss.plist and animations/grossini.plist have image frames grossini_dance_*.png, and in Image/blocks9ss.plist the frames is smaller than frames in animations/grossini.plist, so if load Image/blocks9ss.plist first, the samples use frames named grossini_dance_*.png in animations/grossini.plist will crash. After check in source file, we found these frames in Image/blocks9ss.plist hasn't been used, so we changed frames name in Image/blocks9ss.plist to avoid crash.
2015-12-24 20:22:01 +08:00
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
bcc2ed0e2a
update for scrollView test
2015-12-23 18:14:09 +08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
82867b0073
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
...
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
064cd8d04f
Merge pull request #14722 from newnon/v3.10_webp_improvement
...
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +08:00
81f9d20158
update for js uiTextAtlasTest
2015-12-21 16:29:16 +08:00
09c139039f
add tmx with flipped spritebatch test
2015-12-21 10:00:15 +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
Ricardo Quesada