Commit Graph

121 Commits

Author SHA1 Message Date
Jare Guo 51c5e1a2ba add cc.loader.loadRes, remove "resources://" protocol 2016-03-22 15:40:50 +08:00
Jare Guo cadce447e2 update unit tests 2016-03-21 10:26:58 +08:00
2youyouo2 cc18e4652c fixed animation onEnable/onDisable 2016-03-17 16:03:06 +08:00
2youyouo2 725617ca06 add playAdditive 2016-03-15 17:50:09 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00
pandamicro 5a690106ea Modulize and cleanup shaders 2016-03-14 21:46:12 +08:00
pandamicro 8d8e21831b Clean up macros 2016-03-14 21:46:12 +08:00
2youyouo2 40c88638c2 fixed stop animation 2016-03-14 15:18:29 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 6a3bc53a0a Cleanup kazmath module 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
2youyouo2 06562209cb should not remove animation during updating 2016-03-11 14:19:08 +08:00
pandamicro 3b0d6f9c35 Added cc.director.runSceneImmediate API 2016-03-09 12:13:57 +08:00
Jare Guo b67f7384f9 support to use resources:// instead of cc.url.raw 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
pandamicro 3564ff1ed9 Avoid deserialize error cause Scene to be erased 2016-03-03 11:40:05 +08:00
Jare Guo b6a54cb215 remove angle brackets support from cc.find 2016-03-02 11:26:04 +08:00
knoxHuang ea60080ee1 modify CCNode, tes-node 2016-03-01 15:49:20 +08:00
knoxHuang 22e1e644c3 modify CCNode, CCComponent, tes-node 2016-03-01 15:04:31 +08:00
knoxHuang 742fb9e22d add getComponents, getComponentInChildren, getComponentsInChildren for Components API 2016-03-01 13:07:21 +08:00
Jare Guo 94da7696c5 update PR 2016-02-27 17:09:06 +08:00
pandamicro 21d0a264b5 Improve removing callbacks logic and add test case 2016-02-26 14:53:01 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
pandamicro 24a651cb38 Fix incorrect font handle in native 2016-02-25 15:14:06 +08:00
pandamicro f4ae47f300 Delay completeCallback to fix issue 2016-02-25 10:34:09 +08:00
pandamicro a010bba73f Use pipeline loader in AssetLibrary 2016-02-25 10:34:09 +08:00
pandamicro 321e95c1a8 Fix issues in visual tests and confirm functionality of cc.loader 2016-02-25 10:34:09 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
pandamicro 42515d56ce Refine pipeline implementation, add some important features to adopt CCLoader needs 2016-02-25 10:34:09 +08:00
knoxHuang 4c623eeb22 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-24 13:55:54 +08:00
Jare Guo 466dd16ba3 Merge pull request #369 from dabingnn/refactor_rename_filled_type
rename enum in filled type Horizontal->HORIZONTAL Vertical->VERTICAL
2016-02-24 10:03:42 +08:00
Huabing.Xu 1af3c4181d rename enum in filled type Horizontal->HORIZONTAL Vertical->VERTICAL 2016-02-24 09:44:53 +08:00
pandamicro 52ee6edf11 Merge pull request #360 from dabingnn/add_test_case_sprite
Add test case sprite
2016-02-23 17:48:17 +08:00
Huabing.Xu 7833c277a1 adjust test code 2016-02-23 17:25:12 +08:00
Huabing.Xu 6506c5a2cc adjust test code 2016-02-23 14:40:56 +08:00
Huabing.Xu 654167b9eb adjust test code 2016-02-23 14:01:40 +08:00
Jare Guo d9327b3180 introduce "missing script" mechanisms to prevent data loss 2016-02-23 10:17:10 +08:00
Huabing.Xu f85b5db2f0 Merge branch 'master' into add_test_case_sprite 2016-02-23 09:32:45 +08:00
knoxHuang 36b5f75aec remove contentScaleFactor 2016-02-22 17:42:59 +08:00
Huabing.Xu 4555f0e232 add test case for filled sprite 2016-02-22 17:06:13 +08:00
Jare Guo 995a18eeb2 disallow to modify scene hierarchy when editing animation 2016-02-22 13:56:33 +08:00
Huabing.Xu a206e7f6ba add test cases for scale9 sprite 2016-02-22 11:00:43 +08:00
Huabing.Xu bc11c8fde9 add test cases for simple sprite 2016-02-22 09:33:40 +08:00
pandamicro 0c950a9a57 Add font downloader 2016-02-20 22:21:17 +08:00
pandamicro 38c3da6767 Add audio downloader 2016-02-19 20:31:44 +08:00
Jare Guo 1ae9a42546 Updating api about engine-extends 2016-02-19 09:39:39 +08:00
pandamicro fa6b9e0fd6 Merge pull request #323 from pandamicro/loader
Implementation of Pipeline
2016-02-18 23:18:03 +08:00
pandamicro 7da025e42d Improve pipeline implementation and add loader test 2016-02-18 19:10:42 +08:00
2youyouo2 d69be60934 should load clip in getAnimationState if state not loaded clip 2016-02-18 18:05:41 +08:00