ZappoMan
c54bdb3e8d
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
2014-06-18 15:20:08 -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
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
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
ZappoMan
42f9b5eb6a
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
2014-06-17 21:54:10 -07: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
Atlante45
97dd695213
if model takes too much angular size, don't select it
2014-06-17 18:32:45 -07:00
Andrzej Kapolka
5e0cab59ea
Some comments.
2014-06-17 18:12:06 -07:00
ZappoMan
5a246fab26
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/src/main.cpp
2014-06-17 17:45:06 -07:00
Brad Hefta-Gaub
a51d2deec6
Merge pull request #3039 from Atlante45/snapping_model_rotation
...
Added snapped/smoothed rotation for models + tooltip
2014-06-17 17:42:25 -07:00
Brad Hefta-Gaub
dead474e6b
Merge pull request #3034 from Barnold1953/OculusOverlay
...
New Oculus Magnification Windows
2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
Atlante45
4467ee266d
Added snapped/smoothed rotation for models + tooltip
2014-06-17 17:19:16 -07:00
barnold1953
64725dd21b
Unneeded comment
2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11
De-janked code by removing magic numbers
2014-06-17 17:14:26 -07:00
Andrzej Kapolka
9ded9b0696
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9
Make sure to use same enum streamer for the ones registered by type and the
...
ones registered by scope/name.
2014-06-17 17:06:28 -07:00
barnold1953
9f66eeb37f
Added a const variable for readability
2014-06-17 16:48:06 -07:00
wangyix
7f4cf3719e
added rollover handling to OctreeSceneStats
2014-06-17 16:40:08 -07:00
barnold1953
7cbb19551a
Switched time query method and fixed horrifying bug
2014-06-17 16:38:19 -07:00
Brad Hefta-Gaub
df27de3c73
Merge pull request #3036 from huffman/19788
...
Code Review for Job #19788
2014-06-17 16:28:03 -07:00
Brad Hefta-Gaub
ba72410add
Merge pull request #3029 from thoys/interface-balance-display-fix
...
interface balance display fix
2014-06-17 16:25:07 -07:00
