61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	b2c5154cb6	Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing ... fix issues in model import sizing caused by recent refactor	2017-12-02 09:30:57 -08:00
Anthony Thibault	fe16cc3fab	Merge pull request #11902 from luiscuenca/onloadFix ... Fixes create list and web and QML audio sync	2017-12-01 16:05:07 -08:00
luiscuenca	fefedc11c8	mac fix	2017-12-01 15:17:23 -07:00
luiscuenca	d271f61987	Proper fix	2017-12-01 14:37:59 -07:00
Zach Fox	3fb1df88cb	Merge pull request #11913 from zfox23/commerce_fixMonthLol_RC60 ... Fix month display in commerce... RC60 PR	2017-12-01 10:49:57 -08:00
Zach Fox	b8f7ba9aa6	Fix month display in commerce...	2017-12-01 10:45:36 -08:00
ZappoMan	d1017d81bd	fix issues in model import sizing caused by recent refactor	2017-11-30 18:08:32 -08:00
luiscuenca	83e370d9de	add shared pointer	2017-11-30 17:40:49 -07:00
luiscuenca	5d1f2a04c1	restate deleted lines	2017-11-30 16:43:38 -07:00
luiscuenca	98e8361690	Fix and rebuild	2017-11-30 16:07:43 -07:00
luiscuenca	9cd2dc921a	back to for loop	2017-11-30 15:31:29 -07:00
luiscuenca	0729579266	fix for loop	2017-11-30 15:21:43 -07:00
luiscuenca	58e829dbda	Delete leftover line	2017-11-30 15:11:38 -07:00
luiscuenca	e02e810399	Audio Handler fix	2017-11-30 15:06:02 -07:00
Dante Ruiz	785eedfb1c	Merge pull request #11896 from druiz17/fix-hud-hmd-rc60 ... fix laser interaction on HUD in HMD mode	2017-11-30 11:48:39 -08:00
luiscuenca	b890a29b3a	Clean console log	2017-11-29 19:05:01 -07:00
Howard Stearns	be083664fb	Merge pull request #11901 from howard-stearns/merge-ECDSA-to-rc60 ... Merge pull request #11882 from howard-stearns/the-lost-ECDSA	2017-11-29 17:45:05 -08:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
Zach Fox	39afb4ab6a	Merge pull request #11882 from howard-stearns/the-lost-ECDSA ... The lost ecdsa	2017-11-29 15:53:52 -08:00
Dante Ruiz	982fad5050	fix laser interaction on HUD in HMD mode	2017-11-29 10:42:35 -08:00
Anthony Thibault	8eb8cb0994	Merge pull request #11889 from hyperlogic/bug-fix/vive-no-head-rc60 ... RC60: Head tracking bug fix for vive HMD users	2017-11-28 16:31:27 -08:00
Anthony J. Thibault	7d34469679	Head tracking bug fix for vive HMD users ... (cherry picked from commit 8364700b7a)	2017-11-28 12:38:11 -08:00
Brad Hefta-Gaub	e6c6e5f239	Merge pull request #11883 from birarda/feat/kick-on-fingerprint ... add option to kick logged in users by fingerprint too	2017-11-28 08:29:46 -08:00
Stephen Birarda	e2082c0bcf	apply machine fingerprint permissions if username absent	2017-11-27 19:02:40 -08:00
Stephen Birarda	8978254037	kick logged in by fingerprint/ip if enabled in DS settings	2017-11-27 18:23:14 -08:00
MiladNazeri	83d13717fe	Merge pull request #11752 from Menithal/21539 ... 21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected	2017-11-27 16:02:01 -08:00
Brad Hefta-Gaub	6d6ac0a5a9	Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash ... avoid a crash during domain change while wearing something	2017-11-27 13:01:48 -08:00
Brad Hefta-Gaub	068b93fc30	Merge pull request #11838 from druiz17/fix-grabbing ... fixing setting incorrect parent when grabbing entities	2017-11-27 08:27:42 -08:00
Menithal	693da50a68	21539: Fixed None Checkmark being on Desktop mode	2017-11-27 07:59:04 +02:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
Seth Alves	56e299c205	Merge pull request #11875 from samcake/orange ... Fix the spot light direction	2017-11-23 11:11:31 -08:00
Sam Gateau	9a31a3dc95	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-22 23:29:55 -08:00
Sam Gateau	9c53ab719a	Merge branch 'orange' of https://github.com/samcake/hifi into orange	2017-11-22 23:29:25 -08:00
Seth Alves	9ccc416e80	avoid a crash during domain change	2017-11-22 16:34:56 -08:00
Clément Brisset	e20555bf38	Merge pull request #11870 from Atlante45/feat/update-default-perms ... Add tmpRezCertified to default perms	2017-11-22 14:57:22 -08:00
Atlante45	b398e235a2	Add tmpRezCertified to default perms	2017-11-22 13:40:44 -08:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Sam Gateau	8389137caa	Merge pull request #11834 from highfidelity/pointers ... UI Pointer Optimization	2017-11-21 16:01:52 -08:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
Brad Hefta-Gaub	c66a500fcf	Merge pull request #11861 from druiz17/fix-modal ... Fix replace content dialog not closing	2017-11-21 15:43:20 -08:00
samcake	a0e40efdc8	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
Dante Ruiz	767b0fa4af	remove unused variable warning	2017-11-21 14:45:55 -08:00
samcake	ebd701a1ab	Merging with master	2017-11-21 14:40:37 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	c9ad7b1db5	Merge branch 'master' of github.com:highfidelity/hifi into fix-modal	2017-11-21 13:56:22 -08:00
Dante Ruiz	88c3adbff1	change askToReplaceDomainContent to use async question and warning	2017-11-21 13:56:11 -08:00
Dante Ruiz	56972d1547	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing	2017-11-21 13:09:45 -08:00
Brad Hefta-Gaub	817afcd083	Merge pull request #11741 from ZappoMan/entityItemCleanup ... Entity item cleanup	2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00