Anthony J. Thibault
713bee84c3
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-03 14:06:43 -07:00
Seth Alves
9962d47173
Merge pull request #8326 from birarda/kick
...
kick
2016-08-03 09:21:09 -07:00
Chris Collins
b2a354ddb9
Merge pull request #8331 from huffman/feat/progress-updates
...
progress.js updates
2016-08-02 21:10:54 -07:00
Ryan Huffman
adbd9ff854
Add constants for progress bar offset
2016-08-02 16:34:57 -07:00
Ryan Huffman
1f2e34d59b
Remove 3d overlay from progress.js
2016-08-02 16:29:40 -07:00
Ryan Huffman
79a243b171
Clean up progress.js
2016-08-02 16:19:38 -07:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -07:00
Stephen Birarda
6196f5e86f
switch back to SVGs, remove triggered for controller pose
2016-08-02 14:35:51 -07:00
Stephen Birarda
fa9199c419
use float for clicked value in mod.js
2016-08-02 14:35:51 -07:00
Stephen Birarda
f02f619597
use boolean from RTClick and LTClick
2016-08-02 14:35:51 -07:00
Stephen Birarda
6d38301a3a
rename ignore script to mod.js
2016-08-02 14:35:51 -07:00
Stephen Birarda
6051fcd8f9
use click instead of trigger, change targets to PNG
2016-08-02 14:35:51 -07:00
Stephen Birarda
7d9937e412
handle overlay change if permissions change
2016-08-02 14:35:51 -07:00
Stephen Birarda
a15aef34df
modify ignore script to handle kicking
2016-08-02 14:35:51 -07:00
Anthony Thibault
cf7450beb7
handControllerGrab and web entity input integration
2016-07-29 17:50:45 -07:00
Ryan Huffman
5d50389e29
Make updates to the hmd progress bar
2016-07-29 17:17:59 -07:00
Ryan Huffman
9f6da23b15
Update progress bar images
2016-07-29 10:11:28 -07:00
Ryan Huffman
6279b96223
Add minor tweaks to progress.js
2016-07-29 10:11:12 -07:00
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
Eric Levin
5167809342
release near and far grab at trigger click detent
2016-07-28 08:51:11 -07:00
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
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
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
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
Anthony J. Thibault
212175bdaa
bug fix for far-grab pulling the object in the wrong direction
2016-07-19 10:23:00 -07:00
Brad Davis
d98ae1ba9c
Ensure the pause overlay is unlit (emissive)
2016-07-19 07:10:34 -07:00
