James Chen
|
4da873ecb8
|
Merge branch 'v1.8' into develop
# Conflicts:
# cocos/scripting/js-bindings/script/jsb_cocos2d.js
|
2018-02-23 10:26:48 +08:00 |
|
James Chen
|
d4cfc6c37e
|
Fix mouse scroll event dispatching issue. (#1108)
|
2018-02-09 17:31:17 +08:00 |
|
Jare Guo
|
d9bd3d763c
|
update license (#1089)
* updating license
* update license
|
2018-02-01 15:20:01 +08:00 |
|
pandamicro
|
2971980c03
|
Upgrade cocos/base to v3.13
|
2016-08-04 16:04:41 +08:00 |
|
Wenhai Lin
|
94c95d5838
|
Withespaces does matter.
|
2016-03-31 23:50:02 +08:00 |
|
Wenhai Lin
|
a6dbf31dcf
|
cocos 2d lite version
|
2016-03-29 17:55:48 +08:00 |
|