Wang Nan
|
3890596cb8
|
Merge pull request #658 from 2youyou2/culling
support camera culling
|
2017-06-16 16:18:33 +08:00 |
|
Wang Nan
|
60b93f443b
|
Merge pull request #659 from dumganhar/fix/android-audio-crash-sync
Sync cocos2d-x #17923: [android] AudioEngine may crash while audio's over and stop state is triggered at the same time.
|
2017-06-16 16:17:31 +08:00 |
|
James Chen
|
8906d53f04
|
Sync cocos2d-x #17923
|
2017-06-13 17:47:36 +08:00 |
|
2youyouo2
|
532ea90858
|
set _cameraInstance to nullptr when destroy camera node
|
2017-06-13 09:58:12 +08:00 |
|
2youyouo2
|
28da01c80b
|
support camera culling
|
2017-06-09 18:33:40 +08:00 |
|
Nan Wang
|
4dd8c5a2d4
|
update version
|
2017-06-08 11:24:08 +08:00 |
|
Nan Wang
|
c702920be3
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-06-07 11:41:51 +08:00 |
|
pandamicro
|
71805810e1
|
Merge pull request #656 from knoxHuang/v1.5
fix create renderTexture error for fireball/issues/5860
|
2017-06-07 11:14:25 +08:00 |
|
knoxHuang
|
9aa16c1bfe
|
fix create renderTexture error for fireball/issues/5860
|
2017-06-07 09:52:09 +08:00 |
|
Nan Wang
|
7ec1f2c289
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-06-06 10:25:13 +08:00 |
|
Wang Nan
|
1eedf17da3
|
Merge pull request #653 from zilongshanren/add-culling-back
add 2d culling back
|
2017-06-02 17:58:42 +08:00 |
|
zilongshanren
|
aa1aff7e6b
|
remove culling for graphicsnode
|
2017-06-02 15:32:20 +08:00 |
|
zilongshanren
|
3261623a74
|
add 2d culling back for scale9sprite and grahpics
|
2017-06-02 15:15:59 +08:00 |
|
Wang Nan
|
0da0a8bef2
|
Merge pull request #650 from zilongshanren/improve-editbox-window-style
improve editbox window style
|
2017-06-01 13:54:49 +08:00 |
|
Wang Nan
|
8ca9993659
|
Merge pull request #651 from knoxHuang/v1.5
remove superfluous code in CCEventDispatcher
|
2017-06-01 13:54:33 +08:00 |
|
knoxHuang
|
c962ec5f98
|
remove superfluous code in CCEventDispatcher
|
2017-06-01 13:40:38 +08:00 |
|
zilongshanren
|
1315dab50e
|
improve editbox window style
|
2017-06-01 10:48:18 +08:00 |
|
Nan Wang
|
c6a828d2bf
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-06-01 10:00:59 +08:00 |
|
Wang Nan
|
620eae7833
|
Merge pull request #649 from knoxHuang/v1.5
fix CCSystemEvent bug for fireball/issues/5821
|
2017-06-01 09:49:36 +08:00 |
|
knoxHuang
|
af9d7fc0bc
|
fix CCSystemEvent bug for fireball/issues/5821
|
2017-06-01 09:47:34 +08:00 |
|
Nan Wang
|
5d1ce2a837
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-05-26 14:17:32 +08:00 |
|
Wang Nan
|
c1d8e5fa67
|
Merge pull request #647 from zilongshanren/improve-system-label-wrap-option
fix win32/mac editbox display size error in zoom mode
|
2017-05-25 14:26:18 +08:00 |
|
zilongshanren
|
6d31c00076
|
fix mac editbox positioning in zoom mode
|
2017-05-24 18:10:07 +08:00 |
|
zilongshanren
|
3c9fb6b4f3
|
fix win32 editbox display size error
|
2017-05-24 17:23:23 +08:00 |
|
Nan Wang
|
641862df84
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-05-24 14:31:34 +08:00 |
|
Wang Nan
|
f4a4a08ebe
|
Merge pull request #646 from dumganhar/fix/1.5-update-deps
update deps to 29
|
2017-05-24 13:47:01 +08:00 |
|
James Chen
|
6172e30a73
|
update deps to 29
|
2017-05-24 11:46:24 +08:00 |
|
Wang Nan
|
e84b0ee1b6
|
Merge pull request #639 from dumganhar/fix/fire-5783-audio
Call 'update' method in 'stop/stopAll' to cleanup immediately
|
2017-05-23 14:44:03 +08:00 |
|
Wang Nan
|
a8de5392cb
|
Merge pull request #641 from pandamicro/v1.5
Sync serious XMLHTTP leak fix
|
2017-05-23 14:42:39 +08:00 |
|
Wang Nan
|
05a8f128d9
|
Merge pull request #643 from pandamicro/cascade
Improve insertNode performance
|
2017-05-23 14:41:47 +08:00 |
|
Wang Nan
|
06c9226227
|
Merge pull request #644 from zilongshanren/improve-system-label-wrap-option
improve system label wrap option
|
2017-05-23 14:41:32 +08:00 |
|
zilongshanren
|
3f1b33258c
|
improve system label wrap option
|
2017-05-22 17:14:28 +08:00 |
|
colin
|
7ea050a7ce
|
Improve insertNode performance
|
2017-05-22 14:12:54 +08:00 |
|
pandamicro
|
f3e354b850
|
Sync serious XMLHTTP leak fix
|
2017-05-22 14:09:06 +08:00 |
|
James Chen
|
f535ec9b25
|
[win32] Call 'update' method in 'stop/stopAll' to cleanup immediately
|
2017-05-22 09:48:11 +08:00 |
|
James Chen
|
4edd40c5b4
|
Call 'update' method in 'stop/stopAll' to cleanup immediately
|
2017-05-22 09:45:49 +08:00 |
|
Nan Wang
|
9d76e1dfc2
|
Merge branch 'v1.5' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-05-19 16:42:56 +08:00 |
|
Nan Wang
|
8e4f569a20
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into v1.5
|
2017-05-19 11:41:02 +08:00 |
|
Wang Nan
|
aee32b30ed
|
Merge pull request #638 from 2youyou2/v1.5
update external config.json
|
2017-05-19 11:38:51 +08:00 |
|
2youyouo2
|
298b39d64c
|
update external config.json
|
2017-05-19 11:31:58 +08:00 |
|
Wang Nan
|
f5e985e4ea
|
Merge pull request #637 from dumganhar/fix/fire-5727-v1.5
fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
|
2017-05-19 11:27:47 +08:00 |
|
James Chen
|
6c4b055371
|
remove unused checking
|
2017-05-19 11:10:30 +08:00 |
|
James Chen
|
a4e60ad6bb
|
fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
|
2017-05-19 11:10:25 +08:00 |
|
Wang Nan
|
317bbbd18a
|
Merge pull request #636 from dumganhar/fix/fire-5727
fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
|
2017-05-19 11:08:15 +08:00 |
|
James Chen
|
f2dea4774e
|
remove unused checking
|
2017-05-19 11:02:02 +08:00 |
|
James Chen
|
f87f8c6854
|
fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
|
2017-05-19 10:29:52 +08:00 |
|
Nan Wang
|
d96077a68c
|
update travis branch
|
2017-05-19 10:26:05 +08:00 |
|
Wang Nan
|
9392c162e5
|
Merge pull request #635 from pandamicro/develop
Support multi touch on iOS (the correct way)
|
2017-05-18 14:37:41 +08:00 |
|
pandamicro
|
5394abb9bf
|
Support multi touch on iOS (the correct way)
|
2017-05-18 14:28:03 +08:00 |
|
Wang Nan
|
9a807f007a
|
Merge pull request #634 from pandamicro/develop
Support multi touch on iOS
|
2017-05-18 11:42:09 +08:00 |
|