Commit graph

6020 commits

Author SHA1 Message Date
Andrzej Kapolka
865ca7de20 Align forearms with wrists. Closes #2577. 2014-04-01 16:01:29 -07:00
Andrzej Kapolka
fb37ef5bca Fix for annoying intermittent seg fault on Linux exit. Closes #2542. 2014-04-01 11:25:39 -07:00
AndrewMeadows
f12da05722 Merge pull request #2581 from Atlante45/more_upload_fixes
More upload fixes
2014-04-01 09:51:25 -07:00
AndrewMeadows
ff211dbc2b Merge pull request #2573 from PhilipRosedale/master
Audio VU level meter to replace scope
2014-04-01 09:41:39 -07:00
Philip Rosedale
7d12fcee9d 220Hz tone injection option for easier audio quality checks 2014-03-31 21:55:29 -07:00
Philip Rosedale
81d1eb7ed2 removed unused procedural movement code 2014-03-31 18:24:58 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
James Brotchie
da116608a0 Hitting enter no longer shows chat window when chat is disabled.
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
2014-04-01 07:38:22 +10:00
Philip Rosedale
3babb5e0bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 07:25:46 -07:00
James Brotchie
6880160bc0 Remember most recently opened script location.
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
2014-03-31 22:08:38 +10:00
Philip Rosedale
27f0214032 first pass audio VU scope 2014-03-28 23:09:51 -07:00
Philip Rosedale
78ee8706d6 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-28 16:48:15 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Dimitar Dobrev
9b43508098 Restored code that Git had somehow deleted. 2014-03-28 19:26:16 +02:00
Dimitar Dobrev
6fd1bf7edb Simplified the new goToUser function. 2014-03-28 18:44:06 +02:00
Dimitar Dobrev
3907c563df Put the chat window above the 3D view and animated its showing. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
4374e28e9c Changed the highlighting of own messages to occupy the whole row. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed
upon design.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
5073439007 Highlighted the user's own chat messages. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed Gave more space to the user in sent messages so that resizing of the
column for messages occurs for really long user names.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
a48ca65236 Enabled going to the clicked user in the chat. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
65f912249d Moved user names in the char 1 pixel to the bottom. 2014-03-28 18:36:52 +02:00
Stephen Birarda
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2
split lean input from lean perturbations
2014-03-28 09:25:36 -07:00
Stephen Birarda
be5888e692 Merge pull request #2549 from AndrewMeadows/avatar-interaction
name changes to get rid of "tweaked" angles in Head code
2014-03-28 09:19:45 -07:00
Stephen Birarda
7b840f760c Merge pull request #2538 from AndrewMeadows/enforce-standard
making some type casts abide by coding standard
2014-03-28 09:19:16 -07:00
Andrzej Kapolka
361276d133 Use a spherical estimate of the shadowed region to avoid growing and shrinking
it as we turn around.  Also, might as well render shadows for the billboards.
2014-03-27 16:19:21 -07:00
Andrzej Kapolka
aee15e0496 Don't render display name/chat message for own avatar in first person mode. 2014-03-27 15:38:21 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -07:00
Philip Rosedale
c8cacf75f3 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-27 15:16:11 -07:00
Philip Rosedale
41e9017953 more audio level meter work, improved gun 2014-03-27 15:14:38 -07:00
Andrzej Kapolka
077df3906f Make sure we reset our LOD adjustments before we switch back from throttling
the renderer.
2014-03-27 15:02:26 -07:00
Andrzej Kapolka
eab4b4bc5d Make sure we process the model root nodes in alphabetic order. 2014-03-27 14:47:46 -07:00
Andrzej Kapolka
9078d9a0f2 Fix for avatar LOD's getting into a degenerate state. Don't persist the
avatar LOD, since we adjust it more rapidly.
2014-03-27 14:14:31 -07:00
Andrzej Kapolka
563725e781 Use the "correct" shadow strategy: include only ambient term when in shadow. 2014-03-27 13:44:34 -07:00
Andrzej Kapolka
7cc7230745 Adjust the shadow shader to prevent seeing shadows on the opposite sides of
objects.  Closes #2544.
2014-03-27 13:18:45 -07:00
Andrew Meadows
a978f533e1 update a comment 2014-03-27 11:24:03 -07:00
Andrew Meadows
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -07:00
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
2014-03-27 11:08:55 -07:00
Andrew Meadows
c354e980a8 getTweakedOrientation() to getFinalOrientation() 2014-03-27 11:03:42 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard
Conflicts:
	interface/src/avatar/Hand.cpp
2014-03-27 10:53:54 -07:00
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Atlante45
11f40258b3 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-27 10:12:34 -07:00
Philip Rosedale
101de1e0e5 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 23:24:44 -07:00
Philip Rosedale
56492e3ac8 Merge pull request #2536 from ey6es/master
Provide a simple means of tracking download progress, increase speed at which we adjust avatar LOD.
2014-03-26 23:23:27 -07:00
Philip Rosedale
7d168b5b1f Merge pull request #2537 from ZappoMan/bugfixes
some windows bug fixes
2014-03-26 23:22:06 -07:00
Philip Rosedale
ff8d154412 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 22:38:35 -07:00
Andrzej Kapolka
f339a3c0d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 18:30:23 -07:00
Stephen Birarda
206096465b Merge branch 'master' of https://github.com/highfidelity/hifi into flock-bots 2014-03-26 17:46:48 -07:00
Stephen Birarda
7eab276122 suppress debug in ScriptEngine, fix spatialization from FS head changes 2014-03-26 17:19:23 -07:00
Stephen Birarda
87cbe9a1f4 Merge pull request #2524 from AndrewMeadows/shapes
avatar responds to hand-vs-head collisions again
2014-03-26 17:10:43 -07:00