Johnny Wu
|
118f9fc2c8
|
Merge branch 'master' of github.com:cocos-creator/engine into inspector
|
2016-07-18 10:05:20 +08:00 |
|
pandamicro
|
a06a9b7ff4
|
Merge pull request #900 from pandamicro/webgl
Upgrade WebGL Renderer with auto batching
|
2016-07-15 13:52:30 +08:00 |
|
pandamicro
|
f970bfcbb9
|
Improve WebGL renderer
|
2016-07-14 19:53:59 +08:00 |
|
Johnny Wu
|
2d60ac2c2b
|
Merge branch 'master' of github.com:cocos-creator/engine into inspector
|
2016-07-14 14:37:33 +08:00 |
|
pandamicro
|
4ef771c043
|
Fix remained issues in new renderer
|
2016-07-13 14:04:25 +08:00 |
|
pandamicro
|
6f61fd0e8c
|
Revert defensive code in Node getComponent[s]
|
2016-07-13 14:04:25 +08:00 |
|
Johnny Wu
|
8230fdd797
|
Merge branch 'master' of github.com:cocos-creator/engine into inspector
|
2016-07-12 18:24:09 +08:00 |
|
Johnny Wu
|
a462ce79e4
|
change inspector url
|
2016-07-12 18:22:28 +08:00 |
|
pandamicro
|
c532c09eff
|
Merge Cocos2d-html5 v3.12 webgl renderer
|
2016-07-12 16:33:51 +08:00 |
|
Jare Guo
|
ef436d9da4
|
deferred load scene's raw asset
|
2016-07-08 17:15:57 +08:00 |
|
Huabing.Xu
|
ede00e139c
|
spine works on dirty region
|
2016-07-07 10:50:58 +08:00 |
|
Nan Wang
|
99d66f056b
|
update NodePool api doc
|
2016-06-28 14:23:00 +08:00 |
|
Jare Guo
|
0300460296
|
spine meta should support postImport being called twice
|
2016-06-18 16:19:27 +08:00 |
|
Jare Guo
|
afc8b48f5d
|
spine should use postImport
|
2016-06-17 20:29:10 +08:00 |
|
Jare Guo
|
842a68ea83
|
fix scale of skeleton is readonly after upgrading from old version
|
2016-06-12 14:33:12 +08:00 |
|
knoxHuang
|
9d47cc05e7
|
update updateWorldTransform example for Skeleton
|
2016-05-31 14:31:13 +08:00 |
|
knoxHuang
|
a8fd1f125a
|
remove auto updateWorldTransform, add updateWorldTransform api for Skeleton
|
2016-05-31 14:06:09 +08:00 |
|
Jare Guo
|
98580b1a28
|
spine should be visible after adding to existing node.
|
2016-05-26 21:25:56 +08:00 |
|
Wang Nan
|
94f04f206b
|
Merge pull request #712 from pandamicro/master
Fix a bunch of bugs
|
2016-05-23 15:29:19 +08:00 |
|
knoxHuang
|
29b04c5e8f
|
Add resume and pause function for Skeleton.
|
2016-05-23 11:57:01 +08:00 |
|
pandamicro
|
7172623584
|
Merge branch 'master' of github.com:fireball-x/engine
|
2016-05-23 11:32:49 +08:00 |
|
pandamicro
|
f028985ba0
|
Use push/pop in cc.NodePool
|
2016-05-23 11:32:27 +08:00 |
|
Wang Nan
|
00a5067baf
|
Merge pull request #710 from jareguo/master
make sizeProvider error more clear
|
2016-05-23 11:24:21 +08:00 |
|
Wang Nan
|
55d6c4eeb6
|
Merge pull request #709 from jareguo/temp
fix rendering component can not hide in onLoad
|
2016-05-23 11:23:59 +08:00 |
|
Wang Nan
|
f9da41e7bf
|
Merge pull request #705 from pandamicro/master
Add cc.NodePool as node's object pool
|
2016-05-23 11:08:44 +08:00 |
|
Jare Guo
|
b1e8e498e9
|
make sizeProvider error more clear
|
2016-05-21 18:23:03 +08:00 |
|
Jare Guo
|
ec2247995b
|
fix rendering component can not hide in onLoad
|
2016-05-21 17:37:01 +08:00 |
|
pandamicro
|
d118fb931e
|
Add cc.NodePool as node's object pool
|
2016-05-20 17:00:34 +08:00 |
|
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
|
dbba94fbfb
|
refactor error checking codes for type attribute in CCClass
|
2016-05-19 11:51:31 +08:00 |
|
pandamicro
|
0af950dc70
|
Use EventTarget to emit EVENT_HIDE & EVENT_SHOW
|
2016-05-19 11:02:17 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
Jare Guo
|
28e6ae187d
|
Merge pull request #668 from jareguo/master
remove cc.sys.isNative in html5
|
2016-05-13 17:12:18 +08:00 |
|
Wang Nan
|
5d9ce5d57e
|
Merge pull request #669 from cocos-creator/v1.0
merge V1.0
|
2016-05-13 13:45:01 +08:00 |
|
Jare Guo
|
f8edcbe802
|
remove cc.sys.isNative in html5
|
2016-05-13 11:21:22 +08:00 |
|
knoxHuang
|
b0122605fb
|
fix Inherits from SGNode nodes can not overload a method in BaseNodePropertyDefine.js
|
2016-05-12 11:06:36 +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 |
|
knoxHuang
|
3d535aec20
|
Perfection API
|
2016-04-20 10:32:34 +08:00 |
|
pandamicro
|
fdd22fed25
|
Merge pull request #587 from knoxHuang/master
Synchronize Improve AudioEngine implementation.
|
2016-04-15 16:22:13 +08:00 |
|
Nan Wang
|
3719f971e9
|
replace engine url with unpack protocol
|
2016-04-14 19:09:56 +08:00 |
|
knoxHuang
|
9446e7f5b3
|
Synchronize Improve AudioEngine implementation.
|
2016-04-14 10:11:20 +08:00 |
|
zhangbin
|
c314eefbd2
|
Merge branch 'master' into import-ccs
|
2016-04-07 17:32:37 +08:00 |
|
zhangbin
|
2626f6e6c0
|
Improve the code for runtime.
|
2016-04-07 17:23:32 +08:00 |
|
Johnny Wu
|
e493f2047b
|
upgrade editor-framework to v0.5.0
|
2016-04-07 16:56:39 +08:00 |
|
zhangbin
|
65b6fe136c
|
Remove the Studio Component from component menu.
|
2016-04-07 09:43:59 +08:00 |
|
zhangbin
|
2b7cfb8cc5
|
Add component for importing Studio Project.
|
2016-04-06 12:03:55 +08:00 |
|
Jare Guo
|
38256cc062
|
transform should be computed immediately in canvas mode
|
2016-03-29 17:43:57 +08:00 |
|
Jare Guo
|
5cd134b72b
|
fix spine renderer on canvas
|
2016-03-28 18:24:12 +08:00 |
|
Wang Nan
|
1ae4d71dfc
|
Merge pull request #539 from jareguo/v1.0
fix spine blend mode
|
2016-03-25 20:24:53 +08:00 |
|