ZappoMan
c93ed450a2
Merge pull request #791 from Atlante45/stalking_indicator
...
Stalking indicator
2013-08-06 12:33:26 -07:00
Eric Johnston
ab31c3f82d
Rave glove: Fix initialization issues and activate mode switch.
...
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
2013-08-06 11:59:58 -07:00
atlante45
eb9f32b7cb
Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator
2013-08-06 11:07:58 -07:00
atlante45
97239968a5
Corrected wrong argument in sizeof
2013-08-06 11:05:00 -07:00
atlante45
32c155ef71
Render a string to show who is following who
2013-08-06 10:53:10 -07:00
Eric Johnston
fc23eaa825
Fixed per github feedback.
...
Also, to prevent a repeat of yesterday's crash trouble, disabled the mode switch, so that those working on the rave mode can enable it locally for testing.
2013-08-06 10:28:31 -07:00
Eric Johnston
16aae5993a
Rave glove fixes: removed double-stored glove mode members
...
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
2013-08-06 07:33:18 -07:00
ZappoMan
cc8c92c4e0
Merge pull request #785 from machinelevel/dev4
...
Disable hand receive logic to keep team from crashing while a bug is bei...
2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb
Warning fix: virtual method needs virtual destructor
2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c
More cleanup after crash tracing
2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a
Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled
2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e
Disable hand receive logic to keep team from crashing while a bug is being tracked.
2013-08-05 15:46:12 -07:00
Jeffrey Ventrella
96b443ec5d
Merge pull request #781 from machinelevel/dev4
...
Rave glove demo: Network rave data
2013-08-05 14:07:57 -07:00
Eric Johnston
a3a5c3d6d4
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
2013-08-05 13:25:05 -07:00
Andrzej Kapolka
2722cfa5ac
Fix for GCC warning. #import?
2013-08-05 11:58:09 -07:00
Stephen Birarda
d51e0b59bd
change DATA_SEND_INTERVAL_MSECS to DATA_SEND_INTERVAL_USECS
2013-08-05 10:30:56 -07:00
Stephen Birarda
cddbf85172
don't include AudioInjector in Agent class
2013-08-05 10:13:25 -07:00
Stephen Birarda
0120ac2d0f
remove an extra debug
2013-08-05 10:09:00 -07:00
Stephen Birarda
8f876b91ae
changes for stub pull request of assignee work
2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a
resolve conflicts on merge with upstream master
2013-08-05 09:56:07 -07:00
Jeffrey Ventrella
c60acfad28
merge
2013-08-02 11:00:53 -07:00
Jeffrey Ventrella
6ebe33bb0b
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 11:00:10 -07:00
Jeffrey Ventrella
8fc800acff
some work on hands
2013-08-02 10:59:04 -07:00
Andrzej Kapolka
69cac69067
Go ahead and show the leap hand by default, but don't include the fingers if
...
the palms are inactive (!)
2013-08-01 18:56:14 -07:00
Andrzej Kapolka
c038e2c9ba
Wrong array index here, and finger needs to be flagged as active so that the
...
avatar mixer will encode it.
2013-08-01 18:32:48 -07:00
Stephen Birarda
269e040263
Qt5 find package cleanup
2013-08-01 15:27:55 -07:00
Stephen Birarda
2b0cfe3c67
resolve conflicts on merge with upstream master
2013-08-01 14:33:23 -07:00
Jeffrey Ventrella
1df7026b26
merge?
2013-08-01 10:54:09 -07:00
Stephen Birarda
71ab8ae4f8
some necessary changes for AvatarData transmission
2013-08-01 10:07:10 -07:00
Jeffrey Ventrella
6c1cc911d5
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
cecb908dc1
cleanup
2013-07-26 12:53:40 -07:00
Jeffrey Ventrella
9890cf72ce
added keyboard mode switching for rave glove effects
2013-07-26 12:37:37 -07:00
Stephen Birarda
890d2e40ec
more fleshing out of Agent class to interpret javascript
2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66
modifications to hook shared classes to iOS
2013-07-24 13:05:02 -07:00
Stephen Birarda
7134d13001
tweaks for iOS compatibility
2013-07-24 12:34:32 -07:00
Stephen Birarda
67912cc325
merge with birarda/qt5 and resolve conflicts
2013-07-24 12:14:31 -07:00
Stephen Birarda
9f2b2d09a9
changes to CMakeLists for Qt5
2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542
switch to new qt5 find module setup
2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9
changes to CMakeLists to up to qt5
2013-07-23 20:28:11 -07:00
Stephen Birarda
da0049933b
rename Operative to Agent
2013-07-23 20:25:21 -07:00
Stephen Birarda
7a028aa43d
cmake changes for update to qt5
2013-07-23 20:23:32 -07:00
Jeffrey Ventrella
fdebe166ba
fixed it so both leap hands produce particles
2013-07-22 14:07:51 -07:00
Eric Johnston
6ceb48127a
Small fix when no Leap connected.
2013-07-19 19:56:05 -07:00
Eric Johnston
b8cf4a9775
Rave glove: stabilization of Leap hands
2013-07-19 19:47:07 -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
cb6f542b9f
First-pass finger motion trails
2013-07-17 17:00:23 -07:00
Eric Johnston
aa0cab2180
Code review issues addressed.
2013-07-17 16:09:24 -07:00
Eric Johnston
8ebf5fbd6b
Rave & Leap: cleanup and move over to new hand/finger structures
2013-07-17 14:54:18 -07:00
Eric Johnston
46c5383d10
minor cleanup
2013-07-17 12:54:44 -07:00
Eric Johnston
f21d2a477d
Rave Glove Demo: Restructuring palm and finger data structures
2013-07-17 08:29:50 -07:00
