163 commits

Author	SHA1	Message	Date
John Conklin II	9f0b4fb437	Merge pull request #14122 from SamGondelman/skybox ... Rebake default skybox for all platforms	2018-10-17 09:50:00 -07:00
Sam Gondelman	121fc7205c	Delete Default-Sky-9-cubemap.texmeta	2018-10-14 22:36:22 -07:00
Wayne Chen	2d85f882b8	adding buttons	2018-10-02 17:47:09 -07:00
SamGondelman	49553e0285	bake default skybox	2018-10-01 14:05:15 -07:00
Wayne Chen	54f800fbda	including images/parent buttons to text	2018-09-25 20:21:05 -07:00
Wayne Chen	bf7dd94db7	button was clipped; adding higher res img	2018-09-13 17:25:33 -07:00
Wayne Chen	2b8aebdb6b	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to aef3ed3e01.	2018-09-13 17:21:29 -07:00
Wayne Chen	db1acb87b8	button was clipped; adding higher res img	2018-09-13 15:38:24 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged ... Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Wayne Chen	78fa52285f	adding show password toggle in textfield	2018-09-05 23:48:21 -07:00
Dante Ruiz	75cc1c62c0	mostly done interstitial page	2018-08-10 16:53:34 -07:00
Dante Ruiz	353121be7d	making some changes	2018-08-09 16:29:37 -07:00
Dante Ruiz	8c5eefcc95	some file and code cleanup	2018-08-07 10:58:45 -07:00
Alexander Ivash	fd7fb424f5	apply updated image from Mukul	2018-07-23 23:48:06 +03:00
Alexander Ivash	46992f04ad	replace bodymart & avatarisland images	2018-07-06 21:00:55 +03:00
Alexander Ivash	235b0e9f4d	change icon for 'guy-in-circle'	2018-07-06 21:00:53 +03:00
Alexander Ivash	856c95b52a	move avatarapp-specific images into appropriate subfolder	2018-07-06 21:00:53 +03:00
Alexander Ivash	0efb5437e8	remove sample avatar thumbnails	2018-07-06 21:00:53 +03:00
Alexander Ivash	1ddfc87396	wip on avatarapp	2018-07-06 21:00:51 +03:00
druiz17	8c83bd29a3	making requested changes	2018-06-07 14:04:39 -07:00
Dante Ruiz	25305ab57f	updating texture	2018-06-06 11:31:39 -07:00
Dante Ruiz	995cfeb3c5	cleaning code	2018-06-06 10:42:12 -07:00
Dante Ruiz	59c50b7f26	remove highlight overlay in favor of materialEntity	2018-06-06 08:38:58 -07:00
vladest	2a3004079e	About UI	2018-05-14 23:22:06 +02:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
Cristian Luis Duarte	428f4b7b9d	Android - Make the virtual pad (joystick) position fixed. Change assets.	2018-02-27 21:24:21 -03:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Alexander Ivash	29625953f6	update privacy-specific disabled preview image	2018-01-18 23:26:43 +03:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
Gabriel Calero	970ca5e08f	Add virtual pad for android	2018-01-17 15:00:43 -03:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Brad Davis	65794cf142	Better skybox for android testing	2018-01-10 20:20:57 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
humbletim	de6975b227	add missing cursor-*.pngs	2017-07-24 17:16:13 -04:00
Zach Fox	a346e5ccf6	New inspect icon	2017-07-21 11:56:06 -07:00
Olivier Prat	82da9fb537	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Zach Fox	0af53bb4a5	Instructions and cool static :)	2017-07-05 14:46:59 -07:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00