Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 01:16:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13336 commits 76 branches 59 tags 1.2 GiB
Commit graph

13336 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
2e99d316ac remove JointState::_translation 
(use corresponding data in FBXJoint instead)
 2014-05-29 12:52:05 -07:00
Andrew Meadows
a898fcbf75 move details of getJointRotation() into JointState 
also: remove unused getLeft/RightHandRotation() methods
 2014-05-29 11:43:25 -07:00
Andrew Meadows
4cf5628783 move applyRotationDelta() from Model to JointState 2014-05-29 10:00:55 -07:00
Andrew Meadows
29e093e2e0 fix float literals to agree with coding standard 2014-05-29 09:20:01 -07:00
Andrew Meadows
86d6fd45de safe copy of JointState data 2014-05-29 08:19:43 -07:00
Philip Rosedale
79405444d1 Merge pull request #2947 from PhilipRosedale/master 
Set max voxel size of 16 meters in script for voxel creation
 2014-05-28 21:05:23 -07:00
Philip Rosedale
e0d68607cd Set max voxel size of 16 meters in script for voxel creation 2014-05-28 21:02:33 -07:00
Clément Brisset
859461a1aa Merge pull request #2946 from AndrewMeadows/inertia 
cleanup: JointState transitions toward a proper class
 2014-05-28 18:18:41 -07:00
Andrew Meadows
0925da05d5 merge upstream/master into andrew/inertia 2014-05-28 17:53:47 -07:00
Andrew Meadows
ec25982a58 add JointState::updateWorldTransform() 2014-05-28 17:51:17 -07:00
Andrew Meadows
b15b0fd96c cleaner initialization of JointState 2014-05-28 17:31:07 -07:00
Andrew Meadows
9f2a4ae626 Make JointState a proper class 
JointState gets a pointer to its corresponding FBXJoint
 2014-05-28 16:49:39 -07:00
Clément Brisset
e286250bb5 Merge pull request #2943 from ZappoMan/aacube 
Support for ray picking non-axis-aligned bounding box of models
 2014-05-28 15:54:33 -07:00
Andrew Meadows
e74da5f2a0 merge upstream/master into andrew/inertia 2014-05-28 14:55:08 -07:00
Andrew Meadows
13f11e1056 Remove "fromBind" arg in Model::setJointRotation 
It was always set 'true'.
 2014-05-28 14:53:32 -07:00
ZappoMan
574bca38e6 clean up comments and variable names 2014-05-28 12:10:51 -07:00
Andrzej Kapolka
16a370303f Merge pull request #2942 from ey6es/master 
Fix arguments to applyRotationDelta.
 2014-05-28 12:04:43 -07:00
ZappoMan
d88dd90d79 revert dead code 2014-05-28 12:04:24 -07:00
Andrzej Kapolka
4cbc550820 Fix arguments to applyRotationDelta. 2014-05-28 12:03:57 -07:00
ZappoMan
e3d880248f tweaks 2014-05-28 12:03:40 -07:00
ZappoMan
bebfd7a301 non-aabox picking working 2014-05-28 12:02:22 -07:00
ZappoMan
c917678a45 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 11:04:04 -07:00
Brad Hefta-Gaub
9546fe477c Merge pull request #2940 from AndrewMeadows/inertia 
fix for lack of neck rotations
 2014-05-28 11:00:55 -07:00
Brad Hefta-Gaub
1340ea49d3 Merge pull request #2934 from Barnold1953/master 
OverlayRenderer class and display Overlays to Oculus
 2014-05-28 11:00:36 -07:00
AndrewMeadows
2d4970d106 Merge pull request #2932 from birarda/master 
make scripted assignments passed in DS config static
 2014-05-28 10:54:28 -07:00
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
Andrew Meadows
676a8882fe fix for no neck motion 
FaceModel needs similar override to updateJointState() as SkeletonModel
 2014-05-28 10:43:21 -07:00
ZappoMan
0e7f3e0e37 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 10:37:28 -07:00
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
Stephen Birarda
54bdae4428 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 10:09:55 -07:00
barnold1953
35e63757ed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 09:25:55 -07:00
Philip Rosedale
bf4b0707c0 Merge pull request #2938 from matsukaze/master 
Job #19694. Add option for larger number of frames to the audio scope d...
 2014-05-27 21:02:15 -07:00
matsukaze
619db8ee93 Job #19694 - Add option for larger number of frames to the audio scope display 2014-05-27 23:24:28 -04:00
Philip Rosedale
8d7e682a1f Merge pull request #2937 from huffman/19714 
Code Review for Job #19714
 2014-05-27 20:20:45 -07:00
Philip Rosedale
c52592311f Merge pull request #2936 from ey6es/master 
A couple more shadow tweaks: reduce "shimmer" by moving in texel increments, use multisampling on voxels as well as models.
 2014-05-27 18:28:03 -07:00
Andrzej Kapolka
62eeeaa1c6 Fix for Windows build failure. 2014-05-27 18:12:15 -07:00
Andrzej Kapolka
222655d948 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:43:34 -07:00
Andrzej Kapolka
e723d0da0a Merge pull request #2935 from AndrewMeadows/inertia 
cleanup: move avatar specific stuff from Model to SkeletonModel
 2014-05-27 17:41:14 -07:00
Stephen Birarda
21274dfc23 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:38:28 -07:00
Andrzej Kapolka
9796334160 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:26:56 -07:00
Andrzej Kapolka
7c12417653 Use multisampling on the shadow maps for the voxels, too. 2014-05-27 17:26:19 -07:00
barnold1953
216a73cf60 Fixed coding standard issues 2014-05-27 16:40:51 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
barnold1953
2570c55241 Touched up comments 2014-05-27 16:21:34 -07:00
barnold1953
5665e4d278 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f Made Overlay appear as flat image in front of camera in Oculus Rift. It 
needs to be a curved surface instead.
 2014-05-27 16:13:56 -07:00
Brad Hefta-Gaub
36efa68938 Merge pull request #2933 from Atlante45/point_and_glow 
Switched to findRayIntersection in editModels.js
 2014-05-27 15:58:46 -07:00
Andrew Meadows
9f72d6ca3f fix bug -- negate logic around invalid joint index 2014-05-27 15:53:20 -07:00
Atlante45
285bd0d2f2 Switched to findRayIntersection 2014-05-27 15:50:39 -07:00