minggo
|
ed955cbe1d
|
update version
|
2016-06-17 18:09:27 +08:00 |
minggo
|
3c12cce352
|
update changelog
|
2016-06-17 18:09:20 +08:00 |
minggo
|
f9988cad8e
|
Merge pull request #15873 from CocosRobot/update_lua_bindings_1466129959
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-06-17 11:54:31 +08:00 |
minggo
|
3ab6f78965
|
Merge pull request #15872 from CocosRobot/update_cocosfiles_1466129842
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-17 11:54:23 +08:00 |
CocosRobot
|
4c233b8df7
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-06-17 02:22:58 +00:00 |
CocosRobot
|
eee0d14e8f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-17 02:17:23 +00:00 |
minggo
|
6778ebf451
|
Merge pull request #15853 from ricardoquesada/vr_squashed
Squashed commit of the following:
|
2016-06-17 10:15:20 +08:00 |
minggo
|
e9cf762304
|
Merge pull request #15866 from minggo/remove-compiling-flag
remove gcc comipling flag
|
2016-06-17 09:39:18 +08:00 |
minggo
|
34f8fcbef0
|
Merge pull request #15867 from Microsoft/v3-win10-fix
V3: removed incorrect AppBundle info for Win10 cpp-test project
|
2016-06-17 09:39:09 +08:00 |
minggo
|
6280b8a376
|
Merge pull request #15870 from mogemimi/fix-unused-function
Remove unused debug function in RenderCommand
|
2016-06-17 09:38:32 +08:00 |
minggo
|
44ced37785
|
Merge pull request #15825 from dumganhar/iss15652-perf-fix
issue #15652: fix low FPS on some android devices while auto batch is disabled.
|
2016-06-17 09:37:42 +08:00 |
minggo
|
3a0b2aff1e
|
Merge pull request #15865 from CocosRobot/update_cocosfiles_1466063494
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-17 09:37:01 +08:00 |
mogemimi
|
0872a50f60
|
Remove unused debug function in RenderCommand
|
2016-06-17 03:19:19 +09:00 |
Ricardo Quesada
|
08ed2eccd2
|
fix: using `enum class` instead of `typedef enum`
|
2016-06-16 07:02:04 -07:00 |
Dale Stammen
|
b80a81fc7c
|
removed incorrect AppBundle info
|
2016-06-16 06:09:59 -07:00 |
minggo
|
832ec5eab4
|
remove gcc comipling flag
|
2016-06-16 16:14:50 +08:00 |
CocosRobot
|
134a09da6f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-16 07:51:35 +00:00 |
minggo
|
50ebac34a6
|
Merge pull request #15864 from zilongshanren/upgrade-external-config
bump config.json version to 99
|
2016-06-16 15:49:24 +08:00 |
zilongshanren
|
40e72ffc53
|
bump config.json version to 99
|
2016-06-16 15:04:29 +08:00 |
minggo
|
0db0a45fa0
|
Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
fix TTF and BMFont word wrap
|
2016-06-16 15:01:27 +08:00 |
minggo
|
9b210e00d7
|
Merge pull request #15837 from geemedia/cmake-improvements
Various CMake improvements
|
2016-06-16 14:53:10 +08:00 |
minggo
|
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 |
minggo
|
bef15fd971
|
Merge pull request #15861 from mogemimi/fix-wsometimes-uninitialized
Fix -Wsometimes-uninitialized warning in release build
|
2016-06-16 14:15:53 +08:00 |
zilongshanren
|
f0f8663fa9
|
fix TTF and BMFont word wrap
|
2016-06-16 14:15:00 +08:00 |
minggo
|
d12d19dbbe
|
Merge pull request #15857 from minggo/issue-15833
remove unneeded test case
|
2016-06-16 14:13:59 +08:00 |
mogemimi
|
01aaff66c8
|
Fix -Wsometimes-uninitialized warning in release build
|
2016-06-16 14:27:52 +09:00 |
minggo
|
5fa57ae5c1
|
Merge pull request #15844 from halx99/patch-1
fix: missing properties for clone
|
2016-06-16 11:15:13 +08:00 |
minggo
|
0f2a8068c4
|
Merge pull request #15858 from CocosRobot/update_cocosfiles_1466046619
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-16 11:12:06 +08:00 |
CocosRobot
|
600175a93c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-16 03:10:20 +00:00 |
minggo
|
ab0e461b00
|
Merge pull request #15852 from MSOpenTech/v3-winrt-x64
V3: updated to support Windows 10 UWP x64 builds
|
2016-06-16 11:08:28 +08:00 |
minggo
|
d8bd0ff8c8
|
Merge pull request #15855 from mogemimi/fix-possible-leak
Fix possible memory leak when pass initialization fails
|
2016-06-16 11:04:03 +08:00 |
minggo
|
1df89de065
|
Merge pull request #15856 from CocosRobot/update_lua_bindings_1466045768
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-06-16 11:02:18 +08:00 |
minggo
|
43ece2de34
|
remove unneeded test case
|
2016-06-16 11:00:15 +08:00 |
CocosRobot
|
cc2b887dbb
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-06-16 02:58:46 +00:00 |
minggo
|
b0f3d43414
|
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
RenderTexture - set opacity modify RGB
|
2016-06-16 10:52:21 +08:00 |
Ricardo Quesada
|
9e40fffb13
|
fix: remove liboculus
|
2016-06-15 17:53:01 -07:00 |
Ricardo Quesada
|
98e2c4bb4a
|
fix: compiles cpp-empty-test
|
2016-06-15 15:25:19 -07:00 |
mogemimi
|
4f329d8aac
|
Fix possible memory leak when pass initialization fails
|
2016-06-16 04:52:38 +09:00 |
Ricardo Quesada
|
ccfbc29288
|
fix travis error
|
2016-06-15 12:08:40 -07:00 |
Ricardo Quesada
|
180c2f1e9a
|
Squashed commit of the following:
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 11:26:33 2016 -0700
Merge branch 'v3' into vr
commit b32d329f9331a4f9bbbbf946b88b31db7559934d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 11:25:27 2016 -0700
fix: dont' include oculus files
commit 816928c6a8782984830aa92de5bed038c1306cdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 10:57:26 2016 -0700
fix: missing guard in header
commit 2abd4eb5a1fc961c2cbae9b00809b5e6409740db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 10:43:49 2016 -0700
removed VR engines... should be part of package manager
commit 583179755d1c66c02e898297230d0f882e629b98
Merge: 12f4f71 b6d6bb0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 10:42:37 2016 -0700
Merge branch 'vr' of github.com:ricardoquesada/cocos2d-x into vr
commit 12f4f71aca4fa15231976a7727faf40648d62313
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jun 15 10:42:12 2016 -0700
fix: new VR API... easier to enable/disable different VR renderers
commit b6d6bb087f54cbd272fbfb9e1cf1cd6bba776ffa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 14 20:48:04 2016 -0700
fix: compiles and runs on win10
commit e73aa8902118377abbd2192c757104c4531d2a9e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 14 20:27:06 2016 -0700
fix: vr works again
commit 5615e276507edf8602f043f3130204a89dbaba69
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 14 18:55:18 2016 -0700
fix: compiles on windows
commit 494061ee4da8fbc5616f83efb64b2c0c3932778e
Merge: 284910b fd3b6d4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 14 17:13:47 2016 -0700
Merge branch 'v3' into vr
commit 284910b204ee0dd76d949ea8f2b2f6b1b72e533f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 14 17:12:25 2016 -0700
android vr: better performance
commit aa8328e8029143dd7c6c724f38915f0fb3b64abe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jun 13 16:10:14 2016 -0700
fix: low pass filter in accel and magnet
commit f6d9b622abff5abb95ad60fa7139f3ce1ec9caab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jun 13 15:43:00 2016 -0700
fix: removes debugging info
commit 2004f0ce5605dad70ff8656a058073181346f083
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jun 13 14:54:32 2016 -0700
fix: kind of works on android! yeah!
commit d6dcb6a3410fda053f0d6fbc00af817a13a86d3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 10 09:44:53 2016 -0700
logging
commit 7e5d6ad52d39642c111e7b690173338af4e94092
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 7 22:53:07 2016 -0300
android head tracking
compiles, doesn't work yet... how to debug java code?
commit cbf5f6482aa0ae002a7dc40045ef3ffdbe192e26
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 7 19:45:41 2016 -0300
reading sensor from android
not compiling yet
commit 6ee0a3c2c43f8e8a603bfce9fddb0cce5ce79415
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jun 7 11:45:06 2016 -0300
compiles on android... finally
commit fb728da756ca7ee94b316c113e2239a77d9f4b53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jun 6 18:15:12 2016 -0300
fix: compile vr android files only on android
commit 90db6daef382d142bb60207d2b16936dd66ee245
Merge: 2e56f03 cc936af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jun 6 12:15:56 2016 -0300
Merge pull request #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 |
Dale Stammen
|
53321e401a
|
updated to support Windows 10 UWP x64 builds
|
2016-06-15 08:50:04 -07:00 |
minggo
|
fc44d0deed
|
Merge pull request #15850 from minggo/hide-virtual-button
[ci skip]hide virtual button correctly
|
2016-06-15 18:38:59 +08:00 |
minggo
|
7bf13f34cd
|
hide virtual button correctly
|
2016-06-15 18:33:52 +08:00 |
PooperPig
|
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 |
minggo
|
8c9019b128
|
Merge pull request #15848 from minggo/hide-virtual-button
[ci skip]hide virtual button if has focus
|
2016-06-15 18:20:53 +08:00 |
minggo
|
d94dc7edc0
|
hide virtual button if has focus
|
2016-06-15 18:19:06 +08:00 |
minggo
|
3807a2f678
|
Merge pull request #15847 from minggo/hide-virtual-button
[ci skip]hide virtual button by default
|
2016-06-15 18:08:00 +08:00 |
minggo
|
a8c6011f66
|
use android sdk 19
|
2016-06-15 18:06:53 +08:00 |
minggo
|
8634773be3
|
hide virtual button by default
|
2016-06-15 17:55:26 +08:00 |
minggo
|
d7b495c3d1
|
Merge pull request #15838 from MagicXrEv/rename-end-functions
lua binding : Rename end() to endToLua().
|
2016-06-15 16:24:34 +08:00 |