16 commits

Author	SHA1	Message	Date
David Rowe	71ec5f3612	Fix tablet highlighting when using the Create and Shapes apps	2018-10-20 11:57:46 +13:00
David Rowe	490c085eb8	Merge branch 'master' into M16440 ... # Conflicts: # scripts/system/controllers/controllerModules/hudOverlayPointer.js # scripts/system/controllers/controllerModules/inVREditMode.js	2018-10-19 09:06:33 +13:00
David Rowe	0b163ffaf8	Fix typos	2018-10-09 11:05:48 +13:00
David Rowe	3bc1c2963d	Fix HUD laser while in Shapes app	2018-10-04 13:15:33 +13:00
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
David Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
David Rowe	6095a90e69	Don't display default lasers when Shapes app is active	2018-01-04 21:09:38 +13:00
David Rowe	6c16fcfe65	Fix tablet laser when Shapes app is running	2018-01-04 16:37:20 +13:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
David Rowe	6c5a1c0460	Address laser and controller interactions with HUD overlays and tablet	2017-09-16 15:45:44 +12:00