213 commits

Author	SHA1	Message	Date
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
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
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
Seth Alves	fad686571a	Merge pull request #10874 from jherico/overlay_mutex ... Restore mutex in overlay interface	2017-07-03 17:25:42 -07:00
Brad Davis	97edbb7f37	Restore mutex in overlay interface	2017-07-03 14:49:57 -07:00
Brad Davis	6c86c297cb	Don't use a blocking connection for a high-frequency function like editOvleray	2017-07-03 12:40:52 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Seth Alves	e1c805e76f	lock in Overlays::findRayIntersectionInternal	2017-05-11 17:02:00 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
Ryan Huffman	8a1bd781f0	Fix overlay findRayIntersection not properly handing multiple drawInFront overlays	2017-03-13 14:44:14 -07:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
Seth Alves	df034ea6da	remove commented-out code	2017-02-27 11:27:59 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	a286c72b3b	cleanups	2017-02-23 15:12:45 -08:00
Seth Alves	2c42309aaa	perfer tablet over other overlays for mouse-clicks	2017-02-23 13:32:24 -08:00