61921 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
luiscuenca	d75c176fef	clean up unused lastmode	2017-11-13 06:10:17 -07:00
Ryan Downe Karpf	9ff4541ee3	Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack ... Remove hack for missing inttypes.h header on VS2010	2017-11-12 10:59:19 -08:00
Sam Gateau	37ce7a9b20	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-12 08:44:33 -08:00
Ryan Downe Karpf	f8b1c7978c	Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569 ... [Case 6569]: Silent failure is possible during Model Creation	2017-11-12 08:36:10 -08:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
Sam Gateau	9159763cbf	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-11 13:52:26 -08:00
Ken Cooke	89dbbb44ed	Merge pull request #11780 from kencooke/audio-codec-update ... Audio codec update for all platforms (includes Android)	2017-11-11 11:33:33 -08:00
Sam Gateau	eb270f3473	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-11 09:21:32 -08:00
Atlante45	8f133fc7fa	Congratulation page styling fixes	2017-11-10 18:12:43 -08:00
Atlante45	067436a743	CR	2017-11-10 18:12:33 -08:00
David Back	163de649bf	prevent rendering HUD elements in secondary camera	2017-11-10 17:44:09 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00
David Back	6466a05740	alternate approach to mirror projection wip	2017-11-10 17:15:47 -08:00
luiscuenca	262dc091ce	7589 Fix notifications shrink with avatar	2017-11-10 17:22:41 -07:00
Atlante45	9cd8f372f2	Fix race condition	2017-11-10 16:21:06 -08:00
Atlante45	796909d366	Permissions page tweaks	2017-11-10 16:19:49 -08:00
Atlante45	2782ae03c5	Add back buttons	2017-11-10 15:48:44 -08:00
Atlante45	c047a1d0a4	Rework perms wizard page	2017-11-10 15:48:44 -08:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Ryan Huffman	ecc76ab321	Remove dead code from ds settings	2017-11-10 15:35:05 -08:00
Ryan Huffman	2307cde599	Fix add-place button being added when account disconnected	2017-11-10 15:34:53 -08:00
Ryan Huffman	03364c1893	Cleanup DS settings for small screens	2017-11-10 15:34:22 -08:00
Andrew Meadows	469b68011c	Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero ... div by zero fixes, detected by address sanitizer	2017-11-10 13:47:40 -08:00
SamGondelman	cbf0543646	deadspot	2017-11-10 13:22:38 -08:00
samcake	6b1e2d0d5a	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-10 12:37:06 -08:00
Sam Gateau	f857b37d2e	Merge pull request #11758 from NissimHadar/hazeUIFix ... Improved Haze UI in Create menu	2017-11-10 11:58:06 -08:00
Anthony Thibault	08c12a1ced	Merge pull request #11704 from AndrewMeadows/shape-manager-key ... cleanup ShapeInfo hash generation	2017-11-10 11:31:46 -08:00
luiscuenca	d53a29b958	correction	2017-11-10 12:24:19 -07:00