317 commits

Author	SHA1	Message	Date
SamGondelman	0bfcde67ea	remove overlays from application.cpp	2019-01-24 14:11:24 -08:00
SamGondelman	a75fe4b48b	cloneOverlay, deleteOverlay, findOverlays	2019-01-23 18:54:39 -08:00
SamGondelman	217ff2b1b2	keyboardFocusOverlay	2019-01-23 18:33:35 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Dante Ruiz	a77121a588	keyboard touch ups	2018-11-16 14:20:17 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
John Conklin II	40a48777dc	Merge pull request #14231 from ctrlaltdavid/M16205a ... Fix lasers going through tablet to drawInFrontOverlays	2018-10-18 15:36:29 -07:00
David Rowe	9b4c5e1685	Fix OSX/Linux warnings	2018-10-19 08:20:21 +13:00
David Rowe	1610d79023	Remove now redundant mouse pointer code that tried to do the same thing	2018-10-18 17:11:26 +13:00
David Rowe	c41ce5d484	Make tablet have priority over drawInFront overlays rendered behind it	2018-10-18 17:10:48 +13:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
Olivier Prat	9f4fd47b85	Not using render resolution scale in application and display plugin	2018-07-11 10:11:49 +02:00
Sam Gateau	56a1137f7b	Merge pull request #13312 from SamGondelman/overlayPipelines ... Fix layered overlay rendering and highlight	2018-06-18 14:35:03 -07:00
Dante Ruiz	6ddc768f57	making overlays use precisionPicking and adjust tablet screen position	2018-06-06 15:40:33 -07:00
SamGondelman	aec7206901	get rid of overlay pipelines and just use forward rendering	2018-06-05 14:44:44 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -07:00
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
Brad Davis	eb20181b60	Shut down the overlay interface on exit	2018-03-27 14:18:01 -07:00
David Rowe	05efc5a231	Revert "Remove Overlays.getOverlayObject() from JavaScript API" ... This reverts commit 8e2a3e8c99.	2018-03-21 15:36:39 +13:00
David Rowe	8e2a3e8c99	Remove Overlays.getOverlayObject() from JavaScript API	2018-02-04 14:15:48 +13:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
David Rowe	5dca387055	Remove old, unused overlay panel code	2018-01-12 12:47:22 +13:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
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
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