71774 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
John Conklin II	ea7bc26ad8	Merge pull request #14038 from wayne-chen/fixInterstitialButton ... Fix Interstitial GoTo button stretch	2018-09-21 11:44:48 -07:00
John Conklin II	fa5bb84628	Merge pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74 ... Fix sorting of entity list not working as expected	2018-09-21 11:44:17 -07:00
John Conklin II	428ace17e1	Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall ... Fixing double loginFailed	2018-09-21 11:36:06 -07:00
John Conklin II	9c2a7931fb	Merge pull request #14036 from AndrewMeadows/crowd-update-tuning ... tweak avatar update priority coefficients for load tests	2018-09-21 09:44:15 -07:00
John Conklin II	0560b8678c	Merge pull request #14022 from jherico/fix/amd_highlight ... Fix AMD highlighting effect	2018-09-20 16:17:10 -07:00
Ryan Huffman	1ee655c8f8	Fix sorting of entity list not working as expected	2018-09-20 13:51:00 -07:00
Wayne Chen	8bd698b143	leaving button in natural dims	2018-09-20 11:13:27 -07:00
Andrew Meadows	cf85c617a2	tweak avatar update priority coefs for load tests	2018-09-20 09:56:50 -07:00
Wayne Chen	8d0e55c1cd	Merge branch 'master' of https://github.com/highfidelity/hifi	2018-09-19 13:00:33 -07:00
John Conklin II	3b1e0dc7d9	Merge pull request #13987 from zfox23/discovery_appUi ... Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications	2018-09-19 12:38:28 -07:00
John Conklin II	6c63f92f39	Merge pull request #13933 from SamGondelman/accelerationSpread ... Fix particle acceleration spread	2018-09-19 11:49:42 -07:00
John Conklin II	60c07280f8	Merge pull request #13971 from SamGondelman/parabola ... Correct transparent parabola shader	2018-09-19 11:46:24 -07:00
Brad Davis	783ea21951	Fix AMD highlighting effect	2018-09-19 11:21:12 -07:00
Wayne Chen	8b3fff120a	Merge branch 'master' of https://github.com/highfidelity/hifi	2018-09-18 16:28:33 -07:00
Wayne Chen	be5f498c2f	reversion	2018-09-18 15:47:54 -07:00
Wayne Chen	48e4b38312	reversion	2018-09-18 15:28:15 -07:00
Wayne Chen	8274f4cb4c	reverting domain handler change	2018-09-18 15:26:12 -07:00
Zach Fox	d487914656	Prevent text notification from appearing when not necessary	2018-09-18 11:28:59 -07:00
Sam Gateau	d768809fbc	Merge pull request #13969 from SamGondelman/modelBugs ... Fixing Model animation bugs	2018-09-18 11:28:37 -07:00
Wayne Chen	f82063ed46	Merge branch 'master' of https://github.com/highfidelity/hifi	2018-09-18 09:17:28 -07:00
Zach Fox	c453594eb7	Overhaul notification logic for PAL	2018-09-17 14:41:18 -07:00
Zach Fox	143a059b16	Small changes to AppUI and PAL	2018-09-17 11:11:36 -07:00
Zach Fox	23fab0985b	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-17 11:11:21 -07:00
John Conklin II	be76c43aec	Merge pull request #13999 from gcalero/dont_popup_login_android ... Don't popup login dialog in android	2018-09-14 16:06:03 -07:00
John Conklin II	cb8e3c6452	Merge pull request #14003 from danteruiz/snap-fix ... Fix snapshot settings issue in HMD	2018-09-14 15:34:22 -07:00
John Conklin II	49e578ebef	Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic ... don't zero kinematic velocities when releasing simulation ownership	2018-09-14 15:18:06 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
Zach Fox	9c5544af39	Merge in big work from appui_notifications branch	2018-09-14 14:37:04 -07:00
Zach Fox	9e50904376	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-14 14:36:22 -07:00
Dante Ruiz	ff52639bc3	fix update	2018-09-14 14:10:36 -07:00
Dante Ruiz	4eb5c9714b	fix snapshot settings	2018-09-14 12:59:28 -07:00
luiscuenca	04e6225a95	Threshold back	2018-09-14 11:22:47 -07:00
Wayne Chen	0afea6fbd1	removing double login fail signal	2018-09-14 11:08:53 -07:00
luiscuenca	8c9173b639	Safe landing for discrepancies	2018-09-14 11:06:30 -07:00
David Back	86972cf4fb	Merge pull request #13992 from dback2/entityListSearchCase ... Fix entity list search case-sensitivity and allow id search	2018-09-14 10:58:44 -07:00
Gabriel Calero	72eeeac2ba	Don't popup login dialog in android	2018-09-14 14:40:30 -03:00
Andrew Meadows	9390687e2d	remove redundant EntityMotionState::updateSendVelocities() call	2018-09-14 10:37:55 -07:00
Andrew Meadows	9073e1ade3	don't zero kinematic velocity at end of sim ownership	2018-09-14 10:37:17 -07:00
Howard Stearns	4378f5bf1c	Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta ... Text tuning for wallet setup call to action	2018-09-14 10:17:22 -07:00
David Back	296e2ba488	lowercase search term at start	2018-09-14 09:57:27 -07:00
David Back	30f0bd577a	Merge branch 'entityListSearchCase' of github.com:dback2/hifi into entityListSearchCase	2018-09-14 09:42:44 -07:00
David Back	a45be897ec	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase	2018-09-14 09:42:04 -07:00
Sam Gateau	81a69c7769	Merge pull request #13995 from samcake/black ... Attempt to fix LOD setting getting stuck	2018-09-14 09:31:35 -07:00
sam gateau	b35f09fead	Address review comments	2018-09-14 08:43:35 -07:00
howard-stearns	685b2978ce	Text tuning for wallet setup call to action	2018-09-14 08:26:25 -07:00
John Conklin II	44041fcc14	Merge pull request #13986 from Atlante45/fix/ess-crash ... Fix ESS crash caused by concurrent access to _entityScripts	2018-09-14 07:56:45 -07:00
Sam Gateau	eccca053f9	Clean changes	2018-09-13 23:58:40 -07:00
Sam Gateau	1438643a5f	Adding extra sanity checks on all time dependant values to avoid bad behavior maybe	2018-09-13 23:48:50 -07:00
unknown	f9480c24a5	store search term lower	2018-09-13 20:07:49 -07:00