Commit graph

450 commits

Author SHA1 Message Date
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
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
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
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
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