Commit graph

828 commits

Author SHA1 Message Date
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
4ea0de1637 deleting old dead code 2013-08-12 13:39:01 -07:00
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
Stephen Birarda
da97cf75b4 Merge pull request #842 from Atlante45/master
Follow mode improvements
2013-08-08 16:32:35 -07:00
Philip Rosedale
0e1149a8ef Fixes per review 2013-08-08 16:11:51 -07:00
Philip Rosedale
d5a0b2ff93 Fixes per review 2013-08-08 16:10:07 -07:00
Philip Rosedale
43ad461275 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-08 16:01:02 -07:00
Philip Rosedale
45961b2b64 Collision and click sounds improved 2013-08-08 16:00:50 -07:00
atlante45
b1e975e96b Don't show pie menu when on voxel 2013-08-08 15:48:33 -07:00
Andrzej Kapolka
c929f67cc4 Update the *other* avatar mixer bandwidth stats. 2013-08-08 12:33:31 -07:00
Andrzej Kapolka
29912d053a Merge branch 'master' of https://github.com/worklist/hifi 2013-08-08 11:02:59 -07:00
Andrzej Kapolka
aca15d4aef Disable specular highlights for ground and voxels. 2013-08-08 10:59:01 -07:00
ZappoMan
647c176631 make voxel server fades slightly smaller than bounds to prevent z-fighting 2013-08-08 09:57:48 -07:00
Andrzej Kapolka
9dbec35f6a Merge pull request #823 from ZappoMan/master
Display Frustum and resizeGL() cleanup
2013-08-07 16:29:34 -07:00
ZappoMan
cb211fbb04 CR feedback 2013-08-07 16:27:43 -07:00
ZappoMan
9f5f7d96da Merge pull request #820 from Atlante45/master
Display leap hand and rave glove in first person mode
2013-08-07 16:17:37 -07:00
ZappoMan
f4820143d7 cleanup resizeGL, and Display Frustum menus 2013-08-07 16:12:03 -07:00
Philip Rosedale
a4d1bc5b6e Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:43:49 -07:00
Philip Rosedale
0445da3221 Stop rotating more quickly, display avatar position and yaw stats 2013-08-07 14:42:57 -07:00
atlante45
6fb76d3dfe Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:30:18 -07:00
atlante45
c48652c2c3 Display leap hand and rave glove in first person mode 2013-08-07 14:28:21 -07:00
Andrzej Kapolka
e9b3cca3de OpenGL fields of view are vertical, not horizontal. 2013-08-07 14:26:22 -07:00
ZappoMan
153e8afd44 Merge pull request #816 from Atlante45/master
Fix objects coming into near clip
2013-08-07 12:39:01 -07:00
ZappoMan
393723d8fb changed delete voxel fade color 2013-08-07 12:36:26 -07:00
atlante45
19b9be3361 - Now P switch between first and third person view 2013-08-07 12:24:13 -07:00
ZappoMan
451b2bc595 added Sending Mode to on screen stats 2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80 Merge pull request #811 from ey6es/master
Several minor fixes for depth camera code.
2013-08-07 12:01:01 -07:00
Andrzej Kapolka
377adb30ae Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:14:48 -07:00
atlante45
ce12c51fce Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd Merge pull request #810 from ZappoMan/master
quick fix crash in parseVoxelStats()
2013-08-07 11:11:46 -07:00
atlante45
08309e3aac Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5 quick fix crash in parseVoxelStats() 2013-08-07 11:11:03 -07:00
atlante45
f151b2cfc1 - Don't render body when in first person view 2013-08-07 10:58:30 -07:00
atlante45
132d03e291 Moved string when following to chest 2013-08-07 10:56:32 -07:00
ZappoMan
d893d4cf16 Merge pull request #807 from machinelevel/dev4
Rave tweaks: change the look of the hands, fix screen-darken
2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a Rave tweaks: change the look of the hands, fix screen-darken
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
2013-08-07 10:29:31 -07:00
Andrzej Kapolka
ca939fb6b8 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4 Merge remote-tracking branch 'upstream/master' into particles 2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d fixed mohawk physics bug 2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc Include received video data in bandwidth usage, clear webcam bits when it's
been turned off.
2013-08-07 10:17:04 -07:00
Philip Rosedale
cdfabd7647 Merge pull request #805 from ZappoMan/master
Tweaks for Grayson
2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f cleanup 2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d removed ground plane grid, and changed start position 2013-08-06 19:15:26 -07:00
Philip Rosedale
7583e1cd14 Merge pull request #802 from ey6es/master
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want. 2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-06 16:28:22 -07:00