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 |
|
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 |
|
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 |
|
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 |
|
Bradley Austin Davis
|
6707f889b8
|
Fixing laser offset, support laser in Oculus
|
2016-06-13 17:33:18 -07:00 |
|
howard-stearns
|
dfd03d5e61
|
Prepare for working laser. But at this point, we still show the laser AND
the Reticle.
|
2016-06-13 17:15:51 -07:00 |
|
howard-stearns
|
526fc7d062
|
Make handControllerGrab independent of whether we're using laser or
Reticle.
|
2016-06-13 17:13:10 -07:00 |
|
howard-stearns
|
0366c891cc
|
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer
|
2016-06-13 17:06:43 -07:00 |
|
Bradley Austin Davis
|
aab42ff841
|
Merge branch 'settings' into lasers
|
2016-06-13 15:43:03 -07:00 |
|
Andrew Meadows
|
1a37653364
|
Merge pull request #8039 from sethalves/quiet-es-sim-spam
fix problem related to server-side extrapolation of children of avatars
|
2016-06-13 15:37:33 -07:00 |
|
Bradley Austin Davis
|
b9bf797753
|
Fixing issues with unclosed groups in settings persistence
|
2016-06-13 15:26:48 -07:00 |
|
Seth Alves
|
f8f62a4ff1
|
remove unused function
|
2016-06-13 15:10:52 -07:00 |
|
Bradley Austin Davis
|
62051ad297
|
Working on touch
|
2016-06-13 14:40:15 -07:00 |
|
Howard Stearns
|
213479c530
|
Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements
HMD UI re-centering while driving improvements.
|
2016-06-13 14:28:50 -07:00 |
|
Seth Alves
|
eba518cb65
|
try to make code that converts bullet-calculated values to parent-frame values more effecient
|
2016-06-13 14:26:41 -07:00 |
|
Seth Alves
|
998a5594c0
|
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
|
2016-06-13 13:41:32 -07:00 |
|
Chris Collins
|
b14f9cd312
|
Merge pull request #8041 from sethalves/fix-avatar-entity-locking
Fix avatar entity locking
|
2016-06-13 13:10:32 -07:00 |
|
James B. Pollack
|
188590a891
|
cleanup
|
2016-06-13 13:08:22 -07:00 |
|
James B. Pollack
|
567118f4a9
|
cleanup
|
2016-06-13 13:08:12 -07:00 |
|
James B. Pollack
|
342fc07d29
|
select active element in edit.js after change
|
2016-06-13 13:06:56 -07:00 |
|
Brad Davis
|
130c0dda31
|
PR feedback
|
2016-06-13 13:04:11 -07:00 |
|
Brad Davis
|
bb3722d915
|
trying again to fix mac build.
|
2016-06-13 13:04:11 -07:00 |
|
Brad Davis
|
9640727f51
|
Hand laser rendering support in HMD plugins.
|
2016-06-13 13:04:11 -07:00 |
|
Brad Davis
|
0ddee876c3
|
Merge remote-tracking branch 'upstream/master' into vive-ui
|
2016-06-13 13:03:46 -07:00 |
|