Commits · master · GIMENEZ TANGUY / CityEscape

Mar 31, 2021
- on vire la build et on update le Installation.md · 7dbeed84
  GIMENEZ TANGUY authored 3 years ago
  
  7dbeed84
- on vire la build et on update le Installation.md · 89da6e7d
  GIMENEZ TANGUY authored 3 years ago
  
  89da6e7d
- Merge branch 'master' into 'master' · cdf14e13
  GIMENEZ TANGUY authored 3 years ago
```
duild a génerer

See merge request chirz/cityescape!83
```
  cdf14e13
- on change les spawns · 35364ba4
  BuildTools authored 3 years ago
  
  35364ba4
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · a93bb6fe
  BuildTools authored 3 years ago
  
  a93bb6fe
- merge de revert · f4f8fe37
  BuildTools authored 3 years ago
  
  f4f8fe37
- Merge branch 'revert-4a2fc94e' into 'master' · 10dc0486
  BLOCH VALENTIN authored 3 years ago
```
Revert "Merge branch 'master' into 'master'"

See merge request chirz/cityescape!82
```
  10dc0486
- Revert "Merge branch 'master' into 'master'" · 08dfcb02
  GIMENEZ TANGUY authored 3 years ago
```
This reverts merge request !79
```
  08dfcb02
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · e6ddf8b6
  BuildTools authored 3 years ago
  
  e6ddf8b6
- amelioration ordre de spawn des choses · e271b407
  BuildTools authored 3 years ago
  
  e271b407
- Merge branch 'master' into 'master' · 17d5cf20
  BLOCH VALENTIN authored 3 years ago
```
Correction du bug 'items de shop au dessus de l'interface'

See merge request chirz/cityescape!81
```
  17d5cf20
- Merge branch 'master' into 'master' · 51903cca
  BLOCH VALENTIN authored 3 years ago
```
Ajout des reandme

See merge request chirz/cityescape!80
```
  51903cca
- Correction du bug 'items de shop au dessus de l'interface' · 86c1e241
  Raffael Di Pietro authored 3 years ago
  
  86c1e241
- Résolution de conflits · a7aac604
  GIMENEZ TANGUY authored 3 years ago
  
  a7aac604
- merge · 9a23d283
  GIMENEZ TANGUY authored 3 years ago
  
  9a23d283
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' of git.unistra.fr:chirz/cityescape · 83b521b8
  GIMENEZ TANGUY authored 3 years ago
  
  83b521b8
- Merge · 64221870
  GIMENEZ TANGUY authored 3 years ago
  
  64221870
- 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

Admin message