Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 19:02:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40015 commits 25 branches 0 tags 1.1 GiB
Commit graph

40015 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
8de4a59078 add support for auto-hide reticle and seek lookat on auto-show of reticle 2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578 Merge pull request #7212 from ZappoMan/depthReticleWork 
add fade between depths in depth reticle
 2016-02-28 12:49:47 -08:00
PhilipRosedale
e9aed83920 suppress debug messages 2016-02-28 12:41:40 -08:00
Seth Alves
5bf8670bc2 fix SpatiallyNestable::getChildren 2016-02-28 12:16:41 -08:00
PhilipRosedale
1d681a2461 Add angular size and azimuth limits to object XZ translation 2016-02-28 12:00:13 -08:00
Brad Hefta-Gaub
188cf3694b fix rotation of depth reticle 2016-02-27 17:31:35 -08:00
Brad Hefta-Gaub
e403c990d9 make fade non-linear 2016-02-27 17:13:09 -08:00
Anthony Thibault
89885805d2 OpenVR: Added hysteresis to the touch pad dead spot 
This should make using the Vive touch pad for movement more reliable.
 2016-02-26 18:34:33 -08:00
PhilipRosedale
47504a068e remove unused code 2016-02-26 16:58:38 -08:00
PhilipRosedale
7fd88793dc drag relative to plane where pointer collided selection box 2016-02-26 16:58:17 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience 
Cellscience Updates
 2016-02-26 16:53:00 -08:00
samcake
cfcde5032c Post merge with Zach work for environment map 2016-02-26 16:32:29 -08:00
samcake
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
Brad Hefta-Gaub
581bd69d14 Merge pull request #7216 from hyperlogic/tony/attachment-render-fix 
Avatar: fix for rendering avatar attachments
 2016-02-26 15:43:13 -08:00
ericrius1
5762c33cfe strokes are now parented to whiteboard surface 2016-02-26 15:07:22 -08:00
samcake
483f9a4ee3 Merge pull request #5 from zzmp/fix/skybox-light-orange 
Fix skybox global color shader
 2016-02-26 14:55:20 -08:00
ericrius1
d0752143dc markers and eraser reset to original positions after being dropped 2016-02-26 14:49:48 -08:00
Anthony J. Thibault
01ef5aabcb OpenVR: More reliable detection of left and right hands 2016-02-26 14:38:35 -08:00
ericrius1
48f03ba476 markers resetting 2016-02-26 14:29:43 -08:00
Anthony J. Thibault
9a01c93322 Avatar: fix for rendering avatar attachments 2016-02-26 14:28:27 -08:00
ericrius1
a544ffc942 not emitting right now 2016-02-26 14:20:40 -08:00
Zach Pomerantz
1fbcaea4b4 Fix evalSkyboxGlobalColor 2016-02-26 14:20:21 -08:00
ericrius1
0015e28b95 particle tweaks 2016-02-26 14:14:39 -08:00
Seth Alves
c0c5084149 handle parenting loops 2016-02-26 14:05:02 -08:00
Zach Pomerantz
fdffd8b6e0 Track skybox mipmap levels in DeferredTransform 2016-02-26 13:51:55 -08:00
ericrius1
e83c1f71a6 front and back 2016-02-26 12:17:46 -08:00
ericrius1
ed9f279a63 moved whiteboard Surface up 2016-02-26 12:12:27 -08:00
samcake
5401149713 Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial 2016-02-26 12:10:13 -08:00
ericrius1
df3e26edd5 calligraphy 2016-02-26 12:05:30 -08:00
Brad Hefta-Gaub
6d9c585604 add fade between depths in depth reticle 2016-02-26 12:01:59 -08:00
ericrius1
6e0ddb3918 really fixed rotation 2016-02-26 11:48:15 -08:00
ericrius1
1542b9da12 rotation works right now 2016-02-26 11:33:59 -08:00
Chris Collins
7457b73e74 Merge pull request #7211 from zzmp/fix/default-ambience 
Differentiate global sun and skyStage sun
 2016-02-26 11:33:28 -08:00
Ryan Huffman
a7bb47fbcc Fix initialization of variables for SendQueue and Connection 2016-02-26 11:20:31 -08:00
Ryan Huffman
a0203cf9d5 Update BasePacket to 0-initialize data 2016-02-26 11:13:10 -08:00
Zach Pomerantz
712cf911b1 Differentiate global sun and skyStage sun 2016-02-26 11:06:02 -08:00
Chris Collins
a275d95c59 Merge pull request #7208 from ZappoMan/showOverlayOnMenuPopup 
Show overlay on menu popup
 2016-02-26 11:00:04 -08:00
ericrius1
c81f3256dd rotation 2016-02-26 10:58:22 -08:00
James B. Pollack
6c6ea3f0a7 code cleanup 2016-02-26 10:42:45 -08:00
James B. Pollack
83713898cc maze should delete stray balls 2016-02-26 10:34:27 -08:00
Brad Hefta-Gaub
44f45a3f29 Merge branch 'master' of https://github.com/highfidelity/hifi into showOverlayOnMenuPopup 2016-02-26 10:27:37 -08:00
Seth Alves
5594f1e4e5 if equipped entity vanishes, reset grab state 2016-02-26 10:27:34 -08:00
James B. Pollack
b0cb4b7199 disable boundaries 2016-02-26 10:26:02 -08:00
Andrew Meadows
c4798870d5 Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix 
Crash fix for RenderableBoxEntityItem::render
 2016-02-26 10:25:50 -08:00
Zach Pomerantz
3c53078178 Merge pull request #7194 from ZappoMan/toggleOverlay 
add toggleOverlays menu item and action
 2016-02-26 10:17:24 -08:00
ericrius1
25a2d1eb93 fixed rotation 2016-02-26 10:14:27 -08:00
Seth Alves
6c9cf386a6 when trigger is squeezed, check for things stuck to hand and unhook them 2016-02-26 10:14:09 -08:00
Brad Hefta-Gaub
6b427e59ae show the overlays when the context menu is shown 2016-02-26 10:12:23 -08:00
samcake
d64b9bb6d9 Drafting the support for gloss map 2016-02-26 09:18:40 -08:00
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00