53206 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
ZappoMan	4da8e5e18f	fix left/right legs for kinect	2017-03-30 20:01:59 -07:00
ZappoMan	53c439ffba	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
samcake	47e9668b8f	improving the gl41 backend to mimic the gl45	2017-03-30 17:59:59 -07:00
Seth Alves	715493922e	code review	2017-03-30 17:33:01 -07:00
Anthony J. Thibault	22901a40c8	Expose Avatar skeletons to JavaScript	2017-03-30 17:27:40 -07:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Zach Fox	4712ec7400	Reset pollCount; debug log when expired generated by client	2017-03-30 17:02:15 -07:00
Seth Alves	9ef4d01772	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-30 17:00:07 -07:00
David Rowe	a5c683192b	Improve entity properties scroll handle operation in tablet	2017-03-31 12:26:22 +13:00
trent	e9035a1efb	More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine.	2017-03-30 19:10:15 -04:00
Zach Fox	0bdd0f5c08	Merge pull request #10052 from vladest/tablet-ui-ambient-occlusion ... Set z-order of comboboxes to make sure lowest will no overlap higher …	2017-03-30 15:19:43 -07:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
trent	c5bb419bd1	Fixed OBJ reader crash, did not fix OBJ reader not working properly.	2017-03-30 18:16:55 -04: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
trent	864184a107	wip OBJ loader rewrite; wip because it crashes.	2017-03-30 17:11:40 -04:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00
trent	5bf3da9a7f	Restoring hifi version of the OBJ files to get rid of my debug nonsense.	2017-03-30 16:14:42 -04:00
trent	dd2ed559b6	Merge branch 'master' of https://github.com/highfidelity/hifi into 21240	2017-03-30 16:13:28 -04:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -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
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -07:00
Seth Alves	36ad3af48e	attempt to avoid a hang on shutdown	2017-03-30 11:35:24 -07:00
Andrew Meadows	76ef2b5d9f	Merge pull request #10059 from ZappoMan/addKinectHandRotation ... some more kinect work	2017-03-30 11:05:44 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -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
Seth Alves	cc5fe05268	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-30 09:33:04 -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
Anthony J. Thibault	0e63f97f77	Test script that displays tracking data from Vive.TrackedObjects	2017-03-29 18:17:32 -07:00
Anthony J. Thibault	d47c040768	Vive: Expose all 16 tracked poses to the controller system. ... This is in preparation for the Vive hockey puck trackers...	2017-03-29 18:15:29 -07: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
Howard Stearns	af25e0e21f	Don't consider changes to location details as update-worthy if we're not discoverable.	2017-03-29 17:55:57 -07:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Zach Fox	4887081e2c	New PAL colors; slight layout changes	2017-03-29 16:30:24 -07:00
Howard Stearns	3a7edebb94	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07: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