Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 19:22:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
48351 commits 71 branches 56 tags 1.2 GiB
Commit graph

891 commits

Author SHA1 Message Date
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1 
ignoreIK flag on action-grabbable objects works again
 2016-08-22 18:48:39 -07:00
James B. Pollack
e2a6c08f19 cleanup prints 2016-08-22 17:44:22 -07:00
James B. Pollack
4b61cc9f5f new user data editor 2016-08-22 17:30:08 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-22 16:05:16 -07:00
howard-stearns
fc906df5f6 separate into three files 2016-08-22 15:04:38 -07:00
howard-stearns
6daf91166f pr comments 2016-08-22 15:03:51 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
howard-stearns
989974738a dead code removal 2016-08-22 12:50:51 -07:00
howard-stearns
80afc6a3b4 pr review comments 2016-08-22 10:59:21 -07:00
David Rowe
80ee864143 Add icon to "Share in Feed" button 2016-08-20 18:17:49 +12:00
Howard Stearns
35829f5f01 Merge pull request #8489 from howard-stearns/merge-from-master-to-discovery3 
Merge from master to discovery3
 2016-08-19 21:36:48 -07:00
Howard Stearns
7428eb2635 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-19 21:34:55 -07:00
Howard Stearns
527fb0941f decrease snapshot review dialog height 2016-08-19 21:28:12 -07:00
David Rowe
8d88726dba Fix spacing above image when single column 2016-08-20 13:57:00 +12:00
David Rowe
a94c24e6df Text and controls 2016-08-20 13:44:47 +12:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement 
Movement changes for Hand Controllers
 2016-08-19 18:36:40 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
David Rowe
6a9f221a9e Snapshot image border 2016-08-20 11:36:53 +12:00
David Rowe
3d2afaac77 Size and position snapshot dialog content blocks 2016-08-20 11:19:30 +12:00
Anthony J. Thibault
ff4c194756 eslint fix 2016-08-19 15:31:57 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
howard-stearns
1e08914f8d simplify 2016-08-19 14:32:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
Seth Alves
ff95ef2492 ignoreIK flag on action-grabbable objects works again 2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746 bug fix for when web-entity is deleted while being scrolled 2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
howard-stearns
aab3b83ad9 open login if user tries to share and is not logged in, rather than 
messaging user that they cannot share
 2016-08-18 14:20:53 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
howard-stearns
5e8722ccf5 persist "open feed after" checkbox setting 2016-08-18 12:58:00 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
James B. Pollack
1eaac8605f invert the structure and make it work with oculus 2016-08-18 10:43:37 -07:00
James B. Pollack
09cd0b8f4a debug prints 2 2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
9e14191217 recondition 2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829 debug prints 2016-08-18 08:43:26 -07:00
James B. Pollack
8ede4ddb66 longform 2016-08-17 17:33:24 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -07:00
James B. Pollack
fdfcc235b6 as functions 2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139 get lsy lsx rsy values 2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee update whens 2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275 add whens 2016-08-17 15:50:19 -07:00
James B. Pollack
a7ba4ce1f9 jumping 2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08:43 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
howard-stearns
8823f48666 new snapshot review behavior 2016-08-17 10:00:20 -07:00
Brad Hefta-Gaub
f66b36ff07 Merge pull request #8441 from imgntn/marketplace_spawn_location 
Better create locations for Entities
 2016-08-17 09:09:00 -07:00
James B. Pollack
0810ad0e7b use square of sides 2016-08-16 18:13:42 -07:00
James B. Pollack
e9c2a1d509 cleanup prints 2016-08-16 18:03:34 -07:00
James B. Pollack
06787029b7 small 2016-08-16 17:58:35 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
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
howard-stearns
a8fd92d2bf Hide reticle during snapshot 2016-08-16 12:35:49 -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
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -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
howard-stearns
afe376a0a2 fix breakage I made to snapshot uploading 2016-08-12 14:08:50 -07:00
howard-stearns
1b62332058 don't show checkboxes on confirmation dialog when there's only one picture 2016-08-12 11:50:11 -07:00
howard-stearns
ae9af88db2 Spacing and better size for HMD pictures. 2016-08-12 11:28:35 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
David Kelly
3408ad6f54 Wording change 2016-08-12 10:23:33 -07:00
David Kelly
e23e9014c6 Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares 2016-08-12 10:16:27 -07:00
howard-stearns
e3aae0e93f Fix up layout, and adapt to recent changes in file structure 2016-08-11 16:23:01 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Anthony J. Thibault
1ddbd7022a Moved keyboardFocus, mouse/touch event methods from Reticle to Entities 2016-08-11 11:52:04 -07:00
David Kelly
c1edd008a4 PR feedback 2016-08-11 11:47:55 -07:00
David Kelly
47dea0ea2b Hide sharing if not logged in, or in an accessible place 
The grand future will have option to login, and so on...
 2016-08-10 17:09:43 -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
howard-stearns
5715fd00f3 proper share dialog 2016-08-09 16:42:41 -07:00
SamGondelman
2360e90d39 simplify valid check for rotation 2016-08-09 15:48:31 -07:00
Howard Stearns
2cdca6211f Merge pull request #8389 from davidkelly/dk/uploadSnapshot 
First cut of a snapshot uploader
 2016-08-09 15:47:04 -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
David Kelly
d4f376879d PR feedback 2016-08-09 15:05:23 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
David Kelly
0d1df2627d Merge pull request #8356 from howard-stearns/feed-display 
feed display
 2016-08-09 14:52:53 -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
David Kelly
c8f3a898d2 First cut of a snapshot uploader 
Will need to test end-to-end shortly, etc...
 2016-08-08 15:27:27 -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
elisa-lj11
e8c5303f1b Removed examples.js 2016-08-04 17:23:36 -07:00
elisa-lj11
90a1325f65 Finalized combobox feature 2016-08-04 17:02:57 -07:00
elisa-lj11
b39c8c52ab Included combobox in marketplace view 2016-08-04 17:02:04 -07:00
elisa-lj11
d63d0ba870 In process of creating combobox for marketplace with qml 2016-08-04 17:02:04 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
9833ba1987 No errors upon build 2016-08-04 16:51:14 -07:00
James B. Pollack
80b6ca2b86 single call to istooclose 2016-08-04 16:47:10 -07:00
elisa-lj11
4f33e1502f starting the zip project 2016-08-04 16:46:56 -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
howard-stearns
fed775ff83 simple snapshot confirmation 2016-08-04 15:52:39 -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
howard-stearns
4d0c5c5d19 fix snapshot button hover 2016-08-03 16:22:46 -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
Philip Rosedale
53ef9fa5a8 test commit 2016-08-02 16:05:46 -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
Howard Stearns
c2d1f08551 Merge pull request #8342 from highfidelity/dk/snapshot 
Snapshot button
 2016-08-02 15:31:50 -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
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -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
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
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
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
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
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
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
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
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
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
Stephen Birarda
5fc2afe549 switch to new icon for ignore target 2016-07-13 15:06:31 -07:00
Stephen Birarda
599d9c568a remove unneeded check from copy-paste 2016-07-13 15:06:31 -07:00
Stephen Birarda
aeabae4faf handle removal of an overlay for an avatar that is removed 2016-07-13 15:06:31 -07:00
Stephen Birarda
7bd8c45098 add the correct ignore icon, cleanup data structure 2016-07-13 15:06:31 -07:00
Stephen Birarda
22ab3fc7b5 cleanup a couple of comments 2016-07-13 15:06:31 -07:00
Stephen Birarda
154834b0ab hook up ignoring of user to overlay 2016-07-13 15:06:31 -07:00
Stephen Birarda
3c330d0c48 show simple overlay for script testing 2016-07-13 15:06:31 -07:00
Stephen Birarda
8724f0d0d9 add a stubbed version of the ignore script 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Seth Alves
1999193907 split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely 2016-07-12 11:42:58 -07:00
Seth Alves
367c26a5ee wait a bit before resetting collides-with-my-avatar 2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52 finish merge 2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12 less changes to hand grab 2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07 cleanup 2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752 play nice with grab 2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63 cleanup comments etc 2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211 fix some bugs and also change it to use arrival mode 2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e Equip hotspots render when your hand is near them. 2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053 make thumb and trigger work in any order and on either button released 2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c add new target model 2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177 make thumb and trigger mode an option 2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
Anthony J. Thibault
2db8160568 handControllerGrab improvements 
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
 2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
SamGondelman
6a44ea76e5 fixed snapshot preview on windows 2016-07-06 11:57:29 -07:00
Andrew Meadows
76cb80112e support new shape types in edit.js 2016-07-06 10:51:43 -07:00
James B. Pollack
b0494ec9d5 bug notes 2016-07-05 17:48:30 -07:00
SamGondelman
4eb94f8ccb added support for snapshot notification in HMD, although 3d image overlays seem to be broken in master 2016-07-05 17:40:33 -07:00
James B. Pollack
26950eaaa6 working second model adjustment with hack but wtf 2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6 working initial beam, still trying to clear up no intersection beam issues 2016-07-05 17:25:21 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88 add stuff for fading in/out and also for a nice stretchy beam 2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72 add teleport models etc 2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0 Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
David Rowe
760f4366e1 Don't show users border when hover mouse if logged out 2016-07-02 11:25:04 +12:00
James B. Pollack
00ce75ef48 more notes 2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26 cleanup 2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99 teleportr 2016-07-01 15:19:37 -07:00
howard-stearns
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -07:00
James B. Pollack
4762091aaf add easy mode 2016-07-01 11:12:20 -07:00
howard-stearns
43c7fd1e27 New art. 2016-07-01 10:34:13 -07:00
howard-stearns
804a187a7b Mute changes. 2016-07-01 10:17:17 -07:00
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots 
equip-hotspots feature
 2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1 fix vive bug 2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77 notes 2016-06-30 17:05:16 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
James B. Pollack
82e074de0f working teleporter 2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4 equip bug fix 
you should not be able to equip an object that is already equipped, with your other hand.
 2016-06-30 16:00:18 -07:00
Brad Davis
dfb6cb1aa3 Updating entity list 2016-06-30 14:25:36 -07:00
Anthony J. Thibault
82b1cba81d equip improvements 
Allow the user to equip an object while near or far grabbing it from the other hand.
 2016-06-30 13:58:44 -07:00