Commits · 9a814c0318cbb9aee703465d4cce70434af4a29d · BLOCH VALENTIN / CityEscape

Mar 29, 2021
- systeme de game over ok · 9a814c03
  GIMENEZ TANGUY authored 3 years ago
  
  9a814c03
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · d119f37e
  GIMENEZ TANGUY authored 3 years ago
  
  d119f37e
- Merge branch 'master' into 'master' · 59c08a74
  GIMENEZ TANGUY authored 3 years ago
```
ajout prefabs map

See merge request chirz/cityescape!36
```
  59c08a74
- ajout prefabs map · da3a2b26
  nyvlemacul@gmail.com authored 3 years ago
  
  da3a2b26
- On commence l'animation de game over · 83a3369d
  GIMENEZ TANGUY authored 3 years ago
  
  83a3369d
- Merge branch 'master' into 'master' · 74ba8397
  BLOCH VALENTIN authored 3 years ago
```
correction de bug

See merge request chirz/cityescape!35
```
  74ba8397
- oublié d'enregistrer haha · a1431845
  Raffael Di Pietro authored 3 years ago
  
  a1431845
- aucune idée · a6cdeb0e
  Raffael Di Pietro authored 3 years ago
  
  a6cdeb0e
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · b257abf9
  Raffael Di Pietro authored 3 years ago
  
  b257abf9
- merge · b961e027
  Raffael Di Pietro authored 3 years ago
  
  b961e027
- Merge branch 'master' into 'master' · f18cb762
  DI-PIETRO RAFFAEL authored 3 years ago
```
amélioration du script de dialogue

See merge request chirz/cityescape!33
```
  f18cb762
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 0fbba7b9
  GIMENEZ TANGUY authored 3 years ago
  
  0fbba7b9
- Amelioration du script de dialogue · 2f0c861e
  GIMENEZ TANGUY authored 3 years ago
  
  2f0c861e
- Merge branch 'master' into 'master' · 63e9dcf8
  GIMENEZ TANGUY authored 3 years ago
```
création des prefabs

See merge request chirz/cityescape!32
```
  63e9dcf8
- Reglement du conflit · eba6b6bc
  nyvlemacul@gmail.com authored 3 years ago
  
  eba6b6bc
- création des prefabs pour la map du jeu · 49583b95
  nyvlemacul@gmail.com authored 3 years ago
  
  49583b95
- Merge branch 'master' into 'master' · 0a523bb7
  GIMENEZ TANGUY authored 3 years ago
```
Ajout système de border qu'on peut dépasser seulement avec le bon objet

See merge request chirz/cityescape!30
```
  0a523bb7
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 20805b5a
  Raffael Di Pietro authored 3 years ago
  
  20805b5a
- fix merge · 506cbe32
  Raffael Di Pietro authored 3 years ago
  
  506cbe32
- Merge branch 'master' into 'master' · a71bf767
  BLOCH VALENTIN authored 3 years ago
```
retrait de fichiers qui font tout merder

See merge request chirz/cityescape!29
```
  a71bf767
- retrait de fichiers qui font tout merder · ff7c0b86
  GIMENEZ TANGUY authored 3 years ago
  
  ff7c0b86
- Ajout système de border qu'on peut dépasser seulement avec le bon objet · 08a28303
  Raffael Di Pietro authored 3 years ago
  
  08a28303
- Merge branch 'master' into 'master' · 44aa681e
  BLOCH VALENTIN authored 3 years ago
```
Systeme de dialogue qui marche

See merge request chirz/cityescape!28
```
  44aa681e
- Ajout d'un systeme de dialogue efficace · e4967a9a
  GIMENEZ TANGUY authored 3 years ago
  
  e4967a9a
- Merge branch 'master' of git.unistra.fr:chirz/cityescape · 5972c00e
  GIMENEZ TANGUY authored 3 years ago
  
  5972c00e
- truc · ff76dc02
  GIMENEZ TANGUY authored 3 years ago
  
  ff76dc02
- Merge branch 'master' into 'master' · 535b15e9
  BLOCH VALENTIN authored 3 years ago
```
transitions mise à jour

See merge request chirz/cityescape!27
```
  535b15e9
- transitions mise à jour · efda6347
  nyvlemacul@gmail.com authored 3 years ago
  
  efda6347
Mar 28, 2021
- Merge branch 'master' into 'master' · 6871e7ab
  FISCHER MELVYN authored 3 years ago
```
Ajout du système de dialogue

See merge request chirz/cityescape!26
```
  6871e7ab
- Ajout du système de dialogue · a60206fb
  GIMENEZ TANGUY authored 3 years ago
  
  a60206fb
- Merge branch 'master' into 'master' · ae4cfe2e
  BLOCH VALENTIN authored 3 years ago
```
Modifs hitbox prefab et ajout scène Niveau 2 & finitions niveau 1

See merge request chirz/cityescape!25
```
  ae4cfe2e
- Modifs hitbox prefab et ajout scène Niveau 2 · af6667ed
  Raffael Di Pietro authored 3 years ago
  
  af6667ed
- Finition Niveau1 · f089fcc6
  Raffael Di Pietro authored 3 years ago
  
  f089fcc6
- Merge branch 'master' into 'master' · da0bebab
  BLOCH VALENTIN authored 3 years ago
```
AJout de la première scène

See merge request chirz/cityescape!24
```
  da0bebab
- modif · 29e83a12
  Raffael Di Pietro authored 3 years ago
  
  29e83a12
- Scène 1 finito · 4f554127
  Raffael Di Pietro authored 3 years ago
  
  4f554127
- Merge branch 'master' into 'master' · 80bf5df4
  BLOCH VALENTIN authored 3 years ago
```
Ajout de verdures

See merge request chirz/cityescape!23
```
  80bf5df4
- Ajout de verdures · 597b71db
  GIMENEZ TANGUY authored 3 years ago
  
  597b71db
- Merge branch 'master' into 'master' · 40fe4cce
  GIMENEZ TANGUY authored 3 years ago
```
ajout des tileset decouper

See merge request chirz/cityescape!22
```
  40fe4cce
- resolution conflit v2 · f15b48fd
  v.bloch authored 3 years ago
  
  f15b48fd

Admin message