Commit graph

59 commits

Author SHA1 Message Date
Jeffrey Ventrella
5f0d52ce89 uh, whatever 2013-07-22 10:35:02 -07:00
Jeffrey Ventrella
13e6f2e6fa added sphere resolution to emitter attributes 2013-07-22 10:31:23 -07:00
Jeffrey Ventrella
ad0ca748bb added extra mode and improved particle system 2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e adding rave glove modes and changing API of particle system to accommodate 2013-07-19 18:02:48 -07:00
Jeffrey Ventrella
6e84481931 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 16:08:43 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Renamed from interface/src/Hand.cpp (Browse further)