Commits · 3feddbb8daad527fc45333d7b82fca510ce9fab3 · The Pain de Mii / TheLegendOfSimon_LAS21_T3_D

Dec 17, 2021
- Merge branch 'jordan.pereira-main-patch-10830' into 'main' · 3feddbb8
  MrWarzo authored 3 years ago
```
Update WaypointsFactory.cs

See merge request !88
```
  3feddbb8
- Update WaypointsFactory.cs · 411ebe17
  MrWarzo authored 3 years ago
  
  411ebe17
- Merge branch 'main' into 'main' · 54da4016
  GIRAULT COLIN authored 3 years ago
```
Fix Obstacles

See merge request !87
```
  54da4016
- Fix_Obstacles · 54a91112
  colin authored 3 years ago
  
  54a91112
- Merge branch 'main' into 'main' · e1d3efe2
  LE-CUDENEC JOFFREY authored 3 years ago
```
Ajout de documentation

See merge request !86
```
  e1d3efe2
- Ajout de la documentation · bb4a6710
  LE-CUDENEC JOFFREY authored 3 years ago
  
  bb4a6710
- Merge branch 'main' into 'main' · a6063e83
  MrWarzo authored 3 years ago
```
Documentation supplémentaire

See merge request !85
```
  a6063e83
- Documentation supplémentaire · b15d492f
  MrWarzo authored 3 years ago
  
  b15d492f
- Merge branch 'main' of git.unistra.fr:thepaindemii/TheLegendOfSimon_LAS21_T3_D · 85908234
  LE-CUDENEC JOFFREY authored 3 years ago
  
  85908234
- Merge branch 'jordan.pereira-main-patch-28241' into 'main' · 52f05f1c
  MrWarzo authored 3 years ago
```
Update SpawnOnMap.cs

See merge request !84
```
  52f05f1c
- Update SpawnOnMap.cs · 6feb036e
  MrWarzo authored 3 years ago
  
  6feb036e
- Ajout de la documentation · 057e79f5
  LE-CUDENEC JOFFREY authored 3 years ago
  
  057e79f5
- Merge branch 'main' into 'main' · a85f8553
  GIRAULT COLIN authored 3 years ago
```
Plus d'obstacles

See merge request !83
```
  a85f8553
- Merge branch 'main' into 'main' · 675c36ae
  GIRAULT COLIN authored 3 years ago
```
# Conflicts:
#   T3-Unity/Assets/Scenes/Map_Tests1.unity
```
  675c36ae
- Plus_obstacles · e05af1bb
  colin authored 3 years ago
  
  e05af1bb
- Merge branch 'main' into 'main' · b40b9c5d
  LE-CUDENEC JOFFREY authored 3 years ago
```
Modification

See merge request !82
```
  b40b9c5d
- Modification · ffa8793b
  LE-CUDENEC JOFFREY authored 3 years ago
  
  ffa8793b
- Merge branch 'main' of git.unistra.fr:thepaindemii/TheLegendOfSimon_LAS21_T3_D · 93311a85
  colin authored 3 years ago
  
  93311a85
- fixe · c038bb26
  colin authored 3 years ago
  
  c038bb26
- Merge branch 'main' into 'main' · e4bd73fb
  LE-CUDENEC JOFFREY authored 3 years ago
```
Ajout de la documentation

See merge request !80
```
  e4bd73fb
- Merge branch 'main' into 'main' · 7310d361
  LE-CUDENEC JOFFREY authored 3 years ago
```
# Conflicts:
#   T3-Unity/Assets/Scripts/IA/RunnersFactory.cs
#   T3-Unity/Assets/Scripts/Waypoints/SpawnOnMap.cs
```
  7310d361
- Ajout de la documentation · 431f7dfa
  LE-CUDENEC JOFFREY authored 3 years ago
  
  431f7dfa
- Merge branch 'main' into 'main' · b7ddc192
  MrWarzo authored 3 years ago
```
Documentation de 3 scripts

See merge request !79
```
  b7ddc192
- Documentation de 3 scripts · 17d4f182
  MrWarzo authored 3 years ago
  
  17d4f182
- Merge branch 'main' into 'main' · 69d43cd7
  GIRAULT COLIN authored 3 years ago
```
Suite Placement Obstacles

See merge request !78
```
  69d43cd7
- Merge branch 'main' into 'main' · 44ba4cff
  GIRAULT COLIN authored 3 years ago
```
# Conflicts:
#   T3-Unity/Assets/Scripts/UI/Ui.cs
```
  44ba4cff
- Suite_Placement_Obstacles · d305bbbb
  colin authored 3 years ago
  
  d305bbbb
- Merge branch 'main' into 'main' · d824d203
  MrWarzo authored 3 years ago
```
Main

See merge request !77
```
  d824d203
- Merge branch 'main' of git.unistra.fr:thepaindemii/TheLegendOfSimon_LAS21_T3_D · 62a06d70
  MrWarzo authored 3 years ago
  
  62a06d70
- Merge branch 'jordan.pereira-main-patch-68373' into 'main' · 3523d43a
  MrWarzo authored 3 years ago
```
Update RunnersFactory.cs

See merge request !75
```
  3523d43a
- Update RunnersFactory.cs · f4d85709
  MrWarzo authored 3 years ago
  
  f4d85709
- Merge branch 'jordan.pereira-main-patch-27794' into 'main' · 884ba916
  MrWarzo authored 3 years ago
```
Update Runners.cs

See merge request !74
```
  884ba916
- Update Runners.cs · 4597cae1
  MrWarzo authored 3 years ago
  
  4597cae1
- Merge branch 'jordan.pereira-main-patch-80017' into 'main' · 195bb3a4
  MrWarzo authored 3 years ago
```
Delete PlayerController.cs.meta

See merge request !73
```
  195bb3a4
- Delete PlayerController.cs.meta · 4b786e27
  MrWarzo authored 3 years ago
  
  4b786e27
Dec 16, 2021
- Template documentation débuts · 67dabd21
  MrWarzo authored 3 years ago
  
  67dabd21
- Merge branch 'main' into 'main' · aa8b29b2
  GIRAULT COLIN authored 3 years ago
```
fixe

See merge request !71
```
  aa8b29b2
- fixe · ee7ad995
  colin authored 3 years ago
  
  ee7ad995
- Merge branch 'main' into 'main' · def2126c
  LE-CUDENEC JOFFREY authored 3 years ago
```
Resolution erreur duplication

See merge request !70
```
  def2126c
- Resolution erreur duplication · 1aa4a82d
  LE-CUDENEC JOFFREY authored 3 years ago
  
  1aa4a82d

Admin message