Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 14:13:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7057 commits 71 branches 56 tags 1.2 GiB
Commit graph

7057 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
Stephen Birarda
0ea60c1b0b Merge pull request #1146 from ZappoMan/stephens_requests 
added --getOctalCode to voxel edit so you can easily make jurisdictions from arbitrary voxels
 2013-10-29 16:57:52 -07:00
ZappoMan
c123e045ad added --getOctalCode to voxel edit 2013-10-29 16:42:41 -07:00
ZappoMan
32b1fb2e23 Merge pull request #1145 from birarda/assignment 
fix silent node removal thread join bug
 2013-10-29 16:35:41 -07:00
Stephen Birarda
03b23b504f reference global with colon 2013-10-29 16:05:23 -07:00
Stephen Birarda
66b27fa607 have silent node removal flag reset on join 2013-10-29 15:59:09 -07:00
Stephen Birarda
5f7a83e30c Merge pull request #1144 from ZappoMan/stephens_requests 
made sending environments off by default
 2013-10-29 15:47:21 -07:00
ZappoMan
3b04eabe8a made sending environments off by default 2013-10-29 15:46:23 -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
Stephen Birarda
6e9ee93ed6 add debug for sleep amount to AvatarMixer 2013-10-29 15:28:10 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
Stephen Birarda
08a368a9fd add debug to catch AvatarMixer ghosting 2013-10-29 15:21:55 -07:00
Stephen Birarda
94728d0afb fix packetData memory leak in AvatarMixer 2013-10-29 15:12:23 -07:00
stojce
7765569469 Merge branch 'master' of https://github.com/worklist/hifi into 19447 
Conflicts:
	interface/src/ui/RearMirrorTools.cpp
 2013-10-29 21:21:28 +01: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
RyanDowne
e55eb547fe Merge pull request #1140 from ZappoMan/bugfixes 
flip mirror tools
 2013-10-29 11:00:58 -07:00
ZappoMan
3329d690ac flip mirror tools 2013-10-29 10:53:33 -07:00
Philip Rosedale
2931e2e41a Merge pull request #1138 from ZappoMan/bugfixes 
add mutex for _nodesRequestingJurisdictions to fix crash
 2013-10-29 09:49:15 -07:00
Philip Rosedale
6b3a1de22b Merge pull request #1139 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-29 09:48:53 -07:00
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