Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 22:02:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10841 commits 26 branches 28 tags 1.2 GiB
Commit graph

5861 commits

Author SHA1 Message Date
Andrzej Kapolka
d80f110961 Prevent audio average from becoming less than zero (thus causing sqrt to 
return nan, thus making our fake blendshape coefficient nan, thus making the
jaw disappear).  Closes #2334.
 2014-03-18 09:12:23 -07:00
AndrewMeadows
da58a2f4cd Merge pull request #2324 from ZappoMan/warningsfixes 
Warning Fixes for Windows and Unix
 2014-03-17 10:13:56 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
777e306d09 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 22:36:53 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Brad Hefta-Gaub
2567e296e1 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 21:31:16 -07:00
Brad Hefta-Gaub
4a6cc99be6 slightly different approach to windows warning fix 2014-03-15 21:30:45 -07:00
stojce
19e60a1fc0 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
ZappoMan
0200ac9da8 more unix warnings fixes 2014-03-14 22:43:31 -07:00
Brad Hefta-Gaub
2766860b52 fix some windows warnings in fsbinarystream.cpp 2014-03-14 18:11:22 -07:00
Philip Rosedale
2b7cc43172 Merge pull request #2323 from ZappoMan/throttlerenderingtweaks 
make throttle rendering not adjust LOD
 2014-03-14 17:50:52 -07:00
Brad Hefta-Gaub
c958ae8cfb fix LocalVoxelsOverlay types to match 2014-03-14 17:47:19 -07:00
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
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
stojce
576b8acef3 CR fixes 2014-03-14 20:09:03 +01: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
stojce
4b182bb3e2 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-14 18:22:03 +01:00
stojce
72a92a16e6 Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	interface/interface_en.ts
 2014-03-14 01:52:53 +01: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