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

57853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
de9f620121 Merge remote-tracking branch 'upstream/master' into qt59 2017-07-23 14:07:19 -07:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
Seth Alves
a1107deef1 cleanups 2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3 vertex color support in ModelScriptingInterface 2017-07-23 08:06:26 -07:00
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
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
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
David Kelly
8de09affad Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning 
reposition context overlay when far away
 2017-07-21 13:35:57 -07: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
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e merged with new stuff too 2017-07-21 13:16:41 -07:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Zach Fox
a346e5ccf6 New inspect icon 2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07: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
Zach Fox
7d125f44e4 Set parentID even when overlay already exists 2017-07-21 09:35:49 -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
David Kelly
9c0026bf69 make sure context overlays are on after pal is dismissed 2017-07-21 08:40:12 -07: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 Kelly
875d0eb815 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:20:19 -07:00
David Kelly
6db2e2c6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:18:33 -07: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
Zach Fox
65a0f868ce Merge pull request #11017 from zfox23/contextOverlays_hoverHandlers 
Add hover/unhover handlers to context overlays
 2017-07-20 17:24:35 -07:00
Dante Ruiz
649b974927 mods for changes camera views 2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa Add hover/unhover handlers to context overlays 2017-07-20 16:51:00 -07: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
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
Zach Fox
3698fe9b6b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-20 15:10:06 -07:00
David Kelly
8f8f695e73 Merge pull request #11015 from davidkelly/dk/placeholderHighlighting 
registration point fix
 2017-07-20 15:08:38 -07:00
David Kelly
c8015e4eb6 cleanup, fixed build issue 2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6 whitespace issue 2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16 registration point 2017-07-20 14:18:07 -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