pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
pandamicro
|
14dab8735f
|
Remove _CCClass and all cc._Class usage
|
2018-02-13 12:36:56 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
knoxHuang
|
96e51fbee2
|
gradually remove eventManager and inputManager for fireball/issues/6240
|
2017-11-30 11:19:32 +08:00 |
|
knoxHuang
|
a9afc4671c
|
add __instanceId to inputManager fix fireball/issues/5835
|
2017-06-01 17:59:53 +08:00 |
|
knoxHuang
|
004abc3b66
|
fix cocos-creator/fireball/issues/5484
|
2017-04-18 09:18:03 +08:00 |
|
knoxHuang
|
89f4156891
|
merge html5 code for #fireball/issues/2787
|
2016-06-29 13:40:46 +08:00 |
|
pandamicro
|
8d8e21831b
|
Clean up macros
|
2016-03-14 21:46:12 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|