20641 commits

Author	SHA1	Message	Date
Dante Ruiz	a147ce3f5f	fixed load script issue	2017-01-25 08:00:41 -08:00
Anthony J. Thibault	bff0eeef75	Added username to tablet header	2017-01-24 14:31:57 -08:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Seth Alves	3496e4cc7a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 16:50:41 -08:00
Zach Pomerantz	445a97e07c	Merge pull request #9476 from zzmp/js/audio-injector-finished ... Connect audio injector signal to scripting	2017-01-23 18:13:54 -05:00
Seth Alves	c958314918	merge from upstream	2017-01-23 13:52:01 -08:00
Clément Brisset	19622f86bf	Merge pull request #9475 from Atlante45/fix/injector-options ... Fix invalid volume values in injector options silencing all injectors	2017-01-23 13:17:55 -08:00
Zach Pomerantz	cba0b295e8	connect audio injector signal to scripting	2017-01-23 15:09:08 -05:00
Stephen Birarda	f02832ca71	output the actual value set in WebEntityItem	2017-01-23 11:50:05 -08:00
Atlante45	3f8b2f9cbb	Fix invalid volume values in injector options	2017-01-23 11:49:07 -08:00
Stephen Birarda	d7651e9838	move value sanitizing to WebEntityItem	2017-01-23 11:45:21 -08:00
Stephen Birarda	99e0c8c0e7	use fromUserInput in web entity URL set to avoid crashable URLs	2017-01-23 11:37:54 -08:00
Seth Alves	be8bc9652b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 09:44:04 -08:00
Dante Ruiz	41bf65ed5e	home button improvments	2017-01-20 16:35:41 -08:00
samcake	afd3c3b504	Merge pull request #9436 from AndrewMeadows/cauterization-cleanup ... Cleanup of code that decides not to render head when in first-person	2017-01-20 14:49:08 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Andrew Meadows	10cdea9cd8	cleanup model fade logic	2017-01-19 14:17:50 -08:00
Andrew Meadows	b7c1bfaf58	another attempt to fix model transform	2017-01-19 14:01:40 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
Andrew Meadows	d3af420516	fix broken model transforms	2017-01-19 13:07:50 -08:00
Andrew Meadows	1d6f47e3d8	repack to reduce MeshPartPayload footprint 8 bytes	2017-01-19 12:56:08 -08:00
Andrew Meadows	bfbef91f53	re-enable cauterization of meshes for MyAvatar	2017-01-19 12:56:07 -08:00
Andrew Meadows	3dd8fd838b	move cauterization out of Model class	2017-01-19 12:56:07 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Brad Davis	70de00c6bf	Merge pull request #9421 from jherico/more_trace_details ... Additional trace details for GPU timing, frame data updates	2017-01-19 09:12:34 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
samcake	149e727cf3	Merge pull request #9429 from gcalero/android_forward_shaders ... Create render forward version of pixel shaders	2017-01-19 00:48:25 -08:00
samcake	05304c72e0	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
samcake	027bd30cbc	Removing macOS warning	2017-01-18 16:59:50 -08:00
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
samcake	e3da6aa9f1	Removing the comment	2017-01-18 15:03:31 -08:00
Zach Fox	0ec01c0dc5	CR feedback	2017-01-18 14:55:53 -08:00
Gabriel Calero	5602479988	Create render forward version of pixel shaders	2017-01-18 19:18:59 -03:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	b6188bb73a	fix warnings	2017-01-18 12:49:25 -08:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Brad Davis	a593a2116a	Removing magic numbers	2017-01-17 18:15:40 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00