Commit Graph

4339 Commits

Author SHA1 Message Date
2youyouo2 df4fffcd5d reconstruction collider 2017-06-06 11:39:15 +08:00
Jare Guo 2e1889812a Merge pull request #1704 from jareguo/v1.5
should not mixin class name
2017-06-06 11:22:06 +08:00
Jare Guo 166dc1ad38 should not mixin class name 2017-06-06 11:20:06 +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
Jare Guo 2d42700370 Merge pull request #1701 from zilongshanren/improve-modular-web
add camera to modular system
2017-06-05 16:41:46 +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
zilongshanren b2e93aaed1 add camera to modular system 2017-06-05 16:35:49 +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
zilongshanren 63ed455690 fix chipmunk modular 2017-06-05 16:07:04 +08:00
pandamicro 3ef519e28e Fix unit test case 2017-06-05 15:22:34 +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 4293164343 modular chipmunk 2017-06-05 15:00:41 +08:00
zilongshanren af07d514ed finish engine modular
modular particle system

modular tiledmap

finish modular
2017-06-05 14:17:56 +08:00
Jare Guo 625920f4d5 Merge pull request #1699 from jareguo/v1.5
add progressCallback api
2017-06-05 11:48:20 +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
Wang Nan dede040d1d Merge pull request #1694 from jareguo/temp
fix instantiate-jit if type is wrong
2017-06-05 09:52:14 +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
Wang Nan 7160d1f6a2 Merge pull request #1690 from jareguo/v1.5
避免 SpriteFrame 在载入贴图的同时强制释放引起报错
2017-06-02 18:34:41 +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
Wang Nan 39ac78dbe0 Merge pull request #1689 from knoxHuang/v1.5
add __instanceId to inputManager fix fireball/issues/5835
2017-06-02 10:07:13 +08:00
knoxHuang a9afc4671c add __instanceId to inputManager fix fireball/issues/5835 2017-06-01 17:59:53 +08:00
Jare Guo c1691a51c8 Merge pull request #1687 from zilongshanren/improve-native-control-memory-management
Improve native control memory management
2017-06-01 15:58:32 +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
Wang Nan 889c3e8690 Merge pull request #1686 from knoxHuang/v1.5
fix particleSystem error for fireball/issues/4943
2017-06-01 10:06:00 +08:00
knoxHuang 5db9af60a8 fix particleSystem error for fireball/issues/4943 2017-06-01 09:50:22 +08:00
Jare Guo 3d9fe2c10f Merge pull request #1684 from 2youyou2/physics
remove function from Array.prototype in box2d.js
2017-05-27 17:40:55 +08:00
2youyouo2 e280769ec5 remove function from Array.prototype in box2d.js 2017-05-27 17:31:24 +08:00
Jare Guo 9b2235e5de Merge pull request #1683 from pandamicro/v1.5
More secured Scheduler with target id assert
2017-05-27 11:29:36 +08:00
pandamicro ce15b4f738 fix typo 2017-05-27 11:26:14 +08:00
pandamicro c9adca15b8 More secured Scheduler with target id assert 2017-05-27 11:20:30 +08:00
Jare Guo c2759d8745 Merge pull request #1682 from pandamicro/v1.5
Fix long call stack in downloader
2017-05-27 11:19:35 +08:00
Wang Nan 4b12b1a557 Merge pull request #1679 from jareguo/v1.5
remove eval
2017-05-27 09:58:15 +08:00
pandamicro 78428b4943 Use customizable max concurrent number 2017-05-26 18:28:47 +08:00
Jare Guo c92f6f688c Merge pull request #1681 from 2youyou2/camera
fixed camera typo
2017-05-26 18:23:47 +08:00
pandamicro 65662e0dd2 Fix long call stack in downloader 2017-05-26 18:06:46 +08:00
2youyouo2 dabeb3d5e3 fixed camera typo 2017-05-26 18:05:51 +08:00
Jare Guo 167a24ec6f Merge pull request #1680 from 2youyou2/animation
avoid fire event error
2017-05-26 17:27:26 +08:00