samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
Anthony J. Thibault
6f6fe5f244
reduced radius of grab sphere
2016-07-08 18:23:33 -07:00
samcake
2fbdb22493
Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward
2016-07-08 18:14:05 -07:00
Anthony J. Thibault
bec71e4af4
Went back to transparent spheres for equip points
2016-07-08 17:05:23 -07:00
Anthony J. Thibault
c8d0decab7
Fix for far grab not working until after edit button is pressed
2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70
Added glow effect to search beam
2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
samcake
ed67fe4051
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
5f71f77445
Merge pull request #8192 from AndrewMeadows/simple-hull-shapes
...
experimental ModelEntityItem collision shape options (no visual debugging)
2016-07-08 08:55:11 -07:00
Anthony J. Thibault
0d454cd45e
Equip hotspots render when your hand is near them.
2016-07-07 17:28:23 -07:00
samcake
1eb4acf815
Unifying the lighting pass for scaterring and not
2016-07-07 15:41:00 -07:00
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
Anthony J. Thibault
2db8160568
handControllerGrab improvements
...
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
2016-07-06 15:46:14 -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
Andrew Meadows
76cb80112e
support new shape types in edit.js
2016-07-06 10:51:43 -07:00
howard-stearns
b8e6572ebf
basic hand-controller editing
2016-07-05 17:00:54 -07:00
samcake
16c5a085d8
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-05 10:50:04 -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
samcake
2a52f1db7f
Adding the lighting model class to configure accross the jobs the lighting
2016-07-01 18:36:51 -07: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
samcake
9281b28d43
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-01 13:39:12 -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
samcake
9a604d0ede
Bringing Beckmann specular to the lighting
2016-06-30 19:03:24 -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
samcake
ab21a5a5d5
FIxing the bad brdf and adding better debug tool and better Pipeline architecture
2016-06-29 18:59:06 -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
samcake
b37df393e2
Merging with the new GL45Backend
2016-06-29 10:40:28 -07:00
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
