Mohammed Nafees
803ea28f99
Do not close the Models Browser if double clicked on the loading message
2014-06-21 23:01:22 +05:30
Mohammed Nafees
1b186c3b92
Remove unnecessary lines of code.
2014-06-21 17:57:11 +05:30
Mohammed Nafees
1368c72725
Keep the filter line edit of the Models Browser disabled until the models list has been populated. This fixes interface from crashing in case the user types in the line edit and the list is not populated.
2014-06-21 17:55:19 +05:30
Brad Hefta-Gaub
4ab30aae2b
Merge pull request #3052 from Atlante45/misc_fixes
...
Misc fixes
2014-06-19 18:19:45 -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
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
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
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
Brad Hefta-Gaub
f04e5c0a73
Merge pull request #3041 from kitely/vs2013
...
Allow the project to compile in Visual Studio 2013
2014-06-18 11:33:06 -07:00
Andrzej Kapolka
2513716c5b
Merge pull request #3043 from ey6es/master
...
Add virtual destructor to get rid of Xcode warning.
2014-06-18 11:32:55 -07:00
Andrzej Kapolka
52de729d60
Add virtual destructor to get rid of Xcode warning.
2014-06-18 11:31:58 -07:00
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec
replaced UINT16_MAX at 2 other places
2014-06-18 10:27:02 -07:00
wangyix
54f32d331e
replaced UINT16_MAX with std::numeric_limits<uint16_t>::max
2014-06-18 10:20:19 -07:00
wangyix
b63c88f42c
removed more spaces
2014-06-18 09:38:39 -07:00
wangyix
8c4e365958
added forgotten i++ in sendNackPackets()
...
plus minor style fixes
2014-06-18 09:28:42 -07:00
Oren Hurvitz
32c97bb6a2
Update Windows build instructions
2014-06-18 10:52:02 +01:00
Oren Hurvitz
98b4d6f697
Allow the project to compile using Visual Studio 2013
2014-06-18 10:27:57 +03:00
Andrzej Kapolka
c65af33a6c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 19:15:47 -07:00
Andrzej Kapolka
b8e6660e19
More commentation.
2014-06-17 19:15:29 -07:00
Brad Hefta-Gaub
d6f1cea1f5
Merge pull request #3040 from Atlante45/dont_select_models_too_big
...
if model takes too much angular size, don't select it
2014-06-17 19:12:20 -07:00
