Commit graph

10014 commits

Author SHA1 Message Date
Andrzej Kapolka
8644280eb5 Make sure our mode is fully established before we use the mirror camera to
render the billboard.  Closes #2103.
2014-02-26 12:11:03 -08:00
Philip Rosedale
e7ce7288de Merge pull request #2102 from ey6es/master
More flexible Visage blendshape mapping, hysteresis for billboard switching, no hover text on billboards, eye convergence fix.
2014-02-25 17:04:11 -08:00
Andrzej Kapolka
8554c1dfbf Force a minimum convergence distance on the eyes. Closes #2100. 2014-02-25 16:50:59 -08:00
Andrzej Kapolka
5d99b06a48 Use hysteresis to prevent rapid enabling and disabling of billboard. Closes 2014-02-25 16:12:58 -08:00
Andrzej Kapolka
038f1acf01 Don't render the hover text in mirror/billboard mode. Closes #2098. 2014-02-25 15:34:16 -08:00
Andrzej Kapolka
c588a33b01 Slight mapping improvement. 2014-02-25 15:07:19 -08:00
Andrzej Kapolka
55f4f65bc0 Parse error fix. 2014-02-25 14:49:41 -08:00
Andrzej Kapolka
a5b821ab25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-25 14:49:31 -08:00
Andrzej Kapolka
3e2a659178 Experimenting with more action unit mappings. 2014-02-25 14:47:56 -08:00
Stephen Birarda
6c27b99aba Merge pull request #2099 from birarda/authentication
fix oauth early token expiry
2014-02-25 14:45:02 -08:00
Stephen Birarda
d0269761b6 remove unecessary qDebug include 2014-02-25 14:39:33 -08:00
Stephen Birarda
27be157d70 fix oauth early token expiry 2014-02-25 14:38:19 -08:00
Andrzej Kapolka
d7f55f4c30 Compile fixes. 2014-02-25 14:29:58 -08:00
Andrzej Kapolka
c0a33fe8fe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-25 14:26:50 -08:00
Andrzej Kapolka
16796b50a7 Working on Visage improvements. 2014-02-25 14:26:31 -08:00
Philip Rosedale
6b128466a9 Merge pull request #2094 from birarda/authentication
reset nodelist if domain-server stops talking to you, closes #2092
2014-02-25 14:10:24 -08:00
Philip Rosedale
dd93eff26e Merge pull request #2096 from birarda/scripted-billboard
add option for fake bot billboard from URL
2014-02-25 14:07:39 -08:00
Stephen Birarda
937768ae51 add option for fake billboard from URL, closes #2087 2014-02-25 13:51:48 -08:00
Stephen Birarda
1d0bff7a26 Merge pull request #2095 from PhilipRosedale/master
JS:  assume RAW audio if not detected as WAV
2014-02-25 13:51:26 -08:00
Stephen Birarda
ee70c93a3e have scripted avatars send billboard, if they have one 2014-02-25 13:42:07 -08:00
Stephen Birarda
f2a70bf275 add support for billboard setting from URL 2014-02-25 13:38:20 -08:00
ZappoMan
23b2d7d124 Merge pull request #2073 from josecpujol/19489
19489
2014-02-25 13:34:39 -08:00
Philip Rosedale
70c1f8290e assume RAW audio if not processed as WAV 2014-02-25 13:21:02 -08:00
Stephen Birarda
ce3d6d2fca reset nodelist if domain-server stops talking to you, closes #2092 2014-02-25 13:07:39 -08:00
ZappoMan
6972959587 Merge pull request #2091 from PhilipRosedale/master
Don’t render avatar ‘sphere’ unless there is voice intensity
2014-02-25 13:07:14 -08:00
Philip Rosedale
11e9b18a98 Don’t render avatar ‘sphere’ unless there is voice intensity 2014-02-25 12:35:14 -08:00
ZappoMan
039f9ff1e3 Merge pull request #2088 from birarda/authentication
always authenticate to default and fix audio-mixer session UUID
2014-02-25 11:22:54 -08:00
Stephen Birarda
a24366fcd7 populate packet header only once session UUID is received 2014-02-25 11:16:19 -08:00
Stephen Birarda
1163cfd07e if the domain-server provides no auth, assume default 2014-02-25 10:58:32 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
ZappoMan
17e4426b50 Merge pull request #2086 from PhilipRosedale/master
Add stochastic falloff for sending other avatar’s data
2014-02-25 10:52:43 -08:00
Philip Rosedale
176cb103dc Add stochastic falloff for sending other avatar’s data 2014-02-25 10:41:33 -08:00
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication
groundwork for secure node communication via data-server
2014-02-25 10:07:55 -08:00
Stephen Birarda
45429fa1e1 fix default node auth URL 2014-02-25 09:38:22 -08:00
Philip Rosedale
c783036fcc Merge pull request #2083 from ZappoMan/hideavatar
add support for hiding local rendering of avatar
2014-02-24 19:52:27 -08:00
ZappoMan
76355dc1a8 add support for hiding local rendering of avatar 2014-02-24 19:24:45 -08:00
ZappoMan
e6348d5e30 Merge pull request #2082 from PhilipRosedale/master
Updated color pallete for Grayson, pick random 1 of 3 add voxel sounds
2014-02-24 19:10:55 -08:00
ZappoMan
09fc58763f Merge pull request #2054 from gaitat/19499
Worklist Job #19499
2014-02-24 19:10:31 -08:00
Philip Rosedale
4c6175dd45 Merge pull request #2081 from ey6es/master
Added toggles for rendering bucky balls, particles.
2014-02-24 18:06:42 -08:00
Philip Rosedale
f4b485eb84 Updated color pallete for Grayson, pick random 1 of 3 add voxel sounds 2014-02-24 18:00:58 -08:00
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
ZappoMan
3a5bbfd989 Merge pull request #2061 from PhilipRosedale/master
Added DC offset correction for crappy sound input devices, mousewheel voxel edit size
2014-02-24 17:32:16 -08:00
Philip Rosedale
fffd45019d Added new sounds, default tool ON 2014-02-24 17:17:15 -08:00
Philip Rosedale
3a4ebe878b don’t drag avatar along during orbit, yet. 2014-02-24 17:03:14 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
83f7c17279 move QStringList include to DomainServer header 2014-02-24 15:49:52 -08:00
Stephen Birarda
6d56ab3a30 use toDouble instead of toInt for Qt 5.1 compatibility 2014-02-24 15:27:12 -08:00
Stephen Birarda
672c6a9ed1 fix complaint for incomplete type QStringList 2014-02-24 15:23:47 -08:00
Jose Carlos
64e75bb4ab fixed typo 2014-02-25 00:19:52 +01:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00