56574 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chris Collins	655dbd0703	Merge pull request #10741 from highfidelity/RC-44 ... Beta Release 44 - Includes up to Developer Release 6702	2017-06-19 11:33:58 -07:00
Brad Davis	a004e5fbe8	PR feedback	2017-06-19 11:21:08 -07:00
Brad Davis	a9096aa7f0	Prevent deadlocks from different locking orders in FileCache	2017-06-19 11:21:08 -07:00
Seth Alves	39fb94d76d	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-19 11:21:08 -07:00
Atlante45	c4c6142935	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx	2017-06-19 11:06:51 -07:00
Atlante45	8d45c4da7c	Fix comments	2017-06-19 11:02:31 -07:00
Chris Collins	16822720cc	Merge pull request #10725 from highfidelity/RC-44 ... Beta Release 44 - Includes up to Developer Release 6702	2017-06-19 10:58:24 -07:00
Brad Davis	f790a9bf5c	Merge pull request #10735 from jherico/cache_eject_crash ... Fix for occasional crash on switching domains	2017-06-19 10:53:34 -07:00
Stephen Birarda	2933a20a0c	some cleanup for audio/avatar replicated packet checking	2017-06-19 10:45:33 -07:00
Zach Fox	5245237bb2	Removing unmergeable files before PR	2017-06-19 10:33:22 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
Vladyslav Stelmakhovskyi	9fb947ea3c	Merge branch 'master' into fix_audio_qt59	2017-06-19 16:17:31 +02:00
Brad Davis	7b2369976a	Merge pull request #10736 from sethalves/fix-ubuntu-quazip-build ... build quazip with c++11	2017-06-18 16:51:40 -07:00
Ryan Huffman	fefedd63e4	Merge pull request #10728 from thoys/cooking/bake-shortBow ... bake shortbow	2017-06-18 16:39:33 -07:00
Seth Alves	ec1187991d	Merge pull request #10734 from vladest/fix_tablet_buttons_qt59 ... Fix tablet buttons qt59	2017-06-18 13:48:26 -07:00
Seth Alves	f42146c139	dry up quazip cmake	2017-06-18 13:24:24 -07:00
Vladyslav Stelmakhovskyi	36ff765d7f	Make sure registered object have different name from iport alias	2017-06-18 22:19:28 +02:00
Vladyslav Stelmakhovskyi	a662a0e984	Merge branch 'fix_tablet_buttons_qt59' into fix_audio_qt59	2017-06-18 21:53:59 +02:00
Vladyslav Stelmakhovskyi	59a77c16bd	Cleanup	2017-06-18 20:59:22 +02:00
Seth Alves	a1571608db	try some more	2017-06-18 11:48:11 -07:00
Seth Alves	242d615b50	sigh	2017-06-18 11:16:36 -07:00
Seth Alves	fd137e1a84	build quazip with c++11	2017-06-18 10:22:50 -07:00
Matti Lahtinen	600a39c9b2	Fixed Zone overriding Client.	2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi	f34faa3ee7	Fix backward compatibility with Qt 5.6	2017-06-18 10:54:59 +02:00
Cain Kilgore	394560c979	Added sound effect (temp) when you hit a ball, plus added a check to ensure the game doesn't hang waiting for balls out of the arena.	2017-06-18 07:27:49 +01:00
Cain Kilgore	135beb2d48	Small amounts of cleanup - added Smoke effect when Ball is Hit by Arrow	2017-06-18 02:03:29 +01:00
Clément Brisset	3262e10d76	Merge pull request #10727 from jherico/file_cache_locking ... Prevent deadlocks from different locking orders in FileCache	2017-06-17 15:13:47 -07:00
Vladyslav Stelmakhovskyi	a1475bc65f	Forgot if statement	2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi	b8bb8026ca	Merge branch 'master' into fix_tablet_buttons_qt59	2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi	5a0783c38c	Send mouse events before touch event. It seems the order is important for Qt 5.9	2017-06-17 22:24:27 +02:00
Brad Davis	1632e3b35a	PR feedback	2017-06-16 20:04:23 -07:00
Howard Stearns	532df863b9	Merge pull request #10726 from zfox23/PAL_FixGoToUser ... Fix teleporting to another user from the PAL	2017-06-16 18:08:11 -07:00
Chris Collins	f7721b1ad0	Merge pull request #10732 from Atlante45/master ... Stable > RC-44	2017-06-16 17:50:31 -07:00
Atlante45	d8ec85d02c	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-16 17:49:06 -07:00
Brad Davis	0af6b3b749	Merge pull request #10719 from ctrlaltdavid/21397 ... Ensure desktop dialogs' title bars are visible	2017-06-16 17:35:18 -07:00
Atlante45	d090ac4396	CR	2017-06-16 17:04:57 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Thijs Wenker	57692051c0	bake shortbow	2017-06-17 01:56:38 +02:00
Andrew Meadows	b105ad8338	measure linear velocity of tractor position	2017-06-16 16:55:00 -07:00
Cain Kilgore	26446b6b33	Debugging info - check what the arrow hit	2017-06-17 00:51:34 +01:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01:00
Zach Fox	6230dcf93d	Thanks to Thoys!	2017-06-16 16:34:35 -07:00
Cain Kilgore	80b50927d3	Added smoke image & references	2017-06-17 00:33:16 +01:00
Cain Kilgore	2e56b0d639	Test C ommit	2017-06-17 00:29:25 +01:00
Zach Fox	74fde8efd7	Revert "Fix teleporting to another user from the PAL" ... This reverts commit 6b659101d5.	2017-06-16 15:33:47 -07:00
Brad Davis	a675dfe7d2	Prevent deadlocks from different locking orders in FileCache	2017-06-16 15:30:50 -07:00
Zach Fox	6b659101d5	Fix teleporting to another user from the PAL	2017-06-16 15:09:13 -07:00
Stephen Birarda	39e8510ccb	Merge pull request #10720 from seefo/fb5386 ... Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 15:03:45 -07:00