62098 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nissim Hadar	ebad5cf503	Reduced threshold from 0.9995 to 0.995	2017-12-06 16:55:32 -08:00
Nissim Hadar	3de34834e1	Changed autoTester threshold to 0.9995 ... Added a readme explaining how to deploy autoTester.	2017-12-05 11:19:00 -06:00
Nissim Hadar	29b2eaacde	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-12-04 13:53:44 -06:00
Brad Hefta-Gaub	33adb0d76d	Merge pull request #11868 from ctrlaltdavid/21615 ... Add "size" as synonym for "dimensions" in model overlay property setter	2017-12-03 18:10:30 -08:00
Brad Hefta-Gaub	06cf194ec7	Merge pull request #11910 from ctrlaltdavid/21626 ... Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-03 18:09:17 -08:00
Brad Hefta-Gaub	314265fa86	Merge pull request #11891 from ctrlaltdavid/21625 ... Add missing line3d overlay property getters and setters	2017-12-02 12:52:44 -08:00
Brad Hefta-Gaub	ce68b720c2	Merge pull request #11886 from druiz17/fix-vive-head-pose ... Register the Vive inputDevice if no controllers are available	2017-12-02 12:52:31 -08:00
Brad Hefta-Gaub	3f705a7baf	Merge pull request #11858 from vladest/fix_tablet_scrollbars ... Use ScrollBars from QQC2, which supports mouse and touch events	2017-12-02 12:51:14 -08:00
Brad Hefta-Gaub	ec33aa9c4b	Merge pull request #11880 from ElderOrb/FB7991 ... 7991 Change Instances of Edit Mode to Create Mode	2017-12-02 12:50:48 -08:00
Nissim Hadar	c35310c2fb	Deal with user canceling folder selection.	2017-12-01 17:17:11 -08:00
Nissim Hadar	f9f731acc5	Merge branch 'master' into QtImageCompare	2017-12-01 15:27:34 -08:00
Howard Stearns	e2efe062fe	Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh ... Don't refresh Inventory or Recent Activity if data hasn't changed	2017-12-01 13:57:34 -08:00
Nissim Hadar	6c2e701023	Improved CMakeLists.txt for QT deployment. ... Changed threshold from 0.999 to 0.9998	2017-12-01 13:31:52 -08:00
Brad Hefta-Gaub	dd6af08084	Merge pull request #11908 from ZappoMan/fixModelImportSizing ... fix issues in model import sizing caused by recent refactor	2017-12-01 12:28:14 -08:00
Nissim Hadar	a83244c27f	Corrected typo in comment.	2017-12-01 11:16:57 -08:00
Zach Fox	52ca9a6c76	Merge pull request #11911 from zfox23/commerce_fixMonthLol ... Fix month display in commerce...	2017-12-01 10:44:19 -08:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
Nissim Hadar	526aa8fe57	Changed threshold from 0.98 to 0.999	2017-12-01 09:28:31 -08:00
David Rowe	fd76c7a88b	Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-01 17:40:34 +13:00
Nissim Hadar	12ac551d25	Changed power from 2.0 to 2	2017-11-30 18:27:47 -08:00
Nissim Hadar	c0673db3c5	Fix for MacOS	2017-11-30 18:23:58 -08:00
ZappoMan	750d505f9b	fix issues in model import sizing caused by recent refactor	2017-11-30 17:51:59 -08:00
Nissim Hadar	e1e0163992	Merge branch 'master' into QtImageCompare	2017-11-30 17:24:32 -08:00
Nissim Hadar	c63571a710	Debugging the image comparison.	2017-11-30 16:27:28 -08:00
Nissim Hadar	0842e09570	Debugging the image comparison.	2017-11-30 13:59:02 -08:00
Nissim Hadar	2e8fe40da8	Recursive test evaluations.	2017-11-30 13:07:54 -08:00
Bradley Austin Davis	59aea9c401	Merge pull request #11862 from jherico/android_nov ... Make buildable APK from Gradle	2017-11-30 11:23:29 -08:00
Zach Fox	b0dda3de33	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh	2017-11-30 10:49:20 -08:00
vladest	a3d406d8d1	Merge branch 'master' into fix_tablet_scrollbars	2017-11-30 11:40:50 +01:00
vladest	dfeefe53b8	Make scroll bar handle centered on shaft. Width chaned on par with entities list html view	2017-11-30 11:40:02 +01:00
Zach Fox	7490744fb7	Merge pull request #11882 from howard-stearns/the-lost-ECDSA ... The lost ecdsa	2017-11-29 15:46:22 -08:00
howard-stearns	57ec73bb13	spacing	2017-11-29 14:37:20 -08:00
howard-stearns	115bc27557	back to stable, rather than staging	2017-11-29 13:39:58 -08:00
Nissim Hadar	4afc8f9759	Added print() code to the produced script.	2017-11-29 12:12:13 -08:00
Dante Ruiz	82fb58ed96	remove debug statement	2017-11-29 10:58:10 -08:00
Dante Ruiz	eba8a6e17b	Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose	2017-11-29 10:50:37 -08:00
howard-stearns	fb038c17ee	for now, point this PR at staging so that it can be tested as built by ... jenkins	2017-11-29 09:54:34 -08:00
howard-stearns	55589312f1	new padding/initialization that matters on linux server	2017-11-29 09:53:48 -08:00
Nissim Hadar	5bba93e57e	Merge branch 'master' into QtImageCompare	2017-11-29 09:18:02 -08:00
Nissim Hadar	7a67e3e5f7	Using js modules.	2017-11-29 09:15:30 -08:00
Brad Davis	101d6763cc	PR feedback	2017-11-29 09:11:52 -08:00
Zach Fox	3c892920e3	Prevent seeding text from flashing	2017-11-28 17:00:15 -08:00
howard-stearns	281b4cfd88	Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA	2017-11-28 16:59:44 -08:00
Anthony Thibault	16ca1a9ec6	Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head ... Head tracking bug fix for vive HMD users	2017-11-28 16:30:26 -08:00
Zach Fox	5dc8715879	Bugfix	2017-11-28 16:14:17 -08:00
Zach Fox	489d11d5fd	Remove logging	2017-11-28 16:01:58 -08:00
Zach Fox	3e5a2addd2	Use same logic for Recent Activity	2017-11-28 16:00:46 -08:00
Zach Fox	e769d2fbc3	Don't refresh Inventory or Recent Activity if data hasn't changed	2017-11-28 15:44:42 -08:00
Nissim Hadar	3710d726df	WIP - improving the recursive script.	2017-11-28 15:23:57 -08:00
Nissim Hadar	709fadff2e	WIP - improving the recursive script.	2017-11-28 15:23:33 -08:00