Jeffrey Ventrella
aee29a0ab1
cleaning up the particle system more
2013-07-24 16:37:13 -07:00
Jeffrey Ventrella
288a218ae2
Merge remote-tracking branch 'upstream/master' into particles
2013-07-24 12:41:32 -07:00
Jeffrey Ventrella
2f28f3ea4b
made some extra checks for bogus data coming in, and added more particle effects to rave glove hand
2013-07-24 12:41:01 -07:00
ZappoMan
31a1e3e7b5
Merge pull request #720 from LionTurtle/master
...
Fix eyePosition so that lookatVectors point directly to eyes,
2013-07-24 01:19:49 -07:00
Mark Peng
7177b71bc7
Replace var in renderLookatIndicator with const IDENTITY_UP
2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-23 20:46:34 -07:00
Jeffrey Ventrella
903a248061
cleaned up some code and added asserts to help track down a crash
2013-07-23 20:46:09 -07:00
ZappoMan
e7fb392f38
Merge branch 'master' of https://github.com/worklist/hifi into audio_select
2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350
dry up code
2013-07-23 20:08:57 -07:00
ZappoMan
9507cd8955
switched to vector
2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e
more removing of SourceID from classes
2013-07-23 19:21:43 -07:00
ZappoMan
13ba913fab
made listen mode a typedef
2013-07-23 18:28:30 -07:00
Stephen Birarda
fb05726323
Merge pull request #718 from ZappoMan/voxel_stats
...
Sends Voxel Stats from server to client
2013-07-23 18:16:57 -07:00
Jeffrey Ventrella
062ee657ca
added extra mode and started prototyping "ribbon" effect
2013-07-23 14:41:52 -07:00
ZappoMan
c969570e8c
working on selected audio
2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f
LookatIndicator now scales with the avatar's scale.
2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226
Fix eyePosition so that lookatVectors point directly to eyes,
...
even when looking at someone from above.
2013-07-22 16:46:06 -07:00
Jeffrey Ventrella
90bc3e9a37
um, ok whatever
2013-07-22 14:08:41 -07:00
Jeffrey Ventrella
9f99bff791
Merge remote-tracking branch 'upstream/master' into particles
2013-07-22 14:08:19 -07:00
Jeffrey Ventrella
fdebe166ba
fixed it so both leap hands produce particles
2013-07-22 14:07:51 -07:00
ZappoMan
d3c46cce8f
CR feedback
2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2
CR feedback
2013-07-22 13:58:15 -07:00
ZappoMan
c301b799c5
first cut at selecting audio sources
2013-07-22 13:54:47 -07:00
Jeffrey Ventrella
8a55db53ce
merge
2013-07-22 10:42:18 -07:00
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
Eric Johnston
9ab8fecff5
Minor tweaks to Rave Glove mode, per Ryan's testing
...
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
2013-07-22 07:19:25 -07:00
ZappoMan
c3fa37019e
replaced old voxel stats with new voxel stats
2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f
Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats
2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d
additional stats items
2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb
added extra mode and improved particle system
2013-07-20 09:48:55 -07:00
Eric Johnston
d10ffd4f2d
Small .h fix after testing without Leap libs
2013-07-19 19:53:30 -07:00
Eric Johnston
0cdad1a313
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775
Rave glove: stabilization of Leap hands
2013-07-19 19:47:07 -07:00
ZappoMan
4e8ce1b193
tweaks to stats dialog
2013-07-19 18:15:06 -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
ZappoMan
83290bc8b7
first cut at real voxel stats dialog box
2013-07-19 17:28:37 -07:00
Jeffrey Ventrella
ed2780062b
clean up
2013-07-19 16:23:02 -07:00
Jeffrey Ventrella
6e84481931
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0
clean up
2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773
support piggybacking voxel and voxel stats messages into single packet
2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0
Style fixes.
2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328
improvements to particle system
2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929
send voxel scene stats from server to client
2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c
Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing)
...
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
2013-07-19 09:31:45 -07:00
Eric Johnston
28bf0b5147
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29
Remove more unnecessary additions.
2013-07-19 01:00:55 -07:00
Mark Peng
ceb743a65d
Remove unncessary import math.h (for reals).
2013-07-19 00:56:12 -07:00