Commits · master · e-mmigres / VOC20-T3-G

Dec 11, 2020
- Merge branch 'master' into 'master' · a664d8ed
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Merge executable

See merge request !13
```
  a664d8ed
- Update README.md · 74133aed
  GIRAUD VLADIMIR authored 4 years ago
  
  74133aed
- Executable · e494cac5
  YANG YANG authored 4 years ago
  
  e494cac5
- Résolution des conflicts · 846000bb
  YANG YANG authored 4 years ago
  
  846000bb
- Merge branch 'master' into 'master' · ad3f4edb
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Ajout de couches et correction d'orthographe

See merge request !12
```
  ad3f4edb
- Dernière ammélioration graphique · fd9b7a8d
  YANG YANG authored 4 years ago
  
  fd9b7a8d
- correction orthographe · 21fe5688
  Astral authored 4 years ago
  
  21fe5688
- ajouts de couches · 1481f428
  Astral authored 4 years ago
  
  1481f428
- Merge branch 'master' of https://git.unistra.fr/e-mmigres/voc20-t3-g · 92d6bf24
  Astral authored 4 years ago
  
  92d6bf24
- merge · 010d35f7
  Astral authored 4 years ago
  
  010d35f7
- Merge branch 'master' into 'master' · d46588bc
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Amelioration de l'aspect du jeu

Closes #36, #37, #38, #40, and #41

See merge request !11
```
  d46588bc
- Merge resolution des conflicts · bd3a9ce4
  YANG YANG authored 4 years ago
  
  bd3a9ce4
- Menu principal · 145e67dc
  YANG YANG authored 4 years ago
  
  145e67dc
- Update README.md · bcf001ed
  GIRAUD VLADIMIR authored 4 years ago
  
  bcf001ed
- Indicateur de progression · c8f6afe7
  YANG YANG authored 4 years ago
  
  c8f6afe7
- Update README.md · 0be4e796
  GIRAUD VLADIMIR authored 4 years ago
  
  0be4e796
- Merge branch 'master' into 'master' · 5c7a8cd2
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Merge Uniformisation de L'UI

See merge request !10
```
  5c7a8cd2
- Merge branch 'master' of https://git.unistra.fr/vgiraud/voc20-t3-g · b8c74fac
  Astral authored 4 years ago
  
  b8c74fac
- changement graphique mineur · 89c6b0a3
  Astral authored 4 years ago
  
  89c6b0a3
- fix menu fin · caf9c446
  prime8888 authored 4 years ago
  
  caf9c446
- fix menu principale · 811f1317
  prime8888 authored 4 years ago
  
  811f1317
- resotution merge · d2501104
  Astral authored 4 years ago
  
  d2501104
- mises a jour mineures · a51e7628
  Astral authored 4 years ago
  
  a51e7628
- Merge branch 'master' of https://git.unistra.fr/vgiraud/voc20-t3-g · b74b70ae
  Astral authored 4 years ago
  
  b74b70ae
- add image a rapport · 6648cad7
  prime8888 authored 4 years ago
  
  6648cad7
- ajout image au rapport · da3377fb
  prime8888 authored 4 years ago
  
  da3377fb
- Merge branch 'master' into 'master' · c5853bee
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Ajout de photos objets a chercher

See merge request !9
```
  c5853bee
- photos objets a chercher · 553feb8f
  Astral authored 4 years ago
  
  553feb8f
- Merge branch 'master' into 'master' · c67ef62c
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Merge partie 2

Closes #28

See merge request !8
```
  c67ef62c
- Merge branch 'master' into 'master' · 3f8adc1b
  KLAPCZYNSKI NATHANAEL authored 4 years ago
```
Merge terrain final

Closes #35

See merge request !7
```
  3f8adc1b
- Affichage final du terrain · bfb71e25
  Tozpa authored 4 years ago
```
Closes #35
```
  bfb71e25
- Scène2 finie · 0ce874a7
  Astral authored 4 years ago
  
  0ce874a7
Dec 10, 2020
- Merge branch 'master' of https://git.unistra.fr/vgiraud/voc20-t3-g · 8b387328
  Astral authored 4 years ago
  
  8b387328
- analyse taux c14 v 1.1.1 · a73196ef
  Astral authored 4 years ago
  
  a73196ef
- random object and score fix · 7a6b9ea6
  prime8888 authored 4 years ago
  
  7a6b9ea6
- Changement de nom pour les variables globales · ee769bbe
  Astral authored 4 years ago
  
  ee769bbe
- Encyclopédie finie et ajouts de variables objets globale · 5275f639
  Astral authored 4 years ago
  
  5275f639
- Terrain modifications et textures · 86033cb0
  Tozpa authored 4 years ago
  
  86033cb0
- Merge branch 'master' of https://git.unistra.fr/vgiraud/voc20-t3-g · 79198041
  Astral authored 4 years ago
  
  79198041
- popup encyclopédie v 0.1 · 5cceeb7e
  Astral authored 4 years ago
  
  5cceeb7e

Admin message