Commit graph

56171 commits

Author SHA1 Message Date
Seth Alves
92fe8145be Merge pull request #10616 from vladest/create_button_sticked
Set active button property isActive before Home menu redraw. Makes su…
2017-06-11 13:43:41 -07:00
ZappoMan
4642f32fa7 add better debugging for audio problems
use OS default device if settings have no values
2017-06-10 14:35:29 -07:00
Chris Collins
4b6c13bc1f Merge pull request #10646 from ZappoMan/debugAudioProblems
Fix for no-audio on clean install
2017-06-10 11:32:42 -10:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes
Add additional primitive shapes
2017-06-09 19:02:54 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345
Position tablet relative to hand
2017-06-09 17:01:37 -07:00
Seth Alves
7dfd740285 try again to get forward not-looking-at-anyone gaze to work right 2017-06-09 16:15:47 -07:00
Seth Alves
e9dd91e4fe fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-09 16:15:29 -07:00
Seth Alves
efca4edaac fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-09 16:15:23 -07:00
Stephen Birarda
d2bea94768 simplify fileOnUrl to always look right beside FBX 2017-06-09 15:52:21 -07:00
Brad Hefta-Gaub
6006fa0fe1 Merge pull request #10638 from samcake/hobbes
Adjust the preview to avoid seeing the masked pixels in HMD mode
2017-06-09 15:38:33 -07:00
samcake
bb38938534 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-09 14:34:25 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Stephen Birarda
8bc7ce6357 put back defaultAvatar_full.fst mode to 644 2017-06-09 13:55:57 -07:00
ZappoMan
6fe20f90a3 add better debugging for audio problems
use OS default device if settings have no values
2017-06-09 13:36:12 -07:00
seefo
0343d4e443 Resolved FB5087 2017-06-09 13:33:46 -07:00
Stephen Birarda
e658953246 Merge pull request #10645 from seefo/oven
Oven will now give proper return codes when used via CLI
2017-06-09 13:06:09 -07:00
Liv
7785473ccb moving else 2017-06-09 12:59:08 -07:00
Seth Alves
3f425a5f02 Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes
Fix head puck broken eyes
2017-06-09 12:50:53 -07:00
Zach Fox
c32f5c1f2b Merge pull request #10636 from zfox23/spectatorCamera_unprototype
"Unprototype" the Spectator Camera
2017-06-09 12:00:26 -07:00
seefo
d17bd4352a Merge pull request #10651 from seefo/fb5009
Resolved FB5009
2017-06-09 11:57:29 -07:00
Stephen Birarda
3582e5110e Merge pull request #10644 from seefo/fb5005
Resolved FB5005
2017-06-09 11:55:45 -07:00
Liv
8c488d95d1 Stylish updates 2017-06-09 11:46:38 -07:00
Zach Fox
8825e91775 emissive is true 2017-06-09 11:42:17 -07:00
Zach Fox
3f169e50fe selfie to spectatorCamera 2017-06-09 11:42:17 -07:00
Zach Fox
3d9904cde1 Correctly position actual camera and preview overlay 2017-06-09 11:42:17 -07:00
Zach Fox
fd50434d86 New camera model; Cleanup; Bashing head :against desk 2017-06-09 11:42:16 -07:00
Zach Fox
3884287c41 Use 'resource' protocol instead of 'http' 2017-06-09 11:39:28 -07:00
Zach Fox
5114fd8e1f Rename correctly? 2017-06-09 11:39:28 -07:00
Zach Fox
7aef4dab4c Variable renaming pass 2017-06-09 11:39:28 -07:00
Zach Fox
a4f5d327a2 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-09 11:38:35 -07:00
Zach Fox
12e5fc20f7 Merge pull request #10653 from samcake/flash
Spectator-camera : Provide a way to render the side camera always mono
2017-06-09 11:34:37 -07:00
seefo
06a5d0970c Fixed issue with invalid time being sent when logging 2017-06-09 10:58:07 -07:00
Liv
1808505d8b Coding standard fixes 2017-06-09 10:54:57 -07:00
Seth Alves
5b62c9e83b try again to get forward not-looking-at-anyone gaze to work right 2017-06-09 10:45:04 -07:00
seefo
dc02e34782 Resolved FB#5009 2017-06-09 10:23:53 -07:00
Seth Alves
197fb620d4 Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes 2017-06-09 09:28:07 -07:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
Seth Alves
759a87c27e Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts
Move chat app to run with default scripts
2017-06-08 20:26:34 -07:00
Anthony Thibault
e3c342aa77 Merge pull request #10595 from hyperlogic/feature/spine-spline
Spline IK target support
2017-06-08 18:09:55 -07:00
samcake
b694256559 Restore the value in the script 2017-06-08 17:40:43 -07:00
samcake
4c8eec4e16 Introducing a way to prevent a frame to render in stereo accross batches 2017-06-08 17:38:26 -07:00
Liv Erickson
6657c4d997 Update chat.js
remove stray semicolon
2017-06-08 17:22:18 -07:00
Zach Fox
ab9b014381 Merge pull request #10648 from davidkelly/dk/5222
fix for avatar entities disappearing after grabbing and releasing
2017-06-08 16:52:19 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59
Fixes for Qt 5.9 compatibility
2017-06-08 16:51:08 -07:00
Seth Alves
73a88236a0 Merge pull request #10586 from ctrlaltdavid/21202
Relax hands to default position/rotation when controller tracking is lost
2017-06-08 16:38:08 -07:00
Seth Alves
d87b858c0a Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue
4869 entity resize issue
2017-06-08 16:34:07 -07:00
Seth Alves
9fa74029c7 Merge pull request #10633 from mnafees/21299
CR for Job #21299 - Save category on Marketplace when using back button
2017-06-08 16:10:56 -07:00
Howard Stearns
fee8001a40 Merge pull request #10643 from howard-stearns/monitor-display-of-texture
Monitor display of texture
2017-06-08 16:09:11 -07:00
Anthony J. Thibault
8334dff610 compute rotation from derivative of spline
This should fix bad rotation values for the spine during bowing/touching toes.
2017-06-08 15:00:12 -07:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b Fix intendantion 2017-06-08 22:58:40 +02:00