Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10032 commits 71 branches 56 tags 1.2 GiB
Commit graph

10032 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
4b3911c5c1 Merge pull request #2101 from birarda/authentication 
fixes to login/logout flow when jumping domains
 2014-02-25 18:25:17 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
ZappoMan
3943c49dcc rename MenuType and other CR feedback 2014-02-25 17:32:16 -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
Stephen Birarda
d5fc1caaaf fix wording for access token change signal 2014-02-25 16:12:25 -08:00
Stephen Birarda
2496c6252f fix login/logout flow when jumping domains 2014-02-25 16:10:08 -08:00
Stephen Birarda
6d847f29fb currently support system wide auth only via hifi data-web 2014-02-25 16:05:05 -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
ZappoMan
81bff60645 change singleton approach to not require delete 2014-02-25 14:53:57 -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
ZappoMan
e03c7be5ef moved MenuScriptingInterface to own files 2014-02-25 14:33:37 -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
ZappoMan
73b0a5b359 switch to numbered swatches 2014-02-25 13:32:09 -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
ZappoMan
4d0a25b6ea add menus to editVoxels.js 2014-02-25 13:05:58 -08:00
ZappoMan
e12d791097 remove dead code 2014-02-25 12:37:49 -08:00
Philip Rosedale
11e9b18a98 Don’t render avatar ‘sphere’ unless there is voice intensity 2014-02-25 12:35:14 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -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
ZappoMan
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -08:00
ZappoMan
74d48ab239 added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement 2014-02-25 10:23:59 -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
ZappoMan
cb01c1ee10 add separator support 2014-02-24 23:53:26 -08:00
ZappoMan
374b12980b added checkable menus and sub menus 2014-02-24 23:42:05 -08:00