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
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -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
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
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
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
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
Zach Fox
4ebccfa65c
Use put instead of get sob
2017-10-10 16:23:43 -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
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -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
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Ryan Huffman
9c120f1194
Update AssetMappingsScriptingInterface to not open file for activity event
2017-10-10 09:44:13 -07:00
Cain Kilgore
583b0c521e
Open
2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d
WL 21562 - Fix the error in the Asset Browser
2017-10-10 03:39:13 +01:00
Seth Alves
8ac1875a91
Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login
...
Find nearby entities at login
2017-10-09 17:54:44 -07:00
Seth Alves
3cef3779df
Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build
2017-10-09 17:34:50 -07:00
Seth Alves
aa08053a28
fix osx build
2017-10-09 17:34:43 -07:00
Seth Alves
f349ba3674
replace parent avatar-id with avatar-self-id when exporting entities
2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea
Final fixes
2017-10-09 15:23:22 -07:00
Seth Alves
58534a5a6d
Merge pull request #11550 from druiz17/fix-test-audio
...
fixed looping sample sound bug
2017-10-09 15:21:24 -07:00
Zach Fox
38b95b5403
Instructions HTML file and flow
2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da
don't export avatar-parent sessions IDs into json
2017-10-09 14:02:20 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-09 12:18:09 -07:00
Seth Alves
54204833df
add a getParentTree call for overlays
2017-10-09 12:17:56 -07:00
Zach Fox
acdd1e32e4
First round
2017-10-09 12:11:07 -07:00
Anthony Thibault
13919907de
Merge pull request #11539 from Nex-Pro/patch-1
...
Fixed typo in qWarning message.
2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
druiz17
cd97ab0fdf
fixed looping sample sound bug
2017-10-09 11:39:57 -07:00
Andrew Meadows
bbde1bcd63
move stuff out of writelock when possible
2017-10-09 10:42:42 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532
workaround for bad physics polling on login
2017-10-09 10:27:46 -07:00
Seth Alves
4d2f16efc3
allow project to be built with clang on Linux
2017-10-08 18:01:41 -07:00
Brad Davis
7aeeaeb4e7
Fix rendering transform for text3d overlays
2017-10-07 19:41:43 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
