Commits · master · Rene Herrmann / Flat-the CardGame

27 Jan, 2019 40 commits
- buttonia · 905b3f4a
  Lorenz Fischer authored Jan 27, 2019
  
  905b3f4a
- changed Buttons · 415afeaf
  Lorenz Fischer authored Jan 27, 2019
  
  415afeaf
- klein · 5b0ac62d
  Rene authored Jan 27, 2019
  
  5b0ac62d
- party hard · 82b24b26
  Rene authored Jan 27, 2019
  
  82b24b26
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 8e291a31
  Lorenz Fischer authored Jan 27, 2019
```
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Graphics/MainMenu.uasset
```
  8e291a31
- added Chris buttons · 45378f9c
  Lorenz Fischer authored Jan 27, 2019
  
  45378f9c
- uga · 6023ca94
  Rene authored Jan 27, 2019
  
  6023ca94
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · d521f327
  Rene authored Jan 27, 2019
```
# Conflicts:
#	Config/DefaultEngine.ini
```
  d521f327
- jo · 5cf6c9c4
  Rene authored Jan 27, 2019
  
  5cf6c9c4
- Cursooooor · dcef1a3a
  Lorenz Fischer authored Jan 27, 2019
  
  dcef1a3a
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · ce3149ce
  Lorenz Fischer authored Jan 27, 2019
  
  ce3149ce
- refreshed imgs · 3f4486db
  Lorenz Fischer authored Jan 27, 2019
  
  3f4486db
- puuuuuush · f5cf3169
  Rene authored Jan 27, 2019
  
  f5cf3169
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · fa18c41e
  Rene authored Jan 27, 2019
  
  fa18c41e
- fixed the phone · e5be5150
  Rene authored Jan 27, 2019
  
  e5be5150
- changed Textures to not stream · ca9099a0
  Lorenz Fischer authored Jan 27, 2019
  
  ca9099a0
- removed · d9d0d430
  Rene authored Jan 27, 2019
  
  d9d0d430
- more events · 6b85d0e9
  Rene authored Jan 27, 2019
  
  6b85d0e9
- zufriedenheit am tagesanfang nur von dreck abhängig · e7f9f106
  Rene authored Jan 27, 2019
  
  e7f9f106
- n · ebeb06a4
  Rene authored Jan 27, 2019
  
  ebeb06a4
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 8eca6d32
  Lorenz Fischer authored Jan 27, 2019
  
  8eca6d32
- UI to get new annoying peoples · b85d431b
  Lorenz Fischer authored Jan 27, 2019
  
  b85d431b
- updated emobitch · 04d48f9c
  Rene authored Jan 27, 2019
  
  04d48f9c
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · a27bfce4
  Rene authored Jan 27, 2019
  
  a27bfce4
- mooooore · 97b0940a
  Rene authored Jan 27, 2019
  
  97b0940a
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · d4f6e488
  Lorenz Fischer authored Jan 27, 2019
```
# Conflicts:
#	Content/Maps/OurWG.umap
#	Content/UI/OurWG.uasset
```
  d4f6e488
- no message · 5735da76
  Lorenz Fischer authored Jan 27, 2019
  
  5735da76
- more Events.uasset · cadf60df
  Rene authored Jan 27, 2019
  
  cadf60df
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 2a75638d
  Rene authored Jan 27, 2019
```
# Conflicts:
#	Content/Graphics/MainGameView.uasset
```
  2a75638d
- fixed some buggs · ea8b7cf2
  Rene authored Jan 27, 2019
  
  ea8b7cf2
- Released a new extra long... phone?! · e6b36a7f
  Lorenz Fischer authored Jan 27, 2019
  
  e6b36a7f
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 1ae1b269
  Lorenz Fischer authored Jan 27, 2019
  
  1ae1b269
- People let you know their deepest attributes now · c1e6275b
  Lorenz Fischer authored Jan 27, 2019
  
  c1e6275b
- better trump · f9cee696
  Rene authored Jan 27, 2019
  
  f9cee696
- clean · 525a61a6
  Rene authored Jan 27, 2019
  
  525a61a6
- more events · e36298f7
  Rene authored Jan 27, 2019
  
  e36298f7
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 4e43fcf7
  Rene authored Jan 27, 2019
  
  4e43fcf7
- more Events · ef67c5da
  Rene authored Jan 27, 2019
  
  ef67c5da
- Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/herrmanr/flat-the-cardgame · 2f5bb8bb
  Lorenz Fischer authored Jan 27, 2019
  
  2f5bb8bb
- party preparations · bdd981c0
  Lorenz Fischer authored Jan 27, 2019
  
  bdd981c0