Commit graph

13955 commits

Author SHA1 Message Date
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Clément Brisset
1992f624ad Merge pull request #3054 from huffman/19723
Code Review for Job #19723
2014-06-22 16:37:02 -07:00
Clément Brisset
5b95eafa9b Merge pull request #3053 from ey6es/metavoxels
Added basic tests for metavoxel streaming.
2014-06-22 16:35:49 -07:00
Andrzej Kapolka
626bd42b7b Use randomColorValue, since we have it. 2014-06-20 18:22:36 -07:00
Andrzej Kapolka
811815e61f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-20 18:12:29 -07:00
Andrzej Kapolka
49f1d427ec Removed incremental streaming stubs. 2014-06-20 18:12:08 -07:00
Andrzej Kapolka
de0c45a919 Spanner mutation in test. 2014-06-20 18:09:51 -07:00
Ryan Huffman
0e6abe3359 Update inactive chat window opacity to 0.8 2014-06-20 16:31:22 -07:00
Andrzej Kapolka
ce778f47b1 More work on stream testing, fixed bug with differently-ordered edits. 2014-06-20 14:08:39 -07:00
Ryan Huffman
0c87f0aabc Update chat window behavior
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
Brad Hefta-Gaub
4ab30aae2b Merge pull request #3052 from Atlante45/misc_fixes
Misc fixes
2014-06-19 18:19:45 -07:00
Andrzej Kapolka
24f535e02d Working on metavoxel streaming tests. 2014-06-19 18:15:17 -07:00
Atlante45
4561a6e326 Fixed voxel being deleted even though voxel tool is not selected 2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e fixed tooltip not disapearing when deleting model 2014-06-19 18:09:17 -07:00
Andrzej Kapolka
7a9c0f0e6a Working on tests for metavoxel streaming. 2014-06-19 14:50:19 -07:00
Brad Hefta-Gaub
d7782a2365 Merge pull request #3051 from Atlante45/dont_glow_if_out_of_range
Don't glow models if you can't grab it
2014-06-19 12:37:33 -07:00
Andrzej Kapolka
07e54b5162 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-19 11:38:14 -07:00
Atlante45
4a4efb0bfa Don't glow models if you can't grab it 2014-06-19 11:11:08 -07:00
Brad Hefta-Gaub
45a640d4b2 Merge pull request #3049 from Atlante45/make_selection_range_infinite
Make selection range infinite
2014-06-19 10:54:13 -07:00
Atlante45
676141024a Added angular size limit to hydras too. 2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253 Set minimum angular size too model selection 2014-06-19 10:43:25 -07:00
Brad Hefta-Gaub
5801ea2011 Merge pull request #3048 from ctrlaltdavid/fix_hydra_crash
Fix startup crash where Hydra controllers are not properly plugged in
2014-06-19 08:21:22 -07:00
David Rowe
afab5f1cbf Fix startup crash where Hydra controllers are not properly plugged in
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -07:00
Andrzej Kapolka
2decfb9561 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 18:08:19 -07:00
Andrzej Kapolka
531c32fdd3 More comments, stubbing out incremental streaming. 2014-06-18 18:07:50 -07:00
Brad Hefta-Gaub
c7b1b504b4 Merge pull request #3047 from birarda/master
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
Stephen Birarda
dd5d59208e fix a crash when grabbing AABox from buffer 2014-06-18 15:05:38 -07:00
Brad Hefta-Gaub
4699a8011c Merge pull request #3046 from Atlante45/more_intuitive_rotation_UI
More intuitive rotation UI
2014-06-18 15:04:34 -07:00
Brad Hefta-Gaub
f2b2784fa9 Merge pull request #3045 from wangyix/edit_nack_pull
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
AndrewMeadows
71bbbac1c0 Merge pull request #3038 from ey6es/metavoxels
Support for writing to and reading from a JSON format that mirrors the bitstream format, with tools to convert between them (using generics so as not to require the original classes).
2014-06-18 14:47:11 -07:00
Andrzej Kapolka
6ec562931f Some additional comments for DatagramSequencer. 2014-06-18 14:44:11 -07:00
Atlante45
900024eefe More intuitive rotation UI 2014-06-18 14:22:46 -07:00
Stephen Birarda
1228bd4a1e handle addition of samples for an unattenuated listener 2014-06-18 14:18:39 -07:00
Stephen Birarda
db1031144b fix passing of unattenuated zones to buffers 2014-06-18 13:46:03 -07:00
wangyix
f76b4dc1ab made getMissingSequenceNumbers() inline 2014-06-18 13:39:49 -07:00
wangyix
c7788b793c removed erroneous call updateNodeWithDataFromPacket for octree data nacks 2014-06-18 13:36:54 -07:00
wangyix
29723d0ef3 changed octree data nacks to repeatedly nack missing seq nums 2014-06-18 13:36:54 -07:00
Andrzej Kapolka
530852a756 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 13:10:11 -07:00
Andrzej Kapolka
26159a05d9 Fix for sporadic test failure due to hash ordering. 2014-06-18 13:09:45 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Andrzej Kapolka
eea45e98d7 Fix to include GLM. 2014-06-18 12:22:45 -07:00
Brad Hefta-Gaub
8206c8d709 Merge pull request #3044 from ZappoMan/master
fix bug
2014-06-18 12:19:22 -07:00
ZappoMan
ed32ca721a fix bug 2014-06-18 12:19:01 -07:00
Andrzej Kapolka
e0689b1484 Fixed compile error on Xcode. 2014-06-18 12:04:41 -07:00
Andrzej Kapolka
49ab3d6b43 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 11:59:04 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull
Edit nack pull
2014-06-18 11:43:25 -07:00
wangyix
d78ed66616 removed spaces before comments in OctreeInboundPacketProcessor 2014-06-18 11:37:54 -07:00
Andrzej Kapolka
b74e69e359 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 11:33:41 -07:00