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

13320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
0b4484a153 Trying a different way of determining the cascade threshold distances. 2014-05-29 16:49:51 -07:00
Andrzej Kapolka
391902f79b Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Andrzej Kapolka
698ecbf9c5 Fix for shadow map rendering. 2014-05-28 15:58:45 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
Andrzej Kapolka
16a370303f Merge pull request #2942 from ey6es/master 
Fix arguments to applyRotationDelta.
 2014-05-28 12:04:43 -07:00
Andrzej Kapolka
4cbc550820 Fix arguments to applyRotationDelta. 2014-05-28 12:03:57 -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
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -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
Andrew Meadows
ae3b792a35 move face/head code from Model into SkeletonModel 2014-05-27 15:28:41 -07:00
Stephen Birarda
ce485c48b8 make scripted assignments passed in DS config static 2014-05-27 15:23:10 -07:00
Andrew Meadows
6efa417742 move hand/arm stuff from Model to SkeletonModel 2014-05-27 15:06:50 -07:00
Andrew Meadows
afc7660d74 merge upstream/master into andrew/inertia 2014-05-27 14:57:44 -07:00
AndrewMeadows
1348902c4b Merge pull request #2931 from ZappoMan/aacube 
Support improved Ray picking of models
 2014-05-27 14:57:06 -07:00
Andrew Meadows
f7b8c4f0a0 remove unused Head::_gravity data memeber 2014-05-27 14:50:17 -07:00
Andrzej Kapolka
0b3486d27b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 14:26:01 -07:00
Andrzej Kapolka
2b54d627c0 Try rounding to nearest texel unit to reduce shimmer. 2014-05-27 14:25:27 -07:00
ZappoMan
c63c0c0ce3 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe support ray picking against the AABB for the rotated model extents 2014-05-27 13:39:32 -07:00
Andrew Meadows
07544c7b43 removal of unused getNeckRotation() 2014-05-27 12:52:44 -07:00
AndrewMeadows
5a5635761d Merge pull request #2930 from ey6es/master 
A couple tweaks to improve shadowing: render back faces into shadow map, use biased offset, add option to disable shadow on avatars.
 2014-05-27 12:44:38 -07:00
Andrzej Kapolka
3f478b1939 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 12:31:12 -07:00
Andrzej Kapolka
e22d239d4d What the heck; let's try using some multisampling on the shadow maps. 2014-05-27 12:30:45 -07:00
Brad Hefta-Gaub
ee66d87bec Merge pull request #2929 from binaryking/19674 
Code Review for Job #19674
 2014-05-27 11:58:23 -07:00
Andrzej Kapolka
ee00a86915 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:44:10 -07:00