SamGondelman
|
b59d597780
|
if overlapping calls, haptics take on strength and duration of call that will finish last
|
2016-06-06 15:35:12 -07:00 |
|
SamGondelman
|
cea0d74c35
|
fix spaces and touch duration
|
2016-06-06 15:20:10 -07:00 |
|
SamGondelman
|
e7743cd8e2
|
added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism
|
2016-06-06 15:03:08 -07:00 |
|
Ken Cooke
|
b60b9bb312
|
compiler fixes for GCC/clang
|
2016-06-06 14:54:15 -07:00 |
|
Atlante45
|
399517fcbd
|
Activate Inputs after menus are setup
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
26acc6fd8b
|
Typo
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
24bbb8db3f
|
Remove input plugin menu dependency
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
6f75fab298
|
Revert header changes
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
b635e32933
|
Rename Mac only Oculus display plugin
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
ee62a211ac
|
Remove "Input Devices" menu
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
992fa63932
|
Allow ordered list of preferred plugins
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
932838b1e3
|
Setup preferred display plugin
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
d8493f960a
|
Add command line option to enable/disable plugins
|
2016-06-06 13:28:36 -07:00 |
|
Atlante45
|
3dadb515f3
|
Add plugins name to their metadata file
|
2016-06-06 13:28:36 -07:00 |
|
SamGondelman
|
afca0ec2c9
|
moved vive pulses to correct thread, works with duration
|
2016-06-06 13:25:05 -07:00 |
|
Brad Hefta-Gaub
|
5190d8ab6b
|
Merge pull request #8023 from jherico/settings
Eliminate extraneous writes for unchanged values
|
2016-06-06 12:22:11 -07:00 |
|
Ken Cooke
|
8faaa36913
|
moved table of precomputed data into AudioSRCData.h
|
2016-06-06 12:05:48 -07:00 |
|
Brad Hefta-Gaub
|
b4721ec57e
|
Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions
add Clipboard.getContentsDimensions() JavaScript method
|
2016-06-06 12:03:10 -07:00 |
|
Brad Hefta-Gaub
|
11effb6feb
|
Merge pull request #8007 from hyperlogic/feature/avatar-recording-version
Add version number to avatar recording frame
|
2016-06-06 12:02:49 -07:00 |
|
Brad Hefta-Gaub
|
1782a6ba4a
|
Merge pull request #8011 from hyperlogic/bug-fix/remove-avatar-data-warning
Removed innocuous "AvatarData packet size mismatch" warning
|
2016-06-06 12:02:34 -07:00 |
|
James B. Pollack
|
15745eb5b2
|
Merge remote-tracking branch 'upstream/master' into moreshelfstuff
|
2016-06-06 12:00:41 -07:00 |
|
Seth Alves
|
d202a2bf11
|
better handling of missing settings keys
|
2016-06-06 11:59:39 -07:00 |
|
Ken Cooke
|
4f35d3df02
|
AVX2 code must be in /avx for CMAKE to compile it properly
|
2016-06-06 11:57:17 -07:00 |
|
Ken Cooke
|
34f46b860b
|
AVX2 optimized audio resampler
|
2016-06-06 11:54:18 -07:00 |
|
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 |
|
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 |
|
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 |
|