Commits · f06c181eaeabaac4d738ab9a808108dc098124c7 · gstuitje / RingMaster · GitLab

11 Feb, 2019 26 commits
- character dialogue now depends on their level · f06c181e
  Mitchie Maluschnig authored Feb 11, 2019
  
  f06c181e
- added exclamation marks to characters that have new dialogue · 34a6e4d3
  Mitchie Maluschnig authored Feb 11, 2019
  
  34a6e4d3
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · 4cdf3473
  nedboy3 authored Feb 11, 2019
  
  4cdf3473
- Added an exclamation mark. · b01d7003
  nedboy3 authored Feb 11, 2019
  
  b01d7003
- merge master · a7e4a8eb
  Mitchie Maluschnig authored Feb 11, 2019
  
  a7e4a8eb
- Merge branch 'master' into piethrowing · 77911078
  Mitchie Maluschnig authored Feb 11, 2019
  
  77911078
- merge meta? · 146afaba
  mmaluschnig authored Feb 11, 2019
  
  146afaba
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · 55d9d498
  mmaluschnig authored Feb 11, 2019
```
* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Added an animation for pie throwing.
```
  55d9d498
- differenciated good/bad/perfect explosions in mime mime · 147f7e37
  mmaluschnig authored Feb 11, 2019
  
  147f7e37
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · e050530f
  gstuitje authored Feb 11, 2019
  
  e050530f
- Added an animation for pie throwing. · 3b87455f
  gstuitje authored Feb 11, 2019
  
  3b87455f
- player has to hold the power for a set time before being allowed to release the pie · fbbdef32
  mmaluschnig authored Feb 11, 2019
  
  fbbdef32
- Started Meatball Parade MMR · 809b8def
  astatham authored Feb 11, 2019
  
  809b8def
- Added splat and boing sounds · 5315b3a7
  astatham authored Feb 11, 2019
  
  5315b3a7
- enabled pause menu in mime, player can press 1234 to progress dialogue, player... · 1c57e1cb
  mmaluschnig authored Feb 11, 2019
```
enabled pause menu in mime, player can press 1234 to progress dialogue, player gets lots of pies in tutorial
```
  1c57e1cb
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · c7687dbd
  mmaluschnig authored Feb 11, 2019
```
* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  fixed some art, john smith and mime mime W
```
  c7687dbd
- character dialogue doesnt auto despawn · b570609c
  mmaluschnig authored Feb 11, 2019
  
  b570609c
- fixed some art, john smith and mime mime W · fbdd7ceb
  gstuitje authored Feb 11, 2019
  
  fbdd7ceb
- prep for beta · 9d9a2f13
  mmaluschnig authored Feb 11, 2019
  
  9d9a2f13
- score resets on pie throwing · a38c49ec
  Mitchie Maluschnig authored Feb 11, 2019
  
  a38c49ec
- testBuild · 88d9d3f2
  Mitchie Maluschnig authored Feb 11, 2019
  
  88d9d3f2
- more UI stuff to make the game look nicer · 8fcea7b0
  Mitchie Maluschnig authored Feb 11, 2019
  
  8fcea7b0
- increased the size of trapeze bg stripes, fixed a bunch of visuals here and there · 684ae822
  Mitchie Maluschnig authored Feb 11, 2019
  
  684ae822
- added background to mime mime · 866af6d6
  Mitchie Maluschnig authored Feb 11, 2019
  
  866af6d6
- added background to trapeze(with auto generate) · 3369017f
  Mitchie Maluschnig authored Feb 11, 2019
  
  3369017f
- updated mountains, added background sound, added trapeze textures · 68b6b640
  Mitchie Maluschnig authored Feb 11, 2019
  
  68b6b640
10 Feb, 2019 14 commits
- added background and musiuc to Night menu scene · c098c008
  Mitchie Maluschnig authored Feb 10, 2019
  
  c098c008
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · 9592abcf
  Mitchie Maluschnig authored Feb 10, 2019
  
  9592abcf
- added background image and audio to main menu · 033a1590
  Mitchie Maluschnig authored Feb 10, 2019
  
  033a1590
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · 2e921653
  nedboy3 authored Feb 10, 2019
  
  2e921653
- saved scene · 0429613a
  nedboy3 authored Feb 10, 2019
  
  0429613a
- added some more background images · a5ff18aa
  Mitchie Maluschnig authored Feb 10, 2019
  
  a5ff18aa
- Merge branch 'master' into piethrowing · 9c53b175
  Mitchie Maluschnig authored Feb 10, 2019
  
  9c53b175
- Now Mime Mime has a tutorial stage, still needs to be triggered. · d8a4c403
  nedboy3 authored Feb 10, 2019
  
  d8a4c403
- added animations to pie throwing · 6ae30710
  Mitchie Maluschnig authored Feb 10, 2019
  
  6ae30710
- added clouds! · fa490d49
  Mitchie Maluschnig authored Feb 10, 2019
  
  fa490d49
- added parallax to the tent · 6d2d8b7e
  Mitchie Maluschnig authored Feb 10, 2019
  
  6d2d8b7e
- Merge branch 'piethrowing' · 9c96eef6
  Mitchie Maluschnig authored Feb 10, 2019
  
  9c96eef6
- trying to fix tent in paralax · 9b2dae23
  Mitchie Maluschnig authored Feb 10, 2019
  
  9b2dae23
- added paralax to the background · 293601b8
  Mitchie Maluschnig authored Feb 10, 2019
  
  293601b8