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
Zander Otavka
0c56af7ae8
Add default script to enter first person for HMD
2016-06-24 11:57:50 -07:00
Zander Otavka
d45694836f
Add signal for display mode change in HMD
2016-06-24 11:57:12 -07:00
Brad Davis
a095da31fd
Fix initial visibility of QML windows from scripts
2016-06-24 11:48:55 -07:00
Brad Hefta-Gaub
39ff03cfb5
reduce log spam in Vive plugins
2016-06-24 10:53:46 -07:00
Zander Otavka
41d38ab630
Revert "Automatically enter first person when in HMD mode"
...
This reverts commit 3c9f3f3927
2016-06-24 10:16:40 -07:00
Zander Otavka
88ad570024
Revert "Uses spaces, not tabs"
...
This reverts commit 7e5b9db13a
2016-06-24 10:16:26 -07:00
Zander Otavka
15fbff4ffb
Add eslintrc file
2016-06-24 10:09:52 -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
Seth Alves
2fd38c1585
when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree
2016-06-23 13:10:15 -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
Brad Hefta-Gaub
6111e4952a
fix comments
2016-06-23 10:59:26 -07:00
SamGondelman
a0bb55e4c8
coding standard fun
2016-06-23 10:48:29 -07:00
Andrew Meadows
1d8d1240ca
remove override to avoid new Jenkins OSX warnings
2016-06-23 10:38:46 -07:00
Seth Alves
03b55e6a64
Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject
2016-06-23 10:33:31 -07:00
Brad Hefta-Gaub
c0be9aec6a
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
2016-06-23 10:28:29 -07:00
Howard Stearns
64771428ec
Merge pull request #8068 from highfidelity/vive-ui
...
Vive UI Snapshot
2016-06-23 10:27:30 -07:00
Stephen Birarda
f9b3165350
use a QSet instead of a QStringList
2016-06-23 09:37:17 -07:00
Stephen Birarda
7307bc6a1b
revert to domain connection refusal check with string
2016-06-23 09:27:17 -07:00
SamGondelman
cf44783550
can't enter independent mode through edit.js in HMD mode
2016-06-22 17:53:38 -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
Zander Otavka
7e5b9db13a
Uses spaces, not tabs
2016-06-22 16:50:47 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
Zander Otavka
3c9f3f3927
Automatically enter first person when in HMD mode
2016-06-22 16:22:14 -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
SamGondelman
d4cfe6256a
don't render mini mirror if rendering fullscreen mirror
2016-06-22 14:46:08 -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
