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 |
|
pandamicro
|
d8908507b7
|
Merge pull request #692 from knoxHuang/master
fix update and start calling sequence bug
|
2016-05-19 17:48:47 +08:00 |
|
knoxHuang
|
a1eb098225
|
fix start update lateUpdate calling sequence bug
|
2016-05-19 17:37:38 +08:00 |
|
Jare Guo
|
dbba94fbfb
|
refactor error checking codes for type attribute in CCClass
|
2016-05-19 11:51:31 +08:00 |
|
2youyouo2
|
4a22551b21
|
move _updateClip to editor
|
2016-05-19 11:17:22 +08:00 |
|
ViusualSJ
|
b187f08c70
|
remove audio source tests
|
2016-05-18 11:52:23 +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
|
fcaa3aadc2
|
add test for #2561
|
2016-05-17 11:18:54 +08:00 |
|
Jare Guo
|
10b259a21c
|
support minimized serialization
|
2016-05-17 00:39:27 +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
|
00325b9ec1
|
Merge pull request #654 from jareguo/temp
node's sibling index should not changed if zIndex not changed
|
2016-05-11 16:54:47 +08:00 |
|
Jare Guo
|
6bc1cdae4d
|
node's sibling index should not changed if zIndex not changed
|
2016-05-11 13:42:55 +08:00 |
|
2youyouo2
|
a26c56891d
|
refine collider
|
2016-05-11 10:47:19 +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 |
|
2youyouo2
|
9fac8dc3df
|
refine code
|
2016-05-10 15:18:15 +08:00 |
|
knoxHuang
|
99972b8380
|
transplant MotionStreak
|
2016-05-06 18:48:33 +08:00 |
|
2youyouo2
|
8361570a29
|
refine collider
|
2016-04-29 11:28:03 +08:00 |
|
2youyouo2
|
f8a551681a
|
add collider test
|
2016-04-27 17:23: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
|
56553d11dc
|
working on loadResAll
|
2016-04-20 14:08:20 +08:00 |
|
Jare Guo
|
3265e632e6
|
disallow ignoreAnchorPointForPosition in render tree to avoid rotation bug can not fixed in JSB
|
2016-04-20 01:15:09 +08:00 |
|
Jare Guo
|
98cc058392
|
support the live reloading of undo history
|
2016-04-17 14:21:58 +08:00 |
|
Nan Wang
|
3719f971e9
|
replace engine url with unpack protocol
|
2016-04-14 19:09:56 +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 |
|
Jare Guo
|
6033292369
|
should be able to deactivate self during onLoad
|
2016-04-08 17:27:01 +08:00 |
|
Jare Guo
|
79f4667636
|
formatStr should support type number as first argument
|
2016-04-08 14:58:46 +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 |
|
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 |
|