55596 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	4c4811dca8	finished the head puck	2017-05-30 22:52:39 +01:00
David Rowe	d891c834ba	Move record script files to unpublishedScripts directory	2017-05-31 09:06:11 +12:00
Ryan Huffman	4a52f4090d	Merge pull request #10552 from huffman/fix/multiple-nic-lockup ... Fix SendQueue not setting lastReceiverResponse when recv handshake ack	2017-05-30 13:05:01 -07:00
Stephen Birarda	9fa900bac8	Merge pull request #10568 from thoys/fix-doc-headers ... Fix markdown headers	2017-05-30 12:29:27 -07:00
Thijs Wenker	68ad8fa981	visual headers	2017-05-30 21:12:51 +02:00
Stephen Birarda	60125eb1d7	Merge pull request #10567 from highfidelity/openssl-win-installer-update ... OpenSSL installer update	2017-05-30 12:03:20 -07:00
Thijs Wenker	1ea3b2b7f4	let headers be headers	2017-05-30 21:01:42 +02:00
Thijs Wenker	1339516177	OpenSSL installer update	2017-05-30 20:56:45 +02:00
Brad Davis	765bd3890e	Improving test code for KTX library	2017-05-30 10:47:49 -07:00
Stephen Birarda	41716ec56b	Merge pull request #10554 from seefo/master ... Moved audio asset processing to a separate thread	2017-05-30 10:44:53 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
David Rowe	8de93d9651	Fix typo noticed in passing	2017-05-30 15:53:58 +12:00
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
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
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
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
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
David Rowe	019e92b2a3	Fix buttons not working with controllers	2017-05-27 11:27:18 +12: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
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
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
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
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
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