pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
pandamicro
|
e8d375014d
|
Small issue fixes
|
2017-12-18 16:13:08 +08:00 |
|
Jare Guo
|
e57ee27447
|
Merge branch 'v1.7-release' into v1.7
# Conflicts:
# cocos2d/core/editbox/CCSGEditBox.js
# cocos2d/core/platform/CCInputManager.js
# cocos2d/core/videoplayer/CCSGVideoPlayer.js
|
2017-12-13 14:39:10 +08:00 |
|
knoxHuang
|
96e51fbee2
|
gradually remove eventManager and inputManager for fireball/issues/6240
|
2017-11-30 11:19:32 +08:00 |
|
pandamicro
|
c8188b5211
|
Merge remote-tracking branch 'origin/v1.7' into next
|
2017-11-22 13:58:23 +08:00 |
|
pandamicro
|
e01dcbdb3a
|
Check wechat game with platform instead of browser type
|
2017-11-13 17:10:52 +08:00 |
|
pandamicro
|
bb52f98da3
|
Solve touch onebyone dispatching issue
|
2017-11-06 15:17:06 +08:00 |
|
pandamicro
|
e4651ac94c
|
Running on wechatgame
|
2017-11-03 17:50:13 +08:00 |
|
pandamicro
|
a5b7a0be68
|
Adaptation WeChatGame
|
2017-11-03 17:49:25 +08:00 |
|
pandamicro
|
afd6f4c2da
|
Running on wechatgame
|
2017-11-03 16:43:13 +08:00 |
|
pandamicro
|
64c96b9371
|
Adaptation WeChatGame
|
2017-11-03 10:38:17 +08:00 |
|
knoxHuang
|
92a9d50507
|
public inputManager for fireball/issues/6485
|
2017-10-25 14:26:21 +08:00 |
|
Jare Guo
|
02cd3ea781
|
private cc.inputManager
|
2017-08-22 16:45:52 +08:00 |
|
Jare Guo
|
cf3c481199
|
optimize getHTMLElementPosition
|
2017-08-11 22:29:40 +08:00 |
|
Jare Guo
|
9fb04b623f
|
compact code
|
2017-08-11 22:13:36 +08:00 |
|
Jare Guo
|
789f9eacf6
|
merge mouse event registration
|
2017-08-11 18:42:58 +08:00 |
|
Jare Guo
|
bb940ee0f4
|
clear side effect of getMouseEvent
|
2017-08-11 18:20:01 +08:00 |
|
Jare Guo
|
0011e6e3c0
|
merge touch event registration
|
2017-08-11 17:34:56 +08:00 |
|
Nan Wang
|
4dea8e7a8a
|
move all error logs to DebugInfos.js and only show error id in release build
|
2016-12-15 17:07:01 +08:00 |
|
pandamicro
|
d276e8eabb
|
Fix X5 touch issue by adding TOUCH_TIMEOUT
|
2016-10-24 02:42:11 +08:00 |
|
Jare Guo
|
8a11d50099
|
inline redundant type cheching function
|
2016-04-25 14:33:47 +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 |
|