Commit Graph

1162 Commits

Author SHA1 Message Date
Wang Nan 3890596cb8 Merge pull request #658 from 2youyou2/culling
support camera culling
2017-06-16 16:18:33 +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
knoxHuang 9aa16c1bfe fix create renderTexture error for fireball/issues/5860 2017-06-07 09:52:09 +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
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
knoxHuang af9d7fc0bc fix CCSystemEvent bug for fireball/issues/5821 2017-06-01 09:47:34 +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
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
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
2youyouo2 298b39d64c update external config.json 2017-05-19 11:31:58 +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
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
pandamicro 5b721d51b2 Support multi touch on iOS 2017-05-18 11:36:49 +08:00
2youyouo2 61c76e0d8b support vs 2017 2017-05-17 18:02:57 +08:00
2youyouo2 f873d7f7b4 update game.rc 2017-05-17 17:58:01 +08:00
Wang Nan 5afdbfbc0e Merge pull request #632 from zilongshanren/fix-windows-label-overflow
improve editbox
2017-05-17 17:03:55 +08:00
zilongshanren 456700982f improve editbox 2017-05-17 14:54:24 +08:00
CocosRobot bc44901b16 [ci skip][AUTO]: updating jsbinding automatically 2017-05-16 07:39:25 +00:00
pandamicro a5334ed22a Fix can not restart update after failed issue 2017-05-16 15:27:30 +08:00
pandamicro 67c46cc22b Improve function wrapper 2017-05-16 15:07:21 +08:00
pandamicro fa5fe36f2e Fix version compare handle setting 2017-05-16 15:07:10 +08:00
pandamicro 714ca23e47 Check previous updating state to resume 2017-05-16 15:06:03 +08:00
Wang Nan 8e7c661291 Merge pull request #628 from 2youyou2/physics
add rigidbody.getJointList
2017-05-15 18:00:15 +08:00
zilongshanren dba7eb0d8d refine code 2017-05-15 17:36:45 +08:00
zilongshanren d727e2657f fix windows system label overflow 2017-05-15 17:28:28 +08:00
2youyouo2 c8918d17dd add rigidbody.getJointList 2017-05-15 17:16:13 +08:00
子龙山人 9cc70e6b3c Merge pull request #627 from zilongshanren/refactoring-win32-editbox
improve coding style
2017-05-15 13:46:32 +08:00
zilongshanren f7407266fb improve coding style 2017-05-15 13:46:20 +08:00
Wang Nan c7e88dbac6 Merge pull request #626 from zilongshanren/refactoring-win32-editbox
fix bugs of windows editbox
2017-05-12 10:56:33 +08:00
zilongshanren ae17f9d15d fix bugs of windows editbox 2017-05-12 10:37:35 +08:00
Wang Nan 8e6ecb8dfd Merge pull request #625 from zilongshanren/refactoring-win32-editbox
Refactoring win32 editbox
2017-05-11 17:08:18 +08:00