Commit Graph

4422 Commits

Author SHA1 Message Date
pandamicro 0bdf1ac69b Configurable alpha parameter for webgl construction 2017-06-29 22:50:38 +08:00
pandamicro 854d2d8f14 Add circle reference test case 2017-06-26 18:29:54 +08:00
pandamicro 858fb30a14 Fix circle reference check issue 2017-06-26 17:56:56 +08:00
pandamicro f40b2a00bc Strict assert for sequence construction 2017-06-26 14:05:13 +08:00
Jare Guo 9bde472d96 Merge pull request #1754 from jareguo/v1.5
fix deprecated warning
2017-06-23 16:28:29 +08:00
Jare Guo f1f733efca fix deprecated warning 2017-06-23 16:24:30 +08:00
Wang Nan 42daf9a9ad Merge pull request #1752 from 2youyou2/camera
set transform updated for native
2017-06-23 15:22:01 +08:00
2youyouo2 4dd3158de5 set transform updated for native 2017-06-23 15:20:17 +08:00
Jare Guo 01b18fd269 fix api link 2017-06-23 14:58:27 +08:00
Jare Guo 341b362ac3 Merge pull request #1753 from zilongshanren/remove-webview-border
fix webview border on iOS platform
2017-06-23 14:43:15 +08:00
zilongshanren c077be8f8d fix webview border on iOS platform 2017-06-23 14:21:42 +08:00
Wang Nan 3be7e271a2 Merge pull request #1742 from 2youyou2/graphics
create new buffer when graphics verts number is bigger than 65535
2017-06-23 10:12:10 +08:00
2youyouo2 c82db2821f remove command from graphics 2017-06-22 16:40:34 +08:00
Wang Nan c52bad0a23 Merge pull request #1750 from 2youyou2/camera
recalculate targets culling when camera view matrix changed
2017-06-22 14:05:34 +08:00
2youyouo2 0f14c7d8ea recalculate targets culling when camera view matrix changed 2017-06-22 11:41:32 +08:00
pandamicro 7e59c34d27 Merge pull request #1749 from knoxHuang/v1.5_Temp
fix web and native node object inconsistencies
2017-06-22 11:40:44 +08:00
knoxHuang 8423864d81 fix web and native node object inconsistencies 2017-06-22 10:59:04 +08:00
Wang Nan 3d1a0af20b Merge pull request #1746 from jareguo/v1.5
remove unneeded api in particle sgNode
2017-06-21 14:53:53 +08:00
Jare Guo a1ef7c398d remove unneeded api in particle sgNode 2017-06-21 14:36:36 +08:00
Jare Guo f0cb9c2554 Merge pull request #1745 from knoxHuang/v1.5_Temp
fix CCRect  contains and CCRect  containsRect error
2017-06-21 14:09:03 +08:00
knoxHuang e8ab15f124 fix CCRect api error 2017-06-21 14:06:33 +08:00
2youyouo2 dc8914db9c fixed clean graphics 2017-06-21 11:27:05 +08:00
2youyouo2 a11299ab37 fixed alloc buffer 2017-06-21 11:14:59 +08:00
2youyouo2 aa190b503e create new buffer when graphics verts number is bigger than 65535 2017-06-20 18:14:37 +08:00
Jare Guo 4d6470d3d9 Merge pull request #1739 from 2youyou2/camera
fixed physics api doc
2017-06-20 10:52:39 +08:00
2youyouo2 e25078e7f4 fixed physics api doc 2017-06-20 10:50:20 +08:00
Wang Nan 57587b9175 Merge pull request #1737 from 2youyou2/camera
should revisit nodes when add/remove target to camera
2017-06-19 17:41:08 +08:00
2youyouo2 86cb5ca2ac should revisit nodes when add/remove target to camera 2017-06-19 15:38:36 +08:00
Wang Nan 0ba37e1f0e Merge pull request #1735 from zilongshanren/fix-uc-can-not-input
fix editbox can't input on UC browser
2017-06-19 10:19:58 +08:00
Wang Nan 1829b5ee5c Merge pull request #1736 from jareguo/v1.5
improve api doc
2017-06-19 10:19:40 +08:00
Jare Guo 247199d1d4 improve api doc 2017-06-16 16:46:46 +08:00
zilongshanren 14feef564f fix editbox can't input on UC browser 2017-06-16 16:43:43 +08:00
Wang Nan fc44918319 Merge pull request #1724 from 2youyou2/culling
Culling
2017-06-16 16:16:22 +08:00
Wang Nan 6de028b456 Merge pull request #1730 from jareguo/temp
support typescript 2.3 (async, await)
2017-06-16 16:15:50 +08:00
Wang Nan 984b406c0b Merge pull request #1732 from pandamicro/v1.5
Remove useless salvaged action logic in ActionManager
2017-06-16 16:14:55 +08:00
Wang Nan c779133251 Merge pull request #1726 from jareguo/v1.5
fix api doc for loader.getDependsRecursively
2017-06-16 16:00:52 +08:00
pandamicro 79a57af8db Remove useless salvaged action logic in ActionManager 2017-06-14 18:42:26 +08:00
Jare Guo e74e9094d7 optimize unit-test compile time 2017-06-14 16:45:34 +08:00
Jare Guo db9fbd3713 support typescript 2.3 (async, await) 2017-06-14 11:23:25 +08:00
Jare Guo ca1d17c772 remove unused variables 2017-06-12 18:39:47 +08:00
Jare Guo 6aa097b9a8 Merge pull request #1727 from knoxHuang/v1.5
fix CCMotionStreak err for fireball/issues/5881
2017-06-12 15:07:58 +08:00
knoxHuang 99fb77d598 fix CCMotionStreak err for fireball/issues/5881 2017-06-12 14:50:25 +08:00
Wang Nan 1b4919e626 Merge pull request #1725 from pandamicro/v1.5
Update pstats to 1.3.0 to avoid performance draw back on iOS
2017-06-12 13:45:10 +08:00
Jare Guo fbb31cbe4c fix api doc for loader.getDependsRecursively 2017-06-12 11:52:11 +08:00
pandamicro 7e6b5bdc0d Sets config when setting display stats via director 2017-06-12 11:13:59 +08:00
pandamicro f8094eb739 Remove uselessUpdate pstats to v1.3.0 2017-06-12 11:13:51 +08:00
2youyouo2 570a725551 refine code 2017-06-12 10:00:38 +08:00
2youyouo2 dee1703b83 refine code 2017-06-09 18:14:09 +08:00
2youyouo2 1b338378b2 refine code 2017-06-09 18:11:06 +08:00
Wang Nan a0032ecb45 Merge pull request #1719 from zilongshanren/improve-scrollview-events
improve scrollview events timing
2017-06-09 17:54:20 +08:00