81584 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	4e801632ee	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-04 13:16:43 -08:00
Zach Fox	c39dbc600d	Merge pull request #16441 from zfox23/enableHashMapSignalsForESS ... Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`	2019-11-04 11:59:15 -08:00
Shannon Romano	0bfbe413eb	Merge pull request #16399 from HifiExperiments/proceduralMesh ... Case 7120, Case 14963: Procedural material entities on primitives and meshes	2019-11-04 08:32:31 -08:00
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
HifiExperiments	6e5217b80d	fix build error, add environment variable	2019-11-02 01:03:34 -07:00
Zach Fox	8d07d401c3	Add a line of JSDoc	2019-11-01 14:45:07 -07:00
Zach Fox	3a606d1907	Implement DEV-2654: Allow ESS to make use of signals like	2019-11-01 14:41:11 -07:00
RebeccaStankus	b50fb47a95	Merge pull request #16438 from RebeccaStankus/macWindowSize ... Changed default interface window size on mac	2019-11-01 13:40:18 -07:00
Zach Fox	e1b02fb73a	The same message as the last commit, except do the work this time	2019-11-01 13:23:25 -07:00
Zach Fox	9273db4844	Fix an issue that prevented new screenshare scripts from running properly	2019-11-01 13:03:16 -07:00
Zach Fox	2905416375	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-01 13:02:56 -07:00
Zach Fox	44e196c588	Merge pull request #16439 from samcake/zorro ... Ending a joke	2019-11-01 13:01:55 -07:00
Sam Gateau	52e80f15af	Ending a joke	2019-11-01 12:57:45 -07:00
Sam Gateau	52ac59fad3	Ending a joke	2019-11-01 12:55:34 -07:00
Sam Gateau	a3d8cb8a78	Ending a joke	2019-11-01 12:52:22 -07:00
Rebecca Stankus	3f19bbfcac	Changed variable to not be magic number	2019-11-01 11:46:01 -07:00
milad	d9d9877f83	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-01 10:53:03 -07:00
milad	f2e49cb553	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-11-01 10:52:46 -07:00
milad	1b3367fcf9	logging ids	2019-11-01 10:51:23 -07:00
Rebecca Stankus	e5fcc577f0	Changed default interface window size on mac	2019-11-01 10:47:12 -07:00
Shannon Romano	c5fe88abe6	Merge pull request #16435 from hyperlogic/feature/seated-aim-offsets ... Hooked up seated version of aim offset animation	2019-11-01 10:31:59 -07:00
Shannon Romano	295c37aea9	Merge pull request #16434 from kencooke/audio-webrtc-warning-spam ... DEV-2619: WebRTC spamming logs	2019-11-01 10:22:35 -07:00
Ken Cooke	3cdf25f2bc	Fix compiler warning (unused variable in Release build)	2019-11-01 07:36:35 -07:00
Anthony J. Thibault	4b34311a0a	Hooked up seated version of aim offset animation	2019-10-31 16:23:29 -07:00
Ken Cooke	30564a67ef	Only log a single "AEC not supported" warning per audio device configuration	2019-10-31 14:50:52 -07:00
MiladNazeri	676e7bd5b8	Merge branch 'master' into screenshareElectronApp	2019-10-31 13:11:56 -07:00
milad	240764caa9	updated out folder	2019-10-31 12:39:13 -07:00
Anthony Thibault	f99bb3ec77	Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes ... Extended avatar blendshape support for ARKit compatiblity	2019-10-31 12:33:50 -07:00
Zach Fox	a03534427e	Merge pull request #16430 from zfox23/moreMenuScriptingInterfaceGuards ... Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 12:25:41 -07:00
Zach Fox	68819addd5	Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 11:29:46 -07:00
Zach Fox	a336a71db9	Add necessary include	2019-10-31 10:39:04 -07:00
Zach Fox	db268fc36f	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-10-31 10:01:13 -07:00
Zach Fox	47b3fdbfe3	Stop screenshare process on interface shutdown	2019-10-31 10:01:00 -07:00
milad	9eba9e8483	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-10-31 10:00:26 -07:00
milad	b1d0e42de8	updated packager	2019-10-31 10:00:22 -07:00
Maia Hansen	de5570ced8	Merge pull request #16421 from amerhifi/dev-2571new ... case DEV-2771: Audio client shutdown lock	2019-10-31 09:50:56 -07:00
Zach Fox	d8026304a4	Guard against a crash in stopScreenshare()	2019-10-31 09:47:31 -07:00
Zach Fox	d5c4b0cd9f	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-10-31 09:45:00 -07:00
Zach Fox	1e2fcf8bd5	Add screenshareStopped signal; use std::unique_ptr<QProcess>	2019-10-31 09:43:56 -07:00
milad	114b9250bf	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-10-31 09:37:08 -07:00
milad	9e3318e5dd	added readme	2019-10-31 09:36:58 -07:00
Zach Fox	c22f5097c0	Make SCREENSHARE_EXE_PATH private	2019-10-31 09:24:28 -07:00
Zach Fox	f8e516efb8	Fix typos from the last commit	2019-10-31 09:14:52 -07:00
Zach Fox	cc9eb31d99	Build in PR builds	2019-10-31 09:11:38 -07:00
Zach Fox	6291590737	Fixup paths	2019-10-31 09:01:02 -07:00
Zach Fox	1e24df3f71	Get Interface to look in the proper directories	2019-10-31 08:57:06 -07:00
amerhifi	52e0f54d0c	addressing comments	2019-10-31 07:21:16 -07:00
Zach Fox	82c75e9a92	Add packager to package.json	2019-10-30 17:00:30 -07:00
Zach Fox	5af7acf9ba	Revert spooky changes	2019-10-30 16:53:18 -07:00
milad	ea373ac14c	First steps towards a screenshare app	2019-10-30 16:44:42 -07:00