79730 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	11f47ddeed	BUGZ-753: bad skyboxes on intel GPUs	2019-07-16 13:42:39 -07:00
Shannon Romano	bee8ba489a	Merge pull request #15935 from sethalves/fix-comfort-mode ... BUGZ-1017: fix bug that caused comfort-mode to be active at all times in HMD	2019-07-16 09:57:56 -07:00
Ryan Huffman	117577cd29	Merge pull request #15933 from danteruiz/fix-interactive-deadlock ... BUGZ-1014: Crash when opening Create	2019-07-16 09:05:50 -07:00
Seth Alves	22a913bee2	fix bug that caused comfort-mode to be active at all times in HMD	2019-07-15 21:10:42 -07:00
dante ruiz	e896a53113	fix interactive crash	2019-07-15 17:18:38 -07:00
Shannon Romano	020c7a5f44	Merge pull request #15931 from Atlante45/fix/dev-builds ... Fix debug builds not compiling	2019-07-15 16:28:40 -07:00
Zach Fox	aed94a3a66	Merge pull request #15923 from PrestonB1123/fixShortcuts ... BUGZ-991: Added conditionals to shortcuts to remove overlap	2019-07-15 15:23:58 -07:00
Clement	50d9a53883	Fix variable name in assert	2019-07-15 15:03:25 -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
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	d37456ea31	Merge pull request #15927 from SamGondelman/error ... Possible fix for shader compilation error	2019-07-15 09:00:54 -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	8ad1202bcb	Merge pull request #15916 from luiscuenca/WLAsyncThunder ... BUGZ-989: Get recent builds asynchronously while the windows launcher is showing the splash screen	2019-07-15 08:36:33 -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
Shannon Romano	23c7e1c0f3	Merge pull request #15843 from SamGondelman/quit ... Fix ScriptEngines::loadScript invoke call	2019-07-15 08:32:16 -07:00
hifi-gustavo	de53b9b11d	Merge pull request #15925 from Atlante45/feat/qt-5.12.3-upgrade ... Use absolute path in ci script	2019-07-12 17:21:13 -07:00
SamGondelman	1789e16cc4	possible fix for shader compilation error	2019-07-12 16:22:01 -07:00
Clement	6ddccafa6b	Use absolute path	2019-07-12 15:29:05 -07:00
hifi-gustavo	f019edc19c	Merge pull request #15924 from Atlante45/feat/qt-5.12.3-upgrade ... Move debian packaging files to hifi repo	2019-07-12 14:16:24 -07:00
Clement	b93ec08f5a	Modify path to resources	2019-07-12 14:05:02 -07:00
Clement	54a2619b70	Move ci scripts to hifi repo	2019-07-12 14:03:09 -07:00
dante ruiz	d78661a47f	redo requested work	2019-07-12 13:34:08 -07:00
PrestonB1123	526b210fcd	remembered that macs exist	2019-07-12 12:39:58 -07:00
PrestonB1123	aaf10cec39	added conditionals to shortcuts to remove overlap	2019-07-12 12:37:40 -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
Matt	34908e54ef	Merge pull request #15873 from Atlante45/feat/qt-5.12.3-upgrade ... BUGZ-820: Remove QT_CMAKE_PREFIX_PATH prod hack	2019-07-12 10:24:06 -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
Andrew Meadows	590876e54b	remove NUM_REGIONS_TRACKED	2019-07-11 17:05:32 -07:00
howard-stearns	cc7214fca3	cleanup	2019-07-11 16:56:35 -07:00
SamGondelman	bda87aa13f	trying to fix android	2019-07-11 16:39:23 -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
SamGondelman	046b25ab67	fix haze on web entities, deferred and forward	2019-07-11 14:56:17 -07:00
Andrew Meadows	0d943ca55a	more warning supression	2019-07-11 14:47:31 -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
Andrew Meadows	f165184fb2	eliminate warnings about signed-vs-unsigned comparison	2019-07-11 14:09:37 -07:00
SamGondelman	7793e07eeb	fix polyvox	2019-07-11 13:34:58 -07:00
Shannon Romano	dd9b4a8143	Merge pull request #15917 from PrestonB1123/disablePShortcut ... disabled P shortcut and re-enabled in metaverse	2019-07-11 13:32:11 -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