Commit graph

13 commits

Author SHA1 Message Date
Eric Johnston
57c2f16894 Merge branch 'master' of https://github.com/worklist/hifi into dev4
Conflicts:
	interface/src/Hand.cpp
2013-07-17 16:42:11 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -07:00
Jeffrey Ventrella
e6b751e538 more work on particle system 2013-07-12 14:32:14 -07:00
Jeffrey Ventrella
980a5b7980 cleanup 2013-07-10 18:32:17 -07:00
Jeffrey Ventrella
171c10dabe raised home position 2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
84a7a78b8d made a test particle system 2013-07-10 17:15:03 -07:00