pandamicro
|
c8194e2e90
|
Merge pull request #781 from mbunger/master
Chrome on Android is supporting WebGL since v. 30
|
2016-06-15 11:40:44 +08:00 |
|
Martin Bünger
|
4b3c81acb7
|
Accidently deleted some code
|
2016-06-13 09:46:27 +02:00 |
|
Martin Bünger
|
25521e34fe
|
Fixed code
|
2016-06-13 09:43:32 +02:00 |
|
Martin Bünger
|
b8ed451cbb
|
Chrome on Android is supporting WebGL since v. 30
http://googlechromereleases.blogspot.dk/2013/08/chrome-beta-for-android-update_22.html
|
2016-06-09 15:46:11 +02:00 |
|
Jare Guo
|
ea99e48163
|
Update README.md
|
2016-06-08 11:04:35 +08:00 |
|
Wang Nan
|
8f7f19a67b
|
Merge pull request #773 from cocos-creator/v1.1
merge V1.1
|
2016-06-07 15:29:44 +08:00 |
|
Wang Nan
|
144b6f398e
|
Merge pull request #770 from zilongshanren/fix-scrollview-scrollto-api
Fix scrollview scrollto api
|
2016-06-07 09:25:31 +08:00 |
|
Wang Nan
|
bcfdbe6d93
|
Merge pull request #772 from jareguo/v1.1
update PULL_REQUEST_TEMPLATE.md
|
2016-06-07 09:25:00 +08:00 |
|
Jare Guo
|
743ab3c59f
|
update PULL_REQUEST_TEMPLATE.md
|
2016-06-06 18:52:05 +08:00 |
|
Jare Guo
|
05e88726aa
|
Merge pull request #771 from zilongshanren/fixLabelResizeHeight
Fix label resize height
|
2016-06-06 18:41:46 +08:00 |
|
zilongshanren
|
998cdb1dc8
|
only set line height when label is bmfont
|
2016-06-06 18:37:19 +08:00 |
|
zilongshanren
|
6098e801cd
|
fix label resize height issue
|
2016-06-06 17:10:00 +08:00 |
|
Jare Guo
|
4aef0964b8
|
Merge pull request #768 from 2youyouo2/resize
register window-resize in jsb
|
2016-06-06 17:05:29 +08:00 |
|
2youyouo2
|
924225fcaa
|
optimize canvas resize
|
2016-06-06 16:40:26 +08:00 |
|
zilongshanren
|
8c2e92b009
|
add bmfont layout
|
2016-06-06 16:34:22 +08:00 |
|
Wang Nan
|
56be9b8d22
|
Merge pull request #769 from 2youyouo2/anim
revert collider animatable
|
2016-06-06 16:16:47 +08:00 |
|
2youyouo2
|
c6b7007ec7
|
revert collider animatable
|
2016-06-06 15:57:34 +08:00 |
|
Nan Wang
|
5a4989dbdd
|
fix ccscheduler api typo
|
2016-06-06 15:44:35 +08:00 |
|
2youyouo2
|
2c85cdddef
|
register window-resize in jsb
|
2016-06-06 15:38:40 +08:00 |
|
zilongshanren
|
1befbf572e
|
improve none layout anchor and size precision
|
2016-06-06 14:55:39 +08:00 |
|
zilongshanren
|
de1b8d0a5e
|
fix scrollview scrollToOffset
|
2016-06-06 14:34:23 +08:00 |
|
Wang Nan
|
66992b0748
|
Merge pull request #763 from jareguo/v1.1
fix label color can not changed before update phase
|
2016-06-06 10:36:07 +08:00 |
|
Jare Guo
|
8292ac6f3b
|
should not window.cancelAnimationFrame twice after setFrameRate
|
2016-06-03 17:45:34 +08:00 |
|
Jare Guo
|
2bd87bf953
|
Merge pull request #766 from natural-law/issue3268
Solve the error effect of TiledMap in Windows Creator.
|
2016-06-03 17:16:03 +08:00 |
|
Jare Guo
|
6f7e2bbed0
|
Merge pull request #765 from 2youyouo2/anim
fixed fromVal maybe null
|
2016-06-03 16:49:00 +08:00 |
|
2youyouo2
|
c1fd88b13e
|
fixed fromVal maybe null
|
2016-06-03 16:46:25 +08:00 |
|
Jare Guo
|
47dfddd7f0
|
Merge pull request #764 from pandamicro/v1.1
Fix downloadImage issue when cross origin load fail
|
2016-06-03 15:54:39 +08:00 |
|
pandamicro
|
b63344c240
|
Fix downloadImage issue when cross origin load fail
|
2016-06-03 15:51:37 +08:00 |
|
zhangbin
|
092b8bafbd
|
Solve the error effect of TiledMap in Windows Creator.
|
2016-06-03 15:28:42 +08:00 |
|
Jare Guo
|
3a660d7aab
|
fix label color can not changed before update phase
|
2016-06-03 14:12:36 +08:00 |
|
Jare Guo
|
eefa01f0f2
|
allow path ends with slash in loadResAll
|
2016-06-03 14:12:36 +08:00 |
|
Jare Guo
|
f7c677ac4e
|
minor fix
|
2016-06-03 14:12:36 +08:00 |
|
Jare Guo
|
0ceb0e8401
|
Merge pull request #762 from knoxHuang/v1.1
fix start multiple runs
|
2016-06-02 18:30:00 +08:00 |
|
knoxHuang
|
c555d045ba
|
fix start multiple runs #fireball/issues/3258
|
2016-06-02 17:52:32 +08:00 |
|
Jare Guo
|
e7cd158976
|
Merge pull request #745 from pandamicro/master
Add capturing phase in event system and refactor CCScrollView & CCButton
|
2016-06-02 15:42:37 +08:00 |
|
pandamicro
|
272ac66762
|
Remove preventDefault in event
|
2016-06-02 15:33:01 +08:00 |
|
Wang Nan
|
584ff69308
|
Merge pull request #761 from natural-law/v1.1
Solve the error effect of TiledMap on WebGL.
|
2016-06-02 15:21:00 +08:00 |
|
Wang Nan
|
97f707e781
|
Merge pull request #760 from dabingnn/fix_label_bugs
Fix label bugs
|
2016-06-02 15:19:59 +08:00 |
|
Wang Nan
|
1d83395ff3
|
Merge pull request #759 from dabingnn/fix_label_bugs
Fix label bugs
|
2016-06-02 15:19:48 +08:00 |
|
zhangbin
|
56d321440a
|
Solve the error effect of TiledMap on WebGL.
|
2016-06-02 15:08:45 +08:00 |
|
Huabing.Xu
|
ab26de3c4d
|
fix label bugs 1. outline sharp edge 2. margin for outline
|
2016-06-02 09:57:20 +08:00 |
|
Nan Wang
|
5ff1903b4f
|
update version
|
2016-06-02 09:28:59 +08:00 |
|
Wang Nan
|
c1953bb1e6
|
Merge pull request #758 from cocos-creator/master
merge master
|
2016-06-01 15:50:43 +08:00 |
|
Jare Guo
|
4222767d32
|
Merge pull request #757 from knoxHuang/master
fix get spriteFrame name error for jsb
|
2016-06-01 14:43:59 +08:00 |
|
Huabing.Xu
|
93acfa93a5
|
use round for line join to avoid sharp edge for outline effect
|
2016-06-01 14:39:33 +08:00 |
|
knoxHuang
|
90fe87ef1b
|
fix get spriteFrame name error for jsb
|
2016-06-01 14:38:39 +08:00 |
|
Jare Guo
|
39cd20a24d
|
Merge pull request #756 from 2youyouo2/doc
update collider doc
|
2016-06-01 11:34:37 +08:00 |
|
2youyouo2
|
d5bafe9aab
|
update CCIntersection doc
|
2016-06-01 11:27:01 +08:00 |
|
2youyouo2
|
a9339b83a8
|
fixed collider doc
|
2016-06-01 11:11:30 +08:00 |
|
Nan Wang
|
b5b5d4a406
|
Merge branch 'v1.1' of github.com:cocos-creator/engine into v1.1
|
2016-05-31 17:16:58 +08:00 |
|