Philip Rosedale
774b99d868
merge fix
2014-03-19 17:14:03 -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
f2793d74ad
Merge pull request #2391 from ey6es/master
...
Remove file texture loading (since we can just use file URLs), don't add...
2014-03-19 16:55:02 -07:00
Philip Rosedale
527c0f5a73
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-19 16:27:39 -07:00
Philip Rosedale
69a83ee94d
add bots able to see voxels
2014-03-19 16:27:27 -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
dd9c4aa854
changes to bot.js for new Agent microphone audio
2014-03-19 16:18:44 -07:00
Stephen Birarda
8c4fad443f
allow Agents to microphone audio from Sound objects
2014-03-19 16:14:58 -07:00
Andrzej Kapolka
e34f2ca69b
Remove file texture loading (since we can just use file URLs), don't add alpha
...
channels for opaque textures (and note when textures with alpha channels are
entirely opaque), enforce a maximum texture size of 1024 by 1024.
2014-03-19 16:11:15 -07:00
ZappoMan
f3968679d3
cleanup isInView() to use inFrustum() directly
2014-03-19 15:44:18 -07:00
Brad Hefta-Gaub
08c5c49891
Merge pull request #2389 from thagale/master
...
Potential fix for: closes #2386
2014-03-19 15:04:13 -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
Brad Hefta-Gaub
07742f54a7
Merge pull request #2377 from RyanDowne/master
...
increased head smoothing for visage
2014-03-19 09:35:51 -07:00
Philip Rosedale
c26ed77931
merge fix
2014-03-19 09:16:52 -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
Ryan
7c45df002a
increased head smoothing for visage
2014-03-19 07:41:36 -07:00
ZappoMan
cd6e0f1698
switch to deleteLater to prevent deadlock
2014-03-19 01:02:49 -07:00
ZappoMan
80ea33bf02
removed test code
2014-03-19 00:37:43 -07:00
ZappoMan
584adfda08
cleanup headers
2014-03-19 00:32:38 -07:00
ZappoMan
b3f60a068d
remove isScheduledForDelete from OctreeQueryNode
2014-03-19 00:17:14 -07:00
ZappoMan
450a9c03a7
revert changes
2014-03-18 23:54:23 -07:00
Philip Rosedale
9c8a4828f2
remove unused variable, function
2014-03-18 22:41:09 -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
Philip Rosedale
408151d842
Merge pull request #2363 from RyanDowne/master
...
removing fly to voxel option
2014-03-18 22:38:25 -07:00
Philip Rosedale
83026fa2ca
added skeet to gun, display joint names to log in crazy legs
2014-03-18 22:22:40 -07:00
Philip Rosedale
24c779e551
Fix bug in extrusion deleting first voxel made
2014-03-18 22:05:51 -07:00
Philip Rosedale
e447818f77
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-18 18:20:57 -07:00
Andrzej Kapolka
1f55b905f2
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-18 17:50:49 -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
Andrzej Kapolka
6d0269d537
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-18 17:20:44 -07:00
Andrzej Kapolka
0fc0d50bda
Only post the blender if we have blendable meshes to blend.
2014-03-18 17:19:42 -07:00
Philip Rosedale
d947b17d8a
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-18 17:19:06 -07:00
Stephen Birarda
f86b793c96
only output version mismatch once per sender per packet
2014-03-18 17:14:57 -07:00
Philip Rosedale
caf9de5463
Merge pull request #2365 from birarda/master
...
fix for packet version mismatch
2014-03-18 17:14:35 -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
Philip Rosedale
c129e294b0
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-18 16:34:02 -07:00
ZappoMan
220232312d
remove unused variables
2014-03-18 16:06:20 -07:00
ZappoMan
88fd686126
tweak thread tests
2014-03-18 15:59:02 -07:00
Ryan
07497ea4f7
removing fly to voxel option
2014-03-18 15:35:25 -07:00
Andrzej Kapolka
137cbe2cf4
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-18 13:58:11 -07:00