29756 commits

Author	SHA1	Message	Date
Shannon Romano	d49fabf370	Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill ... BUGZ-781: Remove loading-orb upon killing of avatar	2019-07-16 15:31:37 -07:00
Zach Fox	a4f4961dfd	Merge pull request #15941 from zfox23/graphicsSettingsMargin ... Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:26:43 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
Jamil Akram	d2000d810d	Merge pull request #15929 from dooglifeSF/teleport_fix ... add teleport.fbx back to avatar/animations	2019-07-16 14:37:24 -07:00
dante ruiz	e896a53113	fix interactive crash	2019-07-15 17:18:38 -07:00
Shannon Romano	3f7e5a48bb	Merge pull request #15533 from sethalves/squeeze-vision-while-moving ... Case 21663: comfort mode	2019-07-15 14:54:31 -07:00
Simon Walton	e259aa55c2	Remove loading-orb upon killing avatar, in case destructor isn't called	2019-07-15 14:14:24 -07:00
dooglifeSF	413a089402	add teleport.fbx back to avatar/animations ... compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer	2019-07-15 13:24:21 -07:00
Shannon Romano	a64bc7f638	Merge pull request #15761 from danteruiz/fix-interactive-window-crash ... BUGZ-400: Crash in Application::notify	2019-07-15 11:35:15 -07:00
Shannon Romano	7ea8675e83	Merge pull request #15919 from howard-stearns/mac-sleep-monitor ... Mac sleep monitor	2019-07-15 08:39:19 -07:00
Shannon Romano	09729fb430	Merge pull request #15918 from zfox23/newGraphicsSettings ... New Settings -> Graphics... dialog for Classic UI users	2019-07-15 08:38:01 -07:00
Shannon Romano	1bc72a86da	Merge pull request #15911 from amerhifi/bugz-968 ... case Bugz-968 adding a null check to the display plugin. Possible that display plug…	2019-07-15 08:35:29 -07:00
Shannon Romano	8ce64d95ab	Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux ... BUGZ-863: wait for objects to be added to physics before completing SafeLanding	2019-07-15 08:34:17 -07:00
dante ruiz	d78661a47f	redo requested work	2019-07-12 13:34:08 -07:00
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -07:00
amerhifi	ba6307e8e4	revert of extra space	2019-07-12 10:55:44 -07:00
amerhifi	f78c1cb5d0	reverting display plugin reset change	2019-07-12 10:54:08 -07:00
Howard Stearns	7ce6dd71d5	fix comment	2019-07-12 10:48:05 -07:00
Shannon Romano	74b830dd12	Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen ... BUGZ-918: Generate RSA key-pair early in start-up	2019-07-12 09:42:11 -07:00
Shannon Romano	3e70f4f51c	Merge pull request #15671 from SamGondelman/uber ... DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer	2019-07-12 09:39:33 -07:00
Seth Alves	9baf4c7078	comfort mode -- squeeze vision to avoid sickness	2019-07-12 09:14:17 -07:00
howard-stearns	cc7214fca3	cleanup	2019-07-11 16:56:35 -07:00
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Dante Ruiz	2f74f8253f	finishing requested changes	2019-07-11 15:39:59 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -07:00
howard-stearns	2eb3fdb1ec	Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor	2019-07-11 14:35:00 -07:00
amer cerkic	15e7663ed5	removing the destroy call since its not necessary	2019-07-11 14:27:41 -07:00
SamGondelman	22a7a97a9a	fix forward web + parabola blending	2019-07-11 12:23:04 -07:00
amer cerkic	efccd10a65	adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed	2019-07-11 12:15:15 -07:00
PrestonB1123	07c71cbadb	disabled P shortcut and re-enabled in metaverse	2019-07-11 12:05:15 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
howard-stearns	8d3dc52ac0	mac sleep monitor checkpoint	2019-07-11 10:58:31 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
dante ruiz	c4a0b39068	requested changes	2019-07-10 17:56:54 -07:00
Simon Walton	645a99c200	Generate RSA key-pair early in start-up	2019-07-10 17:36:25 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Amer	4c145386e5	Merge pull request #15899 from amerhifi/bugz-907 ... Case bugz-907: On launch default to non hmd device	2019-07-10 16:03:29 -07:00
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -07:00
Andrew Meadows	1a5a925a4c	fix a typo	2019-07-10 14:18:34 -07:00
amer cerkic	e463a828ef	removed extra line	2019-07-10 14:09:51 -07:00
amer cerkic	bc51b8e709	removed extra space	2019-07-10 14:08:20 -07:00
amer cerkic	fc21f6088a	undoing code structures changes to else blocks	2019-07-10 14:07:10 -07:00
dante ruiz	7c024b4e8a	fix interactive window crash	2019-07-10 11:49:36 -07:00
Shannon Romano	f235778a6e	Merge pull request #15866 from huffman/feat/override-default-scripts ... DEV-164: Add defaultScriptsOverride option	2019-07-10 10:16:55 -07:00
Andrew Meadows	2da0714e36	comments and more readable code	2019-07-09 15:51:56 -07:00
Andrew Meadows	1bfd5386a9	restore entity->requestRenderUpdate() in SafeLanding::updateTracking()	2019-07-09 15:51:56 -07:00
Andrew Meadows	520c62f6f6	wait for objects added to physics before stop SafeLanding	2019-07-09 15:51:56 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00