Commit graph

6043 commits

Author SHA1 Message Date
Andrzej Kapolka
7f6dc7ac2f Updated translations. 2014-04-02 09:56:30 -07:00
Philip Rosedale
ca863e77f4 Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/interface_en.ts
2014-04-01 21:14:51 -07:00
Philip Rosedale
389091ace6 Merge pull request #2587 from matsukaze/nocrAudioFixes
Audio fixes for win OS.
2014-04-01 21:03:26 -07:00
matsukaze
d28d686ceb Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit. 2014-04-02 17:45:22 -07:00
matsukaze
f305b81655 Merge upstream master into audio fixes. 2014-04-02 17:34:41 -07:00
matsukaze
7542917922 Fix tab with space. 2014-04-02 14:22:17 -07:00
matsukaze
94a23b7ffc Fix brace location and replace tab with space. 2014-04-02 14:15:20 -07:00
matsukaze
952ca928f1 More audio fixes. Fix audio buffer size on Win. 2014-04-02 12:28:22 -07:00
Philip Rosedale
e53bfe4ea1 Merge pull request #2585 from ey6es/master
Align forearms with wrists again, fix for annoying intermittent seg fault on Linux exit.
2014-04-01 20:59:51 -07:00
Philip Rosedale
0b792985d3 Tweaks to VU meter, tone injector, and fix to noise gate 2014-04-01 16:43:18 -07:00
Andrzej Kapolka
865ca7de20 Align forearms with wrists. Closes #2577. 2014-04-01 16:01:29 -07:00
matsukaze
c3934d9e86 Fix heap corruption. 2014-04-01 15:49:08 -07:00
Philip Rosedale
36c41a1fd3 test other way of doing loudness 2014-04-01 15:35:46 -07:00
Andrzej Kapolka
fb37ef5bca Fix for annoying intermittent seg fault on Linux exit. Closes #2542. 2014-04-01 11:25:39 -07:00
Andrzej Kapolka
afb5711879 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-01 10:40:38 -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
Andrzej Kapolka
929f08dec2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-31 18:22:43 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -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
Andrzej Kapolka
176d8f746e Finally at the point of actually getting spanners to turn into voxels. 2014-03-28 15:19:40 -07:00
Andrzej Kapolka
78896d6af9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 13:29:11 -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
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07: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
d3fe6f21ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-27 17:03:24 -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