Brad Davis
5cfa22396c
Merge pull request #5219 from venkatn93/master
...
Changing tooltip reticle
2015-06-29 10:51: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
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
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
Niraj Venkat
be053cfdc7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-24 17:33:57 -07:00
Zander Otavka
05b668484c
Change address bar back/forward button color.
2015-06-23 16:41:15 -07:00
Niraj Venkat
d1526c25b2
Starting new tooltip design in QML
2015-06-23 10:08:48 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Bradley Austin Davis
577962cb67
Merge branch 'master' into overlay
2015-06-20 10:37:55 -07:00
David Rowe
0b13accf94
Merge branch 'master' into addressbar-tidy
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2015-06-19 17:42:27 -07:00
Niraj Venkat
1494aa4faa
Adding new icon and getters
2015-06-19 11:18:16 -07:00
Niraj Venkat
1be303e3ed
Address bar polish
2015-06-18 15:07:27 -07:00
David Rowe
1047703718
Tidy address bar code
...
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
2015-06-18 11:18:56 -07:00
David Rowe
5dab977c28
Add a reload script button after each script in list of running scripts
2015-06-17 16:11:26 -07:00
Brad Davis
f2261b5ed5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:34:50 -07:00
Niraj Venkat
a24e0f7b14
Finishing up new address bar layout
2015-06-16 09:50:03 -07:00
Brad Davis
737e418878
Revert "Revert "Merge pull request #5106 from jherico/render_cursor""
...
This reverts commit 0cdc2b53fe
2015-06-13 10:02:54 -07:00
Niraj Venkat
7142be07b6
New address bar layout with back and forward buttons
2015-06-12 17:45:18 -07:00
Niraj Venkat
fcd4dd32ef
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-12 14:08:33 -07:00
Niraj Venkat
b9b8cfd60d
Starting the new address bar layout
2015-06-12 14:08:06 -07:00
ZappoMan
0cdc2b53fe
Revert "Merge pull request #5106 from jherico/render_cursor"
...
This reverts commit 4d18bd7cec24fda9a733
2015-06-12 12:57:24 -07:00
Brad Davis
9148b866bb
Merge branch 'render_cursor' into cursor_manager
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2015-06-11 16:19:57 -07:00
Brad Davis
bc206633f5
Fixing overlay rendering in HMD
2015-06-11 14:56:21 -07:00
Brad Davis
ca1af77763
Working on cursor manager
2015-06-10 13:24:56 -07:00
David Rowe
7e9122e3d1
Replace login background SVGs with QML rectangles
2015-06-05 13:15:18 -07:00
David Rowe
0538eb5756
Add remainder of dialog content and polish look
2015-06-04 22:27:23 -07:00
David Rowe
afc2f374e5
New login dialog background with circular and rectangular variations
...
Developer menu item toggles between the two.
2015-06-04 14:39:28 -07:00
David Rowe
9c52c79fe1
Combine icon and input areas into a single SVG
2015-06-01 13:29:36 -07:00
David Rowe
e41b4c1b7b
Add new address bar dialog error message
...
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -07:00
David Rowe
05e251eba4
Add icon to address bar dialog
2015-06-01 09:01:10 -07:00
David Rowe
333da93642
Updated face tracker mute icons
2015-05-05 23:20:23 -07:00
David Rowe
e689b6a869
Remove leading Unicode control chars
2015-05-01 12:07:00 -07:00
David Rowe
7bc995be5e
Add camera muting icons
2015-04-30 23:14:24 -07:00
stojce
039deb8b42
added go button active state icon
2014-09-24 23:26:34 +02:00
stojce
c14bf84af8
layout fix
2014-09-24 00:14:00 +02:00
barnold1953
c593117ac5
New reticle for sixense and oculus mouse movement
2014-06-13 15:03:09 -07:00
Ryan Huffman
edcff0b67f
Merge remote-tracking branch 'upstream/master' into RunningScripts
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/FramelessDialog.cpp
interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -07:00
Ryan Huffman
46d4a31f01
Update login images
2014-04-28 13:16:06 -07:00
Ryan Huffman
23397a4b10
Add LoginDialog
2014-04-28 08:55:03 -07:00
Ryan Huffman
792ab7e17e
Update icon for Load Script button
2014-04-25 15:57:10 -07:00
Ryan Huffman
9bea70ac54
Revert "Add emoticons to chat"
...
This reverts commit 3c9b6264a8
2014-04-23 10:49:22 -07:00
Ryan Huffman
3c9b6264a8
Add emoticons to chat
2014-04-17 19:51:25 -07:00
Ryan Huffman
4afea2d228
Remove chat window docking
2014-04-16 09:55:12 -07:00
Ryan Huffman
aaddecd024
Merge remote-tracking branch 'upstream/master' into 19554
...
Conflicts:
interface/resources/resources.qrc
interface/ui/chatWindow.ui
2014-04-14 11:20:49 -07:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02:00
Ryan Huffman
de475ee46c
Update behavior of chat window close button
...
Use a stylesheet to suppress highlighting of the background when
pressing the button down. Instead, it will change the image.
Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system. The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
2014-04-10 12:19:27 -07:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
