Commit Graph

4631 Commits

Author SHA1 Message Date
Jare Guo d872e93ea9 Merge pull request #1837 from jareguo/master
优化单元测试编译速度
2017-07-26 18:10:32 +08:00
Jare Guo c25563be14 Merge pull request #1843 from pandamicro/master
Remove ...args in engine
2017-07-26 18:04:46 +08:00
pandamicro 6533180e9d Remove ...args in engine 2017-07-26 18:03:58 +08:00
Jare Guo 6413a2a5df Merge pull request #1842 from pandamicro/master
修复 Editor 中无法加载 tsx 资源的问题
2017-07-26 16:21:15 +08:00
pandamicro 43c07f8017 Fix raw asset cannot be loaded by url in editor issue 2017-07-26 15:53:29 +08:00
pandamicro 52ae127d45 Fix loader doc 2017-07-26 15:53:10 +08:00
Jare Guo fd770f5d2a Merge pull request #1840 from zilongshanren/improve-jsb-label-performance
fix ttf font size in web
2017-07-25 15:14:06 +08:00
zilongshanren 21b4386502 fix ttf font size in web 2017-07-25 14:54:31 +08:00
Jare Guo bbc296645b Merge pull request #1839 from zilongshanren/improve-jsb-label-performance
improve ttf font creation performance
2017-07-25 14:48:47 +08:00
zilongshanren c70c7a2989 improve ttf font creation performance 2017-07-25 14:39:53 +08:00
Jare Guo d04a9dcc37 fix spine addAnimation on native 2017-07-25 11:17:36 +08:00
Jare Guo da3cd5a3cd optimize test pipeline, add gulp buld-test-sm for debugging 2017-07-25 11:17:36 +08:00
Wang Nan 6c5f0e5dad Merge pull request #1835 from pandamicro/master
Fix spine rotation calculation mistake
2017-07-24 18:41:20 +08:00
pandamicro d6408b08fc Fix spine rotation calculation mistake 2017-07-24 18:36:12 +08:00
Wang Nan 24ad5272b9 Merge pull request #1833 from jareguo/master
update gulp-uglify to v3
2017-07-24 16:38:02 +08:00
Jare Guo 384cd9ee39 update gulp-uglify to v3 2017-07-24 16:31:46 +08:00
Wang Nan 742a9c2b26 Merge pull request #1828 from zilongshanren/fix-ttf-md5-cache
fix custom ttf md5 cache
2017-07-24 10:12:37 +08:00
Jare Guo 330fd8bc89 Merge pull request #1830 from pandamicro/master
Fix tutorial hotupdate issue
2017-07-23 22:18:25 +08:00
Jare Guo f83241eca5 Merge pull request #1831 from knoxHuang/master
fix require DebugInfo mode error
2017-07-23 22:17:05 +08:00
knoxHuang 7b57bdb093 fix require DebugInfo mode error 2017-07-23 12:15:58 +08:00
pandamicro cfb64a59fb Increase default max batch vertex count 2017-07-22 14:30:04 +08:00
pandamicro f94677996e Fix DebugInfos not included in jsb issue 2017-07-22 14:29:41 +08:00
pandamicro fce95c971e Fix callFunc creation issue with primitive data parameter 2017-07-22 14:29:24 +08:00
pandamicro d391f17810 Fix director event before update missing issue 2017-07-21 15:37:26 +08:00
zilongshanren d1e19b9c37 fix fontFace load api 2017-07-21 14:18:26 +08:00
zilongshanren d9ec5dae6c fix custom ttf md5 cache 2017-07-21 13:56:01 +08:00
Jare Guo 88c2801071 Merge pull request #1827 from knoxHuang/master
fix CCMotionStreak bug for fireball/issues/6083
2017-07-21 10:50:20 +08:00
knoxHuang e0f2c4b89c fix CCMotionStreak bug for fireball/issues/6083 2017-07-21 10:44:57 +08:00
Wang Nan 18571448c6 Merge pull request #1826 from jareguo/master
add cc.BlockInputEvents
2017-07-20 17:39:51 +08:00
Jare Guo 58fe6f29ec reviewed 2017-07-20 17:26:01 +08:00
Jare Guo d385a68924 add cc.BlockInputEvents 2017-07-20 16:22:07 +08:00
Wang Nan fa92df2735 Merge pull request #1825 from cocos-creator/v1.5
merge V1.5
2017-07-20 16:13:57 +08:00
Wang Nan c73efee569 Merge pull request #1822 from jareguo/master
refactor gulp utils
2017-07-20 10:46:02 +08:00
Jare Guo 668e202a24 refactor gulp utils 2017-07-19 23:00:27 +08:00
Jare Guo 06eeec9923 Merge pull request #1819 from VisualSJ/master-6048
#6048 currentTime error
2017-07-19 16:48:15 +08:00
pandamicro a62e8a8507 Merge pull request #1821 from knoxHuang/master
fix schedule error
2017-07-19 16:36:34 +08:00
knoxHuang 90b9d5f4b8 fix schedule error 2017-07-19 16:30:45 +08:00
Jare Guo c6345f1265 Merge pull request #1820 from jareguo/v1.5
support TypeScript 2.4
2017-07-19 16:07:11 +08:00
VisualSJ 0789ac178a #6048 currentTime error 2017-07-19 15:50:49 +08:00
Jare Guo 783296d8ef support TypeScript 2.4 2017-07-19 15:34:01 +08:00
Jare Guo c04186bd44 Merge pull request #1818 from zilongshanren/improve-md5-pipe
md5 cache respect libraryPath and rawAssetsPath
2017-07-19 14:06:23 +08:00
zilongshanren 348feb7115 fix potential url path issue 2017-07-19 11:43:18 +08:00
zilongshanren 6ea5d7957a md5 cache respect libraryPath and rawAssetsPath
improve libraryBase

use slice instead replace
2017-07-19 11:31:25 +08:00
Jare Guo 252071dfcb Merge pull request #1817 from knoxHuang/master
fix audioEngine deprecated code for fireball/issues/6058
2017-07-19 11:11:59 +08:00
knoxHuang e714c4585c fix audioEngine deprecated code for fireball/issues/6058 2017-07-19 11:09:38 +08:00
Jare Guo 8c24ea1d41 Merge pull request #1816 from knoxHuang/master
fix Mask node 'setContentSize' is invalid for fireball/issues/6056
2017-07-18 14:51:50 +08:00
knoxHuang 1afeed88ea fix Mask node 'setContentSize' is invalid for fireball/issues/6056 2017-07-18 14:47:15 +08:00
Jare Guo 7c93d4b071 Merge pull request #1815 from 2youyou2/v1.5
fixed polygon separator
2017-07-17 16:36:31 +08:00
2youyouo2 4c9794d41e fixed polygon separator 2017-07-17 16:12:05 +08:00
Jare Guo 7479c5f4dd Merge pull request #1814 from VisualSJ/master-6032
#6032 Audio bug
2017-07-17 15:10:13 +08:00