Commits · 86c1e2418672fb99582eb47527936f070364bcc8 · BLOCH VALENTIN / CityEscape

Mar 31, 2021
- Correction du bug 'items de shop au dessus de l'interface' · 86c1e241
  Raffael Di Pietro authored 3 years ago
  
  86c1e241
Mar 30, 2021
- Merge branch 'master' into 'master' · 4a2fc94e
  BLOCH VALENTIN authored 3 years ago
```
Ajustements

See merge request chirz/cityescape!79
```
  4a2fc94e
- Ajustements · 9f9438ba
  Raffael Di Pietro authored 3 years ago
  
  9f9438ba
- Merge branch 'master' into 'master' · 08d5872a
  BLOCH VALENTIN authored 3 years ago
```
Modif caméra, modif barre

See merge request chirz/cityescape!78
```
  08d5872a
- Modif caméra, modif barre, et jspquoi d'autre · f05fa90c
  Raffael Di Pietro authored 3 years ago
  
  f05fa90c
- Merge branch 'master' into 'master' · 70ff3a88
  BLOCH VALENTIN authored 3 years ago
```
Hum hum (j'ai oublié d'enregistrer la scène)

See merge request chirz/cityescape!77
```
  70ff3a88
- Hum hum (j'ai oublié d'enregistrer la scène) · 8bdabe55
  Raffael Di Pietro authored 3 years ago
  
  8bdabe55
- Merge branch 'master' into 'master' · b0825e8b
  FISCHER MELVYN authored 3 years ago
```
CORRECTION DU BUG DE LAG DANS LES DEPLACEMENTS !!(youhouu)

See merge request chirz/cityescape!76
```
  b0825e8b
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 3ddd7cf3
  Raffael Di Pietro authored 3 years ago
  
  3ddd7cf3
- CORRECTION DU BUG DE LAG DANS LES DEPLACEMENTS !!(youhouu) · 9aeae85b
  Raffael Di Pietro authored 3 years ago
  
  9aeae85b
- Merge branch 'master' into 'master' · 21fa240f
  BLOCH VALENTIN authored 3 years ago
```
mise à jour menu

See merge request chirz/cityescape!75
```
  21fa240f
- mise à jour menu · 80b10f36
  nyvlemacul@gmail.com authored 3 years ago
  
  80b10f36
- Merge branch 'master' into 'master' · 4feb00ca
  BLOCH VALENTIN authored 3 years ago
```
J'ai (encore) oublié de sauvegarder ma scène..

See merge request chirz/cityescape!74
```
  4feb00ca
- J'ai (encore) oublié de sauvegarder ma scène.. · 41dc4f8a
  Raffael Di Pietro authored 3 years ago
  
  41dc4f8a
- Merge branch 'master' into 'master' · 1cd915ab
  BLOCH VALENTIN authored 3 years ago
```
j'ai enlevé le bouton

See merge request chirz/cityescape!73
```
  1cd915ab
- j'ai enlevé le bouton · 84d161d6
  Raffael Di Pietro authored 3 years ago
  
  84d161d6
- Merge branch 'master' into 'master' · e68b6eec
  GIMENEZ TANGUY authored 3 years ago
```
ajout de la generation du village dynamiquement

See merge request chirz/cityescape!72
```
  e68b6eec
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · b5219ccc
  v.bloch authored 3 years ago
  
  b5219ccc
- j'ai fini mon script de generation de la ville · 29f93a42
  v.bloch authored 3 years ago
  
  29f93a42
- Merge branch 'master' into 'master' · 87ea5fd1
  GIMENEZ TANGUY authored 3 years ago
```
maj des textboxs

See merge request chirz/cityescape!71
```
  87ea5fd1
- maj des textboxs · cd68dff0
  nyvlemacul@gmail.com authored 3 years ago
  
  cd68dff0
- Merge branch 'master' into 'master' · cd60217e
  GIMENEZ TANGUY authored 3 years ago
```
ajout bouton press E to buy Object

See merge request chirz/cityescape!70
```
  cd60217e
- Merge branch 'master' into 'master' · c4805baa
  FISCHER MELVYN authored 3 years ago
```
# Conflicts:
#   Assets/Scripts/Game/GenerateMap.cs
```
  c4805baa
- ajout bouton press E to buy Object · 271bc949
  nyvlemacul@gmail.com authored 3 years ago
  
  271bc949
- Merge branch 'master' into 'master' · 40b6edd9
  DI-PIETRO RAFFAEL authored 3 years ago
```
ajout d'un game controller pour tout gérer

See merge request chirz/cityescape!69
```
  40b6edd9
- ajout du gameController · 44d3191e
  v.bloch authored 3 years ago
  
  44d3191e
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · e2221280
  v.bloch authored 3 years ago
  
  e2221280
- merge · e1ed2015
  v.bloch authored 3 years ago
  
  e1ed2015
- Merge branch 'master' into 'master' · deff4ced
  FISCHER MELVYN authored 3 years ago
```
Correction bug taille interface

See merge request chirz/cityescape!68
```
  deff4ced
- Correction bug taille interface · 04f06bf9
  Raffael Di Pietro authored 3 years ago
  
  04f06bf9
- Merge branch 'master' into 'master' · 7c5986ae
  FISCHER MELVYN authored 3 years ago
```
probleme enregistrement

See merge request chirz/cityescape!67
```
  7c5986ae
- probleme enregistrement · c1bccfa0
  Raffael Di Pietro authored 3 years ago
  
  c1bccfa0
- Merge branch 'master' into 'master' · eeb10ad8
  DI-PIETRO RAFFAEL authored 3 years ago
```
ajout d'un script de dégât

See merge request chirz/cityescape!66
```
  eeb10ad8
- ajout du script definissant le nb de degat infligés au joueur · 0d6e1d59
  v.bloch authored 3 years ago
  
  0d6e1d59
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 1bfc4093
  v.bloch authored 3 years ago
  
  1bfc4093
- merge · a9f2ae8b
  v.bloch authored 3 years ago
  
  a9f2ae8b
- Merge branch 'master' into 'master' · 88a4ec7a
  BLOCH VALENTIN authored 3 years ago
```
Ajout de l'affichage de l'inventaire

See merge request chirz/cityescape!65
```
  88a4ec7a
- Ajout de l'affichage de l'inventaire · 0bb41c2b
  Raffael Di Pietro authored 3 years ago
  
  0bb41c2b
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 9770b7e7
  v.bloch authored 3 years ago
  
  9770b7e7
- ajout du system de detection de l'usine · 8a6764d8
  v.bloch authored 3 years ago
  
  8a6764d8

Admin message