Commit graph

8816 commits

Author SHA1 Message Date
Stephen Birarda
abafaffe44 fix a missed Model->Entity rename that caused slot error 2014-09-17 14:43:48 -07:00
Stephen Birarda
8dddbb9d4b make snapshots uploaded for locations temp files that will be cleared 2014-09-17 14:43:48 -07:00
Stephen Birarda
e7b9e2b060 have LocationManager upload snapshot after location creation 2014-09-17 14:43:48 -07:00
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021
Code Review for Job #20021
2014-09-17 09:19:29 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Brad Hefta-Gaub
a9206e0e85 Merge pull request #3422 from chansensturm/audio-temp
Implement Gordon-Smith 2-pole quadrature oscillator
2014-09-15 18:24:11 -07:00
Philip Rosedale
bd5cb346d2 Merge pull request #3420 from AndrewMeadows/ragdoll
Walking avatar tweaks
2014-09-15 16:12:23 -07:00
Philip Rosedale
8eeebd15da Merge pull request #3418 from ey6es/master
Ryan's new blendshape mappings for Mixamo.
2014-09-15 14:17:00 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement.
Also tweaked max walking speed.
2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm
7a9cf193b4 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-15 13:47:24 -07:00
Stephen Birarda
193c125d66 fix scope for switch case 2014-09-15 13:29:13 -07:00
Stephen Birarda
6e9da9747e add a missing update of having heard from the audio-mixer 2014-09-15 13:25:50 -07:00
Andrzej Kapolka
6a0b3fa202 Ryan's new blendshape mappings for Mixamo. 2014-09-15 13:16:17 -07:00
Philip Rosedale
a70e27f442 Merge pull request #3411 from ZappoMan/fixWarnings
fix warnings and removed some asserts
2014-09-14 20:28:39 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
David Rowe
be20ec9f4a Construct controllers in inactive state 2014-09-14 13:47:14 -07:00
David Rowe
c7b34b4f54 Lower left and right hands independently when no longer being tracked 2014-09-14 13:47:13 -07:00
Craig Hansen-Sturm
089267a937 completely remove new audio objects from playback rendering path when they are unused 2014-09-14 12:26:25 -07:00
Andrew Meadows
908f4f3a5e merge upstream/master into andrew/ragdoll
Conflicts:
	interface/src/scripting/GlobalServicesScriptingInterface.cpp
2014-09-13 17:25:35 -07:00
ZappoMan
c32d5db75c fix bug with attachments being stretched 2014-09-13 15:32:21 -07:00
ZappoMan
d92d2d57a0 one more shot at these warnings 2014-09-13 09:28:28 -07:00
ZappoMan
95a63cf131 fix windows warning and change QByteArray initializer to match documented prototype 2014-09-13 09:14:52 -07:00
ZappoMan
9c34aed36d fix type signed/unsigned warning 2014-09-13 09:02:48 -07:00
ZappoMan
d6ebbd8633 fixed use of uninitialized variable warning 2014-09-13 09:01:27 -07:00
ZappoMan
a95e5487fc fix type signed/unsigned warning 2014-09-13 09:00:47 -07:00
ZappoMan
a6178a137f fix windows warnings 2014-09-13 09:00:18 -07:00
Brad Hefta-Gaub
ec23a7a868 Merge pull request #3410 from chansensturm/audio-noise
Head Penumbra filter gain smoothing
2014-09-13 07:47:30 -07:00
Craig Hansen-Sturm
8119dcd9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-13 00:43:47 -07:00
Craig Hansen-Sturm
2c7d15c01b disable input gain/mute 2014-09-12 18:32:28 -07:00
Andrew Meadows
b94b737f26 fix build for no XMPP 2014-09-12 17:56:25 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia
Conflicts:
	interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
Andrew Meadows
62867391a3 collide against PhysSimulation instead of VoxelTree 2014-09-12 17:38:45 -07:00
Andrew Meadows
c21491a034 add update expiry to VoxelShapeManager 2014-09-12 17:38:20 -07:00
Andrzej Kapolka
7f31b4563c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-12 15:35:46 -07:00
Brad Hefta-Gaub
e69e90b5b4 Merge pull request #3405 from thoys/20017
Code Review for Job #20017
2014-09-12 15:34:50 -07:00
Andrzej Kapolka
97813a2f72 Make sure we note that the blender finished even if the geometry changed. 2014-09-12 15:34:49 -07:00
Brad Hefta-Gaub
66ce6b7c3c Merge pull request #3407 from ey6es/master
Only allow one "blender" to run at a time for each model.
2014-09-12 15:34:39 -07:00
Andrzej Kapolka
72a6254fa1 Only allow one "blender" to run at a time for each model. 2014-09-12 15:24:38 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Thijs Wenker
df0cbd54fc Merge branch 'master' of https://github.com/highfidelity/hifi into 20017
Conflicts:
	interface/src/Application.cpp
2014-09-12 23:04:05 +02:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities
New Entities Features
2014-09-12 13:57:45 -07:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup
initial transition to new metaverse API
2014-09-12 13:45:40 -07:00