Commits · master · Barre Oblique V2 / SAB20-T3-A

Dec 11, 2020
- Merge branch 'master' into 'master' · 11430550
  Mathieu Voyer authored 4 years ago
```
Version Terminale 1.5

See merge request !31
```
  11430550
- Version Terminale 1.5 · e25d547f
  Mathieu Voyer authored 4 years ago
  
  e25d547f
- Merge branch 'master' into 'master' · bb5be055
  Mathieu Voyer authored 4 years ago
```
Version Finale 1.4

See merge request !30
```
  bb5be055
- Version Finale 1.4 · f23863eb
  Mathieu Voyer authored 4 years ago
  
  f23863eb
- Merge branch 'master' into 'master' · fee4b906
  Mathieu Voyer authored 4 years ago
```
1.31

See merge request !29
```
  fee4b906
- Version 1.31 - Correction code · 1188953d
  Mathieu Voyer authored 4 years ago
  
  1188953d
- Merge branch 'master' of https://git.unistra.fr/m.voyer/sab20-t3-a into master · d2da8018
  Mathieu Voyer authored 4 years ago
  
  d2da8018
- Version 1.31 - Correction de bugs et ajout bouton Quitter · 3b831e5b
  Mathieu Voyer authored 4 years ago
  
  3b831e5b
- Merge branch 'master' into 'master' · 2db049da
  Mathieu Voyer authored 4 years ago
```
Version 1.3 - Documentation à jour

See merge request !28
```
  2db049da
- Merge branch 'master' into 'master' · b84ea198
  Mathieu Voyer authored 4 years ago
```
# Conflicts:
#   Assets/ConseilClasse.cs
#   Assets/CorrectionControle.cs
#   Assets/MainMenu.cs
```
  b84ea198
- Version 1.3 - Documentation à jour · 0912f9d1
  Mathieu Voyer authored 4 years ago
  
  0912f9d1
- Merge branch 'master' into 'master' · b43a5084
  LADWEIN SAMUEL authored 4 years ago
```
add all commentary

See merge request !27
```
  b43a5084
- Update ChangeSceneVideo.cs · 9f8d8a8e
  LADWEIN SAMUEL authored 4 years ago
  
  9f8d8a8e
- Update DialogLetters.cs · 8c72e54b
  LADWEIN SAMUEL authored 4 years ago
  
  8c72e54b
- Merge branch 'm.voyer-master-patch-74854' into 'master' · 899349c4
  Mathieu Voyer authored 4 years ago
```
Update README pour version 1.2

See merge request !26
```
  899349c4
- Update README pour version 1.2 · c36bef5e
  Mathieu Voyer authored 4 years ago
  
  c36bef5e
- Merge branch 'rejou-master-patch-78134' into 'master' · 4239953d
  REJOU LEA authored 4 years ago
```
Update README.md

See merge request !25
```
  4239953d
- Update README.md · 12797a6d
  REJOU LEA authored 4 years ago
  
  12797a6d
- Merge branch 'master' into 'master' · 0b49fbdf
  LADWEIN SAMUEL authored 4 years ago
```
Commentaire

See merge request !24
```
  0b49fbdf
- Merge branch 'master' into 'master' · 0af09987
  LADWEIN SAMUEL authored 4 years ago
```
# Conflicts:
#   Assets/CorrectionControle.cs
```
  0af09987
- Presque tout les commentaires · 11fbf9f3
  Samuel Ladwein authored 4 years ago
  
  11fbf9f3
- Merge branch 'master' into 'master' · adfd49d9
  Mathieu Voyer authored 4 years ago
```
Version 1.2 - Dialogues

See merge request !23
```
  adfd49d9
- Commentaire · 4f5895f7
  Samuel Ladwein authored 4 years ago
  
  4f5895f7
- Version 1.2 - Dialogues · 00ffa91b
  Mathieu Voyer authored 4 years ago
  
  00ffa91b
- Merge branch 'master' into 'master' · 0d81a39b
  LADWEIN SAMUEL authored 4 years ago
```
1.1

See merge request !22
```
  0d81a39b
- Update DialogLetters.cs · 75eb8d1d
  LADWEIN SAMUEL authored 4 years ago
  
  75eb8d1d
- Merge conflit resolu ? · caca0fec
  Samuel Ladwein authored 4 years ago
  
  caca0fec
Dec 10, 2020
- Version 1.1 - Peaufinage · 84db57d5
  Mathieu Voyer authored 4 years ago
  
  84db57d5
- Merge branch 'master' into 'master' · 7fe4b012
  Mathieu Voyer authored 4 years ago
```
Version 1.0 - Toutes les fonctionnalités

See merge request !20
```
  7fe4b012
- Version 1.0 - Toutes les fonctionnalités · ec224b3c
  Mathieu Voyer authored 4 years ago
  
  ec224b3c
Dec 09, 2020
- Merge branch 'master' into 'master' · 01f6ac1a
  Mathieu Voyer authored 4 years ago
```
Assets et Script Controle

See merge request !19
```
  01f6ac1a
- Assets et Script Controle · f94e777c
  Mathieu Voyer authored 4 years ago
  
  f94e777c
- Merge branch 'master' into 'master' · 4aa80de1
  LADWEIN SAMUEL authored 4 years ago
```
add documentation

See merge request !18
```
  4aa80de1
- add documentation · ed9d0439
  Samuel Ladwein authored 4 years ago
  
  ed9d0439
- Merge branch 'master' into 'master' · af11d125
  Mathieu Voyer authored 4 years ago
```
AffichageEleve.cs

See merge request !16
```
  af11d125
- AffichageEleve.cs · f020d901
  Mathieu Voyer authored 4 years ago
  
  f020d901
- Merge branch 'rejou-master-patch-71839' into 'master' · 5be00d4e
  REJOU LEA authored 4 years ago
```
Update README.md

See merge request !15
```
  5be00d4e
- Update README.md · 0041a9b0
  REJOU LEA authored 4 years ago
  
  0041a9b0
- Merge branch 'rejou-master-patch-51210' into 'master' · f03d4db1
  REJOU LEA authored 4 years ago
```
Update README.md

See merge request !14
```
  f03d4db1
- Update README.md · ce9b10ac
  REJOU LEA authored 4 years ago
  
  ce9b10ac

Admin message