Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 00:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7665 commits 71 branches 59 tags 1.2 GiB
Commit graph

4109 commits

Author SHA1 Message Date
Andrzej Kapolka
76d8bd0a9c Finger IK, take two. 2013-11-13 13:53:41 -08:00
Andrzej Kapolka
3e4c5f84ed Only rotate if we have at least three active fingers. 2013-11-13 13:26:36 -08:00
Andrzej Kapolka
52a3071cb3 Order of update fix. 2013-11-13 12:29:43 -08:00
Andrzej Kapolka
332de0646d Orient the Leap hands relative to the body, not the head. 2013-11-13 12:22:54 -08:00
Andrzej Kapolka
d87dccd614 Alignment to pull elbows towards ground. 2013-11-13 12:06:08 -08:00
Andrzej Kapolka
c2e4a70685 Back to the cyclic coordinate descent algorithm (easier to apply joint 
constraints); Leap hands relative to eyes.
 2013-11-13 10:35:20 -08:00
Andrzej Kapolka
a36f9d52af Constraint fix, apply constraints to wrists. 2013-11-12 15:43:11 -08:00
Andrzej Kapolka
df30e3c851 As a hack, when we have an FBX face/body, position the camera to point at the 
origin and reposition the models based on the relative eye positions.  Fixes
the jitteriness in rear mirror mode.
 2013-11-12 12:28:07 -08:00
Andrzej Kapolka
feb2a150b7 Don't decay head roll/pitch when moving if Faceshift is active. 2013-11-08 18:05:24 -08:00
Andrzej Kapolka
dff2266aee Merge branch 'master' of https://github.com/worklist/hifi 2013-11-08 15:38:52 -08:00
Andrzej Kapolka
0eaaa89c9a Read the palm direction from the FST, use that to determine Leap rotations. 2013-11-08 15:38:20 -08:00
Andrzej Kapolka
3446337cc5 Trying incremental rotations for Leap palms. 2013-11-08 15:11:56 -08:00
Andrzej Kapolka
49c9d41dd5 Read and enforce angle constraints (untested). 2013-11-08 14:49:38 -08:00
philiprosedale
facf7094f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-08 14:34:52 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Philip Rosedale
f3b6e21a6d Voxel click to fly is now an option in the Tools Menu 2013-11-08 14:34:15 -08:00
Andrzej Kapolka
db9fa63112 Partial orchidectomy: removed (some of) Jeffrey's balls. 2013-11-08 11:19:35 -08:00
Philip Rosedale
d4fc85b197 Merge pull request #1226 from ey6es/master 
New IK method with "gravity" for more relaxed positions, Leap integration with new skeleton.
 2013-11-07 18:11:20 -08:00
Andrzej Kapolka
62134ebc4c Sign fix. 2013-11-07 18:00:21 -08:00
Andrzej Kapolka
11fedb23cd Try finding the fingers using the rotation about the palm. 2013-11-07 17:51:54 -08:00
Andrzej Kapolka
ebe3ef4b22 Toggle for the leap hands. 2013-11-07 17:20:52 -08:00
ZappoMan
1587cf0bbe some comment cleanup 2013-11-07 17:17:34 -08:00
ZappoMan
2c4ab63d2b tweaks to placement and wording of voxel stats 2013-11-07 17:11:35 -08:00
Andrzej Kapolka
f5889934a2 Derp, have to set the rotation after adjusting it. 2013-11-07 17:01:29 -08:00
Andrzej Kapolka
4bf4accba7 Rotate the palm according to the average finger direction. 2013-11-07 16:57:07 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
Andrzej Kapolka
55d31ee7f3 Render the body in first-person mode so that we can see our hands. 2013-11-07 16:37:51 -08:00
Andrzej Kapolka
d35356348b Demagicked a couple of numbers. 2013-11-07 16:24:46 -08:00
Andrzej Kapolka
dabb670f1a Merge branch 'master' of https://github.com/worklist/hifi 2013-11-07 16:21:06 -08:00
Andrzej Kapolka
a29dfe9c63 Yet another finger attempt. 2013-11-07 16:14:23 -08:00
Andrzej Kapolka
6ac3fe4c9c Merge pull request #1224 from birarda/master 
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
 2013-11-07 15:44:41 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
Andrzej Kapolka
c3049d4378 Another shot at the fingers. Not attempting IK on the anymore. 2013-11-07 14:25:01 -08:00
ZappoMan
64d5ccf91e add menu option for voxel server fade in/out and dont remove local voxels when server shuts down 2013-11-07 14:10:09 -08:00
Andrzej Kapolka
aec7dbca08 Attempting the fingers again. 2013-11-07 13:57:54 -08:00
Andrzej Kapolka
797645a209 More palm fixes. 2013-11-07 13:29:17 -08:00
Andrzej Kapolka
4360621daf Adjustments to wrist rotations. 2013-11-07 13:17:08 -08:00
Andrzej Kapolka
f0e72d8d0c Removed unused variable, debugging code. 2013-11-07 12:16:17 -08:00
Andrzej Kapolka
e6cd9a7368 Working on wiring up the fingers. 2013-11-07 12:12:48 -08:00
Andrzej Kapolka
be09d319b7 Gravity adjustments. 2013-11-06 17:58:05 -08:00
Andrzej Kapolka
1ae8a211bb Swap the palms if they're in the wrong order. 2013-11-06 17:34:40 -08:00
Andrzej Kapolka
afd3f6937c Derp; I don't want the length of the scale, I want the average of the 
components.
 2013-11-06 17:05:10 -08:00
Andrzej Kapolka
2e9625ebd5 Check palms' active state, apply rotations. 2013-11-06 16:57:30 -08:00
Andrzej Kapolka
2b4db0ea0e Apply Leap data directly to skeleton. 2013-11-06 16:47:03 -08:00
Andrzej Kapolka
d0cd9e9790 Active the hand when we have leap hand data. 2013-11-06 16:24:25 -08:00
Andrzej Kapolka
97cf9f2285 Cleanup on aisle 3. 2013-11-06 15:58:35 -08:00
Andrzej Kapolka
1706c7c97a New IK method: will be easier to add constraints, adds "gravity" influence to 
sap potential energy.
 2013-11-06 15:51:26 -08:00
Stephen Birarda
a4fcff6b19 only send fake event to the OGLWidget 2013-11-06 12:36:52 -08:00
Stephen Birarda
503de083f8 an actual patch for two finger mouselook fail after dialog 2013-11-06 12:27:45 -08:00
Andrzej Kapolka
c55f8c5900 Forgot to return a value. 2013-11-05 16:14:21 -08:00
Andrzej Kapolka
ae4db63368 Remove growing head behavior. 2013-11-05 16:11:12 -08:00
Andrzej Kapolka
9460fb87c2 Return arm to neutral position when mouse pointer is invisible. 2013-11-05 16:06:11 -08:00
Andrzej Kapolka
add8ccc877 Lower the deflection amount. 2013-11-05 14:31:41 -08:00
Andrzej Kapolka
092f1fa4c8 Shorten the long term average. 2013-11-05 14:10:53 -08:00
Andrzej Kapolka
6633b6a633 For now, don't perform avatar collisions unless we have a skeleton model. 2013-11-05 13:56:14 -08:00
Andrzej Kapolka
359083ee9d Sneak in a toggle for chat circling. 2013-11-05 12:30:38 -08:00
Andrzej Kapolka
afc5e0795c Merge branch 'master' of https://github.com/worklist/hifi 2013-11-05 12:13:40 -08:00
Andrzej Kapolka
0c8799bb3d Tweaks to voxel editing: edit from farther away, expand cubes to make sure 
they show up over voxels, initialize voxel scale with moused-over scale.
 2013-11-05 12:12:54 -08:00
Stephen Birarda
60e7c54303 fix some checks for empty inputs 2013-11-05 11:26:53 -08:00
Stephen Birarda
145efbda2d some dialog touchups and visual changes 2013-11-05 11:21:32 -08:00
ZappoMan
843e9da873 merge conflict fix 2013-11-05 10:47:05 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
Andrzej Kapolka
b2ed29dbff Work around precision issues with multiplying matrices with high translation 
magnitudes (by using relative translation).
 2013-11-04 16:49:12 -08:00
Andrzej Kapolka
361f1f6adf Don't override the lookat positions we receive for others. 2013-11-04 14:07:05 -08:00
Andrzej Kapolka
490194c747 Rescale eye positions to compensate for growing heads. 2013-11-04 13:53:39 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
Andrzej Kapolka
acaac714e6 More smoothing. 2013-11-04 11:20:56 -08:00
Andrzej Kapolka
ce1ebf8d11 The Faceshift eye rotations are indeed relative to the head. 2013-11-04 10:57:29 -08:00
Andrzej Kapolka
65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact 
Conflicts:
	interface/src/Application.cpp
 2013-11-04 10:40:02 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
ZappoMan
c4a2b3c49b fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
stojce
3ac149b7a2 Fix for Qt 5.2 beta 2013-11-03 14:59:15 +01:00
Andrzej Kapolka
def3707041 I don't think Faceshift's gaze data is actually head-relative. 2013-11-01 18:28:35 -07:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Andrzej Kapolka
e4bf5358eb Attempt to use Faceshift eye data to deflect the default eye behavior. 2013-11-01 17:58:41 -07:00
Philip Rosedale
79fb92f195 Merge pull request #1170 from ZappoMan/point_shader 
first cut a variable point size point rendering
 2013-11-01 17:02:28 -07:00
ZappoMan
508b8f4678 change in comment to kick off build 2013-11-01 16:29:49 -07:00
ZappoMan
b103f9dacf clean up 2013-11-01 15:32:17 -07:00
ZappoMan
e62322b805 clean up comment 2013-11-01 15:28:54 -07:00
ZappoMan
61b6d6a4a4 added comment about fixing point selection 2013-11-01 15:27:57 -07:00
ZappoMan
cab87c3a97 added comment about fixing point selection 2013-11-01 15:27:25 -07:00
Andrzej Kapolka
966f75db9b Sanity check to prevent crash in Model::simulate. 2013-11-01 14:47:25 -07:00
ZappoMan
13b558c033 removed dead code 2013-11-01 14:40:58 -07:00
ZappoMan
56aafabacd fixed up comments and style guide items 2013-11-01 14:39:55 -07:00
ZappoMan
6fd3c9714f fixed header file merge conflict 2013-11-01 14:37:46 -07:00
ZappoMan
f5d09c0218 fix comments and style 2013-11-01 14:36:20 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
d04b36bf48 Fix for GuyFinal rotation. 2013-11-01 14:25:26 -07:00
Andrzej Kapolka
62381e19b5 Only use hacky model translation with the old skeleton. 2013-11-01 13:33:50 -07:00
Andrzej Kapolka
c3e0f8bc1f Bump up the maximum eye angle slightly. 2013-11-01 10:48:09 -07:00
Andrzej Kapolka
4a011e0624 Pull out the weight access. 2013-10-31 17:10:35 -07:00
Andrzej Kapolka
12374c2cc4 Allow more clusters per mesh. 2013-10-31 17:01:00 -07:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
Andrzej Kapolka
1809c525f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:39:39 -07:00
Stephen Birarda
ddcaa513a1 fix broken build from merge in Skeleton 2013-10-31 15:38:00 -07:00
Andrzej Kapolka
b3b4c6e397 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:20:05 -07:00
Ryan
4db3d9606f Merge remote-tracking branch 'origin/master' 2013-10-31 14:55:00 -07:00
Andrzej Kapolka
70485a0ba9 Fix for meshes with no texture coordinates. 2013-10-31 14:52:36 -07:00
Andrzej Kapolka
55de8ceb85 Use blue default texture when we fail to load a normal map. 2013-10-31 14:46:51 -07:00
Andrzej Kapolka
070e755368 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 14:26:38 -07:00
Andrzej Kapolka
1a532be845 Smooth the normals. 2013-10-31 14:26:06 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
Andrzej Kapolka
a15bff3857 Closer to mesh fix. 2013-10-31 13:49:06 -07:00
Andrzej Kapolka
09babeca5d Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:44:07 -07:00
Andrzej Kapolka
06713a44bf Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:42:05 -07:00
Andrzej Kapolka
bc796c63e3 Working on mesh fix. 2013-10-31 12:41:40 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
724ac4888f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-10-31 12:13:04 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
Stephen Birarda
7b9eb55bda fix the dialog mouselook bug 2013-10-31 11:32:19 -07:00
Ryan
8b781bf9cd Merge remote-tracking branch 'origin/master' 2013-10-31 08:59:09 -07:00
Ryan
1279f3c3bb Made the stick and ball radius much smaller so they don’t break through the new meshes. 2013-10-31 08:55:37 -07:00
Philip Rosedale
edf36f2a9e Merge pull request #1142 from lordwaym/starfield-fix 
Starfield fix and Milky Way
 2013-10-30 21:58:03 -07:00
Philip Rosedale
e47f433444 Merge pull request #1150 from ZappoMan/bugfixes 
Several Bug Fixes and Improvements
 2013-10-30 17:02:54 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
Andrzej Kapolka
4ef3500096 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-30 16:45:09 -07:00
Andrzej Kapolka
9c5ebfcf77 If the skeleton has meshes, don't render the balls and sticks. 2013-10-30 16:44:40 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
14ddb89341 improve behavior of too more than _maxVoxels 2013-10-30 14:28:32 -07:00
ZappoMan
3f9631dd53 fix voxels as points menu to work correctly on startup 2013-10-30 14:14:34 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00
ZappoMan
98f09d7061 removed dead code 2013-10-30 12:21:05 -07:00
ZappoMan
e8f5c86c73 fix one call to calculateShouldRender() 2013-10-30 12:19:47 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
Andrzej Kapolka
a7ade142fd Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-30 11:57:31 -07:00
Andrzej Kapolka
156b3dd2e6 Sign change. Forgot we flip the texture coordinates. 2013-10-30 11:55:22 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
ZappoMan
75721eb7ba first cut at user adjustable LOD 2013-10-29 16:17:11 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
ZappoMan
0253914b9b Merge pull request #1143 from birarda/assignment 
add node kill debugging, remove ground plane
 2013-10-29 15:40:39 -07:00
Lord Waymaster
2f3ba6bc13 Starfield fix and Milky Way 
Fixed bug where more stars were generated at the poles.

Added 'Milky Way' band in sky, customisable with MILKY_WAY_WIDTH,
MILKY_WAY_INCLINATION and MILKY_WAY_RATIO consts in Generator.cpp.
 2013-10-29 15:22:41 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
stojce
a14242632a Rear view zoom level 
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
 2013-10-29 20:51:14 +01:00
ZappoMan
3329d690ac flip mirror tools 2013-10-29 10:53:33 -07:00
Andrzej Kapolka
4e6edfc2db Fix for arm on old skeleton. 2013-10-28 17:28:10 -07:00
Andrzej Kapolka
003917423e Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 17:04:53 -07:00
Andrzej Kapolka
4771982c30 Merge pull request #1131 from stojce/19443 
Code Review for Job #19443
 2013-10-28 17:04:36 -07:00
Andrzej Kapolka
e45446a0ee Oops; I broke the voxel attachments. 2013-10-28 16:36:31 -07:00
Andrzej Kapolka
e7b05f40ef Remove unused variables. 2013-10-28 16:07:07 -07:00
Andrzej Kapolka
6d8f8dc8ed Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 15:59:42 -07:00
Andrzej Kapolka
6e76179ca3 Place hand based on mouse position, but make sure we don't point above the 
shoulders.
 2013-10-28 15:59:04 -07:00
Andrzej Kapolka
4f34d89c4a Added left hand/hand rotation setters in preparation for Leap integration. 2013-10-28 14:38:09 -07:00
Andrzej Kapolka
b56d47929b Extremely basic IK based on implementation of the cyclic coordinate descent 
algorithm.  Actually seems to work pretty well.
 2013-10-28 13:38:22 -07:00
ZappoMan
1c2e5eecd6 send VOXEL_QUERY to out of view voxel servers with PPS of 0 2013-10-28 12:07:02 -07:00
stojce
4fe9964e5a reset view 
- reset icon
- resetView signal
 2013-10-28 18:19:31 +01:00
stojce
b09e657ecc click mirror behaviour 
- shrink function - restore mirror window view and set forward
fullscreen view
 2013-10-27 09:57:00 +01:00
stojce
f675b198cb RearView Tools 
- moved to separate class
- new icon/button for restore view
-
 2013-10-26 21:10:05 +02: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