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
Andrzej Kapolka
475528f112
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 15:00:32 -07:00
Andrzej Kapolka
6cf971c849
More intersection-avoidance tweaks.
2014-04-10 14:51:43 -07:00
Stojce Slavkovski
112c8946d6
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 23:46:22 +02:00
Stephen Birarda
5f1e63bb4a
Merge pull request #2647 from AndrewMeadows/fix-crash
...
fix crash: don't access null action
2014-04-10 14:44:01 -07:00
Stephen Birarda
11f5ee202a
Merge pull request #2646 from Atlante45/master
...
Fixed dometime using wrong texdir
2014-04-10 14:43:36 -07:00
Stephen Birarda
fbb0e01f2c
Merge pull request #2648 from Atlante45/glow_when_talking
...
Modified max glow + don't glow you own avatar
2014-04-10 14:43:13 -07:00
Atlante45
9c662acc9d
Modified max glow + don't glow you own avatar
2014-04-10 14:40:35 -07:00
Philip Rosedale
3f0793286f
Merge pull request #2644 from Atlante45/glow_when_talking
...
Glow when you talk, flash when you clip
2014-04-10 13:46:52 -07:00
Andrew Meadows
ac9ead36e2
fix crash: don't access null action
...
In particular, don't crash on pressing Enter when lacking qxmpp support
2014-04-10 13:10:24 -07:00
Stojce Slavkovski
459fed5c7b
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 21:52:37 +02:00
Atlante45
ea93be15f1
Fixed dometime using wrong texdir
2014-04-10 12:44:51 -07: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
Stephen Birarda
86b0b78692
add a missing semi-colon for windows build
2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7
just call free instead of gnutls_free on windows
2014-04-10 12:24:41 -07: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
Stephen Birarda
38867a2f09
fix for re-declarations of xgnutls_free
2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c
put gnutls_free fix in DTLSSession header
2014-04-10 12:11:41 -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
Andrzej Kapolka
873541dd7b
Trying out basic pushback for other avatars.
2014-04-10 11:56:17 -07:00
Atlante45
2cc2149647
Glow when you talk, flash when you clip
...
closes #2592
2014-04-10 11:55:30 -07:00
Stephen Birarda
2c96ce08ae
add stackoverflow fix for lnk2001 error in gnutls_free
2014-04-10 11:50:26 -07:00
Ryan Huffman
2d481dda4e
Update chat menu to properly position itself when opening
...
The previous implementation seemed to assume a full-screen main window -
it will now open on the right side of the window, vertically centered,
regardless of where the main window is.
2014-04-10 11:46:28 -07:00
Ryan Huffman
5099a0e061
Remove chat window opening animation
2014-04-10 11:41:10 -07:00
Stephen Birarda
cfc2431a59
don't be a dummy and include Systime header from implementation
2014-04-10 11:37:09 -07:00
Stephen Birarda
00a826330e
use GetSystemTimeAsFileTime with previous gettimeofday setup
2014-04-10 11:34:43 -07:00
Stephen Birarda
ea8f0df17d
use extern C in Systime header
2014-04-10 11:30:20 -07:00
Stephen Birarda
885cee28c5
guard Systime against being included on UNIX/OS X
2014-04-10 11:28:22 -07:00
Stephen Birarda
1daaf561de
don't include missing sys/time, declare gettimeofday in Systime header
2014-04-10 11:26:47 -07:00
Stephen Birarda
3651eff3d6
cleanup Systime to gettimeofday without lean and mean windows
2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa
More plane intersection bits.
2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab
define WIN32_LEAN_AND_MEAN before include windows.h in Systime
2014-04-10 11:17:03 -07:00
Stephen Birarda
ef418f09b3
don't let windows.h include winsock
2014-04-10 11:15:33 -07:00
Stephen Birarda
53aafd6897
rely on winsock2 for timeval declaration
2014-04-10 11:06:22 -07:00
Stephen Birarda
7d4399da35
don't use reserved word causing issues on windows
2014-04-10 11:01:17 -07:00
Stephen Birarda
52203bd36e
another attempt to repair QNetworkInterface call on windows
2014-04-10 10:58:20 -07:00
Stephen Birarda
ad0776be4e
repair QNetworkConfigurationManager include
2014-04-10 10:55:02 -07:00
Stephen Birarda
714db42f87
include QNetworkConfigManager to fix HifiSockAddr error on windows
2014-04-10 10:51:20 -07:00
Stephen Birarda
186c588d5a
remove doubled timeval definition from SharedUtil
2014-04-10 10:48:50 -07:00
Stephen Birarda
da24483d7c
include WS2tcpip for socklen_t on windows
2014-04-10 10:45:43 -07:00
Stephen Birarda
b87c04444e
include winsock2 from HifiSockAddr
2014-04-10 10:41:01 -07:00
Stephen Birarda
8b19982e61
commit missing Syssocket removals to Node and Logging
2014-04-10 10:36:30 -07:00
Stephen Birarda
7cef2def66
remove Syssocket which is from our pre-Qt days
2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08
make sure gnutls define for ssize_t comes before gnutls include
2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac
add ssize_t definition for gnutls.h include on Windows
2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d
fix GnuTLS include dir variable name
2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e
link to GnuTLS library from script-engine
2014-04-10 10:12:09 -07:00
Stephen Birarda
16bb28a4fa
make GnuTLS a system include to suppress warnings
2014-04-10 10:04:02 -07:00
Stephen Birarda
68c445e718
link GnuTLS to targets linking the networking library
2014-04-10 10:00:10 -07:00
