Commit Graph

3122 Commits

Author SHA1 Message Date
zilongshanren 14feef564f fix editbox can't input on UC browser 2017-06-16 16:43:43 +08:00
knoxHuang 99fb77d598 fix CCMotionStreak err for fireball/issues/5881 2017-06-12 14:50:25 +08:00
Wang Nan 1b4919e626 Merge pull request #1725 from pandamicro/v1.5
Update pstats to 1.3.0 to avoid performance draw back on iOS
2017-06-12 13:45:10 +08:00
pandamicro 7e6b5bdc0d Sets config when setting display stats via director 2017-06-12 11:13:59 +08:00
zilongshanren ca94530ce4 renaming variable 2017-06-09 17:12:49 +08:00
zilongshanren 2231f8a367 improve scrollview events timing 2017-06-09 17:04:02 +08:00
zilongshanren 41896dbc01 improve project data back compatibility 2017-06-08 17:19:43 +08:00
zilongshanren eb8611c55b improve progressbar, make error msg explicitly 2017-06-08 17:11:20 +08:00
pandamicro 836bb3c87d Avoid duplicated asset entry in loader caused by synchronous process 2017-06-07 16:31:52 +08:00
pandamicro 3b0b43ea80 Fix delayed sync task won’t trigger flow issue 2017-06-07 14:59:48 +08:00
Wang Nan 2387dd7487 Merge pull request #1708 from zilongshanren/add-renderTextureBack
add renderTexture back
2017-06-06 16:28:29 +08:00
Wang Nan 9c07346262 Merge pull request #1705 from jareguo/v1.5
should not throw error if builtin component is cut
2017-06-06 16:27:08 +08:00
Wang Nan a55566614c Merge pull request #1706 from pandamicro/v1.5
Support synchronous loader process
2017-06-06 16:26:39 +08:00
zilongshanren d13a10d861 add renderTexture back 2017-06-06 16:21:55 +08:00
Jare Guo ed23b87787 Merge pull request #1707 from zilongshanren/fix-button-callback-event-args
Fix button callback event args
2017-06-06 15:34:04 +08:00
zilongshanren 3c2776afd2 fix button multiple event callback 2017-06-06 15:32:38 +08:00
Jare Guo d35501942f Merge pull request #1697 from 2youyou2/physics
fixed rigidbody _onNodeScaleChanged
2017-06-06 15:07:33 +08:00
pandamicro 191d16e114 Support synchronous loader process 2017-06-06 14:45:40 +08:00
Jare Guo 8f3c84b724 should throw emit error if builtin component is cut 2017-06-06 14:16:38 +08:00
2youyouo2 a6823dab18 fixed rigid body _onNodeScaleChanged 2017-06-06 11:39:36 +08:00
2youyouo2 df4fffcd5d reconstruction collider 2017-06-06 11:39:15 +08:00
Jare Guo e4b3843c39 Merge pull request #1703 from zilongshanren/add-component-animate-attrib
Add component animate attrib
2017-06-06 11:24:00 +08:00
Jare Guo 166dc1ad38 should not mixin class name 2017-06-06 11:20:06 +08:00
zilongshanren 678c73fa42 disable layout type animate 2017-06-06 10:49:11 +08:00
zilongshanren cd6bcca25a refine layout scrollview label animatable property 2017-06-06 10:45:34 +08:00
zilongshanren b515a38864 enable layout property be animated. 2017-06-06 10:23:03 +08:00
Wang Nan 29dd24cb50 Merge pull request #1702 from pandamicro/v1.5
Fix AssetLibrary.loadJson
2017-06-06 10:12:43 +08:00
pandamicro 1474cb43db Fix AssetLibrary.loadJson 2017-06-06 10:04:28 +08:00
Wang Nan 3496c61b13 Merge pull request #1700 from pandamicro/v1.5
Improve loader pipeline by supporting synchronous download process
2017-06-05 16:41:31 +08:00
pandamicro 1d2f656966 Remove handle load queue logic when ignoreMaxConcurrency 2017-06-05 16:32:56 +08:00
pandamicro 3b3629c290 Fix downloader load queue handle logic 2017-06-05 16:28:58 +08:00
Jare Guo ba0e740511 Merge pull request #1692 from zilongshanren/improve-modular-web
improve web modular system
2017-06-05 16:09:22 +08:00
pandamicro 1011b4ed12 Made JSB download functions synchronous 2017-06-05 15:22:34 +08:00
pandamicro a8b3346054 Merge syncFlow and asyncFlow, determine result dynamically to avoid long stack 2017-06-05 15:22:34 +08:00
zilongshanren af07d514ed finish engine modular
modular particle system

modular tiledmap

finish modular
2017-06-05 14:17:56 +08:00
Jare Guo be0b5c9a51 add progressCallback api 2017-06-05 11:47:13 +08:00
Jare Guo 9a026e4394 Merge pull request #1691 from zilongshanren/improve-loadttf-timer
remove scheduler call for custom font loader
2017-06-05 10:19:29 +08:00
zilongshanren d2ef66f330 use setInterval instead of setTimeout 2017-06-05 10:17:58 +08:00
Wang Nan 586e21e508 Merge pull request #1693 from jareguo/v1.5
fix creator.d.ts
2017-06-05 09:53:52 +08:00
zilongshanren 137232683d fix setTimeout timing 2017-06-05 09:45:53 +08:00
Jare Guo 663c42ecdd fix instantiate-jit if type is wrong 2017-06-03 00:55:42 +08:00
Jare Guo eddf3c076f fix creator.d.ts - support abstract component 2017-06-03 00:18:03 +08:00
Jare Guo e615432115 fix creator.d.ts 2017-06-03 00:08:52 +08:00
zilongshanren f42ceb1359 remove videoplayer/webview/editbox from core 2017-06-02 18:27:14 +08:00
zilongshanren 084bffa271 remove scheduler call for custom font loader 2017-06-02 17:52:23 +08:00
Jare Guo 0096a51ef3 SpriteFrame should not crash when texture cleared while loading texture 2017-06-02 13:46:52 +08:00
Jare Guo d6d4e37e03 refine doc 2017-06-02 10:34:23 +08:00
knoxHuang a9afc4671c add __instanceId to inputManager fix fireball/issues/5835 2017-06-01 17:59:53 +08:00
zilongshanren f07fecffd6 improve editbox memory management
improve videoplayer memory management

improve webview memory management

add missing API doc annotation.

improve API docs

improve api docs

remove unneeded code

fix typo

refine API docs

remove unintened docs deletion
2017-06-01 15:51:32 +08:00
knoxHuang 5db9af60a8 fix particleSystem error for fireball/issues/4943 2017-06-01 09:50:22 +08:00