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

5536 commits

Author SHA1 Message Date
samcake
7120b64a33 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-01 10:53:40 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
Brad Hefta-Gaub
ae824bb180 Merge pull request #7173 from ericrius1/whiteboardV2 
Whiteboard using markers and erasers
 2016-03-01 09:12:16 -08:00
samcake
e72035ee3d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 18:55:30 -08:00
Howard Stearns
c0eef51d41 Merge pull request #7222 from ZappoMan/depthReticleWork 
more reticle improvements
 2016-02-29 17:42:03 -08:00
Eric Levin
33fe2e9b36 Update markerEntityScript.js 2016-02-29 16:11:08 -08:00
Brad Hefta-Gaub
dc4c4e8c94 some tweaks to auto-hide 2016-02-29 14:24:43 -08:00
Seth Alves
0268ca0888 Merge pull request #7219 from PhilipRosedale/editFix2 
More accurate X/Z movement with edit.js
 2016-02-29 13:23:02 -08:00
Brad Hefta-Gaub
bd80ecd4dc Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-29 13:17:24 -08:00
Philip Rosedale
3eabf0d451 Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand 
when trigger is squeezed, check for things stuck to hand and unhook them
 2016-02-29 12:59:02 -08:00
PhilipRosedale
42f6ede43c azimuth = elevation, duh 2016-02-29 10:22:24 -08:00
PhilipRosedale
d1bc31afb6 azimuth function is really just a ratio 2016-02-29 10:16:34 -08:00
PhilipRosedale
08eacc436f Fixed rayPlane test again 2016-02-29 10:13:01 -08:00
samcake
4bec6ddf52 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
4009f03c38 move autohide/show behavior to depthReticle, make it a default script 2016-02-29 08:38:53 -08:00
PhilipRosedale
cee79c8274 Fixed bug in rayPlane test 2016-02-28 15:44:23 -08:00
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
e403c990d9 make fade non-linear 2016-02-27 17:13:09 -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
ericrius1
5762c33cfe strokes are now parented to whiteboard surface 2016-02-26 15:07:22 -08:00
ericrius1
d0752143dc markers and eraser reset to original positions after being dropped 2016-02-26 14:49:48 -08:00
ericrius1
48f03ba476 markers resetting 2016-02-26 14:29:43 -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
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
ericrius1
c81f3256dd rotation 2016-02-26 10:58:22 -08:00
Seth Alves
5594f1e4e5 if equipped entity vanishes, reset grab state 2016-02-26 10:27:34 -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
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
ef433c0e01 legacy support for EntityViewer.setKeyholeRadius() 2016-02-25 22:24:37 -08:00
ericrius1
0ce4385554 no offset increment 2016-02-25 18:22:54 -08:00
ericrius1
4d2a65926c test 2016-02-25 18:06:13 -08:00
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -08:00
ericrius1
0602bf7f1a logging 2016-02-25 16:20:35 -08:00
Philip Rosedale
86d6d255fa Merge pull request #7199 from sethalves/fix-grab-heartbeat 
only update heartbeat in userData of grabbed entity every 5 seconds
 2016-02-25 16:17:11 -08:00
ericrius1
a79d334bed no query string 2016-02-25 16:12:34 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00