Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 08:40:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
4874eda317 add mutex for _nodesRequestingJurisdictions to fix crash 2013-10-28 22:16:36 -07:00
Andrzej Kapolka
e106514af0 Merge pull request #1137 from ey6es/ick 
Fix for arm on old skeleton.
 2013-10-28 17:29:09 -07:00
Andrzej Kapolka
4e6edfc2db Fix for arm on old skeleton. 2013-10-28 17:28:10 -07:00
Andrzej Kapolka
5f5b65121a Merge pull request #1136 from ey6es/ick 
Fix for voxel attachments.
 2013-10-28 17:08:13 -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
ZappoMan
0840fc6544 Merge pull request #1135 from ey6es/ick 
Basic IK/pointing based on mouse cursor with new skeleton.
 2013-10-28 16:26:43 -07:00
Andrzej Kapolka
e7b05f40ef Remove unused variables. 2013-10-28 16:07:07 -07:00
Stephen Birarda
6367b5a1ea Merge pull request #1134 from ZappoMan/multiple_voxel_servers 
fix blinking
 2013-10-28 16:04:17 -07:00
ZappoMan
905fd48e84 fix blinking 2013-10-28 16:03:29 -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
ZappoMan
97070607ea added SIMPLE_EXTERNAL_CHILDREN mode, which saves on most of our child VoxelNode children storage without being too complicated 2013-10-28 14:43:27 -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
f12064c647 clean up voxel server stats page 2013-10-28 13:24:25 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
ZappoMan
87a44bafc9 added population data back for SIMPLE_CHILD_ARRAY implementation 2013-10-28 12:37:47 -07:00
Stephen Birarda
b792d01511 Merge pull request #1132 from ZappoMan/master 
Fix voxel server crashes
 2013-10-28 12:21:22 -07:00
ZappoMan
e3c64429b9 added SIMPLE_CHILD_ARRAY implementation to temporarily work around memory corruption 2013-10-28 12:10:30 -07:00
ZappoMan
ce524714d9 properly call resetVoxelPacket() when suppressing duplicate packets 2013-10-28 12:09:40 -07:00
ZappoMan
b10d111891 delete _lastVoxelPacket in ~VoxelNodeData() 2013-10-28 12:08:52 -07:00
ZappoMan
3ed61db873 add guard around nodeData on delete 2013-10-28 12:07:56 -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
ZappoMan
0095259adf Merge branch 'master' of https://github.com/worklist/hifi 2013-10-26 16:37:58 -07:00
stojce
f675b198cb RearView Tools 
- moved to separate class
- new icon/button for restore view
-
 2013-10-26 21:10:05 +02:00
ZappoMan
8cbf5a88e5 Merge pull request #1128 from birarda/master 
pay attention to jurisdictions, run the silent node removal thread in the agent
 2013-10-25 15:01:51 -07:00
Andrzej Kapolka
e5c7e69c9c Merge pull request #1130 from ey6es/master 
Temporary fix for Mavericks: ignore the per-vertex color on skinned meshes (they don't yet need them).
 2013-10-25 14:44:34 -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
5cc8cfb7e9 Merge branch 'master' of github.com:worklist/hifi 2013-10-25 14:25:00 -07:00
ZappoMan
130213bffc Merge pull request #1129 from ZappoMan/bugfixes 
added guard to protect against external child access
 2013-10-25 14:24:04 -07:00
ZappoMan
b8a87294e6 added guard to protect against external child access 2013-10-25 14:22:56 -07:00
Stephen Birarda
3305ae415e Merge branch 'master' of github.com:worklist/hifi 2013-10-25 14:10:40 -07:00
Stephen Birarda
0ba73154b9 Merge pull request #1127 from ZappoMan/bugfixes 
temporarily force external child storage
 2013-10-25 14:10:19 -07:00
Stephen Birarda
d97292a4f1 run the silent node removal thread in the agent 2013-10-25 14:07:50 -07:00
ZappoMan
dcccfb7ef0 temporarily force external child storage 2013-10-25 14:03:49 -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
Stephen Birarda
3df07d344f have assignment client pay attention to jurisdictions 2013-10-25 11:39:21 -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
Philip Rosedale
e2f9cf47ea Merge pull request #1124 from birarda/master 
avoid a divide by zero in PacketSender
 2013-10-25 11:21:22 -07:00
Philip Rosedale
018bf2b438 Merge pull request #1125 from ey6es/master 
Fix for eyes' rotating into sockets, fisheye distortion on inset mirror.
 2013-10-25 11:18:23 -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
Stephen Birarda
8aad3e146f avoid a divide by zero in PacketSender 2013-10-25 10:49:35 -07:00
ZappoMan
9a55702482 Merge pull request #1122 from birarda/master 
fixes for Assignment payload, checkInPacket
 2013-10-25 10:38:39 -07:00