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

57486 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
Seth Alves
71f0899178 Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-21 16:19:51 -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
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
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
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
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
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
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
Seth Alves
bd37f8edf5 Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-20 09:03:59 -07: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
Ken Cooke
87d9dfd243 Merge pull request #11002 from ctrlaltdavid/21461 
Fix noise reduction checkbox not always working
 2017-07-19 19:22:28 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
Stephen Birarda
3936ee93f0 use default scripts path in EditTabView to fix load on OS X 2017-07-19 16:34:04 -07:00
Atlante45
70a5916ef3 Fix debug builds startup crash 2017-07-19 16:18:01 -07:00
utkarshgautamnyu
ce5ff23e70 made changes to size of content to dosplay 'choose file' button 2017-07-19 16:15:34 -07:00
Seth Alves
be48268be8 getMeshes handles registration point 2017-07-19 15:02:40 -07:00
Seth Alves
8a732e7d4b Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-19 13:58:07 -07:00
Seth Alves
750b7192af trying to get the resulting model to line up with the originals 2017-07-19 13:58:03 -07:00
Clément Brisset
d76039387a Merge pull request #10992 from Atlante45/fix/heap-use-after-free 
Fix potential data corruption in the FileCache
 2017-07-19 10:44:02 -07:00
Seth Alves
a8698c2fbc EntityScriptingInterface::getMeshes support for Model entities 2017-07-19 08:59:09 -07:00
Andrew Meadows
d48f45f7e6 Merge pull request #10990 from druiz17/bug-help-issue 
fixed another instance of the tablet getting stuck on the help screen
 2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb made requested changes 2017-07-19 16:28:16 +01:00
Brad Hefta-Gaub
044b8fc19a Merge pull request #10993 from druiz17/bug-rogue-laser 
Do not show lasers when editing in 2D mode.
 2017-07-18 16:53:11 -07:00
Brad Davis
009df176c5 Ensure we continue calling idle when minimized 
Conflicts:
	interface/src/Application.cpp
 2017-07-18 16:14:17 -07:00
Brad Davis
43476afff5 Merge pull request #10995 from AndrewMeadows/fix-debug-build 
fix broken debug build
 2017-07-18 16:00:18 -07:00