Commits · 52332cf4f41d695a765c6bcdbc31ac7abdec0d24 · Shawn Wang / crazyflirt

06 May, 2018 39 commits
- tweak catched image position · 52332cf4
  Matt authored May 06, 2018
  
  52332cf4
- catched tip · 5e301ee7
  Matt authored May 06, 2018
  
  5e301ee7
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 5add77ce
  Mike Zhu authored May 06, 2018
  
  5add77ce
- 修改随机播放catched逻辑 · 9d0cb31e
  Mike Zhu authored May 06, 2018
  
  9d0cb31e
- img · f75ffbeb
  Shawn Wang authored May 06, 2018
  
  f75ffbeb
- tMerge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 3cf276e6
  Mike Zhu authored May 06, 2018
  
  3cf276e6
- 修改重新进入房间的开始字体 · ff440dd6
  Mike Zhu authored May 06, 2018
  
  ff440dd6
- disable tween · e6b81a06
  Matt authored May 06, 2018
  
  e6b81a06
- a · 22c4134b
  Shawn Wang authored May 06, 2018
  
  22c4134b
- c · e0257e72
  Shawn Wang authored May 06, 2018
  
  e0257e72
- mock · d0562263
  Shawn Wang authored May 06, 2018
  
  d0562263
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 1c0c374e
  Shawn Wang authored May 06, 2018
  
  1c0c374e
- fix · 6381a215
  Shawn Wang authored May 06, 2018
  
  6381a215
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 613892d1
  Mike Zhu authored May 06, 2018
  
  613892d1
- 更新游戏排行 · 1f4ef36c
  Mike Zhu authored May 06, 2018
  
  1f4ef36c
- fix hit test · de3bcbb0
  Matt authored May 06, 2018
  
  de3bcbb0
- fix · 942afd4d
  Shawn Wang authored May 06, 2018
  
  942afd4d
- asldjoasd · b35a62d8
  Shawn Wang authored May 06, 2018
  
  b35a62d8
- fix hit test · 48a42560
  Matt authored May 06, 2018
  
  48a42560
- 创建gameover页面 · 480f2513
  Mike Zhu authored May 06, 2018
  
  480f2513
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 28c14e0c
  Shawn Wang authored May 06, 2018
  
  28c14e0c
- asdsad · dd9cfa04
  Shawn Wang authored May 06, 2018
  
  dd9cfa04
- fix hit test · d90641f6
  Matt authored May 06, 2018
  
  d90641f6
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 93be376a
  Shawn Wang authored May 06, 2018
  
  93be376a
- update · 21281ef2
  Shawn Wang authored May 06, 2018
  
  21281ef2
- fix hit test · ad398fb5
  Matt authored May 06, 2018
  
  ad398fb5
- fix hit test · 6c9718fa
  Matt authored May 06, 2018
  
  6c9718fa
- fix hit test · faa48ffb
  Matt authored May 06, 2018
  
  faa48ffb
- add hit test · 65c2ac66
  Matt authored May 06, 2018
  
  65c2ac66
- mg · 4a2c995a
  Nick An authored May 06, 2018
  
  4a2c995a
- mark · 875e8753
  Nick An authored May 06, 2018
  
  875e8753
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 1f179fb6
  Shawn Wang authored May 06, 2018
```
# Conflicts:
#	fe/src/Main.ts
```
  1f179fb6
- loop and control boundery · e707eaf2
  Shawn Wang authored May 06, 2018
  
  e707eaf2
- bgm设置无限循环 · af39239b
  Mike Zhu authored May 06, 2018
  
  af39239b
- bgm · 3f9c7cd9
  Shawn Wang authored May 06, 2018
  
  3f9c7cd9
- 分享 · 7b730bf7
  Shawn Wang authored May 06, 2018
  
  7b730bf7
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 022672e7
  Shawn Wang authored May 06, 2018
  
  022672e7
- avatar group · 6e9763d0
  Shawn Wang authored May 06, 2018
  
  6e9763d0
- zip all the images · 7cbf3f94
  Shawn Wang authored May 06, 2018
  
  7cbf3f94
05 May, 2018 1 commit
- add map · 86015ab2
  Matt authored May 05, 2018
  
  86015ab2