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
Ryan Huffman
4ae148ff19
Update chat window to not allow movement while docked
2014-04-14 11:34:35 -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
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
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
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
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
Philip Rosedale
8ccc0a2081
Merge pull request #2650 from thoys/chatwindow-docking-feature
...
Fixed docking of ChatWindow
2014-04-11 07:21:53 -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
Stojce Slavkovski
459fed5c7b
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 21:52:37 +02:00
Ryan Huffman
16a2367b29
Update chat window to only scroll when at the bottom
...
It can be frustrating when scrolling up to read a message to have the
window forcibly scrolled to the bottom when a new message appears.
2014-04-10 12:34:45 -07:00
Ryan Huffman
37f9f47488
Fix odd resizing of chat messages
...
When calling updateGeometry on the message labels the layout system
seems to resize the widgets in weird ways. There may be a different way
to keep it from doing this.
2014-04-10 12:09:06 -07:00
Ryan Huffman
ff3ebd1eda
Fix centering of timestamp in chat window
2014-04-10 12:04:30 -07:00
Stephen Birarda
3651eff3d6
cleanup Systime to gettimeofday without lean and mean windows
2014-04-10 11:24:54 -07:00
Stephen Birarda
cf47418d58
remove the audio scope
2014-04-09 17:16:29 -07:00
Stephen Birarda
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Stephen Birarda
d4f2c9e631
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-09 14:40:14 -07:00
stojce
9ab61faacb
additional CR fixes
2014-04-09 22:32:15 +02:00
stojce
a1c6843bd4
CR Fixes
2014-04-09 22:14:35 +02:00
stojce
c9605be193
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-09 21:57:56 +02:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
0a9c7e3d74
add an include guard to Stats
2014-04-09 11:35:20 -07:00
Stephen Birarda
86d236faef
repairs to date and author name in RearMirrorTools
2014-04-09 10:13:06 -07:00
stojce
7b26317eaf
Merge branch 'master' of https://github.com/worklist/hifi into 19548
2014-04-09 18:55:17 +02:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427
prepare header files for regex run against cpp
2014-04-09 09:35:05 -07:00
stojce
cc2f03fb49
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-09 08:19:41 +02:00
Stephen Birarda
7ce91b3f96
fix headers who had their comments removed
2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce
header comment tweaks prior to regex match
2014-04-08 17:19:23 -07:00
Stephen Birarda
6681754994
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-08 14:26:10 -07:00
Andrzej Kapolka
ccd7106527
Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows
...
build.
2014-04-08 10:54:41 -07:00
Stephen Birarda
080b0d7221
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-08 10:28:14 -07:00
Andrzej Kapolka
d4706bba8a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-08 10:21:13 -07:00
Andrzej Kapolka
5a61009099
Add metavoxel bandwidth to details.
2014-04-08 10:19:39 -07:00
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -07:00
Stephen Birarda
efcf506383
resolve conflicts on merge with upstream master
2014-04-07 09:32:08 -07:00
stojce
dd5a198740
Models browser fixes
2014-04-06 16:13:15 +02:00
stojce
ba5a092ad7
Frameless dialog position/size fixes
...
Fixed frameless dialog size and position on main window resize and move
2014-04-06 15:30:30 +02:00
stojce
b45f61ec54
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-05 16:29:57 +02:00
Andrzej Kapolka
2d535f3b86
Removed debugging code.
2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd
Extent tweaks.
2014-04-04 16:32:14 -07:00
