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

10873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
39a6e03476 Modified MyAvatar to support more JS 2014-03-20 12:09:33 -07:00
Atlante45
d239aecbfb Added names to signals argument 2014-03-19 10:17:28 -07:00
Atlante45
a80f81c246 typo 2014-03-18 17:48:17 -07:00
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -07:00
Atlante45
76c2a9fdad Modified Browser to be able to dowload all the fst file when there are more than 1000 2014-03-18 17:36:05 -07:00
Philip Rosedale
caf9de5463 Merge pull request #2365 from birarda/master 
fix for packet version mismatch
 2014-03-18 17:14:35 -07:00
Stephen Birarda
281f2c6614 return false in packetVersionAndHashMatch on version mismatch 2014-03-18 17:04:27 -07:00
Atlante45
1e2dabfd5e Changed addresses to new models locations 2014-03-18 15:09:54 -07:00
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -07:00
Atlante45
0a80f8fcd6 Added browse buttons in the menu 2014-03-18 13:59:08 -07:00
Atlante45
388f8d480a Added the model browser 2014-03-18 13:58:23 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -07:00
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings 
removal of more compilation warnings
 2014-03-18 13:54:17 -07:00
Leonardo Murillo
949f4bac6a Merge pull request #2361 from birarda/master 
fix for random audio-mixer crashes
 2014-03-18 14:33:59 -06:00
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Stephen Birarda
d697a6ea2c Merge pull request #2359 from birarda/master 
spacing fix and silent sample read fix
 2014-03-18 13:04:41 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Leonardo Murillo
725c0f7dab Merge pull request #2358 from birarda/master 
attempted fix for audio-mixer crash
 2014-03-18 14:00:26 -06:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Stephen Birarda
e6365a1b4d Merge pull request #2357 from birarda/orientation-fix 
re-do orientation changes after force push to master
 2014-03-18 12:27:57 -07:00
Stephen Birarda
db25ae8865 remove extra debug 2014-03-18 12:27:45 -07:00
Stephen Birarda
201117c343 Merge branch 'master' of https://github.com/highfidelity/hifi into orientation-fix 2014-03-18 12:26:51 -07:00
Stephen Birarda
c7c51c7504 remove orientation string debug 2014-03-18 12:05:32 -07:00
Stephen Birarda
05e2bb8022 keep storing degrees in data-web but convert on receipt 2014-03-18 12:04:03 -07:00
Stephen Birarda
1d944ac829 reset orientation to identity with spacebar, fix orientation storing 2014-03-18 12:02:12 -07:00
Stephen Birarda
c8d3cd2a1b fix go to orientation to not put the user sideways 2014-03-18 11:55:11 -07:00
AndrewMeadows
e7f113e616 Merge pull request #2350 from birarda/audio-scaling 
suppress silent streams from interface and agent
 2014-03-18 11:48:27 -07:00
Stephen Birarda
7ed982a073 cleanup writing of silent frame to ring buffer 2014-03-18 11:12:36 -07:00
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrzej Kapolka
9ff0a36a06 Merge pull request #2349 from ey6es/master 
Alpha is the new default.
 2014-03-18 10:14:14 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
b69c339279 don't send redundant head rot and hand pos info 2014-03-18 09:39:05 -07:00
Andrew Meadows
272cb879f8 change wording of comment 2014-03-18 09:38:49 -07:00
Andrzej Kapolka
fbf4600a4c Merge pull request #2347 from ey6es/master 
Prevent audio average from becoming less than zero (thus causing sqrt to
 2014-03-18 09:16:52 -07:00
Andrzej Kapolka
d80f110961 Prevent audio average from becoming less than zero (thus causing sqrt to 
return nan, thus making our fake blendshape coefficient nan, thus making the
jaw disappear).  Closes #2334.
 2014-03-18 09:12:23 -07:00
Philip Rosedale
a24dba5e9a Merge pull request #2346 from birarda/master 
scope clientMixBuffer only to AudioMixer run
 2014-03-17 20:15:40 -07:00
Andrew Meadows
3296447af6 remove dupe hand data from avatar updates 
partial progress toward issue #2256
 2014-03-17 18:23:55 -07:00
Andrew Meadows
75ab970c0d fix bug: bad offset into avatar data during decode 2014-03-17 18:23:09 -07:00
Stephen Birarda
1fc9ac1815 make the client mix buffer only as large as it needs to be 2014-03-17 17:55:47 -07:00
Stephen Birarda
f3910f8c1a scope clientMixBuffer only to AudioMixer run 2014-03-17 17:54:27 -07:00
Philip Rosedale
2673aa00f0 Merge pull request #2345 from birarda/master 
guard around update to last heard for a NULL matching node
 2014-03-17 17:40:02 -07:00
Stephen Birarda
7ba595338e guard around update to last heard for a NULL matching node 2014-03-17 17:39:08 -07:00
Philip Rosedale
a7f0e41232 Merge pull request #2342 from birarda/master 
switch data for mix samples in AudioMixer
 2014-03-17 17:30:14 -07:00
Stephen Birarda
07a71d8796 use char instead of QByteArray for mix samples in AudioMixer 2014-03-17 17:22:16 -07:00
Stephen Birarda
746f148e71 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-17 16:57:36 -07:00
Stephen Birarda
447f23a1c9 repair _clientSamples copying into _clientMix 2014-03-17 16:56:29 -07:00