Anthony J. Thibault
7bd553c09c
near grab logic to uses sphere vs entity box
...
instead of sphere vs sphere. Adjusted debug drawing accordingly.
2016-06-23 17:03:15 -07:00
Anthony J. Thibault
eabb8d08c0
Merge branch 'vive-ui' into feature/equip-hotspots
2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5
Grab script hotspot work
...
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
howard-stearns
dc34181032
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 13:04:21 -07:00
howard-stearns
d3735322a5
Whitespace.
2016-06-22 13:03:13 -07:00
Brad Hefta-Gaub
a48cce2975
Merge pull request #8084 from huffman/feat/user-actions
...
Add client-side session id generation and new user activities
2016-06-22 12:36:18 -07:00
Ryan Huffman
9ff742c97c
Fix typo
2016-06-22 12:09:12 -07:00
Ryan Huffman
2233b5ba64
Add user activity tracking for OculusLegacyDisplayPlugin
2016-06-22 11:57:41 -07:00
Howard Stearns
af0335496e
Merge pull request #8120 from howard-stearns/aim-reticle-at-head
...
aim reticle at head
2016-06-22 10:45:49 -07:00
howard-stearns
e4dbb5e61a
Make mouse reticle be perpendicular to head.
2016-06-22 09:57:38 -07:00
Stephen Birarda
18e4c3b94c
Merge pull request #8119 from zzmp/fix/domain-hours-metadata-format
...
reformat operating hours to [[open,close]]
2016-06-22 09:30:12 -07:00
Ryan Huffman
2621add8e3
Fix nearby_avatars not tracking
2016-06-22 09:17:28 -07:00
Ryan Huffman
847685d224
Add tracking of away.js
2016-06-22 09:06:59 -07:00
Ryan Huffman
23f57367e3
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-22 08:55:22 -07:00
Ryan Huffman
890de1bfea
Add went-to user activity back in
2016-06-22 08:54:58 -07:00
Ryan Huffman
1be30ccce9
Fix enabled_edit firing on disable
2016-06-22 08:24:50 -07:00
Ryan Huffman
a7f30ced29
Fix infinite recursion in PluginManager
2016-06-21 21:39:40 -07:00
Clément Brisset
dfc84b5e6d
Merge pull request #8117 from Atlante45/neuron
...
Fix CMake 3.5 issue
2016-06-21 17:47:24 -07:00
Clément Brisset
fbc5f28e6e
Merge pull request #8115 from SamGondelman/updateBuildOSX
...
Update BUILD_OSX.md instructions for OpenSSL and Qt paths
2016-06-21 17:47:05 -07:00
Howard Stearns
a1844d8c19
Fix plugin include. (How did this build for me locally?)
2016-06-21 17:36:41 -07:00
Anthony J. Thibault
2a82dddc2b
Draw attach points as if they were equip-hotspots
2016-06-21 17:36:36 -07:00
Atlante45
89c50ab3df
Update neuron archive in cmakelists
2016-06-21 17:23:08 -07:00
Zach Pomerantz
e03974181a
reformat operating hours to [[open,close]]
2016-06-21 17:19:37 -07:00
howard-stearns
223f9bda2e
gratuitous change to force things.
2016-06-21 17:03:49 -07:00
howard-stearns
baa9139881
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 17:02:23 -07:00
Howard Stearns
c600b65f45
Merge pull request #8114 from jherico/vive-keyboard
...
Don't trigger keyboard on revealing the overlay layer
2016-06-21 17:00:36 -07:00
SamGondelman
db8190ad49
fix typo
2016-06-21 16:56:00 -07:00
howard-stearns
d6095d1f11
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 16:52:22 -07:00
Howard Stearns
3879312968
Merge pull request #8116 from ZappoMan/cleanupPlugins
...
remove dead refereince to PluginContainer.h from space mouse
2016-06-21 16:51:06 -07:00
Ryan Huffman
4e52521f8c
Update UserActivityLogger device blacklist
2016-06-21 16:43:16 -07:00
Ryan Huffman
310adb0f45
Update spacemouse deviceConnected implementation
2016-06-21 16:42:39 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f
Update connected device detection implementation
2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
d9e8026cd6
Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion
...
fix setting velocity of inactive kinematic RigidBody
2016-06-21 16:32:04 -07:00
Brad Hefta-Gaub
f2f7e21eaf
remove dead refereince to PluginContainer.h from space mouse
2016-06-21 16:17:43 -07:00
Brad Davis
f3bad3a63b
Don't trigger keyboard on revealing the overlay layer
2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
SamGondelman
9a17f5b439
update homebrew instructions
2016-06-21 14:12:27 -07:00
Brad Hefta-Gaub
5878927bd0
Merge pull request #8050 from ZappoMan/cleanupPlugins
...
Cleanup plugins
2016-06-21 13:53:22 -07:00
Howard Stearns
7e88772e85
Merge pull request #8106 from howard-stearns/triggering-change
...
triggering change
2016-06-21 13:51:12 -07:00
Brad Hefta-Gaub
c18f5e19f5
Merge pull request #8090 from zzmp/doc/metadata-script
...
add example script for metadata from metaverse
2016-06-21 13:42:10 -07:00
Brad Davis
c928de6051
Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default
...
turn hud reset behavior on by default
2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85
Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud
...
minimize trigger distance to hud
2016-06-21 13:33:16 -07:00
Ryan Huffman
0ea9c5c26d
Fix getMemoryInfo not returning false on non-Windows
2016-06-21 13:32:17 -07:00
Ryan Huffman
251e2137d3
Remove old use of connectedDevice
2016-06-21 13:31:10 -07:00
Ryan Huffman
6c2c7f1eec
Fix connected_device user activity event
2016-06-21 13:28:40 -07:00
Zach Pomerantz
c8ead2ad04
conform to coding braces standard
2016-06-21 13:28:15 -07:00
Howard Stearns
cd09c61f31
Merge pull request #8108 from jherico/vive-toolbars
...
Additional toolbar work
2016-06-21 13:26:09 -07:00
