Eric Levin
f37570dc9a
only pulse on release when held
2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2
Tuned haptic pulses for grab, release, equip, de-quip
2016-07-27 17:58:24 -07:00
James B. Pollack
6a72fe7df4
cleanup
2016-07-25 16:58:59 -07:00
James B. Pollack
5ed1e602e6
Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors
...
Fix script end errors
2016-07-25 16:50:05 -07:00
James B. Pollack
05e3a8613a
colors back to blue and red
2016-07-25 16:28:47 -07:00
James B. Pollack
9240672c9d
change distance hold origin
2016-07-25 13:06:09 -07:00
Brad Hefta-Gaub
1802f8e7a2
Merge pull request #8298 from imgntn/lazzzers
...
Update hand controller laser colors
2016-07-23 13:50:38 -07:00
Ryan Downe Karpf
91714aaca6
Merge pull request #8258 from AlexanderOtavka/edit-model-ui
...
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
James B. Pollack
d4ed347f5f
Merge pull request #8293 from AlexanderOtavka/fix-market-title
...
Fix marketplace title
2016-07-22 16:55:41 -07:00
James B. Pollack
c04a41c3cb
fix invisible characters from slack copying
2016-07-22 16:51:42 -07:00
Chris Collins
e755528cf2
Merge pull request #8278 from sethalves/fix-equip-fly-away
...
fix equip fly-away
2016-07-22 16:47:31 -07:00
Zander Otavka
2cd97bfe78
Fix squeezeHands.js error on script end
2016-07-22 15:55:42 -07:00
Zander Otavka
cc7e723e07
Remove extra debug print
2016-07-22 15:23:39 -07:00
James B. Pollack
3607a34f55
tweak telecolors
2016-07-22 13:25:33 -07:00
James B. Pollack
e81f65d992
colors
2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f
remove all the old visualization methods
2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195
remove particle beam and lights
2016-07-22 09:19:13 -07:00
James B. Pollack
5202038210
Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
...
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
Zander Otavka
8976f18290
Change 3.14 literal to Math.PI
2016-07-21 18:36:58 -07:00
Zander Otavka
30c5f277a0
Finish renaming functions
2016-07-21 15:52:19 -07:00
Zander Otavka
72978c5d96
Rename examples -> marketplace
...
Includes the title of the marketplace web window.
2016-07-21 15:44:42 -07:00
samcake
853f31f6ea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-20 10:49:27 -07:00
Thijs Wenker
be0ccad0d3
Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:26 +02:00
Thijs Wenker
b3b1bf7884
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:02 +02:00
Anthony J. Thibault
837b19ed1b
fix for pushing avatar into floor when exiting away mode.
...
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
are facing the same direction as the current HMD orientation.
away.js now uses the above new API's instead of MyAvatar.reset()
2016-07-19 14:42:24 -07:00
samcake
7f169b8e4f
Adjust qml positions and fix one shader bug
2016-07-19 13:20:19 -07:00
Thijs Wenker
2adff24a05
silly workaround- workaround
2016-07-19 21:34:42 +02:00
Seth Alves
be001a652f
when doing a parenting grab, zero velocity
2016-07-19 11:50:53 -07:00
Brad Hefta-Gaub
866ba2f185
Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom
...
far-grabbed objects no longer fly away when the avatar body shifts
2016-07-19 10:40:48 -07:00
samcake
36d58a2b82
Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui
2016-07-19 10:34:06 -07:00
Anthony J. Thibault
212175bdaa
bug fix for far-grab pulling the object in the wrong direction
2016-07-19 10:23:00 -07:00
samcake
18ec4aa4e2
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-19 09:27:33 -07:00
Brad Davis
d98ae1ba9c
Ensure the pause overlay is unlit (emissive)
2016-07-19 07:10:34 -07:00
samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 23:15:21 -07:00
samcake
34f2a96888
Adding the check for Obscurrance
2016-07-18 18:11:51 -07:00
Ryan Downe Karpf
6e71e369a4
Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii
...
grab script improvements
2016-07-18 16:46:38 -07:00
Thijs Wenker
11b461a730
Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one
2016-07-19 01:46:29 +02:00
Anthony J. Thibault
69500643f3
bugfix for saving attach points
...
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984
remove debug prints
2016-07-18 14:17:06 -07:00
Zander Otavka
d75c2e2a6f
Merge branch 'master' into edit-model-ui
2016-07-18 13:11:51 -07:00
Anthony J. Thibault
959a2f9915
far-grabbed objects no longer fly away when the avatar body shifts
...
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame. This hand vector was used to move the grabbed object position. However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.
Now, we track this hand delta in sensor a.k.a. room space. This is immune to the shifts caused by body shifting.
2016-07-18 13:10:16 -07:00
samcake
80587ca8a3
using the textureGather lookup
2016-07-18 12:52:21 -07:00
Zander Otavka
492f7e0c29
Add gravity to dynamic model entities
2016-07-18 12:43:14 -07:00
Zander Otavka
06985f9278
Make combo box go by index, add default values
2016-07-18 12:06:11 -07:00
Anthony J. Thibault
5a01bf406e
remove obsolete handControllerMouse.js to avoid confusion
2016-07-18 11:29:41 -07:00
samcake
a44aee84ce
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 10:16:55 -07:00
samcake
5a0ce81516
Performing the curvature generation and diffusion at half the resolution
2016-07-18 03:54:05 -07:00
samcake
cfa51ae1f5
REmoving problematic timers for mac
2016-07-17 18:32:43 -07:00
samcake
9332f82d54
Carrefully improving the curvature generation performances
2016-07-17 17:13:07 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Anthony Thibault
c7c8046231
De-equip goes into a near grab instead of dropping the object.
2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb
Re-enable storing of attach points in user settings
...
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
the near grab action moves the entity.
2016-07-16 12:21:08 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
Brad Davis
cf1c954edc
Merge pull request #8257 from jherico/toolbar_hover
...
Fix hover states for toolbar buttons
2016-07-15 18:02:58 -07:00
Philip Rosedale
4925980cbb
Merge pull request #8255 from jherico/search_circle
...
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
samcake
076b8cd297
Instrumenting the GPU git status
2016-07-15 17:47:54 -07:00
Brad Davis
1145c3b590
Smaller and hotter circle, per Philip
2016-07-15 17:45:16 -07:00
Zander Otavka
6c47db016f
Remove some debug logging
2016-07-15 17:43:37 -07:00
Seth Alves
a0e6654ac6
Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux
...
Grab Script Polish (part deux)
2016-07-15 17:34:50 -07:00
Zander Otavka
6417bb1859
Require tripple equals over double, fix in edit.js
2016-07-15 17:33:47 -07:00
Zander Otavka
ded82294f9
Bring edit.js up to the coding standard
...
There were some serious bad practices going on there, I fixed them.
There are still a few, but they are minimized.
2016-07-15 17:31:41 -07:00
Brad Davis
9ebc0c28c8
Fix hover states for toolbar buttons
2016-07-15 17:12:49 -07:00
Brad Davis
317dee1b23
Fix decoration inflation
2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2
Disable attach point saving
2016-07-15 15:36:20 -07:00
Brad Davis
0d811c489a
Removing debug logging
2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387
Make search line termination a circle, like 2D UI
2016-07-15 13:51:14 -07:00
Brad Hefta-Gaub
574aaa9f28
Merge pull request #8248 from jherico/edit_toolbar
...
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
bc647a15ec
Merge pull request #8250 from BingShearer/dice
...
Removed button color declarations on createDice.js to make icons visible
2016-07-15 12:39:44 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Brad Davis
d084623662
PR feedback
2016-07-15 12:15:23 -07:00
samcake
a3f6ed6a89
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-15 09:22:34 -07:00
samcake
800d2db8f1
New plots to watch the GPU load"
...
"
2016-07-15 09:13:55 -07:00
samcake
89ec547161
Trying to get the gpu timer to work correctly
2016-07-14 18:20:20 -07:00
Brad Davis
cd6abadc41
Make sure buttons get removed when shutting down scripts
2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e
Fix edit toolbar button vanishing, persistent edit button
2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df
Move edit.js to new toolbar API
2016-07-14 17:40:03 -07:00
samcake
d69be5e4d2
Fixing the default value for the lightingMOdel flag when using debugDeferredLighting
2016-07-14 16:45:56 -07:00
Bing Shearer
aa70a38e79
Removed button color declarations to make icons visible.
2016-07-14 15:59:47 -07:00
Anthony J. Thibault
37d60c6c85
eslint clean
2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43
Merge branch 'master' into feature/grab-script-polish-part-deux
2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3
Remember object attach point offsets in user settings
2016-07-14 15:51:05 -07:00
Brad Davis
8685b23610
When using the hand controller as a mouse, disable the navigation focus state in QML
2016-07-14 12:11:12 -07:00
Anthony J. Thibault
eb5107d9a5
highlight the grabbed hotspot when the drop gesture is detected
2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d
Added haptics and hysteresis to drop gesture
2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3
removed shake to drop
2016-07-14 10:32:02 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c
Animate equip hotspots scale instead of alpha
2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538
First pass at equip sphere animation
2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4
Support for model overrides for equip hotspots rendering
...
Bug fix for modelScale on hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c
Fix for double rendering of equip hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975
Reduce calls to Entity.getEntityProperties().
...
By using a single EntityProprtiesCache instance instead of one per controller.
2016-07-13 19:13:39 -07:00
samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -07:00
Stephen Birarda
aa433e7233
handle click event on overlays only when in ignore mode
2016-07-13 16:23:40 -07:00
Stephen Birarda
946c7d4644
only handle trigger events when overlays are shown
2016-07-13 16:21:12 -07:00
Stephen Birarda
61975fe33a
use correct function for peeked overlay
2016-07-13 15:47:52 -07:00
Stephen Birarda
9deb9744c6
handle trigger off in controller mapping
2016-07-13 15:34:20 -07:00
Stephen Birarda
cd1c114807
enable the trigger mapping so it's actually usable
2016-07-13 15:20:31 -07:00
Stephen Birarda
a6f39d5e68
add code from entitySelectionTool to handle hmd overlay pick
2016-07-13 15:06:31 -07:00
