Add oscillation feature
Merge branch 'birdgame' into dev