Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 23:00:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

16974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Craig Hansen-Sturm
2383379a35 default sine gain set to -6db 2014-09-18 13:52:53 -07:00
Brad Hefta-Gaub
a5ea0479c1 Merge pull request #3450 from birarda/master 
handle hifi urls emitted from DataWebDialog in Application
 2014-09-18 13:36:37 -07:00
Stephen Birarda
9f3d908d9f fix typo in comment 2014-09-18 13:32:01 -07:00
Brad Hefta-Gaub
c48b3ae51e Merge pull request #3451 from birarda/fix-ssl-handshake-race 
make sure the OAuthWebViewHandler is ready before the NodeList might need it
 2014-09-18 13:29:54 -07:00
Andrzej Kapolka
5c22fe7bd1 Translucency tweak. 2014-09-18 13:27:15 -07:00
Andrzej Kapolka
fb7e633cac Post-merge fixes. 2014-09-18 13:17:23 -07:00
Stephen Birarda
b63ef1f7fe Merge pull request #3453 from birarda/clement-recording-changes 
Rec file format tweaks (on behalf of @Atlante45)
 2014-09-18 13:14:09 -07:00
Craig Hansen-Sturm
256bd627fa clamp to 0.0f when within EPSILON neighborhood of 0.0f 2014-09-18 13:12:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Andrzej Kapolka
37eb40122c Tiny tweak to weight loading: only replace lowest weight if the new weight is 
greater.
 2014-09-18 13:05:57 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
75ecdd2f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 11:27:33 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Philip Rosedale
2d8eb114bc Merge pull request #3448 from AndrewMeadows/ragdoll 
Support avatar motorVelocity in various frames
 2014-09-18 10:45:13 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Craig Hansen-Sturm
1eab983ee0 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-18 10:39:03 -07:00
Stephen Birarda
84f3e99354 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 10:38:50 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00
Stephen Birarda
533a60c35e make sure OAuthWebViewHandler is ready before the NodeList is 2014-09-18 10:34:17 -07:00
Stephen Birarda
9b16f8ea6a Merge pull request #3449 from birarda/clement-recording-changes 
Rec file format tweaks (on behalf of @Atlante45)
 2014-09-18 10:24:48 -07:00
Stephen Birarda
c9c8a1c194 handle another casing issue for Nodelist include 2014-09-18 10:11:34 -07:00
Stephen Birarda
7e7c4bd580 handle hifi urls emitted from DataWebDialog 2014-09-18 10:09:57 -07:00
Stephen Birarda
6d335a8634 fix capitalization in NodeList include 2014-09-18 10:02:54 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Andrew Meadows
2f3eba2896 merge upstream/master into andrew/ragdoll 2014-09-18 09:55:50 -07:00
Andrew Meadows
1ad08e34c4 support for mulitiple frames for scripted motor 2014-09-18 09:54:27 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs 
add a DataWebDialog class to display auth'ed pages from data-web
 2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
93561d3b21 remove the existing user locations dialog 2014-09-18 09:27:07 -07:00
Stephen Birarda
bf83e8fe09 remove the user locations model 2014-09-18 09:23:22 -07:00
Stephen Birarda
d860b8e8db remove test DataWebDialog from Application 2014-09-18 09:22:14 -07:00
Brad Hefta-Gaub
945b251f9b Merge pull request #3446 from stojce/20037 
Code Review for Job #20037
 2014-09-18 09:05:29 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Philip Rosedale
432622d168 merge fix 2014-09-18 08:37:14 -07:00
Philip Rosedale
dbcb778ea9 Drive mouth with loudness relative to long term average 2014-09-18 08:33:41 -07:00
Atlante45
881ca61a09 Modified recordings namefilter 2014-09-18 00:30:07 -07:00
Atlante45
e0739e4aa8 PreCR fixes 2014-09-18 00:03:02 -07:00
Atlante45
06dd9d0376 Moved Player and Recording to their own files 2014-09-17 23:52:21 -07:00
Brad Hefta-Gaub
cfc8cf0d7b Merge pull request #3443 from ey6es/master 
Allow blenders to stack up to a point in order to reduce latency with fewer avatars (but still cap work with lots of avatars).
 2014-09-17 23:30:36 -07:00
Brad Hefta-Gaub
c232c07724 Merge pull request #3441 from birarda/master 
remove the access token from API urls and put in Authorization header
 2014-09-17 23:25:54 -07:00
Philip Rosedale
ed32781335 Merge pull request #3444 from AndrewMeadows/ragdoll 
headMove.js uses avatar motor
 2014-09-17 23:14:33 -07:00
Andrew Meadows
b311333ac3 initial tuning of headMove.js for avatar motor 2014-09-17 22:35:39 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00