53187 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Zach Pomerantz	c30ab4de8b	rm extra setDevice	2017-03-29 18:48:22 -04:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07: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
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -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
Seth Alves	ce9eb1a377	more tablet landscape changes	2017-03-29 14:21:38 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -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
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Howard Stearns	53d484c318	makes connections!	2017-03-29 13:23:31 -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
Delamare2112	4f7cbd5b7c	Add limitless connection and scripting interface	2017-03-29 12:47:58 -07:00
Howard Stearns	b0c97d3a82	putative connection integration for 2-machine testing	2017-03-29 12:22:26 -07:00
samcake	60208bca69	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-29 10:58:05 -07:00