Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-08 23:19:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62531 commits 22 branches 28 tags 1.2 GiB
Commit graph

236 commits

Author SHA1 Message Date
David Rowe
0146eca315 JSDoc review 2017-12-07 10:09:05 +13:00
David Rowe
cd2922a560 Merge branch '21602' into 21624 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2017-11-28 17:04:59 +13:00
David Rowe
4b5aa9bdec Add Overlays API functionality JSDoc 2017-11-25 16:18:14 +13:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00
David Rowe
12e005f215 Initial update of Overlays JSDoc 2017-11-17 17:59:11 +13:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
SamGondelman
2c0272f304 (mostly?) fix touch events 2017-11-13 12:58:31 -08:00
SamGondelman
7d420f5242 isLeftHand, isRightHand, isMouse 2017-11-06 12:29:21 -08:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
SamGondelman
7951826e49 more advanced laser focusing 2017-10-26 16:10:27 -07:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
SamGondelman
9bbb2eb692 austin's comments, send events directly to selected web entity 2017-10-23 10:17:45 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
SamGondelman
c4e6cb28ce move contextoverlay connection to contextoverlayinterface 2017-10-13 16:23:29 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -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
SamGondelman
dacd48862f put back overlay signals for scripts 2017-10-12 16:43:33 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
7f3268548c direct connection to web3doverlay 2017-10-12 14:14:08 -07:00
SamGondelman
27b585cb0b Merge remote-tracking branch 'upstream/master' into pointerEvents 2017-10-12 11:22:23 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07: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 Davis
69f869b339 Remove unecessary blocking call 2017-10-11 11:01:06 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
Anthony J. Thibault
d0f9a20a01 Fix for tablet grabbing at small scales 2017-09-07 15:10:15 -07:00
Brad Davis
0a5bef22fc Allow asynchronous editing of non-QML overlays 2017-08-22 17:12:18 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +02:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Brad Davis
f8b76d65ab Fixing overlay crashes, for real 2017-07-06 18:01:26 -07:00