Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:12:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13695 commits 75 branches 59 tags 1.2 GiB
Commit graph

13695 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Meadows
14e782e439 remove some JointState::getHybridTransform() calls 2014-06-04 10:42:04 -07:00
Andrew Meadows
d3f51fe38e FinalOrientation -> FinalOrientationInWorldFrame 2014-06-04 10:41:17 -07:00
ZappoMan
b48c70a7f7 first cut at PropertyFlags template class 2014-06-04 10:23:50 -07:00
ZappoMan
8d4a8f7e67 first cut at partial model elements 2014-06-04 10:22:49 -07:00
ZappoMan
23ef5b5404 added some comments 2014-06-04 10:22:19 -07:00
Andrew Meadows
aea517af46 fix for partial hand restore after hydra inactive 2014-06-04 10:19:27 -07:00
Philip Rosedale
e48cfb84c1 Merge pull request #2978 from Barnold1953/OculusOverlay 
Fixed bug that disabled cursor for windows
 2014-06-04 08:40:11 -07:00
barnold1953
edf5d5bda1 Fixed bug that disabled cursor for windows 2014-06-04 08:38:01 -07:00
Andrzej Kapolka
1f2a75fc45 More enum streaming bits. 2014-06-03 18:27:56 -07:00
Andrzej Kapolka
56f12075df Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-03 17:17:23 -07:00
Andrzej Kapolka
90e2145fc4 Working on enum streaming. 2014-06-03 17:17:02 -07:00
Philip Rosedale
c97f0da109 Merge remote-tracking branch 'upstream/master' 2014-06-03 17:08:40 -07:00
Philip Rosedale
038b0de46e starting fist squeezing 2014-06-03 17:08:24 -07:00
Philip Rosedale
f7cd4d78ad Fix crazylegs.js to newer joint names 2014-06-03 17:02:52 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
wangyix
c851edd0ef added MovingMedian class, but not using it 
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
 2014-06-03 16:18:40 -07:00
Andrzej Kapolka
6faa7f8f77 Merge pull request #2977 from Barnold1953/OculusOverlay 
Stopped Oculus Overlay Glow
 2014-06-03 16:13:35 -07:00
barnold1953
9373fff05d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-03 16:04:18 -07:00
barnold1953
d4fd1e9515 Stopped Oculus UI from glowing. 2014-06-03 16:01:47 -07:00
Andrew Meadows
a1afcfd42c remove JointState::applyRotationDelta() 
(use JointState::applyRotationDeltaInModelFrame()) instead)
 2014-06-03 15:57:16 -07:00
Andrzej Kapolka
948415d4b4 Merge pull request #2974 from Barnold1953/OculusOverlay 
Curved Oculus Overlay
 2014-06-03 15:44:12 -07:00
Andrew Meadows
7f46e9d514 remove JointState::getJointRotation() 
(use getRotationModelFrame() instead)
 2014-06-03 15:42:38 -07:00
barnold1953
036bdf5d07 Removed pointless 1.0f 2014-06-03 15:26:12 -07:00