Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 05:51:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57722 commits 25 branches 0 tags 1.1 GiB
Commit graph

57722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
6e0394865e fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset 2017-07-23 08:05:09 -07:00
Seth Alves
6f86b266cb support writing of vertex colors 2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953 make OBJ reader able to handle files where some vertices have colors and others don't 2017-07-22 11:57:51 -07: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
Seth Alves
71f0899178 Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-21 16:19:51 -07:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01: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
Andrew Meadows
29daac83a4 optimize cube update only for connected things 2017-07-21 10:59:25 -07:00
Andrew Meadows
d86ae98211 always update bounding box on script edit 2017-07-21 10:57:09 -07:00
Andrew Meadows
17323ba42a always update the bounding box 2017-07-21 10:25:03 -07:00
Andrew Meadows
1e6fc85e3e fix math for expanded bounding box 2017-07-21 10:17:10 -07: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
anshuman64
5f3b68d544 Use ctrl+H instead of alt+H 2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927 mods for changes camera views 2017-07-21 01:01:23 +01:00
Seth Alves
c2667fc89b Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-20 16:34:38 -07:00
Seth Alves
72e5fecb4e do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex 2017-07-20 16:34:34 -07:00
Andrew Meadows
e1eb223616 cleanup bad indentation, cruft, and constants 2017-07-20 16:12:33 -07:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -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
utkarshgautamnyu
0ae8f4526e Merge branch 'express_custom_install' of https://github.com/highfidelity/hifi into express_custom_install 2017-07-20 13:55:39 -07:00
utkarshgautamnyu
7ddac54b37 copy from production for PR builds unchecked for custom and express also over rides deselection 2017-07-20 13:55:04 -07: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
Seth Alves
8a0b43981c Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-20 12:28:58 -07: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
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07: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
utkarshgautamnyu
2310ecab8d Update NSIS.template.in 2017-07-20 11:18:49 -07:00
utkarshgautamnyu
de5984d121 Update NSIS.template.in 2017-07-20 10:39:04 -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