70845 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cristian Luis Duarte	36e9c8ba3b	Android - People - UI changes to match design spec	2018-08-14 12:44:09 -03:00
Seth Alves	54fa7dd0b6	Merge pull request #13817 from sethalves/fix-desktop-handshake ... fix desktop press-x handshake	2018-08-14 08:42:10 -07:00
sabrina-shanman	2576d502ab	Remove unused getter for btCollisionWorld in PhysicsEngine	2018-08-13 17:27:57 -07:00
Ryan Huffman	0fcf1517a5	Fix TextureCache not correctly choosing gl41 when gl45 is disabled	2018-08-13 16:35:21 -07:00
Cristian Luis Duarte	1bfd6fe97d	Android - People - Sliding panel (for users actions)	2018-08-13 20:32:45 -03:00
John Conklin II	73ef2ff09c	Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit ... MS17291: Create-app increase focus distance limit	2018-08-13 14:58:17 -07:00
sabrina-shanman	e5cb078133	Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target	2018-08-13 14:51:37 -07:00
Sabrina Shanman	99374c099a	Merge pull request #13816 from SamGondelman/fading ... Fix parabola shader	2018-08-13 14:45:31 -07:00
Gabriel Calero	4b808fe38e	Revert "Test if this fixes the choppy audio" ... This reverts commit 2e323efe1b.	2018-08-13 18:29:05 -03:00
Seth Alves	0a5c96ecc1	Merge pull request #13792 from luiscuenca/attachmentsAPImgr ... Attachments API returns avatar entities	2018-08-13 14:21:13 -07:00
Andrew Meadows	fd9876cb63	don't attempt physics with invalid modelURL	2018-08-13 13:30:30 -07:00
Alexander Ivash	f910757ec4	FB16914 - Avatar bookmarks missing from Avatar Favorites	2018-08-13 22:57:07 +03:00
Seth Alves	4fa0c96046	fix desktop press-x handshake	2018-08-13 11:57:48 -07:00
John Conklin II	a6e5ce76c6	Merge pull request #13811 from thoys/fix/create/deactivateCreateWhenWindowsClosed ... MS16958: deactivate Create App when desktop windows are closed	2018-08-13 11:51:32 -07:00
Cristian Luis Duarte	b381a182bd	Android - People - add padding to list	2018-08-13 14:31:20 -03:00
SamGondelman	86ba8c3d81	fix parabola shader	2018-08-13 10:08:19 -07:00
unknown	8a22d0adc7	set grabbable user data in addAssetToWorldCheckModelSize	2018-08-11 11:04:44 -07:00
unknown	c622a587e3	Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable	2018-08-11 07:59:56 -07:00
Thijs Wenker	221dfb8979	typo fix	2018-08-11 05:46:48 +02:00
Robin K Wilson	ac37f476d9	Merge pull request #13761 from robin-k-wilson/simplifyBuildInstructions ... Reordered build.md instructions	2018-08-10 20:16:00 -07:00
Simon Walton	829b83c61d	Use elevated model priority during initial load	2018-08-10 18:16:08 -07:00
Thijs Wenker	a20be5b50d	remove rotation for newly created entities	2018-08-11 02:28:01 +02:00
Thijs Wenker	f26188d5b8	added comment for limit choice	2018-08-11 01:54:13 +02:00
Dante Ruiz	75cc1c62c0	mostly done interstitial page	2018-08-10 16:53:34 -07:00
John Conklin II	b56d9c3ea5	Merge pull request #13807 from SamGondelman/fading ... Fixing fading	2018-08-10 16:35:10 -07:00
Zach Fox	57d2f04f14	Merge pull request #13799 from davidkelly/dk/17340 ... Only update gain if it really changed	2018-08-10 16:20:24 -07:00
Simon Walton	0ae86d5aa8	Remove useless statement	2018-08-10 16:16:58 -07:00
luiscuenca	dd93055d89	Convert and load attachments when rig is ready	2018-08-10 16:15:30 -07:00
Sam Gateau	d5c5bd714f	Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars ... don't call Avatar::simulate() on fading avatars	2018-08-10 15:44:07 -07:00
Simon Walton	05fa7fdf0e	Clean-up	2018-08-10 15:43:51 -07:00
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
Zach Fox	096be16bb1	Only restart timer if feedMouseArea doesn't contain mouse	2018-08-10 15:32:44 -07:00
Zach Fox	1a6a55680c	PropagateComposedEvents	2018-08-10 15:30:32 -07:00
John Conklin II	644ff1eafa	Merge pull request #13655 from amantley/animationBlendChanges ... New Default Strafe Animations Plus Animation Tuning Support	2018-08-10 15:03:30 -07:00
Cristian Luis Duarte	610306c49c	Android - People - add friend star	2018-08-10 19:02:01 -03:00
Gabriel Calero	2e323efe1b	Test if this fixes the choppy audio	2018-08-10 18:57:41 -03:00
David Rowe	3a356de49f	Don't auto-action entry in HMD file dialog when single-click on it	2018-08-11 09:46:11 +12:00
Sam Gateau	9cb0c36d90	Merge pull request #13805 from NissimHadar/exportToTestRail1 ... Auto-Tester export to TestRail	2018-08-10 14:40:12 -07:00
Simon Walton	3c665b7de8	Don't delete sequence numbers outside of range as range may change	2018-08-10 14:40:08 -07:00
Cristian Luis Duarte	b65f2d46a6	Android - People - Letters styling in row	2018-08-10 18:18:24 -03:00
John Conklin II	61f0e9323a	Merge pull request #13800 from samcake/zvork-shadow ... Fixing PR13731 shader error on Mac	2018-08-10 14:10:47 -07:00
Ryan Huffman	9fadf58e7b	Add threads lib to image lib	2018-08-10 13:56:48 -07:00
Ryan Huffman	c0ac76bf4a	Merge pull request #13797 from dback2/rotationRingSize ... Edit handle rotation ring size	2018-08-10 13:53:10 -07:00
Cristian Luis Duarte	ef3ac6bba3	Android - Friends - rollback swipe to reveal items	2018-08-10 17:36:32 -03:00
Sam Gateau	ad5b2ddc69	Merge pull request #13711 from AndrewMeadows/myAvatar-vs-backfacing-triangles ... MyAvatar's RigidBody ignores collisions with backfacing triangles	2018-08-10 12:55:28 -07:00
unknown	8c185aa04e	fix menu option	2018-08-10 12:13:09 -07:00
unknown	5d1cc3696a	Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable	2018-08-10 12:10:57 -07:00
unknown	45b9871fdb	when adding asset to world set grabbable	2018-08-10 12:10:49 -07:00
Stephen Birarda	91365aeff4	make avatar kill packets from mixer reliable	2018-08-10 11:31:17 -07:00
SamGondelman	15070f6374	fixing fading	2018-08-10 10:52:58 -07:00