Commits · 93be376a41049809383ca0301717e86a7d2d8fcf · Shawn Wang / crazyflirt

06 May, 2018 16 commits
- 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 24 commits
- add map · 86015ab2
  Matt authored May 05, 2018
  
  86015ab2
- 增加音效管理 · a64360eb
  Mike Zhu authored May 05, 2018
  
  a64360eb
- update bgm · 9bf5c6d5
  Shawn Wang authored May 05, 2018
  
  9bf5c6d5
- bgm · 09dbaec8
  Shawn Wang authored May 05, 2018
  
  09dbaec8
- 房间里准备增加头像 · a8f4e7df
  Mike Zhu authored May 05, 2018
  
  a8f4e7df
- add audio · 6d265e88
  Shawn Wang authored May 05, 2018
  
  6d265e88
- 更新所有玩家倒计时 · 461a7523
  Mike Zhu authored May 05, 2018
  
  461a7523
- Merge branch 'develop-matt' into develop · 9ff81dfe
  Matt authored May 05, 2018
  
  9ff81dfe
- add image · f564fe0c
  Shawn Wang authored May 05, 2018
  
  f564fe0c
- update cid when data.type is entry · 8bf8c6da
  Mike Zhu authored May 05, 2018
  
  8bf8c6da
- update RoomScene · 1fc27b70
  Mike Zhu authored May 05, 2018
  
  1fc27b70
- highlight center grid in touch area · 439120b6
  Matt authored May 05, 2018
  
  439120b6
- mg · d68283ed
  Nick An authored May 05, 2018
  
  d68283ed
- fix doc · 41570fe6
  Nick An authored May 05, 2018
  
  41570fe6
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · abd8ecb2
  Shawn Wang authored May 05, 2018
  
  abd8ecb2
- 666 · 83945f29
  Shawn Wang authored May 05, 2018
  
  83945f29
- show touch area of catcher · 66a90b69
  Matt authored May 05, 2018
  
  66a90b69
- item · c04468c7
  Nick An authored May 05, 2018
  
  c04468c7
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · c6a417b5
  Mike Zhu authored May 05, 2018
  
  c6a417b5
- feat: 使onSocketMessage通知更新Scene · 616e4cb8
  Mike Zhu authored May 05, 2018
  
  616e4cb8
- control 666 · 354e8916
  Shawn Wang authored May 05, 2018
  
  354e8916
- Merge branch 'develop' of cd.i.strikingly.com:shawn.wang/crazyflirt into develop · 1caae731
  Shawn Wang authored May 05, 2018
  
  1caae731
- add image · 4ce78deb
  Shawn Wang authored May 05, 2018
  
  4ce78deb
- fix conflict in Stores · 4af542f5
  Mike Zhu authored May 05, 2018
  
  4af542f5