howard-stearns
1068a4a9bd
remove the optimization for upperId == lowerId. Doesn't work in zaru
...
tunnels.
2017-06-01 13:21:24 -07:00
Anthony J. Thibault
226855b2b9
Bug fixes and cleanup
...
* Bug fix for problem when chest target is enabled but hips target is not.
* centralized the two computeSplineFromTipAndBase functions into one.
* Removed dead code
2017-06-01 13:20:50 -07:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
Stephen Birarda
792d938262
send quit event during shutdown on thread, with timeout
2017-06-01 13:01:24 -07:00
Ryan Huffman
52f9100332
Fix isProcessRunning error in strict mode
2017-06-01 12:48:42 -07:00
Zach Fox
4e929f6d92
Merge pull request #10581 from zfox23/snapshot_fixForUrlShare
...
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
2017-06-01 11:51:14 -07:00
Ryan Huffman
aaf9b9ac7f
Update server-console to watch interface via pid rather than marker
2017-06-01 11:20:36 -07:00
Dante Ruiz
c0003f6791
Merge branch 'master' of github.com:highfidelity/hifi into record-standard
2017-06-01 19:06:50 +01:00
Dante Ruiz
9a8030cc09
Merge branch 'recorder-fix' into record-standard
2017-06-01 19:01:54 +01:00
Dante Ruiz
0e82b33d6d
final changes
2017-06-01 19:00:31 +01:00
Seth Alves
b83620f7c5
Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller
2017-06-01 10:58:33 -07:00
Seth Alves
eca05d9c42
more use of head input
2017-06-01 10:57:53 -07:00
Dante Ruiz
e52765b641
playback recording back through the standard inputs
2017-06-01 18:51:24 +01:00
David Kelly
017955dca8
Merge pull request #10587 from davidkelly/dk/5028
...
Don't allow sorting on non-sortable columns in PAL
2017-06-01 10:49:11 -07:00
Dante Ruiz
c686acc071
fixing build issue
2017-06-01 18:20:56 +01:00
Seth Alves
eb94c48c5b
merge from upstream
2017-06-01 10:10:11 -07:00
Vladyslav Stelmakhovskyi
b0e4b752d5
Implements landscape mode for tablet as rotation instead of stretching
2017-06-01 19:07:17 +02:00
Dante Ruiz
23a9209285
Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix
2017-06-01 18:06:37 +01:00
Dante Ruiz
a1e0737928
saving work
2017-06-01 18:06:06 +01:00
David Kelly
b6b2f92af2
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028
2017-06-01 09:58:07 -07:00
Andrew Meadows
e27199601f
Merge pull request #10585 from samcake/orange
...
Fixing warnings
2017-06-01 09:33:16 -07:00
samcake
257813ec38
comment the code
2017-06-01 09:19:02 -07:00
Dante Ruiz
36002e8b92
Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix
2017-06-01 17:01:59 +01:00
Anthony J. Thibault
813feeb8fd
Limit spine spline compression/stretch to 15%
2017-06-01 08:56:42 -07:00
David Kelly
f79c9ea021
we can sort on ignored
2017-06-01 07:29:31 -07:00
David Kelly
a17886aa58
do not allow sorting on non-sortable columns in PAL
2017-06-01 07:24:03 -07:00
Vladyslav Stelmakhovskyi
30ab9771ef
Merge branch 'master' into create_in_landscape
2017-06-01 16:06:15 +02:00
Seth Alves
0b2eb43ee2
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-01 07:02:31 -07:00
David Rowe
47e65e942e
Gradually relax hands from controlled positions when lose tracking
2017-06-01 23:42:08 +12:00
Sam Cake
ea6be93c9c
adding another flavor of the prepare stencil
2017-06-01 01:24:57 -07:00
NeetBhagat
d27ad061cb
Merge branch 'master' into 21255
2017-06-01 12:46:14 +05:30
Sam Cake
07eb1d89e1
fixing the warning on macosx about the non portable file name
2017-05-31 23:59:44 -07:00
NeetBhagat
c7c07b28e9
Resolve the reviewed comments of @ZappoMan
2017-06-01 12:17:13 +05:30
Sam Cake
3c9b14ee94
Oene more fix
2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c
Fixing the warnings
2017-05-31 23:20:10 -07:00
David Rowe
95aab28e91
Disable unused code
...
Keep for future experimentation per other commented-out code in method
2017-06-01 18:13:57 +12:00
Sam Cake
e02115bcda
clearing up the stencil jobs
2017-05-31 23:00:05 -07:00
Sam Cake
0372deebff
Last warnings?
2017-05-31 22:09:30 -07:00
Sam Cake
d19956f93c
Fixing warnings
2017-05-31 22:02:47 -07:00
Sam Cake
b528c2fc60
Merged
2017-05-31 19:33:14 -07:00
Stephen Birarda
1d9d83b157
initial version of the ClosureEventSender using std::thread
2017-05-31 19:00:41 -07:00
Zach Pomerantz
954e4979f8
expose Audio.devices.input/output
2017-05-31 20:14:58 -04:00
howard-stearns
1e1dd3a633
checkpoint with working detector
2017-05-31 17:10:37 -07:00
Sam Cake
c28584c8f4
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-31 17:06:13 -07:00
Anthony J. Thibault
d3ca34956d
Fix spline interpolation the wrong way when bending backward.
2017-05-31 16:58:17 -07:00
samcake
82d348a2ef
Stencil rejection is working, and more cleaning
2017-05-31 16:46:20 -07:00
Zach Fox
53701371ab
Fix some bugs :(
2017-05-31 16:43:21 -07:00
Liv
27d4edd2d0
Add circle and cone to entity shape list
2017-05-31 16:25:11 -07:00
Dante Ruiz
cca0fa6600
fixed some input recorder design issue
2017-06-01 00:23:37 +01:00
Liv
8bcaacbe40
Removing incomplete torus function
2017-05-31 15:46:35 -07:00