Brad Hefta-Gaub
a5eb5d6515
handle minimize case
2014-03-14 17:22:35 -07:00
Brad Hefta-Gaub
2a03cf1bab
make throttle rendering not adjust LOD
2014-03-14 17:17:38 -07:00
Philip Rosedale
8968cf4af3
Merge pull request #2320 from Geenz/master
...
Fix the "ringing" issue when we're throttling the frame rate.
2014-03-14 16:45:35 -07:00
Geenz
fe124f5c03
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-14 19:38:32 -04:00
Geenz
d02f0ba687
Fix for the “ringing” issue. Don’t let Qt handle our buffer swaps. Handle the swaps ourselves.
2014-03-14 19:38:17 -04:00
Andrzej Kapolka
4ca7e873f6
Merge pull request #2319 from AndrewMeadows/warnings
...
removing a few compile warnings
2014-03-14 16:23:35 -07:00
Andrew Meadows
ab84526a1b
removing compile warnings
2014-03-14 16:12:32 -07:00
Andrzej Kapolka
d9c1a47de8
Merge pull request #2316 from AndrewMeadows/hands
...
remove stretchy arms
2014-03-14 15:50:48 -07:00
Andrew Meadows
d4c7e25f8e
Merge branch upstream/master into "hands" project
2014-03-14 14:28:50 -07:00
Andrzej Kapolka
37ae5142a6
Merge pull request #2315 from ZappoMan/fix_lookWithTouch_and_more
...
fix JS radians vs degrees issues
2014-03-14 14:13:25 -07:00
Brad Hefta-Gaub
8d3da1ba70
Merge pull request #2311 from ey6es/master
...
Make the chat window a Qt dock widget; that seems to be what it was trying to emulate. This fixes the issue on startup that Ryan and I experienced.
2014-03-14 13:05:16 -07:00
Brad Hefta-Gaub
8f200e917b
fix JS radians vs degrees issues
2014-03-14 13:03:14 -07:00
Andrzej Kapolka
4366b45445
Changed orientation tweak names, restore tweaked orientation rather than
...
primary one. Closes #2310 .
2014-03-14 11:13:15 -07:00
Andrew Meadows
a045a87cca
Remove arm stretching, add sixense calibration
2014-03-14 11:11:00 -07:00
Andrzej Kapolka
5f7e41b79b
More dock widget tweaks.
2014-03-14 10:55:27 -07:00
Andrzej Kapolka
a7d35944cc
Use an inner widget for the dock.
2014-03-14 10:48:57 -07:00
Andrzej Kapolka
b721533f0b
Make chat a dock widget, since that's the behavior it's emulating anyway
...
(and for some reason, the current strategy causes a problem on at least Ryan's
and my machine).
2014-03-14 10:43:12 -07:00
Brad Hefta-Gaub
2f13d1e30c
Merge pull request #2305 from ey6es/master
...
Avatar performance improvements, toggle for Visage (and code to allow it to play nice with Faceshift). Closes #2300 .
2014-03-13 21:17:27 -07:00
Andrzej Kapolka
3f78ef40f1
Fixed the translation file.
2014-03-13 17:08:23 -07:00
Andrzej Kapolka
38d03febbc
Add this file back. Hope it didn't have anything important!
2014-03-13 16:58:15 -07:00
Andrzej Kapolka
95e59d7004
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/interface_en.ts
interface/src/Menu.h
2014-03-13 16:56:06 -07:00
Andrzej Kapolka
5f6f4b3d37
Fixes required since enabling Faceshift is now the default.
2014-03-13 16:45:27 -07:00
Brad Hefta-Gaub
89a6ecd1c1
Merge pull request #2301 from Geenz/19514
...
Code Review for Job #19514
2014-03-13 16:31:06 -07:00
Stephen Birarda
c9c76ca30f
Merge pull request #2303 from ddobrev/xmppchat
...
Moved the chat from a window to a built-in panel
2014-03-13 16:30:44 -07:00
Andrzej Kapolka
92bc675c97
Make sure to stop Visage before deleting it.
2014-03-13 16:21:45 -07:00
Andrzej Kapolka
9d1278b663
Wait until we know that Faceshift didn't connect before we attempt to
...
initialize Visage.
2014-03-13 16:18:47 -07:00
Dimitar Dobrev
85a15a2284
Moved the chat from a window to a built-in panel.
2014-03-14 01:12:25 +02:00
Geenz
55d0835ba1
Indentation!
2014-03-13 19:08:18 -04:00
Dimitar Dobrev
881ecb07cd
Changed the font of the entire chat window to Helvetica/Arial.
2014-03-14 01:07:21 +02:00
Geenz
b34921ea6d
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 18:55:36 -04:00
Geenz
4523ae742e
Tweak in code styling per Brad’s feedback, along with using SIGNAL and SLOT instead of function pointers directly.
2014-03-13 18:51:14 -04:00
Stephen Birarda
1303c19498
Merge pull request #2302 from Atlante45/avatar_uploader
...
Avatar uploader
2014-03-13 15:42:27 -07:00
Andrzej Kapolka
007bfa8866
Tweak to Visage toggle.
2014-03-13 15:26:07 -07:00
Atlante45
423f26f669
Review comments
2014-03-13 15:26:02 -07:00
Andrzej Kapolka
fc32d9581d
Visage toggle bits.
2014-03-13 15:17:16 -07:00
Atlante45
0748682119
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 15:04:49 -07:00
Atlante45
e5b5778caf
Upload FST
2014-03-13 15:04:22 -07:00
Andrzej Kapolka
5b30f932c1
Fix for slight graphical glitches on loading avatars.
2014-03-13 14:09:12 -07:00
Andrzej Kapolka
b4cb1457a2
Do a simple frustum check for rendering the avatar or doing a full joint
...
update. Closes #2071 .
2014-03-13 13:29:18 -07:00
Andrzej Kapolka
43feef3ebd
Only update the full set of joints when we've received new data from the
...
mixer. Closes #2274 .
2014-03-13 12:03:02 -07:00
Geenz
4d5b4081e1
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 14:40:10 -04:00
Andrzej Kapolka
95f1351f8c
Merge pull request #2299 from ey6es/master
...
Fixes for Linux build: now that the resources are copied, use the resource directory next to the binary. Because the resource compiler puts a file into resources, don't delete the resources before copying.
2014-03-13 10:59:03 -07:00
Andrzej Kapolka
b2a29cb84f
Fixes for Linux build.
2014-03-13 10:56:19 -07:00
Atlante45
51585acd25
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 10:53:24 -07:00
Stephen Birarda
e8a6ab6831
Merge pull request #2297 from ddobrev/xmppchat
...
Hid the chat window rather than close it in order to preserve sent messages.
2014-03-13 09:40:23 -07:00
Geenz
f9be989a98
Merge branch 'master' of https://github.com/Geenz/hifi into 19514
2014-03-13 11:43:43 -04:00
Geenz
2e119fa0fe
Skip rendering when we're minimized.
2014-03-13 11:41:15 -04:00
Dimitar Dobrev
442ca145da
Hid the chat window rather than close it in order to preserve sent
...
messages.
2014-03-13 14:07:21 +02:00
Brad Hefta-Gaub
cbe9480171
Merge pull request #2293 from ddobrev/xmppchat
...
Changed the chat window to a popup with a custom closing button.
2014-03-12 20:15:29 -07:00
Dimitar Dobrev
727903b216
Changed the chat window to a popup with a custom closing button.
2014-03-13 04:07:33 +02:00
