56483 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Atlante45	097e75285a	Remove extra profiling	2017-06-16 14:31:56 -07:00
Atlante45	c2650c2b71	Declare KTXDescriptor* metatype	2017-06-16 14:31:56 -07:00
Atlante45	54fc8085f3	Remove pointer to file in NetworkTexture	2017-06-16 14:31:56 -07:00
Atlante45	4d3fc39ab6	Make KTX async tasks thread safe	2017-06-16 14:31:56 -07:00
Atlante45	fb8aa96a57	Add resource processing tracking to KTX	2017-06-16 14:31:56 -07:00
Atlante45	306b55e45d	Synchronous mip loading	2017-06-16 14:31:56 -07:00
Atlante45	57e8d8e1fd	Fix download retries	2017-06-16 14:31:56 -07:00
Atlante45	31d2592e7d	Handle header and high mips in the same callback	2017-06-16 14:31:56 -07:00
Atlante45	d2251bb840	Offload ktx processing to threadpool	2017-06-16 14:31:56 -07:00
Atlante45	3110dd72bf	More ktx work	2017-06-16 14:31:56 -07:00
Atlante45	35a0c41cf5	Move Ktx processing to thread pool.	2017-06-16 14:31:56 -07:00
Chris Collins	a0cd210b60	Merge pull request #10724 from Atlante45/master ... Stable -> Master	2017-06-16 13:48:37 -07:00
Atlante45	69a5444993	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-16 13:43:41 -07:00
NeetBhagat	2909aa9ac8	Resolve comments of @zappoman. ... -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.	2017-06-17 01:00:32 +05:30
Zach Fox	54bf0c64a7	Merge pull request #10715 from zfox23/spectatorCamera_buttonMapping ... Spectator Camera controller button mapping + QML Language Fix	2017-06-16 10:33:17 -07:00
Chris Collins	f160034bf0	Merge pull request #10681 from zzmp/audio/parity ... Revamp audio device selection	2017-06-16 10:31:55 -07:00
Zach Fox	378d8e80cf	Remove random component of button mapping name	2017-06-16 10:08:58 -07:00
Zach Fox	e2c6993ae9	Fix bug found by Cain with his patch - thank you!	2017-06-16 10:08:58 -07:00
Zach Fox	749dede8b3	Start with empty string for checkbox	2017-06-16 10:08:58 -07:00
Zach Fox	3df414df36	Bugfixes and language changes	2017-06-16 10:08:58 -07:00
Zach Fox	65b910bcf6	Support Vive	2017-06-16 10:08:58 -07:00
Zach Fox	8cf9c8708d	Allow user to click left thumbstick to switch 'MONITOR SHOWS'	2017-06-16 10:08:58 -07:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
seefo	a4d008eec9	Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 08:57:27 -07:00
David Rowe	3cee2b3764	Ensure desktop dialogs' title bars are visible	2017-06-16 20:10:24 +12:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Clément Brisset	f450e70f1e	Merge pull request #10717 from birarda/feat/replicants ... fix race for isUpstream and node hole punch	2017-06-15 17:39:12 -07:00
Stephen Birarda	c332244f4f	fix race for isUpstream and node hole punch	2017-06-15 17:34:20 -07:00
Clément Brisset	062713de8a	Merge pull request #10716 from birarda/feat/replicants ... fix for table additions when there is no initial row	2017-06-15 17:22:06 -07:00
Stephen Birarda	36b4990114	fix for table additions when there is no initial row	2017-06-15 17:19:05 -07:00
Dante Ruiz	07102cc98d	improving the ui	2017-06-16 00:25:27 +01:00
Thijs Wenker	87a6b16d16	Merge pull request #10713 from huffman/feat/remove-tutorial ... Remove /tutorial in favor of new repo	2017-06-16 01:18:40 +02:00
Clément Brisset	cf4bc34572	Merge pull request #10712 from birarda/feat/replicants ... merge upstream/master into upstream/replicants	2017-06-15 15:47:12 -07:00
Stephen Birarda	e6ef153148	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants	2017-06-15 15:43:13 -07:00
Stephen Birarda	c7e37a09fb	Merge pull request #10710 from seefo/fb5376 ... Fixed a bug where custom port wasn't used in AC when passed through CLI	2017-06-15 15:38:11 -07:00