Ryan Huffman
795ddbc7bf
Update ChatMessageArea to open urls via Menu::openUrl
2014-04-17 15:19:13 -07:00
Ryan Huffman
e1e9c11189
Add Menu slot to open urls
2014-04-17 15:18:40 -07:00
Ryan Huffman
f2112c665a
Disallow rich text from being pasted into the chat area
2014-04-17 14:02:21 -07:00
Ryan Huffman
e2954f8614
Fix color and size of font in timestamp chat messages
2014-04-17 13:49:10 -07:00
Ryan Huffman
48a7561644
Fix chat messages not being html escaped
2014-04-17 13:38:13 -07:00
Ryan Huffman
3ee613b9d5
Add right margin to user list area in chat
2014-04-17 13:20:17 -07:00
Ryan Huffman
7a25d0661f
Update style of chat messages
2014-04-17 13:20:00 -07:00
Ryan Huffman
c1fa6b41e4
Update chat window to use vertical layout
2014-04-17 13:19:36 -07:00
Ryan Huffman
606a48d555
Fix issue with pref dialog disappearing
...
With the frameless dialog being updated to support different types of
window, the pref dialog was no longer able to rely on it to keep itself
open in certain cases. The window flags were also updated to update
after a "browse" call rather than in the slot so that it would still
execute in the case of cancelled selection.
2014-04-17 09:36:17 -07:00
Ryan Huffman
2de9848a37
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-16 14:42:20 -07:00
Ryan Huffman
23d68d538c
Fix bug where multiple user/location popups appear
2014-04-16 14:05:38 -07:00
Ryan Huffman
e8b6b7ab4d
Update style of chat message links
2014-04-16 13:22:22 -07:00
AndrewMeadows
7dc8f2ae3c
Merge pull request #2657 from ey6es/master
...
Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624 .
2014-04-16 12:59:47 -07:00
Ryan Huffman
bfb879d3e6
Update chat textbox to use correct line height
2014-04-16 10:03:22 -07:00
Ryan Huffman
8aee81ae7c
Update username in chat to use correct line height
2014-04-16 10:02:54 -07:00
Ryan Huffman
cb1408d26d
Update chat window to use new Frameless Dialog
...
The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.
2014-04-16 10:01:35 -07:00
Ryan Huffman
4afea2d228
Remove chat window docking
2014-04-16 09:55:12 -07:00
Stojce Slavkovski
c67e42be5e
Moved function into .cpp
2014-04-16 07:46:15 +02:00
Stojce Slavkovski
05023a2585
Snapshot preferences title
2014-04-15 23:29:28 +02:00
Stojce Slavkovski
1a3e6595c5
Allow users to set the destination of Snapshots
2014-04-15 19:36:02 +02:00
Ryan Huffman
06235decae
Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP
2014-04-14 14:10:12 -07:00
Andrzej Kapolka
873620e601
Make sure we set the texture data even if the texture URL is invalid.
2014-04-14 12:27:15 -07:00
Ryan Huffman
4ae148ff19
Update chat window to not allow movement while docked
2014-04-14 11:34:35 -07:00
Ryan Huffman
f698f3375a
Update resource urls for chat window close button
2014-04-14 11:34:27 -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
Andrzej Kapolka
880736c30e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-14 10:24:58 -07:00
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -07:00
Andrzej Kapolka
25d25b1472
Merge pull request #2658 from AndrewMeadows/inertia
...
don't render avatar boundary shapes in first person
2014-04-14 10:23:43 -07:00
Ryan Huffman
2c10b55858
Remove extraneous debug messages
2014-04-12 01:09:29 -07:00
Ryan Huffman
8b904b91ea
Cleanup ChatMessageArea.cpp
2014-04-12 00:53:43 -07:00
Ryan Huffman
45402336ac
Add chat window dragging
...
This was originally implemented by Mohammed Nafees, shared on Basecamp.
I've noticed an issue with dragging across screens (monitors) where the
chat window will jump vertically. I've tried debugging it, and
ultimately it looks like an issue with the `move` method. The
coordinates are valid (I tried using global coordinates as well), and
the amount to move is correct, but when moving to coordinates on a
different screen it doesn't do the right thing.
2014-04-12 00:25:58 -07:00
Ryan Huffman
13cf0c80e6
Fix chat message formatting and word wrapping
...
By switching from a QLabel to a QTextBrowser widget more formatting
options and word wrapping that breaks words is possible. It comes with
an issue I have been unable to resolve
* Selecting text and going down with the cursor will cause it to
scroll. It's possible to increase padding to remove this behavior,
but it doesn't look great.
2014-04-12 00:20:43 -07:00
Philip Rosedale
e3eddadd10
Merge pull request #2651 from AndrewMeadows/avatar-interaction
...
protection against bad avatar-avatar collisions
2014-04-11 21:23:57 -07:00
Leonardo Murillo
f84249ac6c
switching to https
2014-04-11 19:58:49 -06:00
Andrzej Kapolka
0ca68e4cb4
Adjust the size when we toggle the avatar LOD options.
2014-04-11 17:53:02 -07:00
Andrew Meadows
0ad841edfb
don't render avatar boundary shapes in first person
2014-04-11 17:44:51 -07:00
Andrzej Kapolka
39135d3d5f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-11 16:37:49 -07:00
Andrew Meadows
fd3b317c09
merge
2014-04-11 16:36:42 -07:00
Andrzej Kapolka
2fdb8d935b
Merge pull request #2654 from Atlante45/remove_qrc_from_sources
...
Remove qrc from sources
2014-04-11 16:35:48 -07:00
Andrzej Kapolka
4265617c3e
Add missing include.
2014-04-11 16:02:46 -07:00
Andrew Meadows
b5e7c30178
merge
2014-04-11 16:00:34 -07:00
Andrzej Kapolka
fe7a359545
Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624 .
2014-04-11 15:55:48 -07:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Atlante45
c39434f4e3
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources
...
Conflicts:
interface/resources/resources.qrc
2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4
Modify UIs that were using the qrc
2014-04-11 11:59:23 -07:00
Atlante45
18b364d9d9
Removed QResources from Interface
2014-04-11 11:57:25 -07:00
Andrzej Kapolka
d6534d6026
Tweak to zoom on pushback.
2014-04-11 11:10:22 -07:00
Andrzej Kapolka
b7725f094d
Trying the narrowing effect with pushback for other avatars.
2014-04-11 10:19:16 -07:00
Andrzej Kapolka
00e2ff93e3
Playing around with zooming in while pulling back.
2014-04-11 10:08:44 -07:00
Andrew Meadows
f7862eb600
check for bad deltaTime during avatar-avatar collisions
2014-04-11 08:58:26 -07:00
