Commits · 9a23d283b01081efd96438bfc4494ec2e7867ffc · BLOCH VALENTIN / CityEscape

Mar 31, 2021
- merge · 9a23d283
  GIMENEZ TANGUY authored 3 years ago
  
  9a23d283
Mar 30, 2021
- 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
- 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
- Merge branch 'master' into 'master' · d9eb5ee0
  BLOCH VALENTIN authored 3 years ago
```
Raffael Di Pietro's avatar Correction de warning et d'erreurs (j'aime pas le rouge dans la console mdr) & modif dialogues marchand

See merge request chirz/cityescape!64
```
  d9eb5ee0
- Correction de warning et d'erreurs (j'aime pas le rouge dans la console mdr) · b3e8bfbf
  Raffael Di Pietro authored 3 years ago
  
  b3e8bfbf
- Modification des dialogues marchands · 6e826a21
  Raffael Di Pietro authored 3 years ago
  
  6e826a21
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 3fd1be9f
  v.bloch authored 3 years ago
  
  3fd1be9f
- debut de l'ajout de la perte de nature a la vision des usines · 2d3534df
  v.bloch authored 3 years ago
  
  2d3534df
- Merge branch 'master' into 'master' · caaf5312
  BLOCH VALENTIN authored 3 years ago
```
Ajout du tag factory et modification des dialogues

See merge request chirz/cityescape!63
```
  caaf5312
- Ajout du tag factory et modification des dialogues · 5787fbd9
  Raffael Di Pietro authored 3 years ago
  
  5787fbd9
- Merge branch 'master' into 'master' · 7104dde7
  BLOCH VALENTIN authored 3 years ago
```
GenerateMap en singleton

See merge request chirz/cityescape!62
```
  7104dde7
- GenerateMap en singleton · b33de2e7
  Raffael Di Pietro authored 3 years ago
  
  b33de2e7

Admin message