Commit graph

3116 commits

Author SHA1 Message Date
Andrzej Kapolka
8515e9e04b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 14:15:31 -07:00
Andrzej Kapolka
93846460ff Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 13:12:28 -07:00
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the
X/Z axes.  The default environment is flat.  Closes #2378.
2014-03-20 12:09:20 -07:00
Andrzej Kapolka
a761a4862b Merge pull request #2398 from AndrewMeadows/emergency-fixes
explicitly send neck angles in avatar data
2014-03-20 11:19:13 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing
Model browsing
2014-03-20 11:15:35 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling
allow Agents to send microphone audio using Sound objects
2014-03-19 17:00:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
2014-03-19 16:24:47 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
ZappoMan
f3968679d3 cleanup isInView() to use inFrustum() directly 2014-03-19 15:44:18 -07:00
Tony Hagale
7f2a92d759 #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:28:12 -05:00
Tony Hagale
5f94e44cde #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:26:45 -05:00
ZappoMan
3d0207b926 optimize OctreeElement::calculateShouldRender() 2014-03-19 13:54:06 -07:00
ZappoMan
adaa01c13e optimize isLeaf() to just check the child mask instead of counting children 2014-03-19 13:15:28 -07:00
ZappoMan
f3bd8925d9 optimized OctreeElement::furthestDistanceToCamera() 2014-03-19 12:48:11 -07:00
ZappoMan
252bc3b3ee optimized ViewFrustum::getFurthestPointFromCamera() 2014-03-19 11:51:47 -07:00
Philip Rosedale
a1e07374d4 Merge pull request #2369 from ey6es/master
Perform blending in worker threads and only do it when we have new data.  Removed some unused code and fixed a couple warnings.
2014-03-19 08:59:20 -07:00
ZappoMan
584adfda08 cleanup headers 2014-03-19 00:32:38 -07:00
Philip Rosedale
cad11978be Merge pull request #2368 from birarda/master
suppress constant packet version mismatch debug
2014-03-18 22:39:20 -07:00
Andrzej Kapolka
250f648f6f Merge pull request #2371 from AndrewMeadows/master
fix bad startPosition in datagram unpack
2014-03-18 17:50:39 -07:00
Andrzej Kapolka
f9fd0d432f Fix for reading aggregate avatar packets. 2014-03-18 17:48:57 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
Andrew Meadows
6340024daa fix bad startPosition in datagram unpack
The startPosition was wrong (too far back) and the bytesRead return
value was too big and the unpacking of the second chunk of the
datagram would start in the middle of the chunk.
2014-03-18 17:42:58 -07:00
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -07:00
Andrzej Kapolka
6d0269d537 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 17:20:44 -07:00
Stephen Birarda
f86b793c96 only output version mismatch once per sender per packet 2014-03-18 17:14:57 -07:00
Andrzej Kapolka
f8c14a5717 Remove unused variable, reorder includes. 2014-03-18 17:06:01 -07:00
Stephen Birarda
281f2c6614 return false in packetVersionAndHashMatch on version mismatch 2014-03-18 17:04:27 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually
received new data.  Closes #2075.  Closes #2348.
2014-03-18 16:38:05 -07:00
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
2014-03-18 13:57:30 -07:00
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings
removal of more compilation warnings
2014-03-18 13:54:17 -07:00
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Andrzej Kapolka
a4cc15a2cd Collection streaming (untested). 2014-03-18 11:46:12 -07:00
Stephen Birarda
7ed982a073 cleanup writing of silent frame to ring buffer 2014-03-18 11:12:36 -07:00
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrzej Kapolka
b84499c83b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 10:18:12 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrzej Kapolka
a38239b3d8 Working on collection streaming. 2014-03-18 10:11:25 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
b69c339279 don't send redundant head rot and hand pos info 2014-03-18 09:39:05 -07:00
Andrzej Kapolka
4ce953315b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 09:19:58 -07:00
ZappoMan
28766bebc8 pass down parents inFrustum() state to recursion to allow further optimization 2014-03-17 18:30:08 -07:00
Andrew Meadows
3296447af6 remove dupe hand data from avatar updates
partial progress toward issue #2256
2014-03-17 18:23:55 -07:00