Commit Graph

17466 Commits

Author SHA1 Message Date
2youyouo2 f1b5dbeee9 should not trigger button event when node is not active 2015-12-18 18:02:54 +08:00
zilongshanren 4fca96de4c fix doc format 2015-12-18 17:29:07 +08:00
zilongshanren 9046f6d0c9 rename a function 2015-12-18 17:21:36 +08:00
pandamicro d839dacdca Merge pull request #78 from 2youyouo2/master
fixed build native error
2015-12-18 17:20:15 +08:00
zilongshanren 1f082f2005 add missing docs 2015-12-18 17:15:30 +08:00
2youyouo2 d3593b10a0 update polypill 2015-12-18 15:37:23 +08:00
2youyouo2 263e60b8d1 Merge branch 'master' of github.com:fireball-x/engine 2015-12-18 15:34:11 +08:00
2youyouo2 4b6d3a84b7 fixed build native error 2015-12-18 15:30:39 +08:00
Huabing.Xu 10885794b3 canvas works in most cases(except rotated behave error) 2015-12-18 15:25:49 +08:00
zilongshanren ee024d428e Add ScrollView and ScrollBar
Squashed commit of the following:

commit 34fea7fd4ea962f041ebadf4a5b17b3710a1fa02
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 14:47:00 2015 +0800

    finish scrollview feature

commit 373eff672e4f81b79951cd583fc63865c76a0093
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 14:34:49 2015 +0800

    fix float point compare issue

commit 4701cea8b488ae169407fca5be203d9a5e5fcccc
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 10:56:09 2015 +0800

    fix component naming

commit 20f86a505aa09630b0bdf2ad6bdf4287777951aa
Merge: 279d2fc 3c6522e
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 10:55:23 2015 +0800

    Merge branch 'master' into addScrollView

commit 279d2fc1143f6ec473e2ccfcaecc86a50087e033
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 10:40:32 2015 +0800

    make elastic work

commit ed5c3cdb600bdc3d998280ab7e50d2703b50ed71
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 18 10:11:00 2015 +0800

    fix bouncing issue

commit 8a1d3be8aff624597592954a58ce3b48c289c9f9
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 15:26:57 2015 +0800

    make brake factor working

commit 7e3099de4aad72fbf60d3930e9e4337b1c5af828
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 14:56:21 2015 +0800

    make scrollview inertia scroll working

commit 3c3b29935e1dcdcd9eb2f96637ce168ec35a4ac1
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 14:31:51 2015 +0800

    fix convertToWorldSpace

commit 9d58b715f56f010a84e6903962169eea6d450d00
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 11:18:51 2015 +0800

    add inertia scroll skeleton

commit 1523775943394139e723f9f7fdca4ad89a49cc70
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 10:48:14 2015 +0800

    add a few scrollview variables

commit c5231fa52e580d80bd47de60133242cd5c9f0901
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 10:08:23 2015 +0800

    finish scrollbar auto hide

commit 8c79eb33c0a2e25c108c3e03c90c1343469659ea
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 09:44:03 2015 +0800

    fix toggle scrollbar

commit b6a24f82ee1ec4e391adf0e5ecc8c3d0477682d6
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Dec 17 09:34:46 2015 +0800

    finish scroll bar position

commit ba1dab366e94020bddcb0f3b4243c574ff60afa7
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 16 20:22:23 2015 +0800

    fix convert to node space issue

commit e596d37aedb963bfd0f21f383d12f7c828c6c2bf
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 16 17:54:26 2015 +0800

    fuck

commit 3b238be9d0e72a6414e3c578190ed6722dee9899
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 16 16:42:05 2015 +0800

    make handle's position correct

commit e7c21508d1a08c0df761cf945e8d9714391e6f6b
Merge: a882517 3f58254
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 16 10:52:02 2015 +0800

    Merge remote-tracking branch 'origin/master' into addScrollView

commit a882517765f5fae042cfde472202c22e0cc09416
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 16 10:51:33 2015 +0800

    update scrollview

commit 90af1f848509325d317f0df0edb203697a9c04e5
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Dec 15 21:17:27 2015 +0800

    make horizontal and vertical move work

commit b5274cb9248e6eebf29e0ba8ceb3e96cb2d7f483
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Dec 15 20:57:00 2015 +0800

    update scrollbar

commit 43ae08aed730588303fe41857def7d51aea890e6
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Dec 15 16:26:50 2015 +0800

    add scrollbar skeleton

commit 6a4c1a39eeabad06f871a32f77d442f4fcd9b487
Merge: 1184415 306f66a
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Dec 14 20:42:05 2015 +0800

    Merge branch 'master' into addScrollView

commit 1184415480d1b08c589365c6ba919b438a760aa5
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Dec 14 20:01:18 2015 +0800

    add touch event handler

commit 510eba29001073b8c1215d50ae12f3e6d2bc37d6
Merge: d0e44ad e89a6f7
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Dec 14 17:55:27 2015 +0800

    Merge branch 'master' into addScrollView

commit d0e44ad90740706fa34480a3c8228fd1250c0c74
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 11 18:22:23 2015 +0800

    add scrollbar components

commit 8a812def219517d6daab857e997084f7e0bea878
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 11 17:48:42 2015 +0800

    add scrollview skeleton
2015-12-18 14:49:12 +08:00
Huabing.Xu 2fa5d8727f Merge branch 'master' into refine-scale9Sprite 2015-12-18 14:45:27 +08:00
Jare Guo dc609b1c57 Merge pull request #75 from jareguo/master
strip default values from scene template
2015-12-18 14:44:00 +08:00
Jare Guo 36fb1e0f67 strip default values from scene template (fireball-x/fireball#982) 2015-12-18 14:41:10 +08:00
Jare Guo e83b4775ee Merge pull request #74 from jareguo/master
sprite renderer should not change sprite via initWithSpriteFrame
2015-12-18 14:39:55 +08:00
Jare Guo a8a973305b sprite renderer should not change sprite via initWithSpriteFrame 2015-12-18 14:23:36 +08:00
Huabing.Xu cd5f7093fa Fix bug when rotated existed in sprite frame 2015-12-18 14:14:44 +08:00
Jare Guo 4d8016309a Merge pull request #72 from jareguo/master
AssetLibrary should support preload raw asset
2015-12-18 14:14:39 +08:00
Wang Nan c1fb6e3df3 Merge pull request #73 from nantas/master
update scene template.
2015-12-18 11:58:37 +08:00
Nan Wang ea62959a91 update scene template. 2015-12-18 11:57:07 +08:00
Jare Guo 0f9ab0e8f0 AssetLibrary should support preload raw asset 2015-12-18 11:15:47 +08:00
Jare Guo 3c6522e513 Merge pull request #71 from knoxHuang/master
fix create sprite can not add atlas
2015-12-17 22:44:05 +08:00
knoxHuang e38a02f141 fix create sprite can not add atlas 2015-12-17 22:41:46 +08:00
Huabing.Xu eb5d1c384c add trim support 2015-12-17 19:10:40 +08:00
Jare Guo a780289518 Merge pull request #70 from knoxHuang/master
CCScene renname CCSGScene
2015-12-17 17:30:27 +08:00
knoxHuang 32c311653b CCScene renname CCSGScene 2015-12-17 17:26:15 +08:00
Wu Jie d8e7295ceb Merge pull request #69 from jwu/master
use cc.Asset for sprite-atlas
2015-12-17 16:43:19 +08:00
Johnny Wu 14c60d5643 use cc.Asset for sprite-atlas 2015-12-17 16:42:52 +08:00
Jare Guo 378199e063 Merge pull request #68 from knoxHuang/master
CCNode file name Ranname CCSGNode
2015-12-17 16:06:40 +08:00
knoxHuang e89a507991 CCNode file name Ranname CCSGNode
CCNode file name Ranname CCSGNode
2015-12-17 15:53:55 +08:00
Huabing.Xu 36ee29ffe8 fix simple sliced bug 2015-12-17 14:48:02 +08:00
Huabing.Xu 0ccc57b003 first refactored version of scale9 sprite 2015-12-17 14:28:28 +08:00
Jare Guo a10193ada8 Merge pull request #66 from 2youyouo2/master
fixed SampledAnimCurve _findFrameIndex error
2015-12-16 21:47:12 +08:00
2youyouo2 79c2913ce5 refine code 2015-12-16 21:17:54 +08:00
Jare Guo 139c3969c3 Merge pull request #67 from jareguo/master
clean up codes of sprite frame
2015-12-16 21:16:12 +08:00
Wang Nan 66f259a75e Merge pull request #65 from nantas/master
add i18n updates to components.
2015-12-16 21:08:31 +08:00
Jare Guo 26288f3364 clean up codes of sprite frame 2015-12-16 20:58:41 +08:00
2youyouo2 7dd768735d fixed SampledAnimCurve _findFrameIndex error 2015-12-16 20:55:12 +08:00
Nan Wang 1d0b14b32f add i18n updates to components. 2015-12-16 20:43:55 +08:00
Jare Guo 8fe05cad05 Merge pull request #64 from knoxHuang/master
EButton Renamed Button
2015-12-16 17:24:44 +08:00
knoxHuang 20ff5ec173 EButton Renamed Button 2015-12-16 17:15:35 +08:00
Wang Nan e1e6b2cde6 Merge pull request #63 from nantas/master
update some api comments, use sourcemap again for browserify bundler
2015-12-16 16:22:28 +08:00
Nan Wang 941d33a3d4 update some api comments, use sourcemap again since. 2015-12-16 16:21:31 +08:00
Jare Guo 75f74ea5ec Merge pull request #61 from jareguo/master
automate preload raw assets in the scene
2015-12-16 15:58:26 +08:00
Jare Guo 65a172afc8 automate preload raw assets in the scene 2015-12-16 15:57:56 +08:00
Jare Guo 04a8fe89da Merge pull request #60 from knoxHuang/master
ELabel Renamed Label and cc.Label Renamed _ccsg.Label
2015-12-16 15:56:49 +08:00
Jare Guo 617346fcf4 Merge pull request #59 from 2youyouo2/master
should always initClipData in reloadClip
2015-12-16 15:56:08 +08:00
knoxHuang 7df5a78d6f ELabel Renamed Label and cc.Label Renamed _ccsg.Label 2015-12-16 15:54:19 +08:00
Jare Guo b0bc5a2f80 Merge pull request #58 from knoxHuang/master
CCLabel Renamed CCSGLabel and cc.Label Renamed _ccsg.Label
2015-12-16 15:43:24 +08:00
knoxHuang a4c3ee5a98 CCLabel Renamed CCSGLabel and cc.Label Renamed _ccsg.Label 2015-12-16 15:40:35 +08:00
Jare Guo 10e607aa94 Merge pull request #57 from knoxHuang/master
CCEParticleSystem Renamed CCParticleSystem
2015-12-16 15:31:10 +08:00