Brad Hefta-Gaub
7724065298
Merge pull request #8196 from howard-stearns/loaded-machine
...
an objective test of basic performance on struggling machines
2016-07-07 09:02:31 -07:00
Howard Stearns
74ef82f800
add 'dynamic' property as a load
2016-07-06 16:15:02 -07:00
howard-stearns
110f5e9e2a
Don't compare distance when no intersection.
2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72
Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit
2016-07-06 15:06:51 -07:00
Howard Stearns
8ef9f48221
An objective test of basic performance on struggling machines.
2016-07-06 13:42:46 -07:00
howard-stearns
b8e6572ebf
basic hand-controller editing
2016-07-05 17:00:54 -07:00
Clément Brisset
7c0879d919
Merge pull request #8183 from humbletim/fix-typedarrays
...
fix TypedArray byte ordering and .subarray indexing
2016-07-05 10:00:15 -07:00
David Rowe
0ad7aa72fb
Prevent users window from being dragged offscreen
2016-07-04 14:34:38 +12:00
Sam Gondelman
34042d51ad
Merge pull request #8180 from ctrlaltdavid/fix-users-border
...
don't show users border when hover mouse if logged out
2016-07-03 03:14:17 -07:00
humbletim
b7874116b9
fix TypedArray byte ordering and .subarray end indexing
2016-07-02 23:36:08 -04:00
David Rowe
760f4366e1
Don't show users border when hover mouse if logged out
2016-07-02 11:25:04 +12:00
Ryan Downe Karpf
7eb07cba4c
Merge pull request #8171 from jherico/qml_fixes
...
Keyboard focus polish for Vive UI
2016-07-01 16:20:36 -07:00
howard-stearns
71c44f4f93
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-07-01 13:05:32 -07:00
howard-stearns
43c7fd1e27
New art.
2016-07-01 10:34:13 -07:00
howard-stearns
804a187a7b
Mute changes.
2016-07-01 10:17:17 -07:00
Ryan Downe Karpf
873b57219a
Merge pull request #8167 from hyperlogic/feature/equip-hotspots
...
equip-hotspots feature
2016-07-01 09:55:49 -07:00
howard-stearns
125f6d8b63
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68
new icons
2016-06-30 16:47:10 -07:00
howard-stearns
ff55644fe8
stateful hud toolbar buttons
2016-06-30 16:24:11 -07:00
Anthony J. Thibault
d8e5e3cbe4
equip bug fix
...
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
Brad Davis
14784a6088
Remove default focus on text fields
2016-06-30 15:22:13 -07:00
Brad Davis
dfb6cb1aa3
Updating entity list
2016-06-30 14:25:36 -07:00
Anthony J. Thibault
82b1cba81d
equip improvements
...
Allow the user to equip an object while near or far grabbing it from the other hand.
2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757
Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area
...
limit hand controller actions to recommended area
2016-06-30 11:06:32 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
Anthony J. Thibault
43d4dba4c0
iterate over hotspots not entities.
...
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473
WIP, equip-points work but they don't use the proper attach point.
2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637
Addition of equipHotspots
2016-06-29 13:53:06 -07:00
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
Howard Stearns
b551bc3c1a
Use the whole area, less a margin.
2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b
Use normal Script.update (60hz) instead of a timer (@20hz).
2016-06-28 17:44:30 -07:00
howard-stearns
c492d125e0
limit hand controller actions to recommended area
2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d
Only update the (invisible) cursor position from hand controllers when the
...
trigger is partially squeezed.
2016-06-28 11:36:08 -07:00
Brad Hefta-Gaub
3fca0d655c
Merge pull request #8145 from ctrlaltdavid/20978
...
reduce users window flicker when restart script
2016-06-28 10:03:46 -07:00
David Rowe
79cfd2e9dc
Reduce users window flicker when restart script
2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9
Merge pull request #8135 from SamGondelman/fixEditLockHMD
...
Prevent entering independent camera mode through edit.js in HMD mode
2016-06-27 15:50:25 -07:00
Brad Hefta-Gaub
cecd871c66
Merge pull request #8139 from ctrlaltdavid/20978
...
fix users.js display and operation
2016-06-27 12:56:10 -07:00
David Rowe
dc07368dc9
Hide users list when logged out
2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3
Fix "show me" and "visible to" in users window not being remembered
2016-06-25 13:48:43 +12:00
Howard Stearns
de7738e644
Merge pull request #8134 from highfidelity/vive-ui
...
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
David Rowe
8b0f59c9cf
Fix users window minimized state not being remembered
2016-06-25 13:12:16 +12:00
David Rowe
1c1d81ae25
Fix missing users.js menu item
2016-06-25 12:18:03 +12:00
David Rowe
8a5369fcb1
Undo hide users.js when logged out
2016-06-25 12:03:36 +12:00
SamGondelman
d5feac94f4
coding standard fun
2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6
can't enter independent mode through edit.js in HMD mode
2016-06-24 16:23:15 -07:00
Sam Gondelman
3c809ef40c
Merge pull request #8123 from AlexanderOtavka/first-person-hmd
...
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
Brad Hefta-Gaub
2e8f6c2cc6
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
...
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-24 14:08:29 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -07:00
