Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
improved particle rainbow color cycle mode
merge
added BendyLine
Merge branch 'master' of https://github.com/worklist/hifi into particles
  removed 3 magic numbers in particle system
Rave glove demo: Network rave data
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
- Smooth rescaling
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
Merge pull request #781 from machinelevel/dev4

Rave glove demo: Network rave data
Merge remote-tracking branch 'upstream/master' into particles
Working on upgrading to latest version of Oculus software and adding Linux
support.
Merge branch 'master' of https://github.com/worklist/hifi
Switch to debug libs.
Render other avatar's lookat to point at my camera if the other avatar
is looking at my head.
Revert "Switch to debug libs."

This reverts commit 1739371c17b010031930ce6d7d794b0e4f955ee6.
Revert "Working on upgrading to latest version of Oculus software and adding Linux"

This reverts commit 98a0c01b29d2b03fa5dff88ce2c27d7877b364af.
Merge pull request #783 from LionTurtle/master

Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
Merge branch 'master' of https://github.com/worklist/hifi