52993 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	0181783290	Merge pull request #10064 from samcake/ambient ... Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1	2017-03-31 16:04:00 -07:00
Seth Alves	cec02bbf6f	Merge pull request #10011 from humbletim/fix-rightclick-menu-again ... Fix right-click popup menus in web views	2017-03-31 15:48:11 -07:00
Chris Collins	b36f688a5a	Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default ... use tablet-ui stylus as default, rather than avatar finger	2017-03-31 15:34:37 -07:00
samcake	467ea787c6	Adress Seth's review	2017-03-31 14:54:00 -07:00
Clément Brisset	9d0676dd87	Merge pull request #10088 from huffman/stable-merge ... Stable merge	2017-03-31 14:27:42 -07:00
Howard Stearns	0c07003768	Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars ... Avoid invisible avatars	2017-03-31 13:48:41 -07:00
Seth Alves	8d4982d794	Merge pull request #10087 from druiz17/tablet-webView ... Better webview handing for the tablet	2017-03-31 13:26:56 -07:00
Seth Alves	54c66aff07	use tablet-ui stylus as default, rather than avatar finger	2017-03-31 13:18:40 -07:00
Seth Alves	3073b47ea3	Merge pull request #10065 from ctrlaltdavid/21242 ... Address tablet scrollbar issues	2017-03-31 12:43:53 -07:00
Ken Cooke	fa53ebef30	Merge pull request #9996 from zfox23/cleanup_selectAudioDevice ... FB3651: Fix audio devices switching when they shouldn't	2017-03-31 12:07:49 -07:00
samcake	c8970dd704	Fixing the warning on windows	2017-03-31 11:34:03 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
samcake	6a0c07a692	Fixing a bad counter for numFaces	2017-03-31 10:39:13 -07:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
Sam Cake	61d78bc931	BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things	2017-03-30 23:29:37 -07:00
samcake	47e9668b8f	improving the gl41 backend to mimic the gl45	2017-03-30 17:59:59 -07:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
David Rowe	a5c683192b	Improve entity properties scroll handle operation in tablet	2017-03-31 12:26:22 +13:00
samcake	25edb44b75	Fix the problem with the cursor and scattering,	2017-03-30 15:15:14 -07:00
Ryan Huffman	150dcd7dec	Merge remote-tracking branch 'upstream/master' into stable-merge	2017-03-30 14:22:27 -07:00
David Rowe	985a804fe9	Merge branch 'master' into 21242	2017-03-31 08:03:05 +13:00
samcake	26000288d7	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-30 11:45:12 -07:00
Andrew Meadows	76ef2b5d9f	Merge pull request #10059 from ZappoMan/addKinectHandRotation ... some more kinect work	2017-03-30 11:05:44 -07:00
samcake	73a8ec3e72	Merge pull request #10068 from kencooke/audio-debugbuild-fix ... Fix the crash in Debug builds	2017-03-30 10:12:37 -07:00
David Kelly	348674a267	Merge pull request #10034 from davidkelly/dk/avatarEntityIssue ... bad serialization of Avatar Entity parentID	2017-03-30 10:12:19 -07:00
samcake	a310a9c66c	Merge branch 'ambient' of https://github.com/samcake/hifi into ambient	2017-03-30 09:43:07 -07:00
Ken Cooke	69863dd735	Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*	2017-03-30 08:52:04 -07:00
Sam Cake	1c9bc2d71e	Trying to debug the crash on gl4.1	2017-03-29 23:28:06 -07:00
David Rowe	9c4414cff6	No custom styling of marketplaces directory scrollbar	2017-03-30 14:38:17 +13:00
samcake	e6d30fbb2f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-29 18:22:47 -07:00
samcake	5584853340	Keep on cleaning	2017-03-29 18:22:21 -07:00
David Rowe	c7f648a6c2	Disable marketplace directory and Clara.io scrollbars in tablet	2017-03-30 14:20:32 +13:00
David Rowe	06910d1881	Add comment re scrollbar stability in tablet	2017-03-30 14:20:02 +13:00
David Rowe	f954767b84	Get entities list and entity properties scrollbars working on tablet	2017-03-30 14:04:03 +13:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Zach Pomerantz	4a9fbf2bbd	delay 200ms to avoid recursive audio dev switches	2017-03-29 19:05:41 -04:00
Seth Alves	5375b87297	Merge pull request #10058 from hyperlogic/bug-fix/toolbar-hiding-woes ... Fix for disappearing toolbar after reload all scripts	2017-03-29 16:04:37 -07:00
Zach Pomerantz	c30ab4de8b	rm extra setDevice	2017-03-29 18:48:22 -04:00
Chris Collins	bf73183e79	Merge pull request #10057 from huffman/limitless-stable ... Beta Release 36 - Adding support for Limitless VR Interactive Character platform	2017-03-29 15:40:16 -07:00
ZappoMan	047a3b8d71	add debugging	2017-03-29 14:51:42 -07:00
ZappoMan	a4d1db1aeb	tweak	2017-03-29 14:40:47 -07:00
ZappoMan	4ed5219b57	add a sample script to drive feet	2017-03-29 14:36:27 -07:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
ZappoMan	6f2f80e334	make sure kinect plugin debugging setting is actually saved and loaded	2017-03-29 14:06:11 -07:00
Delamare2112	3ebe1a0015	Add AvatarInputs::loudnessToAudioLevel	2017-03-29 14:01:27 -07:00
Delamare2112	2f6add3398	Expose LimitlessSpeechRecognition to scripts	2017-03-29 12:56:08 -07:00
Delamare2112	db11c40a08	Add AnimationCache to Agent	2017-03-29 12:54:25 -07:00