ZappoMan
|
1c2e5eecd6
|
send VOXEL_QUERY to out of view voxel servers with PPS of 0
|
2013-10-28 12:07:02 -07:00 |
|
Andrzej Kapolka
|
3ebb4e3ba9
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-25 14:42:43 -07:00 |
|
Andrzej Kapolka
|
62b2388592
|
Temporary fix for Mavericks: the skin shader isn't getting the color, so just
use white. We're not using vertex colors on anything skinned yet, anyway.
|
2013-10-25 14:40:00 -07:00 |
|
Stephen Birarda
|
99ee614d04
|
Merge pull request #1126 from donpdonp/19444
19444 manage the window title, watch for username changes
|
2013-10-25 13:59:38 -07:00 |
|
Don Park
|
e44b0af9b6
|
make updateWindowTitle public, call it after Menu loads data into the Profile
|
2013-10-25 11:36:50 -07:00 |
|
Don Park
|
248f59325c
|
update the window title when the domain changes or the username changes
|
2013-10-25 11:05:50 -07:00 |
|
Andrzej Kapolka
|
b6f2498364
|
Pull the mirror camera back and narrow its field of view to reduce distortion.
Also, have it point at the avatar's eyes like the full screen mirror.
|
2013-10-25 11:04:34 -07:00 |
|
Andrzej Kapolka
|
09240dba27
|
Limit the eye rotation to 22.5 degrees.
|
2013-10-25 10:55:08 -07:00 |
|
Andrzej Kapolka
|
1e5ec3e84f
|
Fix for models exported from Blender: remove type prefix from IDs.
|
2013-10-25 10:18:40 -07:00 |
|
Don Park
|
dc420beaf2
|
updateWindowTitle()
|
2013-10-25 10:09:34 -07:00 |
|
Philip Rosedale
|
6957d990e2
|
Merge pull request #1120 from ZappoMan/rate_control
Only send PACKET_TYPE_VOXEL_QUERY messages to voxel servers that are in view.
|
2013-10-24 22:17:41 -07:00 |
|
ZappoMan
|
660edddf66
|
only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view
|
2013-10-24 18:38:33 -07:00 |
|
ZappoMan
|
37584244e6
|
only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view
|
2013-10-24 18:37:31 -07:00 |
|
Philip Rosedale
|
bf07ffd714
|
Merge pull request #1118 from ZappoMan/rate_control
add basic rate control, evenly divide packets per second between all connected voxel servers
|
2013-10-24 18:08:33 -07:00 |
|
ZappoMan
|
76fb3c18a2
|
add basic rate control, evenly divide packets per second between all connected voxel servers
|
2013-10-24 17:35:30 -07:00 |
|
Andrzej Kapolka
|
08db294a5b
|
Smooth gaze direction relative to window.
|
2013-10-24 17:23:21 -07:00 |
|
Andrzej Kapolka
|
4f3bacdd4c
|
Use calculated eye position here.
|
2013-10-24 16:16:45 -07:00 |
|
Andrzej Kapolka
|
5f696bd72e
|
Need to set lookat position to camera position before simulating in mirror
mode.
|
2013-10-24 16:06:44 -07:00 |
|
Andrzej Kapolka
|
8b6174f1fe
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-24 15:30:11 -07:00 |
|
Andrzej Kapolka
|
145e9337a2
|
Let's try actually using the average eye position as the camera location for
first person and mirror mode.
|
2013-10-24 15:20:46 -07:00 |
|
Philip Rosedale
|
f8369ea29a
|
Merge pull request #1113 from ZappoMan/rate_control
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
|
2013-10-24 14:48:16 -07:00 |
|
Andrzej Kapolka
|
6554868fd8
|
Merge branch 'master' of https://github.com/worklist/hifi into attach
|
2013-10-24 14:23:48 -07:00 |
|
Andrzej Kapolka
|
bae4a17605
|
Voxel attachments.
|
2013-10-24 13:59:04 -07:00 |
|
ZappoMan
|
015adeedcb
|
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
|
2013-10-24 13:22:31 -07:00 |
|
ZappoMan
|
8ac5f5070c
|
Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar
|
2013-10-23 17:59:00 -07:00 |
|
ZappoMan
|
b4c88a85f8
|
improvements to subtle moves for view frustum and voxel serving
|
2013-10-23 17:49:58 -07:00 |
|
Stephen Birarda
|
faa1c38820
|
update DS in data-server on profile change
|
2013-10-23 16:16:24 -07:00 |
|
Andrzej Kapolka
|
240f65b7c5
|
Scale fixes.
|
2013-10-23 16:15:03 -07:00 |
|
Andrzej Kapolka
|
a9df8a6b29
|
Partial fix for textures in exports from 3D Studio Max.
|
2013-10-23 15:56:09 -07:00 |
|
Andrzej Kapolka
|
41f73b5e9d
|
Support for attaching models to joints.
|
2013-10-23 15:16:29 -07:00 |
|
ZappoMan
|
3efc277aae
|
wrap more displaySide() items for not rendering when in mini rear view mode
|
2013-10-23 14:19:25 -07:00 |
|
ZappoMan
|
d31c3854ad
|
fix merge issue
|
2013-10-23 12:06:11 -07:00 |
|
ZappoMan
|
ea844634a6
|
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
|
2013-10-23 11:59:47 -07:00 |
|
ZappoMan
|
55294e1de7
|
Merge pull request #1103 from ey6es/master
As a temporary measure, restore the full screen mirror as a menu option.
|
2013-10-23 11:59:39 -07:00 |
|
ZappoMan
|
46eadb5fb7
|
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
|
2013-10-23 11:58:47 -07:00 |
|
ZappoMan
|
161367c899
|
fix rear view mirror mode to only render self
|
2013-10-23 11:58:01 -07:00 |
|
Andrzej Kapolka
|
183a866e9e
|
Remove code that will be added back in fullscreen mirror request.
|
2013-10-23 11:44:28 -07:00 |
|
Andrzej Kapolka
|
e8885332f2
|
Code review fixes.
|
2013-10-23 11:39:30 -07:00 |
|
Andrzej Kapolka
|
665551d690
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 11:26:23 -07:00 |
|
Andrzej Kapolka
|
5334d9021e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-23 11:22:04 -07:00 |
|
Andrzej Kapolka
|
71b4b8fe46
|
Use lowercase h to toggle full screen mirror, capital H for inset.
|
2013-10-23 10:54:39 -07:00 |
|
Philip Rosedale
|
b1364f589a
|
Merge pull request #1102 from ZappoMan/keep_local_voxels
added support for forceFullFrustum in hideOutOfView() this fixes inconci...
|
2013-10-23 10:33:54 -07:00 |
|
Andrzej Kapolka
|
adc79be81c
|
Add back the full screen mode as a menu option, temporarily.
|
2013-10-23 10:30:42 -07:00 |
|
ZappoMan
|
b05d6e25e3
|
remove two debug outs
|
2013-10-23 10:23:07 -07:00 |
|
ZappoMan
|
5d18b68a2e
|
added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing
|
2013-10-23 10:14:41 -07:00 |
|
Andrzej Kapolka
|
cf78e21ea4
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
Conflicts:
interface/src/Application.cpp
|
2013-10-23 10:06:56 -07:00 |
|
Andrzej Kapolka
|
a568e71e37
|
Merge pull request #1099 from stojce/19433
Code Review for Job #19433
|
2013-10-23 10:03:36 -07:00 |
|
Andrzej Kapolka
|
251b80b514
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 10:03:22 -07:00 |
|
ZappoMan
|
6e31f74236
|
tweak to menu text order
|
2013-10-23 06:00:26 -07:00 |
|
ZappoMan
|
306b23d489
|
make Fast Voxel Pipeline the default behavior
|
2013-10-23 05:58:47 -07:00 |
|