Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a
handControllerGrab now calls Entities.sendHoverLeaveEntity()
2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Seth Alves
c85e8d0580
don't show equip sphere until hand is in position to equip. widen unequip/drop cone
2016-08-16 11:18:12 -07:00
James B. Pollack
1632f4cb3d
better create locations
2016-08-16 10:52:05 -07:00
Brad Davis
5b09748c00
Merge pull request #8431 from imgntn/assetbutton
...
Open Asset Browser with Button from Edit.js Toolbar
2016-08-13 12:04:21 -07:00
Brad Hefta-Gaub
8a28f7cdac
Merge pull request #8432 from Atlante45/fix/ignore
...
Fix ignore icon stuck in hover state
2016-08-12 19:28:47 -07:00
Atlante45
b6c26b2f87
Fix ignore icon stuck in hover state
2016-08-12 18:13:26 -07:00
James B. Pollack
cd10b2b62e
open asset browser with a button
2016-08-12 15:49:36 -07:00
Atlante45
121890235c
New steam invite icon
2016-08-12 15:24:28 -07:00
James B. Pollack
1366dabc3a
yay
2016-08-12 14:24:29 -07:00
Atlante45
e4dd4c1a41
Merge branch 'master' of https://github.com/highfidelity/hifi into steam
2016-08-12 10:38:05 -07:00
Anthony J. Thibault
1ddbd7022a
Moved keyboardFocus, mouse/touch event methods from Reticle to Entities
2016-08-11 11:52:04 -07:00
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub
9874c63b25
Merge pull request #8398 from zzmp/refactor/system-html
...
refactor system html to split js/css
2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub
412052c285
Merge pull request #8380 from highfidelity/fade
...
Add fade in loading effect
2016-08-09 16:50:05 -07:00
SamGondelman
2360e90d39
simplify valid check for rotation
2016-08-09 15:48:31 -07:00
Zach Pomerantz
d5b822ddbe
remove missing camera selectors
2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520
refactor system html to split js/css
2016-08-09 15:23:31 -07:00
SamGondelman
956078bc91
teleport works with xbox controller
2016-08-09 15:17:36 -07:00
SamGondelman
9b27f8bc0f
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-09 14:55:14 -07:00
Brad Hefta-Gaub
75edb74db4
Merge pull request #8386 from imgntn/edit_1_property_order
...
Edit.js - change spatial property order and cleanup
2016-08-09 12:42:20 -07:00
Atlante45
42c9a695ff
Invite friends in HMD
2016-08-08 15:39:25 -07:00
SamGondelman
328d3128fa
merge from master
2016-08-08 13:30:39 -07:00
Brad Hefta-Gaub
b903c974bc
Merge pull request #8371 from imgntn/teleport_cancel
...
Cancel mode for teleporting
2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a
cleanup
2016-08-08 12:20:48 -07:00
James B. Pollack
bde46adee8
update description
2016-08-08 11:31:43 -07:00
James B. Pollack
f8c1d8f123
change property order and cleanup
2016-08-08 11:01:03 -07:00
SamGondelman
0ec1da4a0d
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-08 10:55:20 -07:00
SamGondelman
b23d3cd35a
fixed messed up transparency on edit selection of shapes
2016-08-05 18:35:16 -07:00
Seth Alves
090a0a6e9a
only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip
2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642
speling
2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7
adjust code that auto-unequips items when they are pulled too far from the equipping hand
2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635
Remove input restrictions on grabbable web entities.
...
You no longer have to be grabbing a grabbable web entity to interact with it.
2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5
Improved support for button rollover and hover
...
Send a combination of mouse and touch events to the web browser entity.
* MouseMove events for when the trigger is not depressed. This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed. This will give us the iPad like scrolling behavior.
2016-08-05 11:32:50 -07:00
Anthony J. Thibault
90a06f0d40
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-05 11:05:10 -07:00
James B. Pollack
80da690680
incease distance a bit
2016-08-05 00:04:30 -07:00
James B. Pollack
7d37f86337
different swapping method
2016-08-04 23:45:43 -07:00
James B. Pollack
80b6ca2b86
single call to istooclose
2016-08-04 16:47:10 -07:00
James B. Pollack
fb8263a882
cleanup
2016-08-04 16:35:50 -07:00
James B. Pollack
63aa0f8c3f
remove weird n
2016-08-04 16:18:13 -07:00
James B. Pollack
f93ed56124
cleaner code
2016-08-04 16:17:21 -07:00
James B. Pollack
c0cfee371e
cancel mode for teleporting
2016-08-04 16:08:51 -07:00
Chris Collins
be87f294d8
Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message
...
fix remote triggering handControllerGrab
2016-08-04 11:55:48 -07:00
James B. Pollack
e012d3cebb
Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers
2016-08-03 15:00:05 -07:00
James B. Pollack
7a41ed25db
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-03 14:59:51 -07:00
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
James B. Pollack
5ad5899140
revert pointer changes
2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056
cleanup dead code
2016-08-02 21:26:04 -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
James B. Pollack
9d56c697e7
no delay!
2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb
no teleport while moving
2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb
start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck
2016-08-02 18:46:47 -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
Thijs Wenker
3a2b0ffa08
Fixes the handControllerGrab Hifi-Hand-Grab
message. Was broken since the hotspot changes to handControllerGrab.js.
2016-08-03 00:47:28 +02:00
James B. Pollack
8541d4bd41
small change to protect
2016-08-02 15:41:28 -07:00
James B. Pollack
d00c1f62fc
fixes
2016-08-02 15:40:19 -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
James B. Pollack
f6984aaff8
clear timeout one more place
2016-08-02 14:42:21 -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
James B. Pollack
41aa485f11
one hand teleprt
2016-08-02 12:52:35 -07:00
James B. Pollack
7fae7e9c77
cleanup
2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df
updates
2016-08-02 12:25:24 -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
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