Stephen Birarda
49e7842d25
push packet version to force an update
2014-04-16 13:37:41 -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
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
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
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
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
13b12f48c2
Merge pull request #2659 from murillodigital/master
...
switching to https
2014-04-11 19:59:22 -06:00
Leonardo Murillo
f84249ac6c
switching to https
2014-04-11 19:58:49 -06:00
Andrew Meadows
0ad841edfb
don't render avatar boundary shapes in first person
2014-04-11 17:44:51 -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
91c21ced5d
Merge pull request #2652 from AndrewMeadows/inertia
...
save settings whenever menu items are changed
2014-04-11 16:35:01 -07:00
Andrew Meadows
b5e7c30178
merge
2014-04-11 16:00:34 -07:00
Andrew Meadows
017d410c48
merge upstream/master -> andrew/avatar-interaction
2014-04-11 15:59:48 -07:00
Andrew Meadows
508d4f216d
fix #2656 avatar jumps very far away
...
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule. The
penetration against such a shape could be arbitrarily large.
2014-04-11 15:55:18 -07:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Philip Rosedale
d3b43a9a89
Merge pull request #2653 from ey6es/master
...
In addition to pushing the camera back to avoid intersecting, also narrow the field of view.
2014-04-11 12:11:36 -07:00
