pandamicro
|
eb71e44cb8
|
Remove useless modules
|
2017-01-22 17:34:22 +08:00 |
|
zhangbin
|
4f53640c0a
|
Solve the error in runtime environment.
|
2016-10-09 16:47:09 +08:00 |
|
Wang Nan
|
0b8088eedb
|
Merge pull request #1142 from natural-law/dragonbones
Support Dragonbones
|
2016-09-22 18:32:11 +08:00 |
|
zhangbin
|
28fa0aab1b
|
Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
# cocos2d/tilemap/CCSGTMXObjectGroup.js
|
2016-09-09 16:58:21 +08:00 |
|
zhangbin
|
66660abf37
|
Merge branch 'master' of github.com:cocos-creator/engine into dragonbones
|
2016-09-09 10:59:30 +08:00 |
|
VisualSJ
|
2bc87645f2
|
review code and support jsb
|
2016-09-06 18:22:54 +08:00 |
|
zhangbin
|
3f94336b8c
|
Add dragonbones support.
|
2016-09-02 14:57:34 +08:00 |
|
zhangbin
|
a6eeb678f7
|
Solve the errors in logic.
|
2016-07-25 18:27:53 +08:00 |
|
zhangbin
|
3fea3ab177
|
Improve component TiledObject & TiledObjectGroup.
|
2016-07-21 16:18:47 +08:00 |
|
pandamicro
|
d118fb931e
|
Add cc.NodePool as node's object pool
|
2016-05-20 17:00:34 +08:00 |
|
knoxHuang
|
3a5a0d0d4d
|
add color for MotionStreak and fix motionStreak warning.
|
2016-05-17 15:58:33 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
knoxHuang
|
99972b8380
|
transplant MotionStreak
|
2016-05-06 18:48:33 +08:00 |
|
zhangbin
|
1037397c97
|
Adjust code for the new environment of Creator.
|
2016-04-07 18:28:42 +08:00 |
|
zhangbin
|
c314eefbd2
|
Merge branch 'master' into import-ccs
|
2016-04-07 17:32:37 +08:00 |
|
Johnny Wu
|
e493f2047b
|
upgrade editor-framework to v0.5.0
|
2016-04-07 16:56:39 +08:00 |
|
zhangbin
|
2b7cfb8cc5
|
Add component for importing Studio Project.
|
2016-04-06 12:03:55 +08:00 |
|
pandamicro
|
6f530df13b
|
Cleanup other modules
|
2016-03-14 21:46:13 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
zhangbin
|
72f1f6f487
|
Solve the warning of TiledMap when starting Creator.
|
2016-02-26 18:24:16 +08:00 |
|
zhangbin
|
16cbc4fb85
|
Implement component cc.TiledLayer
|
2016-02-22 18:28:38 +08:00 |
|
zhangbin
|
f649a50227
|
Optimize the implementation of TiledMap component.
1. Keep the TiledMap component related files in folder `engine/cocos2d/tilemap`
2. Add comments in file CCTiledMap.js
|
2016-02-19 12:06:47 +08:00 |
|
Jare Guo
|
d48e7b6957
|
add spine asset
|
2016-01-25 16:51:57 +08:00 |
|
Jare Guo
|
e9ab74b35b
|
move cc.log jsb polyfill to jsb/index.js
|
2016-01-25 16:45:01 +08:00 |
|
Jare Guo
|
ba61623c53
|
modular spine
|
2016-01-25 16:16:32 +08:00 |
|
knoxHuang
|
d2a9cbc361
|
CCEParticleSystem Renamed CCParticleSystem
|
2015-12-16 15:28:02 +08:00 |
|
Jare Guo
|
03b4b412d0
|
fix render order for _replaceSgNode
|
2015-12-15 17:00:48 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|