Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 09:36:32 +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
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
barnold1953
611c68d0d8 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-03 15:23:58 -07:00
barnold1953
d1b7882c6f Mouse input and magnification for Oculus Overlay 2014-06-03 15:23:17 -07:00
Andrew Meadows
e7f32c211b remove world-frame hand/palm set methods 2014-06-03 14:48:57 -07:00
Andrew Meadows
05af993262 Add more model-frame methods 2014-06-03 14:24:04 -07:00
Andrew Meadows
03bf1fe69d Add joint manipulations in model-frame 2014-06-03 14:04:09 -07:00
Brad Hefta-Gaub
03f0ff111f Merge pull request #2976 from talentraspel/19751 
dynamically malloc/free arrays to avoid stack overflow on windows.
 2014-06-03 12:10:44 -07:00
Stephen Birarda
c02d87fdf7 Merge pull request #2975 from talentraspel/19749 
start timer BEFORE moving it to another thread, because Qt otherwise wil...
 2014-06-03 11:31:53 -07:00
Kai Ludwig
23b56bf174 start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows. 
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
 2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8 Fixed coding standard 2014-06-03 10:49:54 -07:00
Andrew Meadows
f99489c157 rolling back previous change for IK instability 2014-06-03 10:40:30 -07:00
Kai Ludwig
162939fda1 dynamically malloc/free arrays to avoid stack overflow on windows. 
starting with 0 for array index will give a reasonable value for 'first'.
 2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826 Merge pull request #2973 from matsukaze/master 
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
 2014-06-02 22:41:02 -07:00
Andrzej Kapolka
ac7d23bf54 Working on support for streaming Qt enums/flags. 2014-06-02 19:00:48 -07:00
matsukaze
940384309b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-02 22:00:16 -04:00
barnold1953
f4391bcdbe _distance variable 2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03 Fixed Oculus overlay color bug 2014-06-02 16:47:51 -07:00
Philip Rosedale
656849199c Merge branch 'master' of https://github.com/worklist/hifi 2014-06-02 16:23:02 -07:00
barnold1953
4ed03e996a Added Oculus Options menu 2014-06-02 16:15:51 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Andrzej Kapolka
6db385de7a Ported over fixes that I made when working on delta-encoding for avatars. 2014-06-02 15:16:08 -07:00
Andrew Meadows
d7be5faa9d unravel rotation code by giving proper names 
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
 2014-06-02 14:43:25 -07:00
Andrew Meadows
9b3773fa3b remove 'fromBind' argument to getJointRotation() 2014-06-02 14:20:13 -07:00
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d Merge pull request #2972 from polac/19748 
Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.
 2014-06-02 12:18:28 -07:00
Clément Brisset
12a40106f5 Merge pull request #2968 from AndrewMeadows/inertia 
Make JointState a proper class: Part 1
 2014-06-02 12:15:50 -07:00
Andrew Meadows
a62a270004 merge andrew/inertia into andrew/ragdoll 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/renderer/Model.h
 2014-06-02 11:56:27 -07:00
Mika Impola
da3a272475 Fixing the BUG #19748: Sit.js doesn't handle overlays correctly. 2014-06-02 21:47:31 +03:00