Commit graph

135 commits

Author SHA1 Message Date
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
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
Atlante45
9044cb40d5 Compress Default Skybox with BC7 2017-05-18 13:13:40 -07:00
samcake
b627fe463b Generate correct KTX for the default Sky 2017-05-15 10:50:10 -07:00
Atlante45
79d53d92a1 Use baked default skybox 2017-05-10 16:03:02 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
howard-stearns
2ecc71a990 Annoncement Card visual tweeks. 2017-05-05 10:49:09 -07:00
Olivier Prat
8071c04e98 Added fade effect prototype version 2017-04-27 10:31:06 +02:00
Zach Fox
a4587e33f3 Tiny forward/backward icon updates 2017-04-14 13:19:33 -07:00
Faye Li
6f506d6023 some attempts to get icons in create tab 2017-02-13 14:40:45 -08:00
howard-stearns
050d343849 styling changes 2016-11-16 15:54:11 -08:00
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
Brad Davis
93be00fe79 Updating min spec overlay 2016-10-28 14:45:24 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00
howard-stearns
c4ed84f9a6 remove obsolete file 2016-09-22 16:49:38 -07:00
howard-stearns
17549348b4 less busy hotspotting, and make use of restricted feed (by protocol) 2016-09-22 16:48:16 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
Howard Stearns
660343f8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
Brad Hefta-Gaub
8f5c5ebf0e improved disabled preview wording 2016-09-19 18:19:35 -07:00
howard-stearns
d764c363cc Merge branch 'discovery' into ux-improvements 2016-08-16 12:19:43 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
howard-stearns
4da2cb685c Set full url path to where the picture was taken.
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
2016-08-16 10:43:05 -07:00
Brad Davis
39b424645a Cropping no-preview image 2016-08-12 22:28:57 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Ryan Huffman
c47a5c5aad Add default skybox images 2016-08-08 16:03:03 -07:00