6d9bd1bf65
fix stats of seconds per frame on iOS ( #18025 )
2017-07-04 13:38:03 +08:00
61815f57c0
Fixed Director memory leak ( #17952 )
2017-06-21 09:45:53 +08:00
3e912ffee3
add a macro to stip fps related data and functions ( #17934 )
2017-06-20 09:02:13 +08:00
4ca29ac1cf
Merge v3.15.1 ( #17897 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
* The optimization for huawei. (#17832 )
* The optimization for huawei.
* setAnimationInterval fix for all platforms.
* disable debug
* include fix.
* Uses better configuration for huawei optimization (#17838 )
* Uses better configuration for huawei optimization
* Updates jar file and uncomment fps controlling code
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840 )
* update release not and version (#17845 )
* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861 )
* Updates jar to resolve warning while packaging APK file. (#17863 )
* update release date (#17870 )
* fix compiling error
2017-06-05 13:37:50 +08:00
639737286f
before draw event ( #17669 )
2017-05-26 11:09:24 +08:00
013d8525ca
make fps stable on iOS ( #17852 )
2017-05-23 08:46:13 +08:00
ad260980c7
projection fixes ( #17487 )
2017-04-10 09:15:40 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
e2ad8946cb
Replace unsigned int with size_t to avoid implicit conversion ( #17297 )
2017-02-07 09:41:19 +08:00
1e1ac655b1
fixes for iOS 7 and earlier ( #16879 )
...
* initialize Director::_invalid on first init
* fix: Setting the GLView should be done after creating the RootViewController
* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController
* remove old iOS js and lua templates
* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
af8b9cc47c
Support MultiView matrix array ( #16723 )
...
* Support MultiView matrix array
Support MultiView matrix array and add new interface in GLProgram to
support shader header definitions.
* support getMatrixStackSize
* optimize code
* remove indents
* rename resetMatrixStack(unsigned int stackCount)
* Add document to interfaces
* Supplement document of render interface
2016-10-28 09:33:31 +08:00
5b8919829c
Fix typos in local variables ( #16712 )
2016-10-20 18:17:37 +08:00
3ecaa71944
fix: validates director before layout in iOS ( #16394 )
...
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class
github issue #14276
2016-08-18 18:13:15 -07:00
604312ac35
Revert "fix: uses correct constant for Eye in Director" ( #16385 )
2016-08-17 17:53:20 -07:00
dcea1b65ae
fix: uses correct constant for Eye in Director ( #16369 )
...
fixes github issue #8354
2016-08-15 23:27:20 -07:00
c3130caf27
Fix Desktop App crash upon exit when NotificationNode exists. ( #11274 )
2016-08-08 10:20:15 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
1a834ebdbf
fix: FPS appears again
...
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called
github issue #16139
2016-07-21 15:12:57 -07:00
bb25bed6f2
Merge pull request #16164 from dumganhar/fix/iss16046-fps-clock
...
Uses std::chrono::steay_clock for calculating dt.
2016-07-21 16:01:58 +08:00
ddb25ca563
Uses std::chrono::steay_clock for calculating dt.
2016-07-20 12:43:40 +08:00
5f0c0163b3
fix: display FPS again on GLFW platforms
...
Apparently GLFW stop emitting some events that creation time.
2016-07-19 18:26:14 -07:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
04a01b65f4
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
Github issue #15934
2016-06-24 11:44:55 -07:00
4700bbce43
fix restart game crash in FT_Get_Char_Index
2016-06-19 03:22:57 +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
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09: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
48e7d70d9d
Removes unused include in CCDirector.cpp
2016-02-29 18:58:17 +08:00
037051d9c4
Closes websocket connection by dispatching a 'resetDirector' event.
2016-02-29 18:55:51 +08:00
5de611b4b5
Fix typo of function name in AsyncTaskPool
2016-02-26 00:22:46 +09:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
bbf89cf016
Fix director restart issue
2016-02-15 16:30:32 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +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
763559cd1e
Invoking WebSocket::closeAllConnection while reseting Director.
2016-01-13 21:15:48 +08:00
ddb142e211
ouch... doesn't crash on pure C++ projects
2016-01-06 11:16:55 -08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +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
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
cbbfc69ad4
Add missing studio change for Director::drawScene
2015-11-30 11:19:02 +08:00
616eae2b6d
Add cc.Director.EVENT_BEFORE_UPDATE
2015-10-27 17:32:57 +08:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
minggo