50103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Faye Li	0a3a0e817e	polling users and displaying user count	2017-01-25 17:36:50 -08:00
Faye Li	b5b781f4a5	tab content switching	2017-01-25 16:59:16 -08:00
Faye Li	5ad522668a	tabs header for everyone and friends	2017-01-25 16:29:25 -08:00
Faye Li	ce0ee610ea	a test on polling friends	2017-01-25 14:32:36 -08:00
Faye Li	f02b2ef40a	auto poll users when page loads	2017-01-25 11:59:31 -08:00
Faye Li	c7a0e609fc	created a friends button for metaverse friends page	2017-01-25 11:41:07 -08:00
Faye Li Si Fi	f8162970ec	filter out yourself from user list	2017-01-23 15:24:33 -08:00
Faye Li Si Fi	afc85a3afe	Don't display users who aren't in a domain	2017-01-20 13:53:09 -08:00
Faye Li	763028dad4	refresh icon	2017-01-19 15:46:02 -08:00
Faye Li	5bc0030c8f	hook up event bridge	2017-01-19 15:24:56 -08:00
Faye Li	bbed26c8fa	display all online users	2017-01-19 14:34:28 -08:00
Faye Li	23269c2efb	move refresh button to top bar	2017-01-19 13:41:36 -08:00
Faye Li	193251eb8d	background	2017-01-19 13:11:35 -08:00
Faye Li	450b94f641	load font	2017-01-19 12:55:06 -08:00
Faye Li	53404caccf	top bar css	2017-01-19 12:15:27 -08:00
Faye Li	10f512306e	successfully polling all online users	2017-01-19 10:58:29 -08:00
Faye Li Si Fi	5ad1cc6f4d	end of day commit	2017-01-18 18:03:16 -08:00
Faye Li Si Fi	75b1eba84e	initial commit for users.html	2017-01-18 16:10:42 -08:00
Faye Li Si Fi	9865f134db	go to users.html on tablet button click	2017-01-18 16:09:12 -08:00
Faye Li Si Fi	82e0ca2423	create users tablet button	2017-01-18 13:19:19 -08:00
Seth Alves	4dd0de62fc	Merge pull request #9424 from sethalves/tablet-ui ... fix warnings	2017-01-18 12:50:06 -08:00
Seth Alves	b6188bb73a	fix warnings	2017-01-18 12:49:25 -08:00
Seth Alves	02b708feaf	Merge pull request #9419 from druiz17/buttonsMissing ... Fixed pal on tablet	2017-01-18 11:04:10 -08:00
Seth Alves	a1efb7695b	Merge pull request #9420 from sethalves/tablet-ui-model-stylus ... Tablet ui model stylus	2017-01-18 10:51:36 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Dante Ruiz	8172329ec3	Fixed pal	2017-01-18 10:33:58 -08:00
Seth Alves	439d6f0fa3	Merge pull request #9418 from druiz17/tabletController ... game controller input with tablet	2017-01-18 09:31:55 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00: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	715ee0b019	Merge pull request #9416 from sethalves/tablet-ui ... Tablet ui	2017-01-18 06:41:21 -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
Seth Alves	d02ef9fb86	Merge pull request #9415 from hyperlogic/tablet-ui2 ... Adjusted tablet spawn position and orientation to be more natural	2017-01-18 06:36:18 -08:00
Seth Alves	3fe9505f18	Merge pull request #9414 from fayeli/menu-scrolling ... Fix tablet menu scrolling issue	2017-01-18 06:35:06 -08:00
Brad Hefta-Gaub	5036781b81	Merge pull request #9406 from jherico/atp_core_usage ... Consume fewer cpu cores in AssetServer when interface is running locally	2017-01-18 06:50:48 -06:00
Anthony J. Thibault	03f8a310fc	Fix for exception on script ending	2017-01-17 18:17:41 -08:00
Anthony J. Thibault	c6f3eb138a	Adjusted tablet spawn position and orientation to be more natural	2017-01-17 18:16:40 -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
Faye Li Si Fi	d7209ef7f7	syntax	2017-01-17 16:56:54 -08:00
Faye Li Si Fi	42a96a94b4	fix	2017-01-17 16:54:40 -08:00
Faye Li Si Fi	126bfba512	fix tablet menu scrolling issue	2017-01-17 16:40:12 -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