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
Stephen Birarda
bd37a75245
Merge pull request #2678 from birarda/authentication
...
push packet version for DS check-ins
2014-04-16 13:38:11 -07:00
Stephen Birarda
49e7842d25
push packet version to force an update
2014-04-16 13:37:41 -07:00
Ryan Huffman
e8b6b7ab4d
Update style of chat message links
2014-04-16 13:22:22 -07:00
AndrewMeadows
8257e25969
Merge pull request #2676 from birarda/authentication
...
re-instate DS connect behavior
2014-04-16 13:13:33 -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
Stephen Birarda
505145f693
add a missing bracket to IP_DONTFRAG
2014-04-16 12:02:02 -07:00
Stephen Birarda
afcb542bbe
fix a debug line in LimitedNodeList
2014-04-16 11:28:34 -07:00
Stephen Birarda
06a976041b
take pointer of optValue and not actual optValue
2014-04-16 11:27:30 -07:00
Stephen Birarda
a25ef58247
move DTLS socket changes to LimitedNodeList
2014-04-16 11:25:35 -07:00
Stephen Birarda
55d540a0eb
fix a typo in DomainServer.cpp
2014-04-16 11:24:26 -07:00
Stephen Birarda
57567becc8
fix unexpected null parameter to disconnect, closes, #2663
2014-04-16 11:02:08 -07:00
Stephen Birarda
97e45e8fe5
re-instate connect behavior in DS so killed nodes re-connect, amend #2675
2014-04-16 10:56:33 -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
Clément Brisset
fbafbf4a9b
Merge pull request #2672 from stojce/19569
...
Code Review for Job #19569
2014-04-15 22:56:49 -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
Clément Brisset
f61d72fcf0
Merge pull request #2660 from huffman/19554
...
19554 Continue refining Chat
2014-04-14 14:35:08 -07:00
Ryan Huffman
06235decae
Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP
2014-04-14 14:10:12 -07:00
Stephen Birarda
d8cc626ed8
Merge pull request #2667 from birarda/master
...
more cleanup to build guide for windows
2014-04-14 12:41:46 -07:00
Stephen Birarda
55172c6f43
more cleanup to BUILD guide for windows
2014-04-14 12:39:45 -07:00
Stephen Birarda
4f10c4b5d4
Merge pull request #2666 from birarda/master
...
fix for DLL section of build guide
2014-04-14 12:36:56 -07:00
Stephen Birarda
d3776afc93
fix for DLL section in BUILD guide
2014-04-14 12:36:13 -07:00
Stephen Birarda
2a38c01668
Merge pull request #2665 from birarda/master
...
changes to build guide for win32 GnuTLS
2014-04-14 12:32:28 -07:00
Stephen Birarda
1aacba3b46
changes to Windows instructions for GnuTLS
2014-04-14 12:31:53 -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
e5f6445a6a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-14 11:04:32 -07:00
Stephen Birarda
0f9a00aacf
Merge pull request #2664 from birarda/authentication
...
update cmake required version
2014-04-14 10:57:50 -07:00
Stephen Birarda
c5c8327359
update required version of cmake to 2.8.12.2
2014-04-14 10:57:34 -07:00
Stephen Birarda
8f23b12081
Merge pull request #2662 from birarda/authentication
...
update build guide with extra info for GnuTLS
2014-04-14 10:52:09 -07:00
Stephen Birarda
70191111c7
remove GnuTLS DLL tip since DLL section is right below
2014-04-14 10:51:36 -07:00
Stephen Birarda
95abc74d83
add GnuTLS to example windows folder structure
2014-04-14 10:50:57 -07:00
Stephen Birarda
1c7f8c87bc
don't codify directories in OS X section
2014-04-14 10:50:03 -07:00
Stephen Birarda
6cb5497242
codify some library names and fix some other spelling
2014-04-14 10:49:11 -07:00
Stephen Birarda
007a477400
fix a typo in build guide
2014-04-14 10:46:42 -07:00
Stephen Birarda
6b4a7d365f
update build guide with extra info for GnuTLS
2014-04-14 10:43:42 -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
