58422 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities ... Threaded rendering of Entities	2017-08-24 17:34:49 -07: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
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -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
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07: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
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
Ken Cooke	684b7fee5a	DC filter cutoff at 0.5Hz	2017-08-24 11:20:22 -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
Sam Gateau	4a18c5c80e	Merge pull request #11214 from SamGondelman/image3DFix ... Fix Image3DOverlays with fractional alpha	2017-08-24 09:04:02 -07:00
David Kelly	d398adc195	warnings	2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub	5c832eae9c	Merge pull request #11226 from SamGondelman/miceWithLasers ... EntityTreeRender uses RayPick API with precision picking	2017-08-24 08:10:21 -07:00
Chris Collins	93457c0e42	Merge pull request #11237 from birarda/feat/ip-check ... add sender sock addr check to DS packet filter operator	2017-08-24 07:51:23 -07:00
Chris Collins	751440388a	Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix ... Bug fix for deadlock between EntitySimulation and EntityItem locks.	2017-08-23 20:50:41 -07:00
David Kelly	c77dafdf12	fix warnings, prepare a bit for hooking up the passphrase	2017-08-23 17:43:37 -07:00
Liv	1050141b11	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
Stephen Birarda	133b7e66b7	adjust a comment and remove some debug	2017-08-23 16:38:23 -07:00
Stephen Birarda	c122b22dfc	add additional IP check to DS packet filter operator	2017-08-23 15:32:25 -07:00
David Kelly	57d973851e	accidentally left in I guess	2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub	afce8b547a	Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda ... Rig: Use a registry to prevent use after free crashes/corruption	2017-08-23 15:09:28 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
David Kelly	f655bf2713	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-23 14:53:05 -07:00
Zach Fox	e815946744	Merge pull request #11231 from ElderOrb/Case5830 ... 5830: Go-To menu shows up blank except for address bar	2017-08-23 14:33:04 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
SamGondelman	206862a90f	fix flag bits	2017-08-23 12:20:30 -07:00
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00
druiz17	80eac56c4d	Merge pull request #11233 from jherico/threaded_overlay_edits ... Allow asynchronous editing of non-QML overlays	2017-08-23 09:45:01 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Brad Davis	0a5bef22fc	Allow asynchronous editing of non-QML overlays	2017-08-22 17:12:18 -07:00
Anthony Thibault	bb49bcdcfd	Merge pull request #11223 from ElderOrb/bigobj ... fix for 'C1128: number of sections exceeded object file format limit'	2017-08-22 16:36:49 -07:00
David Kelly	591c031e7b	first pass still broken...	2017-08-22 16:24:25 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
beholder	a18410ef07	make building tests optional	2017-08-23 00:40:14 +03:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
beholder	a1e0f31cd8	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
Chris Collins	06641ade94	Merge pull request #11228 from Atlante45/new-master ... Update master from stable	2017-08-22 13:29:51 -07:00
Atlante45	697aed2fa2	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-08-22 12:58:38 -07:00
Chris Collins	8474bfb550	Merge pull request #11227 from highfidelity/RC-52 ... Beta Release 52 - Includes up to Developer Release 7030	2017-08-22 12:57:17 -07:00
Zach Fox	4d8980b538	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-22 12:30:24 -07:00
Zach Fox	763ce73306	Taking a break now	2017-08-22 12:26:46 -07:00
Zach Fox	a31088b60f	More progress	2017-08-22 12:16:17 -07:00
SamGondelman	b8a7fce201	boop	2017-08-22 11:54:55 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
SamGondelman	a904ae1a8a	can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API	2017-08-22 11:41:20 -07:00
Stephen Birarda	9dfc74de57	always write rank ID to variant when present	2017-08-22 11:24:32 -07:00