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
Brad Hefta-Gaub
d7bffc3eab
first cut at negotiating codecs
2016-06-23 17:14:41 -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
SamGondelman
284fcc8a0b
better check for oculus display in oculus legacy plugin because the sdk is buggy
2016-06-23 13:50:17 -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
Brad Hefta-Gaub
be37921845
first cut at codec plugins
2016-06-23 10:42:02 -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
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
Seth Alves
c62b73bf61
when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree
2016-06-22 11:42:57 -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
Seth Alves
fbfb6f169b
Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject
2016-06-22 10:02:12 -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
Ryan Huffman
23f57367e3
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-22 08:55:22 -07:00
