81700 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	99f007349e	Merge pull request #16452 from zfox23/topBarExperiment ... An experiment with the top bar. Will you notice?	2019-11-05 09:34:03 -08:00
Zach Fox	683c3f1300	An experiment with the top bar. Will you notice?	2019-11-05 09:33:11 -08:00
David Rowe	a8173e9477	Remove "user" icon from Entity List	2019-11-05 13:55:31 +13:00
Bradley Austin Davis	69e586cc54	Fix codesign	2019-11-04 16:42:03 -08:00
amer cerkic	b10f2a86c2	removed extra spaces	2019-11-04 15:44:15 -08:00
danteruiz	c8dade2060	making requested changes	2019-11-04 15:20:37 -08:00
amer cerkic	81881acafc	fixing a few spacing issues	2019-11-04 15:08:06 -08:00
amer cerkic	b2ab33116f	removing double calls to switch devices, handling default changes from scripting interface instead	2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub	f5873e6f76	Merge pull request #16446 from samcake/zorro ... Renaming the env variable to enable Material Procedural Shaders	2019-11-04 14:32:54 -08:00
Zach Fox	4e801632ee	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-04 13:16:43 -08:00
luiscuenca	de2d2de938	Head woes in 1st person part 2	2019-11-04 13:33:00 -07: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
Sam Gateau	a4696992e8	Renaming the env variable to enable Material Proecural Shaders	2019-11-04 11:15:37 -08:00
Anthony J. Thibault	821a46697a	Update fixUpLegacyBlendshapes as well	2019-11-04 10:55:05 -08:00
Anthony J. Thibault	101ec9d753	Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes ... These blendshapes are not present in ARKit and are not used by any of our procedural face animations (talking, blinking etc). This change should have been part of #16400 but was accidently left out.	2019-11-04 09:49:24 -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
danteruiz	35ed5031a3	prevent uninstall icon from disapearing	2019-11-01 15:15:58 -07:00
David Rowe	4e12750255	Typo	2019-11-02 11:00:16 +13: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
David Rowe	3bb65edafb	Fix Cmd-click multi-select in entity list on Mac	2019-11-02 09:51:21 +13: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