Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Brad Davis
914b47069b
Working on line height
2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282
Working on line spacing
2015-07-17 14:19:39 -07:00
Bradley Austin Davis
c5e0298f8d
Working on mac sizing
2015-07-17 12:22:38 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Brad Davis
f8144e4ee2
Merge branch 'master' into plugins
2015-07-13 19:52:53 -07:00
David Rowe
daf34053a8
Tweak button positions
2015-07-09 10:15:28 -07:00
David Rowe
db7f1d6d27
Change font to Trebuchet
2015-07-09 09:35:22 -07:00
David Rowe
abc54f2e3f
Polished fonts, colors, etc.
2015-07-07 17:08:02 -07:00
David Rowe
cd258262d2
Use proper Interface logo
2015-07-07 16:21:24 -07:00
David Rowe
1774ad9c53
Rework buttons
2015-07-07 15:59:34 -07:00
David Rowe
98cd706528
Add border around update details
2015-07-07 15:48:39 -07:00
David Rowe
0994cd97dc
Rework header and add logo
...
Use HiFi logo as placeholder for now until Interface SVG is available.
2015-07-07 15:14:15 -07:00
David Rowe
085d87e035
Make background squared, white, and dragable
2015-07-07 14:16:45 -07:00
David Rowe
46e58cd106
Rework dialog container and layout
2015-07-07 13:56:47 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
David Rowe
5046f4c1ac
Update upgrade dialog
...
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
2015-07-06 13:19:42 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Stephen Birarda
3dc3d8b4c1
make the tooltip background darker
2015-06-29 11:05:59 -07:00
Stephen Birarda
133247ec6d
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-29 10:57:16 -07:00
Stephen Birarda
f93ad34282
add spacing above and below tooltipPic
2015-06-29 10:57:09 -07:00
Brad Davis
cdb6620703
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-29 10:55:39 -07:00
Brad Davis
5cfa22396c
Merge pull request #5219 from venkatn93/master
...
Changing tooltip reticle
2015-06-29 10:51:16 -07:00
Brad Davis
5ce79d6800
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-26 17:14:45 -07:00
Brad Davis
4417c00ae4
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.h
interface/src/Menu.h
2015-06-26 17:02:16 -07:00
Niraj Venkat
9101b4ad70
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5
changing link icon
2015-06-26 16:27:04 -07:00
Stephen Birarda
ff33922716
handle conflicts on merge with upstream master
2015-06-26 15:33:35 -07:00
Stephen Birarda
5b660e8c91
Merge pull request #5214 from venkatn93/master
...
Changing formatting of tooltip
2015-06-26 18:27:59 -04:00
Niraj Venkat
87fce44271
Changing formatting of tooltip
2015-06-26 14:41:38 -07:00
Stephen Birarda
9b84eabd18
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 14:40:01 -07:00
Stephen Birarda
7e19a540fd
add the new placeholder image
2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc
initial image replacement for hyperlink preview
2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Niraj Venkat
23f4f7d824
Place name is underlined
2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae
Word wrap implementation
2015-06-25 15:46:43 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Niraj Venkat
de26dc9c49
Further changes to tooltip
2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7
More layout changes
2015-06-25 14:07:03 -07:00
Niraj Venkat
be053cfdc7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-24 17:33:57 -07:00
Niraj Venkat
d89ff2f720
Merge pull request #5188 from AlexanderOtavka/master
...
Improve address bar and edit.js entity properties list.
2015-06-24 16:48:24 -07:00
Brad Davis
8f8bda327c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
2015-06-23 16:54:32 -07:00
Zander Otavka
05b668484c
Change address bar back/forward button color.
2015-06-23 16:41:15 -07:00
Niraj Venkat
0c2e208044
Added basic layout to tooltip QML
2015-06-23 13:54:19 -07:00
Brad Davis
da031b039c
Removing qml wanrings
2015-06-23 10:58:52 -07:00
Niraj Venkat
d1526c25b2
Starting new tooltip design in QML
2015-06-23 10:08:48 -07:00
