Commits · development · Eko Simanjuntak / colourful-love

08 Jan, 2018 7 commits
- Merge branch 'level5' into 'development' · d2b526db
  Eko Simanjuntak authored Jan 08, 2018
```
Level5

See merge request !7
```
  d2b526db
- Merge branch 'development' into 'level5' · 217cddd9
  Eko Simanjuntak authored Jan 08, 2018
```
# Conflicts:
#   Assets/Scripts/BackgroundChanger.cs
```
  217cddd9
- fix menu stories and tutorials · 4bb92381
  Eko Simanjuntak authored Jan 08, 2018
  
  4bb92381
- Merge branch 'level4' into 'development' · 89f9ea01
  Eko Simanjuntak authored Jan 08, 2018
```
Level4-fix

See merge request !6
```
  89f9ea01
- fix-2 · 408f312a
  Juliper authored Jan 08, 2018
  
  408f312a
- fix · 5e5ec16c
  Juliper authored Jan 08, 2018
  
  5e5ec16c
- fixing-level4 · 9c8bb1e1
  Juliper authored Jan 08, 2018
  
  9c8bb1e1
07 Jan, 2018 4 commits
- finishing level 5 · bf6b9a24
  Eko Simanjuntak authored Jan 07, 2018
  
  bf6b9a24
- add unifish level 5 · 008aada7
  Eko Simanjuntak authored Jan 07, 2018
  
  008aada7
- Merge branch 'level3' into 'development' · 52ac555a
  Eko Simanjuntak authored Jan 07, 2018
```
Level3

See merge request !4
```
  52ac555a
- finishing level 3 · 906c2426
  Eko Simanjuntak authored Jan 07, 2018
  
  906c2426
06 Jan, 2018 18 commits
- test-part-2 · c3f77cf5
  Juliper authored Jan 07, 2018
  
  c3f77cf5
- part1 · 23244dca
  Juliper authored Jan 07, 2018
  
  23244dca
- test3 · bddcce4c
  Juliper authored Jan 06, 2018
  
  bddcce4c
- test2 · 60d84fe1
  Juliper authored Jan 06, 2018
  
  60d84fe1
- test1 · e8398c35
  Juliper authored Jan 06, 2018
  
  e8398c35
- level4 · 0d196ccd
  Juliper authored Jan 06, 2018
  
  0d196ccd
- test · 12ea5d78
  Juliper authored Jan 06, 2018
  
  12ea5d78
- add unfinish level 3 · 645ab272
  Eko Simanjuntak authored Jan 06, 2018
  
  645ab272
- fixing · e1ecb7f0
  Juliper authored Jan 06, 2018
  
  e1ecb7f0
- add half level3 · c77694b1
  Eko Simanjuntak authored Jan 06, 2018
  
  c77694b1
- resolve conflict · 83beb736
  Eko Simanjuntak authored Jan 06, 2018
  
  83beb736
- starting level 3 · 82c3a448
  Eko Simanjuntak authored Jan 06, 2018
  
  82c3a448
- Merge branch 'level2' into 'development' · ac23c5fc
  Eko Simanjuntak authored Jan 06, 2018
```
Level2

See merge request !2
```
  ac23c5fc
- Merge branch 'development' into 'level2' · 7a58ea3a
  Eko Simanjuntak authored Jan 06, 2018
```
# Conflicts:
#   colourful-love.userprefs
```
  7a58ea3a
- Merge branch 'new-menu-scene' into 'development' · ceed8ef4
  Eko Simanjuntak authored Jan 06, 2018
```
New menu scene

See merge request !3
```
  ceed8ef4
- fixing · 329bdb49
  Juliper authored Jan 06, 2018
  
  329bdb49
- fix-menu · 3eb774af
  Juliper authored Jan 06, 2018
  
  3eb774af
- final level2 ? · 1e1bfc26
  Juliper authored Jan 06, 2018
  
  1e1bfc26
05 Jan, 2018 4 commits
- not fix yet · 86bb2878
  Juliper authored Jan 05, 2018
  
  86bb2878
- Merge branch 'level1' into 'development' · 25c38151
  Eko Simanjuntak authored Jan 05, 2018
```
Level1

See merge request !1
```
  25c38151
- final level 1 · 91203c6c
  Eko Simanjuntak authored Jan 05, 2018
  
  91203c6c
- test · dc75a488
  Juliper authored Jan 05, 2018
  
  dc75a488
19 Dec, 2017 2 commits
- try · 2c6a4c38
  Juliper authored Dec 19, 2017
  
  2c6a4c38
- use edge collider instead of polygon collider · 2acb0aba
  Eko Simanjuntak authored Dec 19, 2017
  
  2acb0aba
15 Dec, 2017 1 commit
- add finish point · ae9d7fe6
  Eko Simanjuntak authored Dec 15, 2017
  
  ae9d7fe6
08 Dec, 2017 4 commits
- Merge branch 'development' into level1 · bb833c67
  Eko Simanjuntak authored Dec 08, 2017
  
  bb833c67
- delete .vs · 6c06f451
  Eko Simanjuntak authored Dec 08, 2017
  
  6c06f451
- $DESKTOP-VL1MB27\irenedebora's avatar$
  
  add background · 8ada040b
  DESKTOP-VL1MB27\irenedebora authored Dec 08, 2017
  
  8ada040b
- delete .vs from branch level1 · 96bf9b33
  Eko Simanjuntak authored Dec 08, 2017
  
  96bf9b33