Seth Alves
|
408a77dd13
|
merge from upstream
|
2016-06-29 18:49:33 -07:00 |
|
Brad Davis
|
f93a91a97f
|
Abandon seperate vertex formats for now
|
2016-06-28 19:18:16 -07:00 |
|
Brad Davis
|
542601fd9d
|
Fix invalid GL 4.5 calls
|
2016-06-28 18:56:25 -07:00 |
|
Brad Davis
|
ab7fed1af8
|
Switch back to disable GL 4.5 by default, add support for logging when enabled
|
2016-06-28 18:56:25 -07:00 |
|
Brad Davis
|
a41de3a60d
|
Making GL 4.5 enabled by default, adding logging
|
2016-06-28 18:55:26 -07:00 |
|
Brad Davis
|
8b56444dde
|
Fix crash in GL45 buffer re-allocation
|
2016-06-28 18:55:25 -07:00 |
|
Brad Davis
|
b16812aa4d
|
Adding GL 4.5 backend
|
2016-06-28 18:55:24 -07:00 |
|
Brad Davis
|
b45ed7f959
|
Merge remote-tracking branch 'upstream/stable' into stable-merge
|
2016-06-28 15:09:00 -07:00 |
|
Zach Pomerantz
|
c62967a57b
|
add secs per hour
|
2016-06-28 12:38:00 -07:00 |
|
Andrew Meadows
|
e4329cc8de
|
Merge pull request #8137 from AlexanderOtavka/add-entity
Fix bugs with Entities.addEntity
|
2016-06-28 09:54:09 -07:00 |
|
Seth Alves
|
a4b4e9c5f7
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-06-28 09:45:54 -07:00 |
|
Brad Davis
|
8561581ab2
|
Merge pull request #8121 from SamGondelman/miniMirrorFix
Mini mirror/multi-monitor bug fixes
|
2016-06-27 22:04:39 -07:00 |
|
Seth Alves
|
d4cc4bf1e4
|
represent node permissions as a bitfield rather than a list of bools
|
2016-06-27 14:55:13 -07:00 |
|
Seth Alves
|
c7d56493b1
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-06-27 10:07:38 -07:00 |
|
Howard Stearns
|
de7738e644
|
Merge pull request #8134 from highfidelity/vive-ui
Vive UI bug fixes
|
2016-06-24 18:39:06 -07:00 |
|
Zander Otavka
|
a4da63c1ff
|
Fix bug with Entities.addEntity returning bad id
If addEntity failed for whatever reason (eg. lack of permission), it
would return a non-null UUID.
Fixes [FogBugz case #365](https://highfidelity.fogbugz.com/f/cases/356/Entities-addEntity-can-return-a-UUID-even-when-unsuccessful).
|
2016-06-24 16:39:57 -07:00 |
|
Zander Otavka
|
2786061d71
|
Fix bug with entity adding w/o permission
Entities could be added to the local tree, but be rejected by the server
because of a lack of permissions.
|
2016-06-24 16:34:54 -07:00 |
|
Sam Gondelman
|
3c809ef40c
|
Merge pull request #8123 from AlexanderOtavka/first-person-hmd
Automatically enter first person when in HMD mode
|
2016-06-24 15:58:38 -07:00 |
|
Ken Cooke
|
36ebe4a4f6
|
Merge pull request #8125 from ZappoMan/simplifyResamplerUse
cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler
|
2016-06-24 15:43:04 -07:00 |
|
Brad Hefta-Gaub
|
2e8f6c2cc6
|
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
|
2016-06-24 14:08:29 -07:00 |
|
Seth Alves
|
ead6e476a9
|
add a list of blacklist groups which remove permissions rather than grant them
|
2016-06-24 14:03:43 -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 |
|
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
|
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 |
|
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 |
|
Seth Alves
|
cc1b6f0cb2
|
add a permissions-grid row for friends-of-domain-owner
|
2016-06-24 11:42:56 -07:00 |
|
howard-stearns
|
f8391f0062
|
fix reticle bugs
|
2016-06-23 16:51:15 -07:00 |
|
Seth Alves
|
c4b0f1899e
|
merge from upstream
|
2016-06-23 13:26:01 -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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
847685d224
|
Add tracking of away.js
|
2016-06-22 09:06:59 -07:00 |
|
Ryan Huffman
|
890de1bfea
|
Add went-to user activity back in
|
2016-06-22 08:54:58 -07:00 |
|
Ryan Huffman
|
a7f30ced29
|
Fix infinite recursion in PluginManager
|
2016-06-21 21:39:40 -07:00 |
|
SamGondelman
|
78a1845afe
|
fixed resizing of qml overlays when device pixel ratio changes
|
2016-06-21 18:13:11 -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 |
|