56017 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	f5066aac51	Don't adjust position of imported entities of particular types	2017-05-30 15:53:03 +12:00
David Rowe	1e8698aee1	Snap imported JSON to grid	2017-05-30 15:23:18 +12:00
David Rowe	e02021bddf	Tidying	2017-05-30 14:38:59 +12:00
David Rowe	b176dbe544	Refactoring	2017-05-30 14:35:59 +12:00
David Rowe	4c0296daaa	Reposition imported JSON entities so that they start at import distance	2017-05-30 14:29:10 +12:00
David Rowe	18558dd795	Make JSON import distance 2m	2017-05-30 13:34:17 +12:00
volansystech	e90b1b5a67	Resolve the comments of @ZappoMan.	2017-05-29 18:21:59 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
David Rowe	31df18ff5b	Fix snap-to-grid elevation	2017-05-29 18:43:49 +12:00
David Rowe	6c890d90ef	Adjust position of model after its been resized	2017-05-29 17:48:01 +12:00
David Rowe	f0785cd39e	Adjust creation position so that bounding box is creation distance away	2017-05-29 13:52:36 +12:00
David Rowe	9b679325ff	Don't raise creation position if in independent or entity view mode	2017-05-29 13:35:54 +12:00
David Rowe	508dee4580	Increase entity creation distance to 2m	2017-05-29 13:35:18 +12:00
Zach Pomerantz	4a3f2e1d09	use subclass for interface's Audio interface	2017-05-28 19:25:37 -04:00
Zach Pomerantz	b2eda7cf22	rm AudioDevice interface	2017-05-28 19:04:51 -04:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Zach Pomerantz	03d3666c0c	show menu after requesting it	2017-05-28 17:34:11 -04:00
Zach Pomerantz	156b3f9738	use showDialog instead of toggleMenu	2017-05-28 17:10:59 -04:00
Vladyslav Stelmakhovskyi	238a2b2eb8	Merge branch 'master' into fix_claraio_download_clones	2017-05-28 21:40:05 +02:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Menithal	0e46c11a94	Fixed not being able to override slider sizes	2017-05-28 11:59:30 +03:00
David Rowe	367b3ec603	Handle nonvertical avatar orientation	2017-05-28 09:59:32 +12:00
Seth Alves	66415dadc6	Merge pull request #10496 from volansystech/Wl-21298 ... Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-27 08:28:19 -07:00
Menithal	4e97f8ad9c	Removed stray print	2017-05-27 16:21:25 +03:00
Menithal	26389be826	Minor tweaks to unselect behavior	2017-05-27 11:18:29 +03:00
Menithal	9201af96bd	Added Changes from Alan's Feedback	2017-05-27 11:02:01 +03:00
Menithal	5500f8240d	Merge remote-tracking branch 'upstream/master' into 21324	2017-05-27 09:55:56 +03:00
Sam Gateau	bc44a03e13	Merge pull request #10537 from samcake/brown ... Fix the flickering and other lighting issues related to zone entities (part 1)	2017-05-26 18:22:56 -07:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
David Rowe	2a88f5cc79	Merge branch 'master' into 21345	2017-05-27 11:51:29 +12:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
howard-stearns	92aeadd70f	rotation of local capsule offset	2017-05-26 16:34:08 -07:00
David Rowe	019e92b2a3	Fix buttons not working with controllers	2017-05-27 11:27:18 +12:00
howard-stearns	f694691efb	add fixme comments and make isUp/isDown ordinary methods.	2017-05-26 16:15:18 -07:00
Stephen Birarda	bf057219ac	fix reference to pending transfer count for progress/stats	2017-05-26 15:46:50 -07:00
howard-stearns	4be31f1b18	thread safety	2017-05-26 15:31:59 -07:00
Chris Collins	fd3b6cdf1a	Merge pull request #10564 from birarda/bug/content-loading-always ... fix progress bar / stats reference to pending transfer count	2017-05-26 15:29:06 -07:00
Stephen Birarda	6c2758e4ea	fix reference to pending transfer count for progress/stats	2017-05-26 14:37:24 -07:00
Atlante45	ccc7cb638d	Fix "retain avatar info"	2017-05-26 14:18:29 -07:00
howard-stearns	cd3865e420	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 14:18:00 -07:00
Zach Pomerantz	637a448c2c	abstract toggleMenu	2017-05-26 17:12:15 -04:00
Zach Pomerantz	380a16f9dd	use SYSTEM_TABLET static	2017-05-26 17:11:32 -04:00
Zach Pomerantz	297993b358	report success on tablet->pushOntoStack	2017-05-26 17:09:39 -04:00
Stephen Birarda	0a7a42bdc3	fix force of BC3 instead of BC1a compression	2017-05-26 13:52:50 -07:00
Zach Fox	252298938b	Update conditional to handle 'other unowned' case	2017-05-26 13:25:36 -07:00
Zach Fox	21d396bbb5	Pull out ownership bidding changes	2017-05-26 13:25:25 -07:00
Zach Fox	3ec73cc5e1	Changes after discussion with Brad	2017-05-26 13:25:13 -07:00
Zach Fox	ebe6ce9c8d	Committing checkpoint changes, then testing	2017-05-26 13:25:05 -07:00