knoxHuang
|
e2ccb9982f
|
update PageView for fireball/issues/4420
|
2016-10-14 18:28:38 +08:00 |
|
Wang Nan
|
d4d82d772d
|
Merge pull request #1198 from jareguo/v1.3
support resetInEditor
|
2016-10-14 16:50:27 +08:00 |
|
Jare Guo
|
53fa92880e
|
support resetInEditor
|
2016-10-14 16:38:09 +08:00 |
|
Jare Guo
|
5acc106689
|
Merge pull request #1197 from natural-law/v1.3
Solve the error when DragonBones resources using mesh.
|
2016-10-14 16:30:09 +08:00 |
|
zhangbin
|
8fb69ed872
|
Solve the error when DragonBones resources using mesh.
|
2016-10-14 16:19:51 +08:00 |
|
Jare Guo
|
3f8cc536a6
|
Merge pull request #1196 from 2youyou2/graphics-clear
Graphics clear
|
2016-10-14 15:53:26 +08:00 |
|
2youyouo2
|
5510b11976
|
refine code
|
2016-10-14 15:42:49 +08:00 |
|
2youyouo2
|
6912ae3e1a
|
fixed graphics clear
|
2016-10-14 15:39:21 +08:00 |
|
Nan Wang
|
ec2478062d
|
Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3
|
2016-10-14 14:42:52 +08:00 |
|
Nan Wang
|
bfb18e249e
|
update version to v1.3.0-beta.8
|
2016-10-14 14:38:18 +08:00 |
|
Jare Guo
|
c2ba5c4bd8
|
Merge pull request #1195 from jareguo/v1.3
fix _callPreloadOnComponent
|
2016-10-14 14:02:59 +08:00 |
|
Jare Guo
|
47e039cabc
|
fix _callPreloadOnComponent
|
2016-10-14 14:01:46 +08:00 |
|
Jare Guo
|
93283c5d86
|
Merge pull request #1194 from natural-law/issue4335
Solve the error effect on native of nodes with component RenderInSG.
|
2016-10-14 11:26:11 +08:00 |
|
zhangbin
|
95f66807fd
|
Solve the Creator issue 4335.
|
2016-10-14 10:20:00 +08:00 |
|
Jare Guo
|
c64e532bc8
|
Merge pull request #1192 from VisualSJ/v1.3_audio
修复若干音频问题
|
2016-10-13 21:23:56 +08:00 |
|
Jare Guo
|
81b9b44570
|
Merge pull request #1185 from jareguo/v1.3
优化 JSB 上 enabled 切换时的执行效率
|
2016-10-13 18:17:35 +08:00 |
|
VisualSJ
|
f1de56302e
|
Remove warn and fixed stop bug (ios)
|
2016-10-13 16:51:25 +08:00 |
|
Jare Guo
|
73477ae848
|
optimize enabled by removing splice
|
2016-10-13 16:19:53 +08:00 |
|
Jare Guo
|
835663e18a
|
Merge pull request #1191 from knoxHuang/v1.3
fix Widget bug for fireball/issues/4048
|
2016-10-13 14:14:47 +08:00 |
|
knoxHuang
|
3407122654
|
fix Widget bug for fireball/issues/4048
|
2016-10-13 14:11:44 +08:00 |
|
Jare Guo
|
d923bf70c8
|
Merge pull request #1190 from zilongshanren/simplify-ui-event-manual-register
add simplified click event registration
|
2016-10-12 17:31:08 +08:00 |
|
zilongshanren
|
89b6afcd09
|
add simplified click event registration
|
2016-10-12 17:19:48 +08:00 |
|
Wang Nan
|
c97c7fce62
|
Merge pull request #1189 from zilongshanren/v1.3
add custom event data support
|
2016-10-12 16:18:04 +08:00 |
|
zilongshanren
|
44866c87db
|
add custom event data support
|
2016-10-12 16:12:59 +08:00 |
|
Wang Nan
|
d8f1167e30
|
Merge pull request #1188 from 2youyou2/convertToWorldSpace
fixed convertToWorldSpace return value
|
2016-10-12 16:07:50 +08:00 |
|
2youyouo2
|
d5dd3c982c
|
fixed convertToWorldSpace return value
|
2016-10-12 16:05:00 +08:00 |
|
Wang Nan
|
7e42950744
|
Merge pull request #1186 from zilongshanren/add-editbox-default-inputflag
tweak EditBox default input flag
|
2016-10-12 10:56:10 +08:00 |
|
Wang Nan
|
4fffb2e791
|
Merge pull request #1187 from cocos-creator/v1.2
merge v1.2
|
2016-10-11 18:31:38 +08:00 |
|
zilongshanren
|
d7e2e48792
|
tweak EditBox default input flag
|
2016-10-11 17:49:34 +08:00 |
|
Jare Guo
|
2b14093891
|
optimize operation for changing enabled
|
2016-10-11 17:03:47 +08:00 |
|
Nan Wang
|
672053dea3
|
Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3
|
2016-10-11 15:00:51 +08:00 |
|
Wang Nan
|
873dba8de2
|
Merge pull request #1184 from zilongshanren/fix-issue-3959
improve editbox maxLength settings
|
2016-10-11 14:59:08 +08:00 |
|
zilongshanren
|
a314061b0d
|
improve EditBox maxLength property docs
|
2016-10-11 14:52:34 +08:00 |
|
zilongshanren
|
ad5b21ff9b
|
improve editbox maxLength settings
|
2016-10-11 14:32:01 +08:00 |
|
Nan Wang
|
aa0869b1d8
|
Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3
|
2016-10-11 13:56:39 +08:00 |
|
Nan Wang
|
c018751cbe
|
update version to v1.3.0-beta.7
|
2016-10-11 13:46:24 +08:00 |
|
Jare Guo
|
69c58dcf6f
|
Merge pull request #1183 from zilongshanren/fix-issue-4273
only reset node height in resize_height
|
2016-10-11 11:54:51 +08:00 |
|
zilongshanren
|
4a1eb9e0d9
|
only reset node height in resize_height
|
2016-10-10 18:15:23 +08:00 |
|
Wang Nan
|
72c2763c4a
|
Merge pull request #1174 from natural-law/v1.3
Fix the compatible problem of IE 10.
|
2016-10-10 16:11:04 +08:00 |
|
Jare Guo
|
a295ab3ded
|
Merge branches 'v1.3' and 'v1.3' of github.com:cocos-creator/engine into v1.3
|
2016-10-10 15:42:49 +08:00 |
|
Jare Guo
|
3f4df4261d
|
Merge pull request #1182 from jareguo/v1.2
Update CCWidgetManager.js
|
2016-10-10 15:03:00 +08:00 |
|
Jare Guo
|
bbf4743ec1
|
Update CCWidgetManager.js
|
2016-10-10 15:02:09 +08:00 |
|
Jare Guo
|
31ed53a0af
|
Merge pull request #1181 from 2youyou2/animation-event
fixed animation may emit wrong event when set time
|
2016-10-10 14:37:38 +08:00 |
|
Jare Guo
|
1ef6738927
|
Merge pull request #1180 from zilongshanren/improve-pageview-pageturning-event
add setAutoScrollStopEpsilon API to Pageview
|
2016-10-10 14:36:21 +08:00 |
|
zilongshanren
|
24829bd068
|
change range precision to 0.01
|
2016-10-10 14:35:11 +08:00 |
|
2youyouo2
|
602cf64ca2
|
refine code
|
2016-10-10 14:34:10 +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 |
|
2youyouo2
|
a0e418ec2d
|
fixed animation may emit wrong event when set time
|
2016-10-10 14:06:10 +08:00 |
|
zilongshanren
|
04389e27dd
|
add setAutoScrollStopEpsilon API
|
2016-10-10 14:02:53 +08:00 |
|