61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Dante Ruiz	dd043d42c4	fixing merge conflict	2017-11-14 14:21:48 -08:00
SamGondelman	789b06cb9f	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup	2017-11-14 14:17:46 -08:00
Dante Ruiz	558a34d7b8	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-14 14:09:29 -08:00
Dante Ruiz	b026cfc42f	make sure teleport pointers are deleted	2017-11-14 14:09:08 -08:00
Stephen Birarda	05a38a78c5	don't send octree data without first query	2017-11-14 14:08:27 -08:00
SamGondelman	1d7ff1ca1c	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup	2017-11-14 13:39:38 -08:00
luiscuenca	26e401a069	fix broken HMD notifications	2017-11-14 14:22:53 -07:00
Dante Ruiz	54075d4c9a	make hud laser relative to camera	2017-11-14 13:09:16 -08:00
John Conklin II	49abb441e6	Merge pull request #11807 from Atlante45/case8495 ... RC-59 patch - Disable mirror camera in HMD mode	2017-11-14 13:06:47 -08:00
Dante Ruiz	058145df15	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-14 13:04:20 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Olivier Prat	c5bd86a4bf	Disabled bloom by default	2017-11-14 21:54:40 +01:00
Zach Fox	c42003a374	Merge pull request #11794 from ElderOrb/FB4684_3 ... 4684 Add collapse button on the virtual keyboard	2017-11-14 12:22:42 -08:00
SamGondelman	210fd209f5	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup	2017-11-14 11:47:32 -08:00
Atlante45	b31118fe00	CR	2017-11-14 11:41:43 -08:00
Atlante45	6b5b905b2a	Exit right away if the parent process died	2017-11-14 11:41:43 -08:00
Atlante45	462ec30cac	Utilise Windows Job Object so child dies w/ parent	2017-11-14 11:41:43 -08:00
Alexander Ivash	e201e203b8	8984 Opening tablet with "Enter" key displays the audio menu	2017-11-14 22:18:48 +03:00
David Back	4b8021bc4a	Merge pull request #11802 from dback2/mirrorfanciness2 ... prevent rendering HUD elements in secondary camera	2017-11-14 10:49:18 -08:00
Dante Ruiz	416a47cfc7	adding controller haptic feedback to tablet onPress	2017-11-14 09:34:17 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
Dante Ruiz	db2f6810bd	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-14 08:41:38 -08:00
SamGondelman	a505d50027	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup	2017-11-13 17:55:44 -08:00
Thijs Wenker	788514adb0	Merge pull request #11806 from highfidelity/misslivirose-patch-1 ... Update .eslintrc.js	2017-11-14 01:21:27 +00:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Nissim Hadar	b4b148367e	Removed Keylight attenuation from .js (as well as .html).	2017-11-13 16:07:20 -08:00
luiscuenca	7af1a5ca69	clean up unused lastmode	2017-11-13 16:04:03 -08:00
luiscuenca	5d4a3b65e4	Allow script to change to mirror camera in HMD	2017-11-13 16:04:03 -08:00
luiscuenca	8596d78aa6	Not posible to change to mirror mode using js	2017-11-13 16:04:03 -08:00
luiscuenca	d1318ae99e	8495 No mirror camera in HMD mode	2017-11-13 16:04:03 -08:00
Ryan Huffman	b5c4517ee7	Update DS Settings strings	2017-11-13 15:59:57 -08:00
Liv	94b925d9d5	Update .eslintrc.js	2017-11-13 15:53:33 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
Dante Ruiz	132b33dbe7	disable stylus pointer when not being used	2017-11-13 14:53:54 -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
Dante Ruiz	7613bddefa	fixing some issues with hud module	2017-11-13 14:26:34 -08:00
Dante Ruiz	56823f8a72	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-13 13:39:10 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Zach Fox	0b6cc6ba2e	Merge pull request #11803 from zfox23/commerce_fixCertDisappearing ... Fix bug with disappearing certificate info	2017-11-13 12:13:45 -08:00
Stephen Birarda	21e49d1504	Merge pull request #11798 from Atlante45/feat/wizard-tweaks ... Wizard tweaks	2017-11-13 12:07:22 -08:00
samcake	ad9bdc884e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-13 11:52:32 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Seth Alves	9df11fb11a	Merge pull request #11787 from elisa-lj11/musvis ... Second fix to null file path return (specific to music visualizer)	2017-11-13 09:44:47 -08:00
Sam Gateau	4b14a7a820	Merge pull request #11799 from NissimHadar/hazeUIFix ... Removed Keylight attenuation from .js (as well as .html).	2017-11-13 09:18:29 -08:00
Ryan Downe Karpf	3ea6ecf104	Merge pull request #11747 from luiscuenca/case8495 ... 8495 No mirror camera in HMD mode	2017-11-13 09:09:34 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00