55879 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
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
Zach Fox	8dec066c2b	Revert 'dynamicChanged' to be a 'misc' physics property	2017-05-26 13:24:47 -07:00
Zach Fox	827daade1b	Make this PR a protocol change	2017-05-26 13:24:38 -07:00
Zach Fox	64191ee20a	Make the changes - big thanks to Andrew!	2017-05-26 13:24:17 -07:00
Stephen Birarda	cfbbf3183a	Merge pull request #10560 from birarda/bug/zfox-teeth ... fix issue with textures with alpha as a mask	2017-05-26 13:11:02 -07:00
seefo	1d29610dbb	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-26 12:49:56 -07:00
Brad Davis	952d3629ec	Merge pull request #10559 from jherico/fix_compressed_ktx_loading ... Fix compressed KTX loading	2017-05-26 12:46:11 -07:00
Andrew Meadows	fa003b0c14	swap order of changes and deactvations	2017-05-26 12:29:37 -07:00
Stephen Birarda	07440e325f	fix force of BC3 instead of BC1a compression	2017-05-26 12:04:35 -07:00
seefo	cc57d28ccc	Made requested changes to PR10554	2017-05-26 11:49:43 -07:00
howard-stearns	7cee438298	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 11:36:04 -07:00
Brad Davis	f663573f19	Fix compressed KTX loading	2017-05-26 11:25:15 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
Liv	2808ab4865	Sort of making progress on torus vertex buffer	2017-05-26 10:45:29 -07:00
seefo	90d5b2a6d4	Removed SoundProcessor's dependence on Sound objects	2017-05-26 10:32:34 -07:00
seefo	74f0ac5b78	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-26 09:13:20 -07:00
Liv	06a5467b50	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-05-26 09:10:50 -07:00
Dante Ruiz	1b8bd016fe	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-26 17:03:05 +01:00
Dante Ruiz	d317d9236f	made requested changes	2017-05-26 16:40:21 +01:00
volansystech	8d9cfbdf31	Resolve comments of @sethalves . Remove whitespaces.	2017-05-26 11:41:35 +05:30
David Rowe	de4184e9fa	Merge branch 'master' into 21345	2017-05-26 15:49:47 +12:00
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
David Rowe	8a659955cc	Delete old script	2017-05-26 13:02:26 +12:00
David Rowe	b1280ff810	Implement start/stop and reset button actions	2017-05-26 13:02:05 +12:00
David Rowe	f25a9dcede	Add entities to capture stopwatch button clicks	2017-05-26 13:01:19 +12:00
seefo	0e4fbe01dc	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-25 17:04:03 -07:00
howard-stearns	c05001a222	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-25 16:58:07 -07:00