20621 commits

Author	SHA1	Message	Date
Dante Ruiz	41bf65ed5e	home button improvments	2017-01-20 16:35:41 -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
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -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
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Zach Fox	246f5fb7f5	Add log; fix whitespace	2017-01-17 11:51:09 -08:00
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
samcake	305e308575	avoiding the exclusive filtering behavior	2017-01-17 10:54:45 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
samcake	960f4f0ead	Move the drawBOunds job to DrawTasks	2017-01-16 18:33:42 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00
samcake	0b9b5d595c	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-16 17:48:16 -08:00
samcake	83d1c3ad01	Adding support for the meta rendering	2017-01-16 17:47:58 -08:00
Zach Fox	1e8effdcc4	Packet verison bump	2017-01-16 15:28:53 -08:00
Andrew Meadows	fd28457807	fix cauterization hack	2017-01-16 15:13:28 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00