Commit Graph

198 Commits

Author SHA1 Message Date
Wang Nan ef96a955a0 Merge pull request #693 from jareguo/master
refactor error checking codes for type attribute in CCClass
2016-05-20 15:35:00 +08:00
Jare Guo e009c93410 Merge pull request #699 from pandamicro/master
支持在屏幕朝向不正确的情况下自动转屏
2016-05-20 14:37:40 +08:00
pandamicro e86e846a74 Support auto rotate canvas when screen orientation isn't correct 2016-05-20 10:58:52 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
Jare Guo dbba94fbfb refactor error checking codes for type attribute in CCClass 2016-05-19 11:51:31 +08:00
ViusualSJ a3b10ad4b5 change ONLY_ONE 2016-05-18 18:29:08 +08:00
Jare Guo a8ab54b558 Merge pull request #674 from jareguo/temp
add preload lifecycle method
2016-05-17 11:26:13 +08:00
Jare Guo 10b259a21c support minimized serialization 2016-05-17 00:39:27 +08:00
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
Jare Guo 880f0e28ca add preloadScene 2016-05-13 17:37:16 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +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
pandamicro 3b7173d372 Merge pull request #614 from VisualSJ/master_2689
更新,简化Audio支持
2016-04-28 14:11:09 +08:00
Jare Guo 02117aaf3f minor fix 2016-04-27 10:57:39 +08:00
Jare Guo 3f1b682d19 Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
#	cocos2d/core/components/CCRendererInSG.js
#	cocos2d/core/load-pipeline/asset-table.js
#	cocos2d/tilemap/CCTiledMap.js
#	jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
Jare Guo c984d9cdf9 support gizmo event 2016-04-26 18:19:56 +08:00
Jare Guo 2f66e219a0 Merge pull request #625 from jareguo/master
optimizations
2016-04-25 15:03:25 +08:00
Jare Guo 8a11d50099 inline redundant type cheching function 2016-04-25 14:33:47 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
ViusualSJ 884797aa84 Merge branch 'master' of github.com:cocos-creator/engine into master_2689 2016-04-22 14:12:53 +08:00
ViusualSJ 968ac6ec4a Update Audio support table and Fixed bugs 2016-04-21 18:14:58 +08:00
knoxHuang ffb2c9af14 Label.file change to .font 2016-04-20 18:08:16 +08:00
Jare Guo 56553d11dc working on loadResAll 2016-04-20 14:08:20 +08:00
knoxHuang 3d535aec20 Perfection API 2016-04-20 10:32:34 +08:00
Jare Guo 98cc058392 support the live reloading of undo history 2016-04-17 14:21:58 +08:00
pandamicro fdd22fed25 Merge pull request #587 from knoxHuang/master
Synchronize Improve AudioEngine implementation.
2016-04-15 16:22:13 +08:00
Johnny Wu 6109149369 refine ipc reply 2016-04-14 11:58:48 +08:00
knoxHuang 9446e7f5b3 Synchronize Improve AudioEngine implementation. 2016-04-14 10:11:20 +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 725af05924 support missing script for prefab 2016-04-11 21:24:17 +08:00
Jare Guo 10a03eccd5 Can not use JSON.stringify to present Error (#581) 2016-04-11 14:10:16 +08:00
Jare Guo 07cd110664 change saperater to only one space 2016-04-11 10:03:12 +08:00
Jare Guo 6033292369 should be able to deactivate self during onLoad 2016-04-08 17:27:01 +08:00
Jare Guo 9b09fcee2d Merge pull request #577 from cocos-creator/v1.0
Sync 1.0
2016-04-08 15:08:46 +08:00
Jare Guo 79f4667636 formatStr should support type number as first argument 2016-04-08 14:58:46 +08:00
pandamicro f17b74bb58 Merge pull request #569 from pandamicro/v1.0
Fix _resizeEvent being called multiple time issue
2016-04-07 18:30:44 +08:00
pandamicro 4a5a57eb61 Fix resize event issue by avoiding adjust viewport meta multiple times 2016-04-07 18:28:30 +08:00
Johnny Wu e493f2047b upgrade editor-framework to v0.5.0 2016-04-07 16:56:39 +08:00
Jare Guo 9695109756 update callbacks invoker 2016-04-04 00:15:10 +08:00
Nan Wang c8b95e65b2 fixed api doc error. 2016-03-25 16:22:12 +08:00
Jare Guo aa9304626d minor tweaks 2016-03-24 20:28:06 +08:00
knoxHuang dd7e228c34 update Node and Component API 2016-03-24 17:14:06 +08:00
Wang Nan a03361c27a Merge pull request #516 from nantas/v1.0
update engine version. make sure callFunc can pass 0 valued  argument.
2016-03-22 17:37:47 +08:00
Nan Wang f8280f7f77 update api doc to correct crosslinks 2016-03-22 16:34:26 +08:00
Jare Guo 51c5e1a2ba add cc.loader.loadRes, remove "resources://" protocol 2016-03-22 15:40:50 +08:00
Jare Guo d423ebeacf export uuid for persist root node 2016-03-15 20:30:11 +08:00
pandamicro 11359695ba Improve docs and implementation 2016-03-15 12:24:07 +08:00
Jare Guo cf614f41de Merge commit 'd43870aff07040d32817d010fc3ac1716e63d2fb' into v1.0 2016-03-15 10:54:11 +08:00