61557 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
nissim.hadar	f990e3f918	Build auto-tester iff ITK has been installed.	2017-11-17 05:10:14 -08:00
nissim.hadar	df614f3a9e	Merge branch 'autoTester' of https://github.com/NissimHadar/hifi into autoTester	2017-11-14 16:20:05 -08:00
nissim.hadar	4bfa795e31	Merge branch 'master' into autoTester	2017-11-14 16:00:18 -08:00
Nissim Hadar	a2925518c2	Andrew's amazing fix.	2017-11-14 13:35:37 -08: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
Nissim Hadar	95bd10063d	Fixing CMake	2017-11-14 11:48:33 -08: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
Nissim Hadar	7dacea327b	Fixing CMake	2017-11-14 09:40:24 -08:00
Nissim Hadar	ed28cf07b6	Fixing CMake	2017-11-14 09:20:38 -08:00
Nissim Hadar	4eda0ce025	Fixing CMake	2017-11-14 09:00:46 -08:00
Nissim Hadar	b07f98da14	Fixing CMake	2017-11-14 08:34:02 -08:00
Nissim Hadar	156282beaa	Fixing CMake	2017-11-14 08:09:46 -08:00
Nissim Hadar	3f59446718	Fixing CMake	2017-11-14 07:50:16 -08:00
Nissim Hadar	27f7511ce9	Fixing CMake	2017-11-14 07:12:03 -08:00
Nissim Hadar	84c64c3992	Fixing CMake	2017-11-14 00:30:32 -08:00
Nissim Hadar	0e0574edd5	Fixing CMake	2017-11-14 00:11:52 -08:00
Nissim Hadar	c6ffbf612a	Fixing CMake	2017-11-13 23:52:31 -08:00
Nissim Hadar	0c271488bb	Modified tools/auto-tester/CMakeLists.txt	2017-11-13 22:37:10 -08:00
Nissim Hadar	2417890cce	Fixing CMake	2017-11-13 22:26:38 -08:00
Nissim Hadar	ddab843b4d	To make Jenkins happy.	2017-11-13 22:08:48 -08:00
Nissim Hadar	cfcbf1c7cf	Fixing CMake	2017-11-13 21:25:07 -08:00
Nissim Hadar	ffc08a4e5d	Merge branch 'master' into autoTester	2017-11-13 17:35:47 -08:00
Nissim Hadar	4b3f892abe	Used 'system' return value.	2017-11-13 17:35:01 -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
Liv	94b925d9d5	Update .eslintrc.js	2017-11-13 15:53:33 -08:00
Nissim Hadar	311d794529	Corrected case of #include'd file.	2017-11-13 15:38:59 -08:00
Nissim Hadar	58eadbe00f	Use GLOB_RECURSE in lieu of listing the files. This is an attempt to deal with Linux build failing.	2017-11-13 15:29:47 -08:00
Nissim Hadar	501001acf4	Merge branch 'master' into autoTester	2017-11-13 14:56:21 -08:00
nissim.hadar	a4b5690150	Merge branch 'autoTester' of https://github.com/NissimHadar/hifi into autoTester	2017-11-13 13:44:59 -08:00
Nissim Hadar	d11aa64306	Seems to work.	2017-11-13 13:25:59 -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
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Nissim Hadar	aa4320104b	WIP.	2017-11-13 10:25:31 -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
luiscuenca	d75c176fef	clean up unused lastmode	2017-11-13 06:10:17 -07:00
Nissim Hadar	572646b8c6	Just missing the dll's.	2017-11-12 21:43:33 -08:00
Nissim Hadar	eaa51ebe9d	WIP.	2017-11-12 11:27:24 -08: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
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
Nissim Hadar	7a0d188149	WIP.	2017-11-11 18:10:47 -08:00
Nissim Hadar	3457e1de5d	WIP.	2017-11-11 13:19:57 -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
Nissim Hadar	8433374fb6	CMake includes Qt headers	2017-11-10 20:24:11 -08:00
Nissim Hadar	3101663b7b	In the beginning.	2017-11-10 18:55:07 -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