Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 09:57:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13819 commits 76 branches 59 tags 1.2 GiB
Commit graph

13819 commits

This branch
This branch
All branches
Author SHA1 Message Date
wangyix
124bd88b01 added tests for MovingPercentile 2014-06-04 17:23:44 -07:00
matsukaze
197b678bfc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-04 19:43:53 -04:00
Philip Rosedale
864db25f4f remove unused variables causing warning 2014-06-04 15:43:33 -07:00
ZappoMan
b74676de0d add more tests for decode 2014-06-04 15:33:22 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
Philip Rosedale
8bce7127aa support for both hands, but no script for now in the left one 2014-06-04 15:19:49 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
Philip Rosedale
e8fa75b4f3 Added squeezeHands.js 2014-06-04 15:17:17 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
wangyix
5251057ed6 MovingPercentile moved else to same line as } 2014-06-04 15:13:16 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
wangyix
0da6374e19 MovingPercentile .size() consistency 2014-06-04 14:31:58 -07:00
Andrew Meadows
7807388b08 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-06-04 14:28:23 -07:00
wangyix
e2d3fcc518 changed MovingPercentile to use QList 2014-06-04 14:24:23 -07:00
Andrew Meadows
e1cb88471f add a comment 2014-06-04 14:19:45 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
Atlante45
79092e3e81 editModels now has 2 modes 2014-06-04 14:18:28 -07:00
Andrew Meadows
f19b562e88 add JointState::setRotation(rotModelFrame) 2014-06-04 14:17:39 -07:00
Andrew Meadows
212ac13802 setRotation -> setJointRotationFromBindFrame 2014-06-04 14:10:28 -07:00
Andrew Meadows
323fa70cf3 remove last of "InModelFrame" qualifiers 2014-06-04 14:03:29 -07:00
Andrew Meadows
ccfd620c84 setJointPositionInModelFrame -> setJointPosition 2014-06-04 13:56:37 -07:00
Atlante45
15863198d1 change editModels icon 2014-06-04 13:52:31 -07:00
Andrew Meadows
3af4b1b333 getJointPositionInModelFrame -> getJointPosition 2014-06-04 13:51:43 -07:00
Andrew Meadows
971268d4f2 setRotationInModelFrame -> setRotation 2014-06-04 13:46:08 -07:00
Andrew Meadows
b3cabb8156 applyRotationDeltaInModelFrame -> applyRotationDelta 2014-06-04 13:43:15 -07:00
Andrew Meadows
d8f5e10947 getPositionInModelFrame -> getPosition 2014-06-04 13:36:54 -07:00
Andrew Meadows
4a3fbfcdee getRotationInModelFrame -> getRotation 2014-06-04 13:34:58 -07:00
Andrew Meadows
4ae58153e0 computeTransformInModelFrame -> computeTransform 2014-06-04 13:31:31 -07:00
Andrew Meadows
d32e14ca04 renames of JointState data members 2014-06-04 13:27:28 -07:00
Philip Rosedale
84dadd1210 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-04 12:42:37 -07:00
Andrzej Kapolka
a4aa5eb4e8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-04 12:42:06 -07:00
Philip Rosedale
c950a264b0 Merge pull request #2980 from ey6es/master 
Allow floating point start/end frames and negative play speeds.
 2014-06-04 12:03:48 -07:00
Andrew Meadows
b1b7f6bdc4 remove last world-frame transfoms from JointState 2014-06-04 12:03:01 -07:00
Andrzej Kapolka
05a97950cb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-04 12:01:48 -07:00
Andrew Meadows
d46a90d763 remove JointState::_combinedRotation 
instead use JointState::_rotationInModelFrame
 2014-06-04 11:56:20 -07:00
wangyix
ebfc405d9d more cleanup 3 2014-06-04 11:55:20 -07:00
Andrew Meadows
19f0f453a5 remove JointState::setRotation() 
instead use JointState::setRotationInModelFrame()
 2014-06-04 11:52:07 -07:00
Andrzej Kapolka
f6395435cf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-04 11:51:11 -07:00
Andrzej Kapolka
f5c892580e Merge pull request #2979 from AndrewMeadows/bug-fix 
fix for partial hand restore after hydra goes inactive
 2014-06-04 11:51:04 -07:00
Andrzej Kapolka
74afcf5626 Allow floating point start/end frames and negative play speeds. 2014-06-04 11:47:53 -07:00
ZappoMan
2b85145325 added test suite for PropertyFlags, latest work on PropertyFlags 2014-06-04 11:41:09 -07:00
Atlante45
9ea53f8070 some testing with editModels 2014-06-04 11:38:46 -07:00
Andrew Meadows
5d8e3d447a remove JointState::getRota/PositionInWorldFrame() 
instead: use getRotat/PositionInModelFrame() and do math
 2014-06-04 11:36:00 -07:00
wangyix
480efcbe76 more cleanup again 2014-06-04 11:31:44 -07:00
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
Andrew Meadows
729c01ddbf remove more getHybridTransform() calls 2014-06-04 11:25:38 -07:00
wangyix
b452d08495 cleaned up debug statements 
also reorganized MovingPercentile a little bit
 2014-06-04 11:20:29 -07:00
wangyix
6f45939113 re-enabled piggy-backing in OctreeSendThread 2014-06-04 11:02:31 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00