58722 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	7cee80f0cf	my own objects (or rather objects with low poly count) download now	2017-08-25 11:09:11 -07:00
Stephen Birarda	e848253618	remember if express or custom was selected for install	2017-08-25 10:59:56 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
David Kelly	c316e50f0f	security image bug	2017-08-25 10:29:40 -07:00
Elisa Lupin-Jimenez	ee36fd579c	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-25 09:55:48 -07:00
Andrew Meadows	f82fa2f981	Merge pull request #11229 from ElderOrb/optional_build_tests ... make building tests optional	2017-08-25 09:10:56 -07:00
Andrew Meadows	4d7700b774	Merge pull request #11243 from SamGondelman/sharks ... Fix ray pick crash on shutdown	2017-08-25 09:01:14 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
Armads	b30562b9ce	Adding checks to hide avatar attachments to other head and facial joints	2017-08-25 10:25:34 -04:00
vladest	be56cab8e1	Merge branch 'master' into tablet_login_button	2017-08-25 15:50:10 +02:00
vladest	36879f83eb	Added scroll bar. Cleanup	2017-08-25 15:44:07 +02:00
vladest	df09c80cd9	Merge branch 'master' into flickable_web_pages	2017-08-25 13:15:30 +02:00
Sam Gondelman	4e7818180b	Merge branch 'master' into tabletLayer2	2017-08-24 17:56:44 -07:00
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities ... Threaded rendering of Entities	2017-08-24 17:34:49 -07:00
Elisa Lupin-Jimenez	3a512e3072	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 16:50:58 -07:00
Stephen Birarda	3003f64514	add debug for ice server lookup fail	2017-08-24 16:42:53 -07:00
Stephen Birarda	c7affea411	add a timeout for ICE server DNS lookup	2017-08-24 16:40:16 -07:00
Zach Fox	3980a478d9	Only show 'buy' on costed items'	2017-08-24 16:38:44 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Chris Collins	43b1e67e4a	Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter ... Create home bookmark for new content sets loaded in	2017-08-24 16:25:04 -07:00
Zach Fox	8d3c394d00	More progress	2017-08-24 16:21:41 -07:00
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -07:00
Elisa Lupin-Jimenez	e71823a8b5	forgot to track a file	2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez	77f93ae84b	user agent switch allows downloads	2017-08-24 15:44:22 -07:00
Zach Fox	bdc1f7b236	Progress	2017-08-24 15:39:26 -07:00
Zach Fox	e2c74d8b88	Initial progress	2017-08-24 15:22:30 -07:00
Chris Collins	c0afda859f	Merge pull request #11240 from kencooke/audio-gate-threshold ... More aggressive noise gate threshold	2017-08-24 14:49:18 -07:00
vladest	d6079e70fb	Binding to width to make sure it will follow Tablet with when rotating	2017-08-24 23:44:53 +02:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Andrew Meadows	d6b914283c	use sane running average window	2017-08-24 13:56:34 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
Zach Fox	baad5f195e	I'm locking something wrong	2017-08-24 12:53:48 -07:00
vladest	311dc9f0be	Merge branch 'master' into flickable_web_pages	2017-08-24 21:39:01 +02:00
vladest	c7fe845403	Move common webview flickable code to separate core file	2017-08-24 21:35:47 +02:00
Elisa Lupin-Jimenez	5c027705ba	removed extraneous line from active tablet button code	2017-08-24 12:01:08 -07:00
Elisa Lupin-Jimenez	3444b0e84c	blocks icon button now has active state	2017-08-24 11:38:01 -07:00
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
Menithal	e47dfeaeab	Merge remote-tracking branch 'upstream/stable' into 21484	2017-08-24 21:37:20 +03:00
Ken Cooke	684b7fee5a	DC filter cutoff at 0.5Hz	2017-08-24 11:20:22 -07:00
Zach Fox	d370eeea2f	Just gotta test	2017-08-24 11:07:58 -07:00
Elisa Lupin-Jimenez	d81c16ddb1	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 11:01:11 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
David Kelly	698644c3b4	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-24 10:37:58 -07:00
Zach Fox	3d0fd76997	Temp fix for inventory and buy	2017-08-24 10:24:06 -07:00
Ken Cooke	4a253023ee	float constants	2017-08-24 10:15:54 -07:00
Ken Cooke	c3ff505b73	More aggressive noise gate threshold	2017-08-24 10:06:41 -07:00