SamGondelman
7686948daf
resolve conflicts and cleanup
2017-10-20 15:23:17 -07:00
SamGondelman
fb969964f3
generalized scripting interfaces
2017-10-20 14:37:10 -07:00
SamGondelman
24ce09f914
generalized pointer, laserpointermanager -> pointermanager
2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e
one global pickmanager
2017-10-19 16:55:24 -07:00
SamGondelman
3572f7f5db
non-templated pickresult wip
2017-10-19 13:41:16 -07:00
SamGondelman
58172cfbd4
merge from master
2017-10-17 18:05:59 -07:00
SamGondelman
640ad514bc
updates based on austin's comments
2017-10-17 17:53:10 -07:00
Seth Alves
e9d4da5a01
Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard
...
Fix web3Doverlays and webEntities keyboard not showup
2017-10-17 17:32:04 -07:00
Bradley Austin Davis
9e46e288b1
Merge pull request #11604 from SamGondelman/endSphere
...
Scale LaserPointer end overlay in C++
2017-10-17 16:37:35 -07:00
SamGondelman
05f4883104
get rid of valid
2017-10-17 16:15:54 -07:00
druiz17
9a881c5e57
fix keyboard
2017-10-17 15:43:23 -07:00
SamGondelman
6d6ede075f
resolve conflicts
2017-10-17 15:26:32 -07:00
SamGondelman
8a5759df69
PickManager::addPick
2017-10-17 15:22:39 -07:00
SamGondelman
3ef7ebffba
working generalized pickmanager
2017-10-17 15:09:41 -07:00
SamGondelman
596be8ec27
pickmanager wip
2017-10-17 13:16:37 -07:00
SamGondelman
ba4f41b59a
fix warnings
2017-10-17 12:03:59 -07:00
Sam Gondelman
2e69d2b1ad
missed one scripting interface reference
2017-10-17 11:13:02 -07:00
Brad Hefta-Gaub
f7a1816a99
Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue
...
Reduce present traffic on main thread event queue.
2017-10-16 18:02:11 -07:00
SamGondelman
429905de51
update scripts to use ignoreItems, fix caching bug
2017-10-16 15:52:17 -07:00
Brad Hefta-Gaub
c4e672d6b8
Merge pull request #11582 from ElderOrb/case8213
...
8213 Keyboard Input Field: Reveals Passwords
2017-10-16 14:57:18 -07:00
Bradley Austin Davis
3f99e70af0
C++ cleanup for pointers / picking
2017-10-16 14:20:31 -07:00
SamGondelman
aee817fbbc
scale end sphere in c++ for controller modules
2017-10-16 13:31:25 -07:00
Anthony J. Thibault
67d43b4fac
Use atomic<bool> and compare_exchange_strong
2017-10-13 16:03:56 -07:00
Ryan Huffman
4a9aa30630
Merge pull request #10956 from birarda/feat/update-default-avatar
...
update default avatar to be better with oculus grab triggers
2017-10-13 15:57:37 -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
Brad Hefta-Gaub
60030c08fa
Merge pull request #11573 from druiz17/bug-hud-module
...
hud module intersects with dev stats window
2017-10-13 11:48:06 -07:00
Dante Ruiz
d14e6b6e5a
Merge pull request #11450 from ElderOrb/case7722
...
7722 Add onHover Outline to Tablet "X" Button
2017-10-13 11:38:38 -07:00
druiz17
2422c9d9f3
made requested changes
2017-10-13 10:45:24 -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
druiz17
83d2a54b0f
fixed some bugs
2017-10-12 13:48:21 -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
beholder
c31aa6bcdb
8213 Keyboard Input Field: Reveals Passwords
2017-10-12 22:08:46 +03: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
druiz17
a6bc6a09a5
Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module
2017-10-12 10:34:17 -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
druiz17
42cab19ab2
generialze window search
2017-10-11 16:04:35 -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
druiz17
8f3fa08b1e
hud module intersects with stats window
2017-10-11 11:41:10 -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
