Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:00:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
60448 commits 76 branches 59 tags 1.2 GiB
Commit graph

60448 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
67d43b4fac Use atomic<bool> and compare_exchange_strong 2017-10-13 16:03:56 -07:00
Anthony J. Thibault
a2a6cd0c7a Reduce present traffic on main thread event queue. 
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.

This PR attempts to address this in two ways:
  * Change the connection between the DisplayPlugin::presented signal and
    the Application::onPresent slot to be a DirectConnection.  This should
    prevent the main thread from filling up with signal events.
  * Within Applicaiton::onPresent use an atomic counter to prevent the main
    thread from filling up with repeated Idle events.
 2017-10-13 14:28:23 -07:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread 
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
 2017-10-12 17:37:05 -07:00
Stephen Birarda
8a331e29a2 Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker 
Feat/JS-Baker
 2017-10-12 16:16:02 -05:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
utkarshgautamnyu
75aa3a73ad changed pointer args to references in JSBaker:bakeJS() 2017-10-12 12:08:44 -07:00
Zach Fox
30d6c78e4e Merge pull request #11580 from ElderOrb/case8210 
8210 Keyboard Input Field: Pressing Space should Clear Field
 2017-10-12 11:49:18 -07:00
utkarshgautamnyu
49f601329f Update JSBaker.h 2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc Update JSBaker.cpp 2017-10-12 11:34:28 -07:00
Zach Fox
1227168939 Merge pull request #11575 from ElderOrb/QTBUG-49297 
workaround for https://bugreports.qt.io/browse/QTBUG-49297
 2017-10-12 10:56:45 -07:00
beholder
f31316b0aa 8210 Keyboard Input Field: Pressing Space should Clear Field 2017-10-12 15:03:32 +03:00
Anthony J. Thibault
0a943fbe7b Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. 
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.

The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
 2017-10-11 17:32:34 -07:00
Sam Gateau
7edb41b0ea Merge pull request #11577 from samcake/orange 
Fix the HDR generation of cube maps from equirect images (1x2)
 2017-10-11 17:12:27 -07:00
Brad Hefta-Gaub
cd2a742974 Merge pull request #11576 from SamGondelman/pointerEvents 
Remove unused HFMetaEvents
 2017-10-11 16:10:43 -07:00
beholder
dcdf85b08e workaround for https://bugreports.qt.io/browse/QTBUG-49297 2017-10-12 02:10:09 +03:00
samcake
592a4de1e5 Fix the HDR generation of cube maps from equirect images (1x2) 2017-10-11 15:56:22 -07:00
Sam Gateau
38b467a6bf Merge pull request #11570 from jherico/overlays_blocking 
Remove unnecessary blocking call
 2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Seth Alves
a4462056df Merge pull request #11549 from sethalves/linux-clang-build 
allow project to be built with clang on Linux
 2017-10-11 13:28:45 -07:00
Seth Alves
ca128a3251 merge from upstream 2017-10-11 11:09:33 -07:00
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3 
2017-10-10 Commerce Frontend Updates
 2017-10-11 11:07:03 -07:00
Bradley Austin Davis
1e91c5cfce Merge pull request #11561 from AndrewMeadows/improve-geometry-cache 
more correct use of BufferView in GeometryCache
 2017-10-11 11:03:53 -07:00
Brad Davis
69f869b339 Remove unecessary blocking call 2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6 Fix date displays 2017-10-11 10:55:14 -07:00
utkarshgautamnyu
6e4a5da69d Update JSBaker.h 2017-10-11 10:44:19 -07:00
utkarshgautamnyu
1d373c2988 Update JSBaker.cpp 2017-10-11 10:38:48 -07:00
John Conklin II
4394415058 Merge pull request #11565 from huffman/fix/fst-texdir 
Fix .fst texdir not being followed
 2017-10-11 10:24:37 -07:00
Zach Fox
c2733a4186 Fix notification bug 2017-10-11 09:47:16 -07:00
Brad Hefta-Gaub
b69c2a27ca Merge pull request #11569 from Atlante45/new-master 
Merge stable back into master
 2017-10-11 09:33:55 -07:00
Andrew Meadows
d9ba75ca72 fix warning about implicit cast from 64 to 32 bits 2017-10-11 06:07:07 -07:00
Ryan Huffman
69b6a8c163 Fix .fst texdir not being followed 
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.

There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
 2017-10-10 18:29:59 -07:00
Andrew Meadows
886422cbef remove unused variable 2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2 remove unused variable 2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a more correct use of BufferView in GeometryCache 2017-10-10 17:02:26 -07:00
Atlante45
6dd49f5c32 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-10 16:53:34 -07:00
Sam Gateau
160be95081 Merge pull request #11563 from Atlante45/fix/warnings 
Fix warnings
 2017-10-10 16:38:31 -07:00
Zach Fox
4ebccfa65c Use put instead of get sob 2017-10-10 16:23:43 -07:00
Atlante45
cea0f48e5c Fix warnings 2017-10-10 15:19:09 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe Merge pull request #11383 from ElderOrb/case7384 
7384 On Domains without Edit Access, Create Button Text still Highlights
 2017-10-10 14:30:49 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Zach Fox
702528a8cc Fully integrate cert properties 2017-10-10 13:27:17 -07:00
Zach Fox
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Seth Alves
4a3b59ea61 Merge pull request #11560 from druiz17/far-grab-nondynamic 
Far grab non-dynamic entities
 2017-10-10 12:29:38 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
Sam Gateau
c44efda978 Merge pull request #11349 from Zvork/hdrcube 
Under the hood support for HDR cube maps
 2017-10-10 11:43:41 -07:00
Ryan Huffman
568a7ba439 Merge pull request #11557 from cain-kilgore/21562 
WL 21562 - Fix the error in the Asset Browser
 2017-10-10 11:12:33 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event 
Add uploading to asset server event
 2017-10-10 11:03:33 -07:00
druiz17
013e15c9a2 made requested changes 2017-10-10 10:54:56 -07:00