Commit Graph

45 Commits

Author SHA1 Message Date
Jare Guo 880f0e28ca add preloadScene 2016-05-13 17:37:16 +08:00
Nan Wang 3e396e3080 merged v1.0 2016-05-11 17:29:17 +08:00
Jare Guo 612ad35614 loadRes should not support sub asset path to avoid confusing with folder 2016-05-11 00:00:49 +08:00
Jare Guo 8bfe957286 support loadRes by type 2016-05-10 18:59:29 +08:00
Jare Guo 02117aaf3f minor fix 2016-04-27 10:57:39 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Jare Guo 98cc058392 support the live reloading of undo history 2016-04-17 14:21:58 +08:00
Johnny Wu 6109149369 refine ipc reply 2016-04-14 11:58:48 +08:00
Jare Guo 1bfe4f3fd1 Merge pull request #591 from cocos-creator/v1.0
sync V1.0
2016-04-12 14:39:26 +08:00
Jare Guo 10a03eccd5 Can not use JSON.stringify to present Error (#581) 2016-04-11 14:10:16 +08:00
Johnny Wu e493f2047b upgrade editor-framework to v0.5.0 2016-04-07 16:56:39 +08:00
Jare Guo 51c5e1a2ba add cc.loader.loadRes, remove "resources://" protocol 2016-03-22 15:40:50 +08:00
Jare Guo b67f7384f9 support to use resources:// instead of cc.url.raw 2016-03-09 09:58:10 +08:00
Jare Guo be9719414e support sprite frame 2016-03-09 09:58:10 +08:00
Jare Guo 8902bce59b support to load resources dynamically 2016-03-09 09:58:10 +08:00
pandamicro 17aa75520d Refactor LoadingItem.src to id and url 2016-03-04 00:55:35 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro c478ae6b67 Fix AssetLibrary cache issue and uuid loader this issue 2016-02-26 11:58:55 +08:00
pandamicro b91e00560e Fix unexpected asset delete in editor 2016-02-25 18:59:21 +08:00
pandamicro 3a188f4fa8 Restore default value instead of delete _uuid 2016-02-25 17:51:03 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
pandamicro 6257d82ef2 Fix isScene check in AssetLibrary 2016-02-25 14:33:13 +08:00
pandamicro 600e7a59ef Use pipeline loader in JSB 2016-02-25 13:06:57 +08:00
pandamicro 7e02d3e87d Support skips property in pipeline item 2016-02-25 10:34:10 +08:00
pandamicro 2f861d8cb6 Fix issues for Creator editor 2016-02-25 10:34:09 +08:00
pandamicro a010bba73f Use pipeline loader in AssetLibrary 2016-02-25 10:34:09 +08:00
Jare Guo d9327b3180 introduce "missing script" mechanisms to prevent data loss 2016-02-23 10:17:10 +08:00
Jare Guo af799991c5 Updating api about engine-extends 2016-02-18 16:06:25 +08:00
minggo abf53d15a6 fix some comments 2016-02-02 15:46:20 +08:00
Jare Guo 947a4405f7 try to fix loading bug with Firefox on windows 2016-01-23 22:16:59 +08:00
knoxHuang e23bb13989 supplement cocos2d platform directory note 2016-01-06 14:55:13 +08:00
Jare Guo 2fbe33bfb9 SGNode.onExit should not be null 2016-01-05 10:36:00 +08:00
pandamicro 31fde55f3c Fix AssetLibrary mistake 2015-12-30 23:33:31 +08:00
pandamicro 9db531f461 Fix JSB issues 2015-12-30 22:18:13 +08:00
Jare Guo 8e4a704074 force reset property in assetlibrary even if query failed, to make array fully initialized 2015-12-30 21:57:40 +08:00
Jare Guo bab371bd84 fix bug of texture loading 2015-12-28 13:59:57 +08:00
Jare Guo 83042038ed support mounted raw assets in build version 2015-12-23 18:04:49 +08:00
Jare Guo af69bf0988 widget's property should be adjusted to fit new position in edit mode 2015-12-21 15:46:44 +08:00
Jare Guo 60e0622755 should still check images loading state 2015-12-21 02:03:06 +08:00
Jare Guo 0f9ab0e8f0 AssetLibrary should support preload raw asset 2015-12-18 11:15:47 +08:00
Jare Guo 65a172afc8 automate preload raw assets in the scene 2015-12-16 15:57:56 +08:00
pandamicro 45657da750 Fix issues for jsb build 2015-12-12 23:27:55 +08:00
Jare Guo 1ddec54b1c canvas should use design resolution size (+1 squashed commit)
Squashed commits:
[edaaa1b] fix computing position of standalone widget
2015-12-12 01:43:45 +08:00
Jare Guo b97e70e71d support loading builtin raw assets 2015-12-07 21:33:24 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00