Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7305 commits 71 branches 56 tags 1.2 GiB
Commit graph

7305 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
521e51dcd9 Merge pull request #1231 from ZappoMan/bugfixes 
Add sequence and sent time to voxel edit packets to debug edit failing
 2013-11-08 12:31:23 -08:00
ZappoMan
2e8cb63abb add more voxel edit transit time debugging 2013-11-08 10:47:47 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
Stephen Birarda
e4669d7c13 Merge pull request #1228 from ZappoMan/bugfixes 
Bug fixes to make JS/Agent and Voxel Editing work better
 2013-11-08 07:28:16 -08:00
ZappoMan
b0a4ffb11c fix comments line breaks 2013-11-08 02:27:34 -08:00
ZappoMan
3da6062639 fix comment 2013-11-08 02:26:23 -08:00
ZappoMan
a708486834 fix comment 2013-11-08 02:25:51 -08:00
ZappoMan
20c66386f8 fix comment 2013-11-08 02:24:46 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
f1704e9d79 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 18:53:06 -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
Philip Rosedale
5c219697bc Merge pull request #1227 from ZappoMan/new_voxel_scene_stats 
New voxel scene stats
 2013-11-07 18:06:57 -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
ZappoMan
cad51885e8 removed some hackery 2013-11-07 17:21:45 -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
ZappoMan
afaa448f92 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 15:52:29 -08:00
ZappoMan
fffbdb1db0 reverted code 2013-11-07 15:52:19 -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
Philip Rosedale
5118de6fd6 Merge pull request #1216 from ZappoMan/vs_shutdown_behavior 
add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
 2013-11-07 15:27:16 -08:00
ZappoMan
385865c6c1 remove comment 2013-11-07 15:25:21 -08:00
ZappoMan
ce41477f46 fix VS crash on domain server restart 2013-11-07 15:23:23 -08:00
ZappoMan
c87446c90f Merge pull request #1222 from birarda/master 
actually create the QCoreApplication instance
 2013-11-07 15:06:53 -08:00
Stephen Birarda
ce52395a08 actually create the QCoreApplication instance 2013-11-07 15:06:11 -08:00
Philip Rosedale
40dec7c05f Merge pull request #1217 from birarda/master 
fix for AC lack of QCoreApplication
 2013-11-07 14:35:11 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -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
05d647557b Merge pull request #1213 from birarda/master 
temp remove audio from agent, mutate GOL placeholder
 2013-11-07 14:12:38 -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
Philip Rosedale
22e041f64e Merge pull request #1215 from ZappoMan/bugfixes 
fix thread contention issues and VS crash on domain server shutdown and restart
 2013-11-07 13:30:15 -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
ZappoMan
77ba88e56d removed dead comment 2013-11-07 13:06:57 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
ZappoMan
77343695a1 Merge pull request #1214 from birarda/assignment 
fix for deleteLater on Node linkedData
 2013-11-07 12:55:10 -08:00
Stephen Birarda
72b2309dc0 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-11-07 12:43:58 -08:00
Stephen Birarda
24c88512e2 only attempt to deleteLater on linkedData if it exists 2013-11-07 12:41:29 -08:00
Stephen Birarda
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00