Commit Graph

25 Commits

Author SHA1 Message Date
Jare Guo 6d63d1a0ff Merge branch 'v1.3'
# Conflicts:
#	cocos2d/core/event-manager/CCEventManager.js
2017-02-14 17:53:25 +08:00
knoxHuang 85de852a50 fix pageview bug for fireball/issues/4972 2016-12-23 17:01:56 +08:00
Nan Wang 3d9ef3eff8 merged 2016-12-21 14:37:20 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
knoxHuang e746ac276b fix pageview bug for fireball/issues/4926 2016-12-19 11:06:48 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
knoxHuang 05aa536a4c fix pageview buf for for #fireball/issues/4758 2016-11-23 10:19:43 +08:00
knoxHuang 6faadf7445 update size-changed for CCPageView 2016-11-18 17:46:17 +08:00
knoxHuang 58449afe32 update CCPageView 2016-11-18 17:34:13 +08:00
knoxHuang 87fb1fe4ea add UnifiedSize for PageView fireball/issues/4714 2016-11-17 14:36:55 +08:00
zilongshanren cff6ef31c2 improve PageView 2016-11-04 17:49:44 +08:00
zilongshanren b48b08f6d8 sync scroll direction 2016-10-24 16:31:07 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zilongshanren 21a40e37c1 add the missing API docs 2016-10-19 15:22:39 +08:00
zilongshanren 9d5ef3fa3a fix pageview event turning 2016-10-19 10:18:45 +08:00
zilongshanren bb391e08b6 fix typo 2016-10-18 16:06:58 +08:00
zilongshanren b618c77d5b improve PageView 2016-10-18 16:04:42 +08:00
knoxHuang e2ccb9982f update PageView for fireball/issues/4420 2016-10-14 18:28:38 +08:00
zilongshanren 24829bd068 change range precision to 0.01 2016-10-10 14:35:11 +08:00
zilongshanren d05aa4874c change method to property 2016-10-10 14:30:29 +08:00
zilongshanren 885f9283cc add method anotation 2016-10-10 14:07:18 +08:00
zilongshanren 04389e27dd add setAutoScrollStopEpsilon API 2016-10-10 14:02:53 +08:00
knoxHuang 9f5dc12c61 add slider component for fireball/issues/1462 2016-09-21 11:34:52 +08:00
knoxHuang bb6d966e59 update CCPageView code 2016-09-12 11:28:37 +08:00
knoxHuang 99765ac2f4 add pageview to componet for fireball/issues/1461 2016-09-12 10:37:15 +08:00