Commits · master · GICQUEL Gwenael / REV-Megaman

28 May, 2021 11 commits
- wow · 25b64c33
  g6gicque authored May 28, 2021
  
  25b64c33
- Merge branch 'destroy-bullet-on-collision' into 'master' · 4eeef890
  MULOT Morgane authored May 28, 2021
```
destroy bullet

See merge request !6
```
  4eeef890
- destroy bullet · 51d5d9b3
  MULOT Morgane authored May 28, 2021
  
  51d5d9b3
- Merge branch 'boss_1' into 'master' · 1fa9e0c7
  GICQUEL Gwenael authored May 28, 2021
```
boss_mode !

See merge request !5
```
  1fa9e0c7
- boss_mode ! · 377be0fc
  g6gicque authored May 28, 2021
  
  377be0fc
- best commit · 5858f05c
  g6gicque authored May 28, 2021
  
  5858f05c
- Merge branch 'FullMap' into 'master' · 421b982a
  GICQUEL Gwenael authored May 28, 2021
```
Full map

See merge request !4
```
  421b982a
- Merge branch 'master' into 'FullMap' · a0cf89e5
  GICQUEL Gwenael authored May 28, 2021
```
# Conflicts:
#   Assets/Scripts/ComportementPerso.cs
```
  a0cf89e5
- Merge branch 'Tir' into 'master' · 99878ea9
  MULOT Morgane authored May 28, 2021
```
bullet

See merge request !3
```
  99878ea9
- bullet · 559dc93e
  MULOT Morgane authored May 28, 2021
  
  559dc93e
- even better !!!! · c96f5f2f
  g6gicque authored May 28, 2021
  
  c96f5f2f
27 May, 2021 1 commit
- better · 73a78970
  g6gicque authored May 27, 2021
  
  73a78970
22 May, 2021 2 commits
- add many bars and menu · 812a8cd8
  g6gicque authored May 22, 2021
  
  812a8cd8
- checkpoint , respawn and spikes obstacles ! · cf1d2049
  g6gicque authored May 22, 2021
  
  cf1d2049
21 May, 2021 11 commits
- Water & movement ajustment (no more clipping) · f4401381
  g6gicque authored May 21, 2021
  
  f4401381
- full map · 986f0356
  g6gicque authored May 21, 2021
  
  986f0356
- mergeed · 2d95e7bc
  g6gicque authored May 21, 2021
  
  2d95e7bc
- Merge branch 'Camera/Map' · 0bf00333
  g6gicque authored May 21, 2021
  
  0bf00333
- Merge branch 'Perso' into 'master' · 53720612
  MULOT Morgane authored May 21, 2021
```
add perso + move with keys

See merge request !1
```
  53720612
- add perso + move with keys · 586b786c
  MULOT Morgane authored May 21, 2021
  
  586b786c
- add terrain · 85aa9de2
  g6gicque authored May 21, 2021
  
  85aa9de2
- fix camera and moving ball · 5730738e
  g6gicque authored May 21, 2021
  
  5730738e
- Inital commit nothing · 241d724b
  g6gicque authored May 21, 2021
  
  241d724b
- Update .gitignore.txt · 2f0785bd
  GICQUEL Gwenael authored May 21, 2021
  
  2f0785bd
- Add new file · 51cd95b5
  GICQUEL Gwenael authored May 21, 2021
  
  51cd95b5