79487 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
dante ruiz	996a2f0888	remove comment	2019-07-09 15:47:05 -07:00
dante ruiz	1741b9a91b	remove prints	2019-07-09 14:49:08 -07:00
dante ruiz	8819a37712	making updates	2019-07-09 14:44:40 -07:00
dante ruiz	15cc7a0e6c	finished work	2019-07-09 10:43:46 -07:00
dante ruiz	a5f9283bde	almost done	2019-07-06 11:46:40 -07:00
dante ruiz	f210be32dc	updating progress indicator work	2019-07-02 20:56:49 -07:00
dante ruiz	fb8027bdf5	inital progress indicator work	2019-07-01 19:01:13 -07:00
Dante Ruiz	ec4bd95950	Merge pull request #15854 from danteruiz/issues-launchers ... BUGZ-692: Laucner is not movable & BUGZ-831 handle org and credentials erros.	2019-07-01 11:07:07 -07:00
Brad Hefta-Gaub	191086c57a	Merge pull request #15857 from PrestonB1123/webcamPermissions ... DEV-193: Disallow mic and webcam access always.	2019-07-01 09:54:58 -07:00
Brad Hefta-Gaub	0ef9110f2b	Merge pull request #15853 from SimonWalton-HiFi/public-address-change ... BUGZ-762: Propagate a Node's public address change to Connection class	2019-06-28 16:12:01 -07:00
Shannon Romano	07fdbeaa0a	Merge pull request #15855 from SamGondelman/forward ... BUGZ-661: Fix text entity rendering in deferred vs. forward	2019-06-28 15:59:09 -07:00
dante ruiz	12477f3df1	making requested changes	2019-06-28 15:37:21 -07:00
Shannon Romano	89f654175c	Merge pull request #15856 from PrestonB1123/defaultShortcuts ... DEV-173: Re-enable shortcuts	2019-06-28 15:29:53 -07:00
Preston Bezos	ef674a5934	removed permission for qml to access webcam and mic	2019-06-28 15:23:50 -07:00
Sam Gondelman	e2bf3d7138	remove unused constant	2019-06-28 15:11:22 -07:00
Preston Bezos	1315677aec	fixed doc and removed log spam	2019-06-28 15:02:33 -07:00
Preston Bezos	b9deb7bb58	formatting	2019-06-28 14:42:48 -07:00
Preston Bezos	09830dd40c	removed white space	2019-06-28 14:41:07 -07:00
Preston Bezos	d1470d3323	readded ctrl+n and ctrl+b as shortcuts with a default script	2019-06-28 14:33:03 -07:00
SamGondelman	a5b92a6c7b	fix layered rendering of group culled sub items	2019-06-28 14:24:33 -07:00
Shannon Romano	7ff751567b	Merge pull request #15848 from jherico/fix/dev-175-source ... DEV-175: QML content URL validation, whitelist trusted sources	2019-06-28 14:18:56 -07:00
SamGondelman	c76d267c2a	separate text into two render items	2019-06-28 13:53:44 -07:00
dante ruiz	6a5c9097c9	finished adding error checking for launcher	2019-06-28 13:35:24 -07:00
Sabrina Shanman	0b6dfe3f7c	Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood ... BUGZ-868: Avoid SafeLanding signal-slot connection resource leak	2019-06-28 13:29:31 -07:00
Shannon Romano	934c482b90	Merge pull request #15852 from raveenajain/bias_distance_sliders ... BUGZ 598: related debugger scripting update	2019-06-28 11:40:59 -07:00
Simon Walton	225f65f4fb	Log message tweaks ... Also don't need std in std::move, somehow.	2019-06-28 11:30:09 -07:00
Brad Hefta-Gaub	8082ff8529	Merge pull request #15850 from zfox23/PTTAttenuationOption ... BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-28 11:08:11 -07:00
Brad Davis	e3393a8ee5	Apply URL validation to top level window QML	2019-06-28 10:43:03 -07:00
Shannon Romano	67901166ba	Merge pull request #15851 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update - Doc Review	2019-06-28 10:12:05 -07:00
raveenajain	17d127ecf3	modify shadow debugger for new bias input	2019-06-28 10:07:49 -07:00
Zach Fox	5cc6efc831	CR feedback	2019-06-28 09:07:58 -07:00
David Rowe	2d6d3eb4fe	Doc review	2019-06-28 17:05:36 +12:00
dante ruiz	d20f50fa3c	redoing some work	2019-06-27 20:53:23 -07:00
Simon Walton	9b894456e9	Change address for sequence-number hash also	2019-06-27 17:29:17 -07:00
Brad Davis	8bcde84d89	Disable remote QML unless whitelisted	2019-06-27 16:37:56 -07:00
Zach Fox	95ed908dc0	Merge branch 'master' of github.com:highfidelity/hifi into PTTAttenuationOption	2019-06-27 15:58:42 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Simon Walton	1265531f79	Plumb down change of destination address	2019-06-27 15:52:39 -07:00
Andrew Meadows	0bec2bca83	OctreePacketProcessor should process packet even when no SafeLanding	2019-06-27 14:44:23 -07:00
Zach Fox	b95586239a	Merge pull request #15847 from zfox23/removePTTAttenuation ... BUGZ-363: Remove 20dB output attenuation during PTT	2019-06-27 13:45:49 -07:00
Andrew Meadows	45ffa2bb1f	Merge pull request #15827 from raveenajain/nitpick_shadows ... BUGZ 598: nitpick tests failing due to shadow issue	2019-06-27 13:37:31 -07:00
Zach Fox	7c189d46f2	BUGZ-363: Remove 20dB output attenuation during PTT	2019-06-27 13:28:29 -07:00
David Rowe	9f01cc2f32	Merge branch 'master' into DOC-79	2019-06-28 08:14:12 +12:00
jennaingersoll	b6cefd8dfb	Merge pull request #15786 from ChristophHaag/patch-1 ... Update jsdoc to avoid breakage with recent node	2019-06-27 13:06:12 -07:00
raveenajain	3a60bc6a13	clang braces fix	2019-06-27 11:52:43 -07:00
Andrew Meadows	bf068a3211	fix SafeLanding start/stop on entity-server connection flow	2019-06-27 11:33:51 -07:00
raveenajain	d6fb7f8a6f	arrays for bias calcs	2019-06-27 10:42:14 -07:00
raveenajain	309e59ca8b	Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows	2019-06-27 09:42:03 -07:00
raveenajain	04afbde188	cascade loop, fine tune calc	2019-06-27 09:41:39 -07:00
Shannon Romano	417e02ac9d	Merge pull request #15845 from SamGondelman/threadpool ... BUGZ-861: Wait on QThreadPool threads on shutdown	2019-06-27 08:42:06 -07:00