Commits · 3915dfe2cc021baa12b2b74c6effed148f594251 · Button Pusher / ButtonPusher

26 Aug, 2017 2 commits

Update README.md · 3915dfe2
16서원빈 authored Aug 26, 2017
```
우리 한학기 더한다!
We've got another semester
```
3915dfe2

16서원빈 authored Aug 26, 2017

This reverts commit d618a691.

Revert to time before merge conflict cf75c447 and 969139ca.

38747f67

25 Aug, 2017 24 commits
- ddddd · 8c6ef7a6
  16서원빈 authored Aug 25, 2017
  
  8c6ef7a6
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 969139ca
  Chae Ho Shin authored Aug 25, 2017
  
  969139ca
- dd · f1259523
  16서원빈 authored Aug 25, 2017
  
  f1259523
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · cf75c447
  16도재형 authored Aug 25, 2017
```
# Conflicts:
#	Assets/MotionNotes/Clap.cs
#	Assets/MotionNotes/Guard.cs
#	Assets/MotionNotes/HandDown.cs.meta
#	Assets/MotionNotes/Jump.cs
#	Assets/MotionNotes/PushUp.cs
#	Assets/Script/MotionNote.cs
```
  cf75c447
- 모션노트 완료 · d618a691
  16도재형 authored Aug 25, 2017
  
  d618a691
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 264d73d3
  Chae Ho Shin authored Aug 25, 2017
  
  264d73d3
- Fix bug · 79ee0063
  16서원빈 authored Aug 25, 2017
  
  79ee0063
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 89b2c3b3
  16도재형 authored Aug 25, 2017
  
  89b2c3b3
- Result scene · 6f525b2e
  16도재형 authored Aug 25, 2017
  
  6f525b2e
- 모션 모두 추가 · 31681324
  16이상민 authored Aug 25, 2017
  
  31681324
- WIP · d94eeb54
  Chae Ho Shin authored Aug 25, 2017
  
  d94eeb54
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 6e0695fb
  Chae Ho Shin authored Aug 24, 2017
  
  6e0695fb
- merge · 11afaddb
  16서원빈 authored Aug 24, 2017
  
  11afaddb
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 4f6bf12b
  16서원빈 authored Aug 24, 2017
  
  4f6bf12b
- Working on Motions · 22a291dc
  16서원빈 authored Aug 24, 2017
  
  22a291dc
- SetSelect/Result/Ingame integration · a6160b9d
  Chae Ho Shin authored Aug 24, 2017
  
  a6160b9d
- Set Select fix · 5c580308
  Chae Ho Shin authored Aug 24, 2017
  
  5c580308
- Set Select wow · 935a4c60
  Chae Ho Shin authored Aug 24, 2017
  
  935a4c60
- Short Motion Judge just WORKS · c218ccaa
  16서원빈 authored Aug 24, 2017
  
  c218ccaa
- Motion note WIP · 9d2c6c23
  16서원빈 authored Aug 24, 2017
  
  9d2c6c23
- LIGHT IS IMPORTANT · da247e49
  Chae Ho Shin authored Aug 24, 2017
  
  da247e49
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 2815d2c4
  16서원빈 authored Aug 24, 2017
  
  2815d2c4
- Working on motion notes · c471ce93
  16서원빈 authored Aug 24, 2017
  
  c471ce93
- Add title scene sprite · 5158680e
  16도재형 authored Aug 24, 2017
  
  5158680e
24 Aug, 2017 14 commits
- SetSelect scene almost done · 57d048ed
  16도재형 authored Aug 24, 2017
  
  57d048ed
- InGame motion workaround · 38fb1af7
  16서원빈 authored Aug 24, 2017
  
  38fb1af7
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · f9ca2ee7
  16서원빈 authored Aug 24, 2017
  
  f9ca2ee7
- Working InGame · 0acaeb94
  16서원빈 authored Aug 24, 2017
  
  0acaeb94
- Scoredisplay manager sut--goi · 35880739
  Chae Ho Shin authored Aug 24, 2017
  
  35880739
- stage lights subarashi · 554d53fa
  Chae Ho Shin authored Aug 24, 2017
  
  554d53fa
- Set Select wow amazing · 07641f90
  Chae Ho Shin authored Aug 24, 2017
  
  07641f90
- Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher · 51502a09
  Chae Ho Shin authored Aug 24, 2017
  
  51502a09
- Result UI · e2d48911
  Chae Ho Shin authored Aug 24, 2017
  
  e2d48911
- SetSelect · e284086c
  Chae Ho Shin authored Aug 24, 2017
  
  e284086c
- Error on Kinect not usable condition · 4b5563af
  16서원빈 authored Aug 24, 2017
  
  4b5563af
- Update InGame scene for Kinect scripts update(33793d76 ) · c82ef40c
  16도재형 authored Aug 24, 2017
  
  c82ef40c
- Update Kinect part · 33793d76
  16도재형 authored Aug 24, 2017
  
  33793d76
- Change scene UI · a022ecd1
  16도재형 authored Aug 24, 2017
  
  a022ecd1