Stephen Birarda
9eef894e24
add doxygen documentation for Assignment classes
2013-09-06 14:35:59 -07:00
Stephen Birarda
d412e0611d
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-09-06 11:04:18 -07:00
Stephen Birarda
f7b0158cfe
use deque of pointers, make sure DS silent count is refreshed
2013-09-06 10:26:29 -07:00
Stephen Birarda
9244ec1c25
have client keep track of number of silent DS checkins
2013-09-06 09:41:27 -07:00
Stephen Birarda
8b601cac0a
moved the AvatarMixer to a class the assignment-client can handle
2013-09-05 14:01:05 -07:00
Andrzej Kapolka
4961913fc4
Transmit the eye offset position along with the rest of the frustum
...
parameters.
2013-09-05 12:20:15 -07:00
Stephen Birarda
609c48214f
Revert "temporary removal of QtScript dependency for build on ec2 box"
...
This reverts commit f29f8701a1
2013-09-04 16:22:51 -07:00
Stephen Birarda
f29f8701a1
temporary removal of QtScript dependency for build on ec2 box
2013-09-04 16:20:19 -07:00
atlante45
b8c18bee2d
merge
2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e
memory wastes and code cleaning PR comments
2013-09-04 15:12:24 -07:00
atlante45
b03482ead5
Some more memory leaks and codes formatting
2013-09-03 17:16:06 -07:00
Stephen Birarda
24a43c050c
require Qt5Script for avatars library
2013-08-28 10:55:38 -07:00
Stephen Birarda
50e062edf2
some spacing cleanup in AvatarData
2013-08-15 16:06:48 -07:00
Stephen Birarda
154c6b4f32
fix disabling of occlusion culling from menu
2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2
fix disabling of delta sending and low res while moving
2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1
fix monochrome option menu hook
2013-08-15 15:23:26 -07:00
ZappoMan
8e2fcffd5c
enabled Low Res sending while moving by default
2013-08-10 11:58:25 -07:00
ZappoMan
7e5f03a36f
Merge pull request #832 from birarda/assignee
...
tweaks to assignment server and AvatarData for assignment to iOS
2013-08-08 12:13:07 -07:00
Stephen Birarda
94d270b3d5
remove equals at beginning of AvatarData
2013-08-08 11:21:39 -07:00
Eric Johnston
52b33cb466
Rave tweaks: Improvements to finger trails and hand rendering
2013-08-07 16:19:54 -07:00
Stephen Birarda
72b53ea089
add Q_PROPERTY for handPosition
2013-08-07 10:41:32 -07:00
Stephen Birarda
c0793146bd
Avatar instance in JS should be referenced as Avatar
2013-08-07 10:41:17 -07:00
Stephen Birarda
955b7f0d24
Merge branch 'master' of github.com:worklist/hifi into assignee
2013-08-07 10:26:26 -07:00
Eric Johnston
2e5dade413
Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened.
...
Also fixed a warning in AvatarData.cpp initialization
2013-08-06 14:29:30 -07:00
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
Stephen Birarda
d0330b0a28
include QVariantMap in AvatarData, map values to floats for glm::vec3
2013-08-06 11:56:54 -07:00
Stephen Birarda
b0783e4cce
add Q_PROPERTY macro for position QVariantMap
2013-08-06 11:25:29 -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
Stephen Birarda
f3d6f1edd8
add Q_PROPERTY hooks for yaw, pitch, roll, chatMessage
2013-08-06 11:04:13 -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
Stephen Birarda
d1aad8c387
fix sleep interval in Agent.cpp so it isn't 0
2013-08-05 17:39:23 -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
