79418 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gondelman	e2bf3d7138	remove unused constant	2019-06-28 15:11:22 -07:00
SamGondelman	a5b92a6c7b	fix layered rendering of group culled sub items	2019-06-28 14:24:33 -07:00
SamGondelman	c76d267c2a	separate text into two render items	2019-06-28 13:53:44 -07:00
Zach Fox	6e4b9c1723	Merge pull request #15774 from PrestonB1123/iconChanges ... New Top Bar Icons	2019-06-26 11:01:12 -07:00
Preston Bezos	f0dd28e71a	removed extra line	2019-06-26 09:54:43 -07:00
Preston Bezos	bd3fe8a092	fixed conflict and spacing	2019-06-26 09:12:32 -07:00
Brad Hefta-Gaub	06bb09ff58	Merge pull request #15841 from SimonWalton-HiFi/accountmanager-quit-signal ... BUGZ-789: Use a queued signal to quit from AccountManager::saveLoginStatus()	2019-06-25 17:20:41 -07:00
MiladNazeri	7d6cff46ff	Merge pull request #15842 from MiladNazeri/refreshNametagLifetime ... [BUGZ 798] :: updated lifetime	2019-06-25 19:32:33 -04:00
milad	72867437be	updated lifetime	2019-06-25 15:38:02 -07:00
Shannon Romano	2af701235a	Merge pull request #15815 from annabrewer/snapshot-gamma ... BUGZ-765: Snaps Photos are Dark	2019-06-25 15:26:00 -07:00
Shannon Romano	d13b8d354c	Merge pull request #15840 from danteruiz/launcher-issues ... BUGZ-837: Fix Launcher crash (mac)	2019-06-25 15:04:44 -07:00
Simon Walton	b4e1c2264c	Use a queued signal to quit from AccountManager::saveLoginStatus()	2019-06-25 14:47:58 -07:00
Sam Gateau	48f9c33bdd	Merge pull request #15822 from samcake/yellow ... BUGZ-664: Introduce scaling of rendering for forward renderer	2019-06-25 14:27:17 -07:00
Andrew Meadows	20376c9542	Merge pull request #15823 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update	2019-06-25 14:18:13 -07:00
dante ruiz	1e38e7b7eb	print out exception error	2019-06-25 14:11:41 -07:00
Andrew Meadows	adce2a6fd0	Merge pull request #15838 from kencooke/render-blendshape-optim-avx2 ... Fix Mac crash caused by PR#15825	2019-06-25 13:54:39 -07:00
dante ruiz	68d620fca3	fix crash	2019-06-25 13:37:45 -07:00
Zach Fox	1789622bce	Merge pull request #15839 from highfidelity/MiladNazeri-patch-1 ... Update BUILD_WIN.md	2019-06-25 13:32:10 -07:00
MiladNazeri	31c10d1aa1	Update BUILD_WIN.md ... When I updated the download link, I forgot to change the text above. It might be a little confusing.	2019-06-25 13:24:57 -07:00
Ken Cooke	4c5c61231d	Only use QVector resize when actually needed	2019-06-25 12:57:55 -07:00
Ken Cooke	0a34745ff9	Use QVector resize() instead of reserve() to silence Debug builds about size not being set. ... Causes unneeded default initialization, but no obvious way to avoid.	2019-06-25 12:53:07 -07:00
Brad Hefta-Gaub	a2aff0d072	Merge pull request #15832 from huffman/fix/winlauncher-terms-link ... BUGZ-710: Update win32 launcher with working ToS link	2019-06-25 12:48:49 -07:00
Brad Hefta-Gaub	04ab11eab2	Merge pull request #15833 from huffman/fix/winlauncher-logo-aspect-ratio ... Fix aspect ratio of splash logo in win32 launcher	2019-06-25 12:47:28 -07:00
Zach Fox	89db67552f	Merge pull request #15837 from zfox23/SUI/fasterSettingsTabs ... DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 12:06:50 -07:00
Sam Gateau	768dd051aa	Add sanity check for viewport resolution scale to avoid negative value	2019-06-25 11:54:50 -07:00
Ken Cooke	b079e3283e	BUGFIX: use unaligned loads	2019-06-25 11:48:41 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Sam Gateau	9470467c31	Ad the check for nsight to avoid the COmpositeHUD pass	2019-06-25 11:28:01 -07:00
Sam Gateau	4dcfa59997	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-25 11:14:09 -07:00
Preston Bezos	1481c7424f	changed ptt muted icon	2019-06-25 11:02:44 -07:00
Bradley Austin Davis	ca797e30e4	Merge pull request #15825 from kencooke/render-blendshape-optim-avx2 ... Blendshape CPU optimization	2019-06-25 09:41:13 -07:00
Sam Gateau	962a3c2502	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-25 09:34:18 -07:00
Preston Bezos	5686f51171	fixed hmd settings buttons spacing	2019-06-25 09:19:30 -07:00
Dante Ruiz	bcdf409fd3	Merge pull request #15824 from MattHardcastle/mac-hq-launcher ... A couple macOS HQ Launcher bug fixes	2019-06-25 08:28:50 -07:00
Shannon Romano	2991bb4a98	Merge pull request #15834 from SamGondelman/perf ... BUGZ-811: Fix bugs in EntityTreeRenderer::updateChangedEntities	2019-06-25 08:25:33 -07:00
Shannon Romano	b7559dac11	Merge pull request #15831 from danteruiz/fix-launcher-text ... BUGZ-774: Lilypad Launcher (Mac) text issue	2019-06-24 18:38:20 -07:00
Sam Gateau	8d0b7a81f5	one more	2019-06-24 17:01:11 -07:00
Sam Gateau	cb1bf57bd1	Address pr review comments	2019-06-24 16:54:06 -07:00
Shannon Romano	f5169093e0	Merge pull request #15828 from roxanneskelly/bugz812 ... BUGZ-812 - Log system info on domain connect or connect refusal	2019-06-24 16:05:55 -07:00
Anna	792cef1a91	fixed bad merge	2019-06-24 15:57:09 -07:00
Sam Gateau	b0ebcc745d	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-24 15:36:28 -07:00
dante ruiz	dd639c4191	fix typo	2019-06-24 15:33:47 -07:00
Anna	658898c2e0	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-gamma	2019-06-24 15:31:55 -07:00
Bradley Austin Davis	71fb1183be	Merge pull request #15830 from jherico/fix/bugz-771 ... BUGZ-771: Prevent duplicates from accumulating in EntityTree::_needsParentFixup	2019-06-24 15:15:10 -07:00
Ryan Huffman	2824d6fc5f	Fix aspect ratio of splash logo in win32 launcher	2019-06-24 15:13:55 -07:00
Ryan Huffman	5d3ed3f80e	Update win32 launcher with working ToS link	2019-06-24 15:01:31 -07:00
Roxanne Skelly	c5883a8d67	CR fixes	2019-06-24 14:58:06 -07:00
dante ruiz	e119afdead	terms of service	2019-06-24 14:35:59 -07:00
SamGondelman	c605c2917f	trying to fix entity tree renderer performance	2019-06-24 14:32:56 -07:00
Matt Hardcastle	9ae67c15b2	Use old API to launch tasks on all versions of macOS	2019-06-24 14:27:07 -07:00