Andrzej Kapolka
18cb15ee7d
Warning fixes.
2014-09-22 15:31:46 -07:00
Andrzej Kapolka
e6b0dc592b
Don't save the billboard.
2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71
Fix for billboards.
2014-09-22 15:01:39 -07:00
AndrewMeadows
a0b458fd1d
Merge pull request #3465 from chansensturm/audio-noise
...
New Audio Edit Buffer Object / Click Removal / ....
2014-09-22 11:38:42 -07:00
AndrewMeadows
3d89aa9c9c
Merge pull request #3463 from ey6es/deference
...
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels. Don't merge until after conference, obviously.
2014-09-22 10:42:25 -07:00
Craig Hansen-Sturm
90379ee7eb
frame and channel counts are now consistently uint32_t / float32_t replaces float
2014-09-20 04:50:11 -07:00
Andrzej Kapolka
6c907a9d83
Read the emissive color property and use it to effect glow.
2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b
Removed commented lines.
2014-09-19 15:48:56 -07:00
Atlante45
36a3372f58
Same fix for MyAvatar class
2014-09-19 15:47:13 -07:00
Atlante45
c570931f35
Fix attachemnt getting into wrong state
...
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
2014-09-19 15:43:22 -07:00
Andrzej Kapolka
646c0dc48f
Working on translucent model bits.
2014-09-19 15:31:46 -07:00
Andrzej Kapolka
8d3eef708a
Move various avatar render bits to post-lighting section.
2014-09-19 13:13:05 -07:00
Andrzej Kapolka
446c2193ff
Limit what we render for deferred point/spot lights based on the light's
...
radius.
2014-09-19 12:18:00 -07:00
Andrzej Kapolka
08fda3bbef
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75
Fix for lights in rear view mirror/head mode.
2014-09-18 17:39:40 -07:00
Andrzej Kapolka
c6aad42f21
Move LocalLight to AvatarManager, apply it at the avatar level.
2014-09-18 17:09:53 -07:00
Andrzej Kapolka
b9ae005e53
Working on the actual deferred lights.
2014-09-18 16:12:46 -07:00
Philip Rosedale
d3cc22b39d
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-18 14:51:19 -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
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
Stephen Birarda
75ecdd2f68
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-09-18 11:27:33 -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
Stephen Birarda
533a60c35e
make sure OAuthWebViewHandler is ready before the NodeList is
2014-09-18 10:34:17 -07:00
Stephen Birarda
7e7c4bd580
handle hifi urls emitted from DataWebDialog
2014-09-18 10:09:57 -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
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
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
Andrew Meadows
b8f49dc6ef
fix vertical jitter (for real this time)
2014-09-17 21:56:38 -07:00
Andrzej Kapolka
e0a56b4a95
Rejiggered the blender handling: allow up to N blenders active at once so
...
that with small numbers of avatars, the blenders can stack for lower latency.
2014-09-17 17:57:08 -07:00
Andrew Meadows
8359e672bb
merge upstream/master into andrew/ragdoll
2014-09-17 17:56:35 -07:00
Andrew Meadows
cefe8e0268
scripted motor params are now Q_PROPERTIES
2014-09-17 17:55:10 -07:00
Andrew Meadows
21a17823d4
Fix for vertical jitter when walking on floor
2014-09-17 16:26:07 -07:00
Andrzej Kapolka
4a2e68fea4
Fix for eyes on skeleton (e.g., Mixamo) models.
2014-09-17 15:36:22 -07:00
Brad Hefta-Gaub
fd321a5ed1
Merge pull request #3439 from birarda/master
...
upload a snapshot for location on location creation, cleanup interface start errors
2014-09-17 14:52:04 -07:00
