Seth Alves
a4e4093a18
split permissions into two sets, one for 'standard' ones and one for specific users
2016-06-06 10:39:47 -07:00
SamGondelman
b01a00584a
Merge branch 'exposeHaptics' of https://github.com/SamGondelman/hifi into exposeHaptics
2016-06-06 10:35:29 -07:00
SamGondelman
f51cb7ce0c
trying to add duration support for vive
2016-06-06 10:34:32 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
James B. Pollack
3603c8cf2e
add hover game scripts
2016-06-06 09:12:07 -07:00
James B. Pollack
eb3cafb4f9
shelf things
2016-06-06 08:59:41 -07:00
Howard Stearns
fc33e1746f
Merge pull request #8008 from howard-stearns/goto-button
...
Basic address bar toggle button.
2016-06-05 11:19:24 -07:00
Howard Stearns
91450addd3
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button
2016-06-05 10:46:18 -07:00
Howard Stearns
dbc688f445
Merge pull request #8005 from howard-stearns/pointer-cleanup
...
pointer cleanup -- see comment on #8012
2016-06-05 10:17:36 -07:00
Howard Stearns
8debe494f3
Merge pull request #8012 from howard-stearns/hmd-button
...
hmd button -- I'm going to go ahead in merge this myself because it's isolated and I want to bring the branch to a consistent/known/planned state for evaluation. (We will be modifying the implementation going forward.) It's too confusing to equivocate as to what functionality "in" the vive-ui branch when this is pending.
2016-06-05 10:16:47 -07:00
Seth Alves
880c4f18b5
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-05 08:27:59 -07:00
Andrew Meadows
e6844e2468
use world-UP rather than head-UP
2016-06-04 21:11:31 -07:00
Brad Hefta-Gaub
f2bedc546f
Merge pull request #8019 from jherico/settings
...
Eliminate file IO contentions for settings
2016-06-04 21:04:50 -07:00
Brad Hefta-Gaub
9ef7e82270
Merge pull request #8020 from highfidelity/revert-7991-aoighost_builddocs_securityfixes
...
Revert "Update the build docs for a better OpenSSL security posture."
2016-06-04 21:01:03 -07:00
Andrew Meadows
49c835b6fc
use camera twist for walk steering
2016-06-04 20:53:30 -07:00
James B. Pollack
47a84fe91d
make shelf stuff wearable
2016-06-04 20:51:46 -07:00
Andrew Meadows
062711b202
Revert "Update the build docs for a better OpenSSL security posture."
2016-06-04 20:51:21 -07:00
Brad Davis
bc81f00dc7
Eliminate extraneous writes for unchanged values
2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7
Fix unix builds, make settings ACID
2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd
Eliminate file IO contentions for the settings
2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2
Merge pull request #8006 from AndrewMeadows/convexification-2
...
fix bad convex hull simplification
2016-06-04 16:58:03 -07:00
Brad Hefta-Gaub
5390d50ab8
Merge pull request #8015 from kencooke/master
...
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
2016-06-04 16:55:42 -07:00
Brad Hefta-Gaub
eeb08fb401
Merge pull request #8014 from imgntn/leaphands
...
add leap hands to /system
2016-06-04 16:43:30 -07:00
Brad Hefta-Gaub
0a79ab5ff8
Merge pull request #8017 from ctrlaltdavid/toolbar-positioning
...
Save toolbar position when moving it only when stopped moving it
2016-06-04 16:00:30 -07:00
David Rowe
b6cb5617d3
Save toolbar position when moving it only when stopped moving it
2016-06-05 08:55:27 +12:00
Seth Alves
15a52abf7b
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-04 11:07:08 -07:00
Seth Alves
dd009bf8b9
add some debugging prints. make blacklisting work
2016-06-04 11:06:37 -07:00
Seth Alves
be403865fc
don't request public keys for the standard psuedo-account-names
2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64
bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided
2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19
rename AgentPermissions to NodePermissions
2016-06-04 09:50:36 -07:00
Brad Hefta-Gaub
5805c0cf9e
Merge pull request #8016 from howard-stearns/do-not-send-stale-vive-data-as-valid-for-master
...
do not send stale vive data as valid after deactivating
2016-06-04 09:26:43 -07:00
Seth Alves
2977c4eab7
Merge branch 'permissions-grid-ui' of github.com:sethalves/hifi into permissions-grid
2016-06-04 09:08:44 -07:00
howard-stearns
849bee977a
Do not send stale vive data as valid after deactivating.
...
(cherry picked from commit e6cc1fabe0
)
2016-06-04 09:07:51 -07:00
Seth Alves
6870a16197
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-04 09:07:42 -07:00
Seth Alves
09b0e3eaaf
use constants rather than bare strings for standard psuedo-account-names
2016-06-04 09:07:34 -07:00
Brad Hefta-Gaub
c2a34f24cb
Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid
...
Do not send stale vive data as valid after deactivating.
2016-06-04 08:41:26 -07:00
Ken Cooke
89bfa5bc09
fixed typo
2016-06-03 19:22:29 -07:00
Ken Cooke
280289045c
Revert change to reverb settings.
2016-06-03 18:48:23 -07:00
Ken Cooke
cd29aac185
Merge branch 'master' of github.com:kencooke/hifi
2016-06-03 18:42:30 -07:00
Ken Cooke
54293fdad0
Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling.
...
When downsampling 48khz to 24khz, linear interpolation creates aliasing distortion that is quite audible. This change greatly improves the audio quality for all sound assets.
2016-06-03 18:39:43 -07:00
SamGondelman
4fb8eac8ea
much better way of fixing script
2016-06-03 18:12:47 -07:00
David Rowe
2eaf401bd6
Fix spurious data being submitted from changed permissions in new row
2016-06-04 12:39:55 +12:00
James B. Pollack
27594e6df2
remove afro
2016-06-03 17:07:08 -07:00
Andrew Meadows
e92f1a8c5a
Merge pull request #7991 from aoighost/aoighost_builddocs_securityfixes
...
Update the build docs for a better OpenSSL security posture.
2016-06-03 16:17:50 -07:00
James B. Pollack
da023bfbe3
leap
2016-06-03 15:40:04 -07:00
Zach Pomerantz
09e0a2ced7
Parse basic metadata into DomainMetadata
2016-06-03 15:13:09 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
Zach Pomerantz
e04c6e8c44
Add description/hosts/rating to settings UI
2016-06-03 15:00:43 -07:00
Zach Pomerantz
209ace1b86
Include anonymously connected user metadata
2016-06-03 15:00:43 -07:00
Zach Pomerantz
55e5c1f6e0
Declare metadata descriptors
2016-06-03 15:00:42 -07:00