Bradley Austin Davis
|
6ad1008a56
|
Allow explicit overlay alpha from scripts
|
2016-06-15 17:24:32 -07:00 |
|
Howard Stearns
|
faa2624ca7
|
Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays
Continue grabbing through overlays
|
2016-06-15 16:07:01 -07:00 |
|
Howard Stearns
|
0915d1287f
|
Merge pull request #8079 from howard-stearns/no-laser-without-trigger
No laser without trigger
|
2016-06-15 16:06:56 -07:00 |
|
Howard Stearns
|
357b9353dc
|
Merge pull request #8074 from jherico/lasers
Vive hand controller updates
|
2016-06-15 16:06:49 -07:00 |
|
Howard Stearns
|
980eafb972
|
Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries
grab script preliminaries
|
2016-06-15 16:06:06 -07:00 |
|
howard-stearns
|
6f671b7cde
|
see comment.
|
2016-06-15 15:17:34 -07:00 |
|
Bradley Austin Davis
|
87dc6649ce
|
Better track keyboard open state, fix text replacement
|
2016-06-15 15:16:29 -07:00 |
|
howard-stearns
|
1e3b20b66d
|
Explicit check enumerated states instead of relying on order, per
feedback.
|
2016-06-15 15:06:36 -07:00 |
|
howard-stearns
|
2c7642a367
|
Do not make ReticleClick when we enter an overlay with the trigger
pressed.
|
2016-06-15 12:28:42 -07:00 |
|
Bradley Austin Davis
|
bc838ac0b4
|
Fix vive json
|
2016-06-15 11:41:28 -07:00 |
|
howard-stearns
|
6366ca7508
|
Go red for full trigger.
|
2016-06-15 11:08:59 -07:00 |
|
Bradley Austin Davis
|
60035486d3
|
Build fix
|
2016-06-15 10:48:48 -07:00 |
|
Bradley Austin Davis
|
0b0977f362
|
Support keyboard suppresion, control suppresion while in keyboard mode
|
2016-06-15 10:48:48 -07:00 |
|
Bradley Austin Davis
|
71bf9384ce
|
Merge remote-tracking branch 'upstream/master' into vive-ui
|
2016-06-15 10:45:51 -07:00 |
|
Clément Brisset
|
6ed972257f
|
Merge pull request #8077 from birarda/api-recheck-on-fail
clear domain connection refusals on hard reset only
|
2016-06-15 10:24:39 -07:00 |
|
Stephen Birarda
|
59912012c6
|
clear domain connection refusals on hard reset, not soft
|
2016-06-15 09:48:53 -07:00 |
|
Howard Stearns
|
b9754c8564
|
continue grabbing through overlays
|
2016-06-14 20:17:52 -07:00 |
|
Howard Stearns
|
ae65790bf3
|
no laser (or mouse cursor) from hand controllers unless trigger squeezed
|
2016-06-14 18:07:08 -07:00 |
|
Bradley Austin Davis
|
3525498550
|
Merge branch 'rc12-merge'
|
2016-06-14 17:44:24 -07:00 |
|
Bradley Austin Davis
|
21adf4fe68
|
Merge branch 'master' into rc12-merge
|
2016-06-14 17:42:22 -07:00 |
|
Bradley Austin Davis
|
d778ec96d7
|
Revert "fix shapes to property polymorph and persist"
This reverts commit 3bee4b1f9f.
|
2016-06-14 17:42:13 -07:00 |
|
Bradley Austin Davis
|
747b33f756
|
Revert "additional revert related change"
This reverts commit 8586e91a3b.
|
2016-06-14 17:42:01 -07:00 |
|
Bradley Austin Davis
|
f6994f2783
|
Revert "Revert "refresh API info during re-connect - case 570""
This reverts commit 1624146fc2.
|
2016-06-14 17:41:53 -07:00 |
|
Anthony J. Thibault
|
071584597d
|
Merge branch 'vive-ui' into feature/grab-script-preliminaries
|
2016-06-14 15:33:38 -07:00 |
|
Anthony J. Thibault
|
67aac09033
|
Set state debug flag to false
|
2016-06-14 14:59:29 -07:00 |
|
Chris Collins
|
55330f2205
|
Merge pull request #8057 from jherico/settings
Fixing issues with unclosed groups in settings persistence
|
2016-06-14 14:34:14 -07:00 |
|
Chris Collins
|
0236af8bcd
|
Merge pull request #8067 from birarda/api-recheck-on-fail
only signal once on a protocol mismatch with DS
|
2016-06-14 12:53:21 -07:00 |
|
Bradley Austin Davis
|
b1c472e82b
|
Fixing settings, even in release builds
|
2016-06-14 12:16:40 -07:00 |
|
Brad Hefta-Gaub
|
c614b10694
|
Merge pull request #8063 from SamGondelman/viveGripFix
Reset Vive grip buttons to 0 if not pressed
|
2016-06-14 11:47:49 -07:00 |
|
Howard Stearns
|
f5446cc4e4
|
Merge pull request #8064 from howard-stearns/use-system-pointer2
Use system pointer2
|
2016-06-14 11:29:24 -07:00 |
|
howard-stearns
|
5759c2d29d
|
final
|
2016-06-14 11:28:44 -07:00 |
|
Brad Hefta-Gaub
|
1c391e626f
|
Merge pull request #8054 from ctrlaltdavid/20957
fix model export continued
|
2016-06-14 10:57:25 -07:00 |
|
Brad Hefta-Gaub
|
b1de94f39d
|
Merge pull request #8061 from imgntn/entityaddtypeserrors
More verbose messaging about incorrect case in entity types
|
2016-06-14 10:56:58 -07:00 |
|
howard-stearns
|
35fac3ca56
|
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer2
|
2016-06-14 10:47:23 -07:00 |
|
Stephen Birarda
|
2163f9b5f3
|
signal once for domain protocol mismatch, case 918
|
2016-06-14 10:43:45 -07:00 |
|
Howard Stearns
|
d1bbfd3003
|
Merge pull request #8062 from jherico/lasers
Fix offset when UI transform is not identity
|
2016-06-14 10:42:05 -07:00 |
|
Bradley Austin Davis
|
d52a1fe6f9
|
Fix persistence for global scope settings handles, clean up invalid variants in settings
|
2016-06-14 09:49:38 -07:00 |
|
Bradley Austin Davis
|
34c8d257d2
|
Fixing issues with unclosed groups in settings persistence
|
2016-06-14 09:49:38 -07:00 |
|
Bradley Austin Davis
|
f3c47acbb2
|
Fix offset when UI transform is not identity
|
2016-06-14 09:49:25 -07:00 |
|
Bradley Austin Davis
|
175dbb8924
|
Merge remote-tracking branch 'upstream/master' into vive-ui
|
2016-06-14 09:48:56 -07:00 |
|
Brad Davis
|
196ab401e5
|
Merge pull request #8046 from SamGondelman/proceduralRaymarch
Exposed orientation and eye position to procedural entity shaders
|
2016-06-14 09:48:07 -07:00 |
|
Brad Hefta-Gaub
|
19352a12ea
|
Merge pull request #8056 from imgntn/editbugztab
Fix tabbing behavior in edit.js
|
2016-06-14 09:14:10 -07:00 |
|
Brad Hefta-Gaub
|
7da29daf9d
|
Merge pull request #8036 from ctrlaltdavid/20955
Fix image2d overlay color property
|
2016-06-13 19:21:59 -07:00 |
|
Anthony J. Thibault
|
cb51d00c1d
|
Removed CONTINUE_FAR_TRIGGER and CONTINUE_NEAR_TRIGGER
|
2016-06-13 19:08:33 -07:00 |
|
Anthony J. Thibault
|
f11735550f
|
Fix for Vive RIGHT_GRIP LEFT_GRIP button never becoming zero.
|
2016-06-13 18:55:53 -07:00 |
|
Anthony J. Thibault
|
28b6cc2777
|
handControllerGrab.js is now eslint clean.
|
2016-06-13 18:54:21 -07:00 |
|
Howard Stearns
|
e0faaeac66
|
Merge branch 'use-system-pointer' of https://github.com/howard-stearns/hifi into use-system-pointer2
|
2016-06-13 18:40:52 -07:00 |
|
SamGondelman
|
df9fd6c7fc
|
reset vive grip buttons to 0 if not pressed
|
2016-06-13 18:35:39 -07:00 |
|
Howard Stearns
|
d05987de6d
|
Merge pull request #8042 from jherico/lasers
First pass prototype of laser rendering in OpenVR plugin
|
2016-06-13 18:06:15 -07:00 |
|
James B. Pollack
|
1306417c8e
|
more verbose messaging about incorrect entity types
|
2016-06-13 17:48:58 -07:00 |
|