Commits · 9d9a2f1334cb4647024185267e680007c161532d · gstuitje / RingMaster · GitLab

11 Feb, 2019 8 commits
- 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 31 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
- Added coles background images and organised textures folder · 8a119a2a
  Mitchie Maluschnig authored Feb 10, 2019
  
  8a119a2a
- added pieTutorial to build · 857a7571
  Mitchie Maluschnig authored Feb 10, 2019
  
  857a7571
- created tutorial for pie throwing · b6af08cb
  Mitchie Maluschnig authored Feb 10, 2019
  
  b6af08cb
- Merge branch 'piethrowing' · 34d83907
  Mitchie Maluschnig authored Feb 10, 2019
  
  34d83907
- added score ui to pie throwing · 7d489e5b
  Mitchie Maluschnig authored Feb 10, 2019
  
  7d489e5b
- saved scene · d56a3cf1
  Mitchie Maluschnig authored Feb 10, 2019
  
  d56a3cf1
- simon doesnt flip direction when the player flips · ac6ea7b4
  Mitchie Maluschnig authored Feb 10, 2019
  
  ac6ea7b4
- mime mime score now resets · 961a5e74
  Mitchie Maluschnig authored Feb 10, 2019
  
  961a5e74
- Merge branch 'piethrowing' · 37f3529d
  Mitchie Maluschnig authored Feb 10, 2019
  
  37f3529d
- Merge branch 'master' into piethrowing · 78493f91
  Mitchie Maluschnig authored Feb 10, 2019
  
  78493f91
- added simon the bear to bounce the player when they fall · 6560421b
  Mitchie Maluschnig authored Feb 10, 2019
  
  6560421b
- added splat when pie hits a target · 512ae802
  Mitchie Maluschnig authored Feb 10, 2019
  
  512ae802
- Merge branch 'master' into mimemime · 45018551
  nedboy3 authored Feb 10, 2019
```
# Conflicts:
#	RingMaster/RingMaster/Assets/Scripts/MimeScripts/TriggerManager.cs
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt
```
  45018551
- now there is some feedback if the player is shit. · 0d821d6c
  nedboy3 authored Feb 10, 2019
  
  0d821d6c
- Keys changed to QWER. · 554a0998
  nedboy3 authored Feb 10, 2019
  
  554a0998
- saved scene · 89256b1d
  Mitchie Maluschnig authored Feb 10, 2019
  
  89256b1d
- pies now attach to the target they hit · f63d4acb
  Mitchie Maluschnig authored Feb 10, 2019
  
  f63d4acb
09 Feb, 2019 1 commit
- ahava asks for players name · 7ae36752
  Mitchie Maluschnig authored Feb 09, 2019
  
  7ae36752