26892 commits

Author	SHA1	Message	Date
Howard Stearns	da5f77afcd	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-26 15:26:52 -07:00
John Conklin II	70c7ffcc71	Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 ... fix MyAvatar-vs-OtherAvatar collisions	2018-09-26 15:21:18 -07:00
Howard Stearns	e1659ed520	fix old bad merge, and if told referrer while already setup, follow ... immediately	2018-09-26 14:57:47 -07:00
John Conklin II	c1dc0ff2ec	Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only ... Prevent thread issues with PickResults modified by Pointers	2018-09-26 12:12:58 -07:00
John Conklin II	7df90881cd	Merge pull request #14007 from kkurian/marketplace-item-tester ... Marketplace item tester interface	2018-09-26 11:25:53 -07:00
John Conklin II	0de433c7c7	Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master ... fix for deadlock in other avatar entity removal from tree	2018-09-26 09:58:26 -07:00
John Conklin II	c5ff72bd20	Merge pull request #14024 from wayne-chen/toggle404Redirect ... Toggle going to 404 redirect domain	2018-09-25 20:44:57 -07:00
John Conklin II	19438d143e	Merge pull request #14073 from jherico/fix/18069_test ... Working on Vive shutdown issues	2018-09-25 15:41:32 -07:00
Kerry Ivan Kurian	276125937c	Eliminate double equals	2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian	4e7b03883f	Use triple equals	2018-09-25 15:13:26 -07:00
sabrina-shanman	55ab0a394b	Return std::make_shared	2018-09-25 12:21:22 -07:00
sabrina-shanman	6e83e96d1c	Check type in Pointer::getPickResultCopy	2018-09-25 12:05:47 -07:00
sabrina-shanman	660bdf36d0	Check if pick result is null when building visual pick result	2018-09-25 09:56:51 -07:00
sabrina-shanman	8dd36e465b	Merge branch 'master' into crash_ray-pick-dtor_pointer-only	2018-09-25 09:22:30 -07:00
sabrina-shanman	eca31e7a99	Fix instantiating abstract class when creating visual pick result for pointers	2018-09-25 09:20:57 -07:00
Kerry Ivan Kurian	ff83713365	Use persistent object id counter	2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian	ca1da9c830	Implement delete-from-list functionality in marketplace item tester	2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian	505e08b841	Resolve merge conflicts	2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian	0a43c17ce0	Use entity-specific glyphs in marketplace item tester	2018-09-24 21:15:08 -07:00
John Conklin II	be23d07621	Merge pull request #14010 from sethalves/thread-safe-settings ... make settings thread safe	2018-09-24 17:24:50 -07:00
Kerry Ivan Kurian	697f556a60	Persist list of marketplace items in test ... The list of resources between runs of the marketplace item tester now persist between runs of the tester.	2018-09-24 16:30:49 -07:00
Andrew Meadows	a3f946dee1	activate OtherAvarar in physics sim on position change	2018-09-24 16:27:37 -07:00
Wayne Chen	69d5299362	patching fix for previous commits	2018-09-24 15:22:46 -07:00
Brad Davis	72fc686ec1	Fix timer managmement during shutdown	2018-09-24 14:52:13 -07:00
Howard Stearns	2b1e581571	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 14:01:42 -07:00
Wayne Chen	ac5814a1f8	Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect	2018-09-24 13:57:23 -07:00
John Conklin II	a602bff217	Merge pull request #13981 from gcalero/android_settings ... Android settings (AEC)	2018-09-24 13:55:30 -07:00
Howard Stearns	d3391b9273	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 13:50:52 -07:00
Andrew Meadows	c1d65f5118	update avatar shape after it loads	2018-09-24 12:07:08 -07:00
John Conklin II	d520152a95	Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements ... Small Improvements to Anim Stats	2018-09-24 11:56:01 -07:00
Stephen Birarda	b31837168d	fix bad lock, optimize some operations, clarify comment	2018-09-24 11:27:20 -07:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
Kerry Ivan Kurian	f9c25f2f32	Allow user to select asset type in marketplace item tester	2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian	c1cc031bd0	Remove cruft and refactor	2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian	ae4352f450	Rez entity in marketplace item tester	2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian	afa8e44e66	Refactor	2018-09-20 10:53:32 -07:00
Howard Stearns	391128ef77	Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2	2018-09-19 16:46:09 -07:00
Kerry Ivan Kurian	5445d6f670	Switch to localhost before replacing content	2018-09-19 16:06:43 -07:00
Howard Stearns	d644a63990	consistent/usefull checkout flow when you don't have enough money.	2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian	38fd9523ee	Attempt to load content set ... This does not result in the user seeing the content set.	2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian	66bf45c3ef	Update location only if certificate id	2018-09-19 15:18:18 -07:00
Kerry Ivan Kurian	5bc7d944f9	Remove whitespace	2018-09-19 15:17:13 -07:00
Wayne Chen	7e796f7e7f	committing requested changes	2018-09-19 14:26:30 -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	60c07280f8	Merge pull request #13971 from SamGondelman/parabola ... Correct transparent parabola shader	2018-09-19 11:46:24 -07:00
Wayne Chen	a43799fffa	moving settings check within slotted functions	2018-09-19 10:40:49 -07:00
Wayne Chen	795580f4e1	adding 404 redirect toggle with interstitial	2018-09-19 09:55:15 -07:00
Stephen Birarda	3a7785d10f	fix for deadlock in other avatar entity removal	2018-09-18 17:52:24 -07:00
Kerry Ivan Kurian	cfa9d185f0	Add full resource paths to list in marketplace item tester	2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian	a592565b7b	Enable marketplace item test for avatar file	2018-09-18 13:25:01 -07:00