Commit graph

57516 commits

Author SHA1 Message Date
David Rowe
450badf023 Merge branch 'master' into vr-edit-a 2017-07-25 12:21:49 +12:00
Chris Collins
8b978beb31 Merge pull request #11022 from 1P-Cusack/21463
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
2017-07-24 15:13:21 -07:00
Seth Alves
23cb7d8bee Merge pull request #11030 from MiladNazeri/editJs-edit
Fix Parent Joint in edit js WL # 21471 :
2017-07-24 14:11:48 -07:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock
Fix for audio deadlock & audio device selection
2017-07-24 14:03:29 -07:00
Chris Collins
c90442137c Merge pull request #11032 from Atlante45/stable
Stable => Master
2017-07-24 11:42:59 -07:00
Atlante45
d21ca3f1fc Merge branch 'stable' of https://github.com/highfidelity/hifi into stable 2017-07-24 11:41:02 -07:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01 Merge pull request #10999 from birarda/bug/html-path-on-mac-build
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc Merge pull request #10798 from humbletim/add-persistent-console-history
Save JS "Console..." history across sessions
2017-07-24 09:24:04 -07:00
milad
1ce1204a64 WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));

The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));

createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
2017-07-24 10:06:44 -05:00
David Rowe
72e3c9a881 Insert UI handling between input updates and editor actions 2017-07-24 16:59:34 +12:00
David Rowe
51522edd94 Separate out input objects from editor object 2017-07-24 16:32:10 +12:00
David Rowe
1f244fb487 Better way of handling grip click 2017-07-24 15:25:00 +12:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
David Rowe
4353400d23 Fix null state transition 2017-07-22 17:55:00 +12:00
David Rowe
a7f7a2c401 Add representative Tool menu UI elements 2017-07-22 17:47:49 +12:00
David Rowe
9cb8aea4fd Make grip click delete selection 2017-07-22 13:06:15 +12:00
David Rowe
44fe60ddda Stub dominant hand setting support 2017-07-22 11:47:14 +12:00
David Rowe
233655b76b Split script into multiple files 2017-07-22 11:20:17 +12:00
Andrew Meadows
bec7f7c644 Merge pull request #11010 from druiz17/bug-tablet-third-person
You can now properly grab and move the tablet in third person
2017-07-21 13:33:55 -07:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Brad Davis
5b5e94700e Additional audio fixes 2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31 Temporary patch for deadlock 2017-07-21 09:52:36 -07:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
vladest
b13cbd5bde Merge branch 'master' into avatar_default_speeds 2017-07-21 17:45:11 +02:00
Leander Hasty
26cc8134eb WL21463 - entitySelectionTool: use multiarg findRayIntersection instead of editOverlay.
We're seeing the ignoreRayIntersection flag not take effect before findRayIntersection calls.  This may be due to editOverlay and editOverlays becoming non-blocking in 1f7d2b2 .

This altered the flow in mousePressEvent significantly; the first block, intended to handle scale/clone only, started handling rotation (should have been second block) and sometimes selection (should have been third block).

Similarly, in the various rotate grabbers' onMove methods, the pickRay will no longer intersect anything other than rotateOverlayTarget; this avoids some awful behavior when scrubbing over the size and clone grabbers.

This also reverts unnecessary parts of the prior commits to keep the diff for this WL cleaner, and adds a few TODO comments to revisit about redundant statements and incorrect names.

In addition, we've noticed but not fixed herein:

* There is a minor edgecase near 0 and 180, where it's difficult to get within a degree or two of the poles occasionally.
* The scale/clone grabbers don't stay disappeared for rotation in some cases.  This doesn't impact usability anymore, but it'd be nice to determine why they come back when they hide briefly.
* The addGrabbers for yaw/pitch/roll could be deduplicated, and yaw has some multiselect "reposition" enable/disable logic that pitch and roll lack.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
2017-07-21 10:56:24 -04:00
David Rowe
7e4e68ccf9 Fix highlight overlay sometimes being out of position 2017-07-21 14:52:24 +12:00
David Rowe
f858abcf7c Resume app from idle state 2017-07-21 14:31:15 +12:00
David Rowe
218b13b0e9 Turn off laser when grabbing or scaling with hand 2017-07-21 14:17:50 +12:00
David Rowe
1434f98dab Fix multi-selection scale handles box after toggling while grabbed 2017-07-21 13:49:26 +12:00
David Rowe
cf51c546d3 Fix direct scaling scale and position 2017-07-21 13:43:20 +12:00
David Rowe
e09113fef5 Fix handle scaling down to very small dimensions 2017-07-21 13:18:10 +12:00
Clément Brisset
1cb030992f Merge pull request #10945 from rickdaniels/jh21402
Address #21402 Added a handler to Sit.js script for the onLoadComplet…
2017-07-20 18:02:47 -07:00
Stephen Birarda
7cfdf7d5ae Merge pull request #11000 from highfidelity/bug/6219
made changes to size of content to display 'choose file' button
2017-07-20 17:46:15 -07:00
rick@ghostpunch.com
52c8d77d8e Merge branch 'master' of git://github.com/highfidelity/hifi into jh21402 2017-07-20 17:03:46 -04:00
rick@ghostpunch.com
451b7ec1de Revert the role name filter change as it has already been added to the repo 2017-07-20 17:01:02 -04:00
Clément Brisset
c128a3ff86 Merge pull request #11001 from Atlante45/fix/debug-builds
Fix debug builds startup crash
2017-07-20 13:31:55 -07:00
Clément Brisset
d2e64a52e1 Merge pull request #11013 from Atlante45/update-sit
Update sit script in the repo
2017-07-20 13:28:29 -07:00
rick@ghostpunch.com
2b9da2bcba Fix another typo. Sigh... 2017-07-20 15:44:59 -04:00
rick@ghostpunch.com
cc0ed9ead4 Corrected typo in role name search filter. Removed commented out debug print 2017-07-20 15:26:12 -04:00
Atlante45
c0da0cb439 Update sit script in the repo 2017-07-20 11:56:41 -07:00
Brad Hefta-Gaub
cdb7652423 Merge pull request #11007 from MiladNazeri/patch-2
Update CONTRIBUTING.md
2017-07-20 11:55:26 -07:00
Seth Alves
38a955b886 Merge pull request #11011 from trentpolack/21434-obj-vertexcolors
WL21434 - Add vertex color support for OBJ files.
2017-07-20 10:37:37 -07:00
trent
559e2e0ebb Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex. 2017-07-20 13:09:17 -04:00
Chris Collins
13262afec7 Merge pull request #10972 from highfidelity/RC-48
Beta Release 48 - Includes up to Developer Release 6863
2017-07-20 08:57:47 -07:00
trent
ff3e9263ef Stupid tabs. 2017-07-20 11:40:42 -04:00
trent
786535a001 Merge branch 'master' of https://github.com/highfidelity/hifi into 21434-obj-vertexcolors 2017-07-20 11:38:54 -04:00
trent
d71b0802a7 Added vertex color support to OBJReader.h|cpp. 2017-07-20 11:38:42 -04:00
Dante Ruiz
3805228b70 fixed grab the tablet in third person 2017-07-20 16:26:51 +01:00
MiladNazeri
13274fb9a3 Update CONTRIBUTING.md
Same issue as the readme.md change.
2017-07-20 10:20:56 -04:00