Menithal
|
020760cc97
|
21324: Fixed accidental inccorect bracket
|
2017-06-13 20:16:56 +03:00 |
|
Zach Pomerantz
|
89bd895054
|
mv showAudioTools to just AvatarInputs
|
2017-06-13 12:31:05 -04:00 |
|
Menithal
|
00701eb5c7
|
Merge remote-tracking branch 'origin/master' into 21324
|
2017-06-13 19:08:37 +03:00 |
|
Menithal
|
0edb763dac
|
21324: Formatting and PR Feedback Changes
|
2017-06-13 19:06:47 +03:00 |
|
Stephen Birarda
|
e68cf09b11
|
put back defaultAvatar_full.fst mode to 644
|
2017-06-13 07:19:41 -07:00 |
|
Stephen Birarda
|
6af35be286
|
change the packet version across the board for avatar mixer
|
2017-06-13 07:19:34 -07:00 |
|
Stephen Birarda
|
b2805d5f3b
|
push packet version for default mannequin avatar
|
2017-06-13 07:19:27 -07:00 |
|
Stephen Birarda
|
df4358970e
|
change default avatar to new baked mannequin
|
2017-06-13 07:19:16 -07:00 |
|
Sam Cake
|
f4ed635725
|
Fix bug in clearFramebuffer with Stencil Buffer
|
2017-06-12 22:59:42 -07:00 |
|
Brad Hefta-Gaub
|
cbff1910e2
|
Merge pull request #10660 from birarda/bug/fileOnUrl
simplify fileOnUrl to only look for external textures right beside FBX
|
2017-06-12 21:59:17 -07:00 |
|
Brad Davis
|
db8bdbc0a6
|
Merge pull request #10659 from samcake/orange
simple Render Engine refactors coming from the Spectator Cam project
|
2017-06-12 20:31:07 -07:00 |
|
Brad Hefta-Gaub
|
0a84a75bde
|
Merge pull request #10650 from jherico/web_event_handlers
Simplify eventBridge mechanism exposing functionality to web pages
|
2017-06-12 19:23:01 -07:00 |
|
David Rowe
|
5eee2d8352
|
Code review
|
2017-06-13 12:39:46 +12:00 |
|
Seth Alves
|
aeaddd23c7
|
Merge pull request #10658 from seefo/fb5087
Resolved FB5087
|
2017-06-12 17:25:05 -07:00 |
|
Brad Davis
|
308e7295cc
|
Merge pull request #10657 from jherico/tablet_deadlock
Attempt to resolve Tablet scripting interface deadlocks
|
2017-06-12 17:06:58 -07:00 |
|
howard-stearns
|
3d4f9be05b
|
fix teleport vs stuck-in-floor work
|
2017-06-12 17:01:13 -07:00 |
|
Brad Hefta-Gaub
|
347742be1b
|
Merge pull request #10601 from birarda/mannequin-avatar
Update default avatar to baked mannequin
|
2017-06-12 16:42:37 -07:00 |
|
Zach Pomerantz
|
7d3bf75f0b
|
wip: sticky devices
|
2017-06-12 18:48:26 -04:00 |
|
Zach Pomerantz
|
b5dab39f83
|
sticky mic meter / noise reduction
|
2017-06-12 18:41:32 -04:00 |
|
Zach Pomerantz
|
8dac83d3fe
|
add reverb to qml Audio
|
2017-06-12 18:11:08 -04:00 |
|
Zach Pomerantz
|
b37a0239b0
|
up to reverb (needs cherry-picking)
|
2017-06-12 18:00:52 -04:00 |
|
Bradley Austin Davis
|
1968ecbc8f
|
Simplify eventBridge mechanism exposing functionality to web pages
|
2017-06-12 14:46:37 -07:00 |
|
Zach Pomerantz
|
858b980c16
|
add qml Separator
|
2017-06-12 15:18:16 -04:00 |
|
Chris Collins
|
123ed81e20
|
Merge pull request #10664 from zfox23/FB5260_PotentialFontCrash
Potentially fix a crash in font loading
|
2017-06-12 11:49:08 -07:00 |
|
Andrew Meadows
|
321e307c9f
|
Merge pull request #10609 from 1P-Cusack/21317
WL21317 helper functions for getting into avatar coordinate space
|
2017-06-12 11:18:29 -07:00 |
|
seefo
|
cb5a114145
|
Fixed Ubuntu warning
|
2017-06-12 10:47:55 -07:00 |
|
Zach Fox
|
e96c55956f
|
First pass at the fix
|
2017-06-12 09:53:14 -07:00 |
|
David Rowe
|
3e126c0517
|
Smoothly ease hands from uncontrolled to controlled positions
|
2017-06-12 17:14:13 +12:00 |
|
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 |
|
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 |
|