Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Anthony Thibault
aa8d1d097e
Merge pull request #8133 from howard-stearns/do-not-recenter-hud-from-button
...
do not reset hud from button
2016-06-24 15:35:14 -07:00
howard-stearns
9ae3c38616
doh!
2016-06-24 15:26:24 -07:00
howard-stearns
2ae0a7defc
If there are TWO conditions holding things back, weight for them both to
...
clear.
2016-06-24 14:46:46 -07:00
Howard Stearns
f7e9d3968a
Merge pull request #8127 from hyperlogic/bug-fix/grab-visualization-improvements
...
grab visualization improvements
2016-06-24 14:01:44 -07:00
howard-stearns
7da854d98c
do not reset hud from button
2016-06-24 13:35:47 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -07:00
Howard Stearns
86efb3d8bd
Merge pull request #8131 from hyperlogic/bug-fix/grab-script-search-ray-distance
...
Fix for grab script search ray length
2016-06-24 12:47:31 -07:00
samcake
61f5088ef3
Merge pull request #8130 from jherico/qml_window_visibility
...
Fix initial visibility of QML windows from scripts
2016-06-24 12:42:17 -07:00
Brad Hefta-Gaub
1c19d61035
Merge pull request #8122 from SamGondelman/macHydrasFix
...
Removed Mac Hydra support
2016-06-24 12:21:13 -07:00
Brad Hefta-Gaub
cea4b27b4d
Merge pull request #8128 from zzmp/feat/heartbeat-build-version
...
add build version to heartbeat
2016-06-24 12:20:16 -07:00
Brad Hefta-Gaub
4510bb1674
Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats
...
add heartbeats to metaverse for temporary domains
2016-06-24 12:08:37 -07:00
Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Brad Davis
a095da31fd
Fix initial visibility of QML windows from scripts
2016-06-24 11:48:55 -07:00
Brad Davis
e8a5c00f3e
Merge pull request #8126 from howard-stearns/fix-reticle-bugs
...
fix reticle bugs
2016-06-23 20:00:34 -07:00
Zach Pomerantz
1fcd7aa0c4
add build version to heartbeat
2016-06-23 19:55:16 -07:00
Zach Pomerantz
b1b378a91f
add back access token to domain-server
2016-06-23 19:38:41 -07:00
Zach Pomerantz
13310923c4
reset to temp domain after logout
2016-06-23 19:38:23 -07:00
Zach Pomerantz
1de1c632af
use private_description instead of description for domain settings
2016-06-23 17:16:42 -07:00
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
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51: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
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
Andrew Meadows
1d8d1240ca
remove override to avoid new Jenkins OSX warnings
2016-06-23 10:38:46 -07:00
Howard Stearns
64771428ec
Merge pull request #8068 from highfidelity/vive-ui
...
Vive UI Snapshot
2016-06-23 10:27:30 -07:00
SamGondelman
645ae3c21e
remove tabs
2016-06-22 17:02:02 -07:00
SamGondelman
a9ed0b1c83
completely destroyed sixense on macs
2016-06-22 16:56:50 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
SamGondelman
f495f5e3b5
removed mac hydra support
2016-06-22 16:05:55 -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
Andrew Meadows
e5b89ebd17
bump version number
2016-06-22 15:33:44 -07:00
Andrew Meadows
8009d23f70
more STATIC_MESH and dynamic overlap prevention
2016-06-22 15:20:45 -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
Zach Pomerantz
4a30d549ad
force temp domain reset on 404 too (401 already)
2016-06-22 12:04:26 -07:00
Zach Pomerantz
a6115cba6e
update temporary domains to use api_key
2016-06-22 12:04:26 -07:00
Zach Pomerantz
eebf8e91c6
add api_key to domains/public_key updates
2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5
add temporary domain info to account info
2016-06-22 12:02:35 -07:00
Zach Pomerantz
b6b73af2b4
Clean up domain-server setup
2016-06-22 12:02:35 -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
Andrew Meadows
e88b264864
revert compound hull shape generation
2016-06-22 09:30:44 -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
