Philip Rosedale
3e1bf7fbb8
Add variable name for throttled frame rate, change to multiple of 60FPS
2014-03-14 17:09:09 -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
Andrew Meadows
d4c7e25f8e
Merge branch upstream/master into "hands" project
2014-03-14 14:28:50 -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
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
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
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
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
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
Brad Hefta-Gaub
79b1465cb0
Merge pull request #2275 from Atlante45/editVoxels
...
Edit voxels
2014-03-12 18:52:55 -07:00
Geenz
d580f177a3
Refactor if..else into a switch.
...
Also support the hidden and suspended states.
2014-03-12 21:17:54 -04:00
Geenz
292f37154b
Use the applicationStateChanged signal.
2014-03-12 21:08:55 -04:00
Geenz
e27af75ad2
Use QApplication::applicationState to detect if we're in the background.
...
May want to expand upon this at some point; if we’re hidden we most
definitely *do not* want to render anything
2014-03-12 20:49:58 -04:00
Geenz
9c61f12926
Support for an idle render time step.
...
The basics of this is, if the application has changed its active state
then we only call paintGL every N milliseconds. Currently the default
time step is 100 milliseconds.
2014-03-12 19:10:26 -04:00
Dimitar Dobrev
6d4d61c38a
Removed the double border between the sent messages and the entry.
2014-03-13 01:06:11 +02:00
Atlante45
424afaa36b
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
...
Conflicts:
interface/interface_en.ts
2014-03-12 15:59:17 -07:00
Andrzej Kapolka
9ad2ea9059
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-12 15:30:39 -07:00
AndrewMeadows
bed8617846
Merge pull request #2277 from ZappoMan/server_scale_testing
...
Voxel/Particle Server Scaling Work
2014-03-12 15:24:29 -07:00
Andrzej Kapolka
ffe3717573
Enable back face culling on the opaque parts of avatars.
2014-03-12 15:10:33 -07:00
Andrzej Kapolka
bab74e9cd4
Push the distance back even more.
2014-03-12 15:01:09 -07:00
