Burt Sloane
|
7022c4009f
|
midi in and out
|
2017-06-15 15:18:06 -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 |
|
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 |
|
David Rowe
|
fff8876b21
|
Code review
|
2017-06-10 09:33:45 +12: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Liv Erickson
|
6657c4d997
|
Update chat.js
remove stray semicolon
|
2017-06-08 17:22:18 -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 |
|
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 |
|
Seth Alves
|
ce4c3e1601
|
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-08 13:55:30 -07:00 |
|
Liv
|
03edb06ecb
|
change design to run chat separately so it can be removed if users prefer to not use it
|
2017-06-08 13:46:33 -07:00 |
|
Liv
|
0e27ad767c
|
Move chat app to be included as part of the default scripts
|
2017-06-08 13:07:01 -07:00 |
|
seefo
|
fce3badd1d
|
Resolved FB#5005
|
2017-06-08 11:57:44 -07:00 |
|
seefo
|
a4f4d49bec
|
Oven will now give proper return codes when used via CLI
|
2017-06-08 11:52:58 -07:00 |
|
Clément Brisset
|
dd3a7f7249
|
Merge pull request #10641 from highfidelity/stable
stable -> master after sandbox PID hotfix
|
2017-06-08 10:57:28 -07:00 |
|
Stephen Birarda
|
71bb55f661
|
Merge pull request #10642 from seefo/fb4399
Resolved FB4399
|
2017-06-08 10:42:12 -07:00 |
|
seefo
|
110a2f5d03
|
Resolved FB#4399
|
2017-06-08 10:35:50 -07:00 |
|
Seth Alves
|
3b47142592
|
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-08 10:28:38 -07:00 |
|
Stephen Birarda
|
f4d0bc69b1
|
Merge pull request #10630 from seefo/oven
Added CLI to Oven tool
|
2017-06-08 10:13:08 -07:00 |
|
seefo
|
0c7ffa0ac6
|
Replaced baker in OvenCLI with an std::unique_ptr
|
2017-06-08 09:48:30 -07:00 |
|
Liv
|
34bd2b8a2b
|
style fix
|
2017-06-08 09:01:01 -07:00 |
|
Howard Stearns
|
5352e85418
|
Merge pull request #10553 from howard-stearns/do-not-get-stuck-in-floor
Do not get stuck in floor
|
2017-06-07 20:11:38 -07:00 |
|
Stephen Birarda
|
f884de87ad
|
Merge pull request #10637 from highfidelity/RC-42-Hotfix
Build 42.1 Hotfix Update server-console to watch interface via pid rather than marker
|
2017-06-07 19:05:40 -07:00 |
|
seefo
|
8d5b90afe7
|
Merge pull request #10600 from seefo/snapshot
Added Polaroid Feature to Snapshot
|
2017-06-07 17:05:29 -07:00 |
|
seefo
|
26bd6b67ae
|
Final touches to polaroid feature
|
2017-06-07 16:52:16 -07:00 |
|
howard-stearns
|
9cf027a68c
|
pr feedback
|
2017-06-07 16:44:13 -07:00 |
|
howard-stearns
|
fa74daf875
|
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:43:25 -07:00 |
|
howard-stearns
|
9b5b352bc7
|
Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:21:08 -07:00 |
|
samcake
|
1b45276de2
|
Adjust the preview to avoid seeing the masked pixels in HMD mode
|
2017-06-07 15:55:38 -07:00 |
|
Ryan Huffman
|
2146f96091
|
Replace static use of qApp with QCoreApplication
|
2017-06-07 15:33:44 -07:00 |
|
Ryan Huffman
|
f10f717ea2
|
Add clarifying comment to use of kill in isProcessRunning
|
2017-06-07 15:33:37 -07:00 |
|
Ryan Huffman
|
3888385a72
|
Remove the runningMarker timer
|
2017-06-07 15:33:29 -07:00 |
|
Ryan Huffman
|
ccd473ad0c
|
Remove shutdownWatcher option inside sandbox
|
2017-06-07 15:33:22 -07:00 |
|