Merge branch 'mimemime' into piethrowing
* mimemime: (25 commits) fixed weird drop after animation saved all prefabs player walk animation works added walking abnimation to player in scene attempted fix for walk merged master into daytime now the player can have a walking animation updated the other characters scripts to give replies player responses are now spaced nicely added an angle meter for pie throwing Added platforms to place characters on. starting work on player replies fixed character interactions and the timers on the dialoue box random song will be played from tent when the player walks near (song randomly chosen at start) praise the sun added sky added cream pie texture tent gives visual display when ready to interact Added ability to get to performance from daytime scene Created a main menu, player can cycle through: main menu --> Daytime -->pause -->main Menu ... # Conflicts: # RingMaster/RingMaster/Assets/Textures/John Smith-1.png.meta # RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt
... | ... | @@ -158,7 +158,6 @@ GameObject: |