26917 commits

Author	SHA1	Message	Date
amantley	90feeffa9d	cleaning up. putting squat fix in vertical recenter	2018-10-01 14:21:00 -07:00
amantley	1a0e2c6ea1	clean up for pr	2018-10-01 08:30:51 -07:00
amantley	9e40045927	added criteria to stop false positive for sit down	2018-09-30 17:13:34 -07:00
amantley	bdd6befef9	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-09-29 15:39:36 -07:00
amantley	884ad66a14	added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now	2018-09-28 17:18:24 -07:00
Kerry Ivan Kurian	440e2062f5	Fix application uninstall in marketplace item tester	2018-09-27 22:14:02 -07:00
amantley	42cb8a7ef0	avatar app changes	2018-09-27 16:59:54 -07:00
amantley	52355e53f1	adding the menu item to the avatar app for the sit state.	2018-09-27 16:44:55 -07:00
Roxanne Skelly	af6db93b70	Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray	2018-09-27 12:05:21 -07:00
John Conklin II	0b185c6890	Merge pull request #14031 from zfox23/notificationsForFourApps ... Discovery Notifications Project: Notifications for PEOPLE, WALLET, MARKET, and GOTO	2018-09-27 11:34:05 -07:00
amantley	fa9abf0fff	added the floor at 0.0 in sensor space for oculus. to do: vive	2018-09-26 18:08:00 -07:00
John Conklin II	7701cfd9c8	Merge pull request #14084 from luiscuenca/appearOnFloorFix ... Fix avatars loading below the ground bug	2018-09-26 16:00:53 -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
Zach Fox	6a3fa28fad	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-26 15:12:04 -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
amantley	4f9de1be1c	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-09-26 08:38:30 -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
luiscuenca	754653b093	Fix warnings	2018-09-25 17:31:18 -07:00
luiscuenca	82b08f1a93	Wait until skeleton is loaded to locate the avatar	2018-09-25 16:21:05 -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
Roxanne Skelly	cbb4bff2db	Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray	2018-09-25 14:16:43 -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
amantley	ad6bbc7ff6	latest squatty changes	2018-09-25 11:22:44 -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
Roxanne Skelly	c1d2f00c9b	Fix url.toString()	2018-09-24 15:45:38 -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
Roxanne Skelly	16dba169c5	Tray Notifier code review fixes	2018-09-24 14:36:54 -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
Roxanne Skelly	6f4c376d9f	Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray	2018-09-24 13:45:24 -07:00
Roxanne Skelly	d5baadbefa	Modify --url hifiapp: behavior to trigger through appUI when first ... starting interface. Also, menu names and order follow UX documentation.	2018-09-24 13:43:55 -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