Andrzej Kapolka
|
5f6f4b3d37
|
Fixes required since enabling Faceshift is now the default.
|
2014-03-13 16:45:27 -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 |
|
Andrzej Kapolka
|
007bfa8866
|
Tweak to Visage toggle.
|
2014-03-13 15:26:07 -07:00 |
|
Andrzej Kapolka
|
fc32d9581d
|
Visage toggle bits.
|
2014-03-13 15:17:16 -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 |
|
Andrzej Kapolka
|
b2a29cb84f
|
Fixes for Linux build.
|
2014-03-13 10:56:19 -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 |
|
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 |
|
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 |
|
Andrzej Kapolka
|
889c1358fc
|
Increase the distance at which avatars glow when moving.
|
2014-03-12 14:56:52 -07:00 |
|
Dimitar Dobrev
|
d67381d85e
|
Changed the font used in the chat to Helvetica, with Arial as a
fallback.
|
2014-03-12 23:45:10 +02:00 |
|
Atlante45
|
728a5f6251
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-12 14:09:27 -07:00 |
|
Atlante45
|
5941ad0dd1
|
Changed lockForWrite() to lockForRead()
|
2014-03-12 14:08:23 -07:00 |
|
Andrzej Kapolka
|
f85f49caa6
|
Might as well update this.
|
2014-03-12 14:03:22 -07:00 |
|
Andrzej Kapolka
|
43ad9b4048
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-12 13:54:45 -07:00 |
|
Andrzej Kapolka
|
800be7eef4
|
One more degree conversion.
|
2014-03-12 13:38:16 -07:00 |
|
Dimitar Dobrev
|
6caf6b2c31
|
Filtered received messages, accepting only group ones.
|
2014-03-12 22:36:50 +02:00 |
|
Andrzej Kapolka
|
f088912ecf
|
More GCC warning fixes.
|
2014-03-12 12:51:43 -07:00 |
|
Andrzej Kapolka
|
f1145272eb
|
Signed/unsigned fix.
|
2014-03-12 12:29:01 -07:00 |
|
Atlante45
|
a2acdc01ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Conflicts:
interface/interface_en.ts
|
2014-03-12 12:21:56 -07:00 |
|
Atlante45
|
9402a5852c
|
Fixed review comments
|
2014-03-12 12:20:43 -07:00 |
|
Andrzej Kapolka
|
e249b29b45
|
Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
|
2014-03-12 12:10:29 -07:00 |
|
Andrew Meadows
|
e68241d2a9
|
using glm::degrees() instead of DEGREES_PER_RADIAN
|
2014-03-12 12:08:27 -07:00 |
|
Andrew Meadows
|
c3e8d51694
|
orientation stored in dataserver is in degrees
|
2014-03-12 12:06:59 -07:00 |
|
AndrewMeadows
|
1f80a5a074
|
Merge pull request #2269 from ey6es/master
Fix for white flashes when loading avatars, performance improvements.
|
2014-03-12 11:43:13 -07:00 |
|
AndrewMeadows
|
0d38f1c320
|
Merge pull request #2260 from ey6es/metavoxels
Yet another metavoxel checkpoint: work on streaming spanners, LOD/subdivision bits, etc.
|
2014-03-12 11:34:59 -07:00 |
|
ZappoMan
|
4b60c549e7
|
add LOD to overlay display
|
2014-03-12 11:10:52 -07:00 |
|
Dimitar Dobrev
|
4c26f025ac
|
Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.
|
2014-03-12 20:04:22 +02:00 |
|
Atlante45
|
1c4051b288
|
Added importBoundaries
|
2014-03-12 10:35:22 -07:00 |
|
Atlante45
|
5ccba0b080
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-12 10:27:27 -07:00 |
|
Dimitar Dobrev
|
acb4047b54
|
Increased the right margin of sent messages for better visibility.
|
2014-03-12 17:33:25 +02:00 |
|
ZappoMan
|
86feabee99
|
add last scene packets, bytes and pps
|
2014-03-12 02:22:24 -07:00 |
|
ZappoMan
|
7ce741762e
|
Merge branch 'master' of https://github.com/worklist/hifi into server_scale_testing
|
2014-03-12 01:21:33 -07:00 |
|
ZappoMan
|
a95fd55172
|
suppress sending of extra queries when the client's view hasn't changed
|
2014-03-12 01:11:21 -07:00 |
|
ZappoMan
|
4d0b762de3
|
some hacking on full scene debuggin
|
2014-03-11 20:33:53 -07:00 |
|
Atlante45
|
72e1810df5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-11 18:15:58 -07:00 |
|
Andrzej Kapolka
|
6c4223bcdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 18:12:12 -07:00 |
|
Atlante45
|
6fcb802a94
|
Added preview deplacement + fixed locking issue
|
2014-03-11 18:01:38 -07:00 |
|
Andrzej Kapolka
|
c21e18c220
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-11 17:35:52 -07:00 |
|