Commit graph

542 commits

Author SHA1 Message Date
Ryan Huffman
91f847a7f0 Update progress bar image 2016-07-28 17:24:35 -07:00
Ryan Huffman
58932a6806 Add reset of progress bar when domain changes 2016-07-28 17:13:05 -07:00
Ryan Huffman
a786224297 Add easing back to progress.js 2016-07-28 16:55:45 -07:00
Ryan Huffman
873e7b63df Update progress-bar.svg 2016-07-28 16:26:12 -07:00
Ryan Huffman
c1b86fe3d2 Update progress.js to only track total number of downloads 2016-07-28 16:16:11 -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
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