233 commits

Author	SHA1	Message	Date
David Back	b165eac6a0	Merge branch 'master' into mergeAccountGlobalServices	2018-01-05 10:54:59 -08:00
Melissa Brown	eb83c68d46	Merge pull request #12094 from ctrlaltdavid/resolution-removed ... Delete web3d overlay "resolution" property JSDoc	2018-01-05 10:38:07 -08:00
David Rowe	d6a0457ee5	Delete web3d overlay "resolution" property JSDoc	2018-01-05 16:48:37 +13:00
David Back	c620f3274c	merge	2017-12-22 16:28:29 -08:00
Alexander Ivash	bd3a056f4e	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict ... note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope	2017-12-21 20:03:38 +00:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
David Rowe	92be33da31	Web3d overlay's "resolution" property has been removed	2017-12-13 11:40:44 +13:00
David Rowe	578c42b4ea	Merge branch 'master' into 21624	2017-12-13 09:41:09 +13:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
David Rowe	0146eca315	JSDoc review	2017-12-07 10:09:05 +13:00
David Back	3873a8f91e	Merge branch 'master' into mergeAccountGlobalServices	2017-12-04 14:46:59 -08: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	97b4dcaa5c	Web3DOverlay's resolution property is deprecated	2017-11-28 16:31:13 +13:00
SamGondelman	52039e022b	merge from master, get rid of resolution in RayPick	2017-11-27 13:11:35 -08: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
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
SamGondelman	393ad0079c	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
SamGondelman	e38b0ab6b8	make web overlays match web entities more, remove resolution	2017-11-17 11:50:24 -08: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	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
SamGondelman	224386317d	send overlay visibility through transaction	2017-11-09 12:14:40 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Bradley Austin Davis	55d819d7e3	Merge pull request #11699 from SamGondelman/ui ... Pointers generate PointerEvents (WIP)	2017-10-31 10:01:15 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -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
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -07:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
David Back	cffcf2d8df	point Account context to GlobalServices instead	2017-10-24 13:44:00 -07:00
Sam Gateau	50a3ccdbca	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-21 10:01:07 -07:00
SamGondelman	7f3268548c	direct connection to web3doverlay	2017-10-12 14:14:08 -07:00
vladest	f1d5df5926	Restore lost-in-merge context property	2017-10-12 18:26:50 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
samcake	480047548d	exposing the Render interface to the overlay web3d	2017-10-11 18:04:29 -07:00
Zach Fox	525e0d8f61	Make SettingsScriptingInterface accessible to tablet	2017-10-05 16:51:13 -07:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
Sam Gateau	9317ad38aa	Merge pull request #11462 from highfidelity/game-render-interface ... Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing	2017-09-26 17:40:23 -07:00
samcake	badb45c921	fixing the web surface now getting scaled when the table t is grabbed is fixed	2017-09-26 15:20:45 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00