Commit graph

6428 commits

Author SHA1 Message Date
ZappoMan
334f688e4e add support for sending unverified datagrams to nodes 2014-04-18 15:30:45 -07:00
Brad Hefta-Gaub
57a221f343 Merge pull request #2689 from AndrewMeadows/inertia
improved collision shapes for head models
2014-04-18 14:06:45 -07:00
AndrewMeadows
aaac7ac82c Merge pull request #2688 from ey6es/master
Added head translation for Faceplus.
2014-04-18 13:45:00 -07:00
Andrew Meadows
54153a70a3 merge upstream/master into andrew/inertia 2014-04-18 11:30:26 -07:00
Andrew Meadows
26487aad06 more correct bounding shapes for Models 2014-04-18 11:19:21 -07:00
AndrewMeadows
a10aaa537e Merge pull request #2692 from ZappoMan/moonshot
added wet/dry mix, and alternate distance attenuation features
2014-04-18 10:34:55 -07:00
ZappoMan
2dc39512a2 CR feedback 2014-04-18 10:19:09 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrew Meadows
cfdbdad2d8 improved method for disabling bad joint shapes 2014-04-17 16:22:35 -07:00
Andrzej Kapolka
3af02a3327 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-17 16:07:48 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrew Meadows
3072161a30 improved collision shapes of models 2014-04-17 15:18:46 -07:00
Andrew Meadows
3acc518e8a make float literals obey the coding standard 2014-04-17 15:18:15 -07:00
Andrzej Kapolka
0a2670ea23 Detabbed. 2014-04-17 13:42:29 -07:00
Andrzej Kapolka
a12b90c65b Add head translation to Faceplus. Closes #2684. 2014-04-17 13:34:37 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
Andrew Meadows
e139a6dc95 remove warnings about signed-unsigned comparison 2014-04-17 08:46:41 -07:00
Andrew Meadows
db717b980b merge upstream/master into andrew/inertia
Conflicts:
	interface/src/Application.cpp
2014-04-17 08:40:25 -07:00
ZappoMan
9fc650dd6e CR feedback 2014-04-16 17:10:26 -07:00
ZappoMan
b269a26441 CR feedback 2014-04-16 17:08:06 -07:00
ZappoMan
4c6471caa4 fix typo 2014-04-16 16:43:01 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
3cb109ec89 clean up 2014-04-16 15:21:04 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Andrew Meadows
83dc8717aa bumpSettings on load/stop script 2014-04-16 14:46:49 -07:00
ZappoMan
b00a67cb57 added support for local audio spatialization independent of inbound audio 2014-04-16 13:55:39 -07:00
Andrew Meadows
ddb8ac9ad4 merge upstream/master into andrew/inertia 2014-04-16 13:40:10 -07:00
Andrew Meadows
9ab1b76484 use new Qt connect syntax for compile-time checks 2014-04-16 13:28:54 -07:00
AndrewMeadows
7dc8f2ae3c Merge pull request #2657 from ey6es/master
Added tools to adjust avatar LOD to LOD tools dialog.  Closes #2624.
2014-04-16 12:59:47 -07:00
Andrew Meadows
6b23da40d6 use correct name for signal connect 2014-04-16 12:18:40 -07:00
Stojce Slavkovski
c67e42be5e Moved function into .cpp 2014-04-16 07:46:15 +02:00
ZappoMan
ba361b0f62 add local audio stats 2014-04-15 21:50:44 -07:00
ZappoMan
67de87d114 added slider for local audio attenuation 2014-04-15 21:31:35 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
ZappoMan
040df97be2 more cleanup 2014-04-15 20:23:47 -07:00
ZappoMan
82d9c50dc5 moved all local processing to AudioReflector 2014-04-15 20:11:53 -07:00
ZappoMan
a46d3fd254 first cut at local audio spatialization working 2014-04-15 19:57:37 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
ZappoMan
523cc4bdfe revert some code 2014-04-15 16:30:47 -07:00
ZappoMan
a7cbf7f667 revert some code 2014-04-15 16:26:46 -07:00
ZappoMan
585024d70e resample the local audio before sending it to any registered listeners 2014-04-15 16:04:33 -07:00
ZappoMan
f9b6585435 some cleanup 2014-04-15 15:20:03 -07:00
ZappoMan
5bc8c83706 loop and variable name cleanup 2014-04-15 15:16:55 -07:00
ZappoMan
e514c95642 variable names cleanup to match coding standard 2014-04-15 14:47:38 -07:00