ZappoMan
|
8622f2d548
|
fix comment
|
2014-03-12 10:20:33 -07:00 |
|
ZappoMan
|
6173a4d2a7
|
fix isFullScene correctly
|
2014-03-12 10:19:21 -07:00 |
|
Stephen Birarda
|
cc8d052bd9
|
Merge pull request #2273 from ddobrev/xmppchat
Increased the right margin of sent messages for better visibility
|
2014-03-12 10:16:24 -07:00 |
|
Dimitar Dobrev
|
acb4047b54
|
Increased the right margin of sent messages for better visibility.
|
2014-03-12 17:33:25 +02:00 |
|
ZappoMan
|
86feabee99
|
add last scene packets, bytes and pps
|
2014-03-12 02:22:24 -07:00 |
|
ZappoMan
|
7e6beba4d2
|
removed redundant calc of isFullScene
|
2014-03-12 01:29:41 -07:00 |
|
ZappoMan
|
7ce741762e
|
Merge branch 'master' of https://github.com/worklist/hifi into server_scale_testing
|
2014-03-12 01:21:33 -07:00 |
|
ZappoMan
|
a95fd55172
|
suppress sending of extra queries when the client's view hasn't changed
|
2014-03-12 01:11:21 -07:00 |
|
ZappoMan
|
e72d3127bf
|
fix comment and remove dead code
|
2014-03-11 21:25:30 -07:00 |
|
ZappoMan
|
025da315c6
|
removed dontSleep from JurisdictionListener
|
2014-03-11 21:11:47 -07:00 |
|
ZappoMan
|
8befefb054
|
first cut at making PacketSender use QWaitCondition
|
2014-03-11 20:45:46 -07:00 |
|
ZappoMan
|
4d0b762de3
|
some hacking on full scene debuggin
|
2014-03-11 20:33:53 -07:00 |
|
ZappoMan
|
f5cdb98efb
|
switch ReceivedPacketProcessor to using QWaitCondition
|
2014-03-11 20:32:02 -07:00 |
|
Atlante45
|
72e1810df5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-11 18:15:58 -07:00 |
|
Atlante45
|
03d7fb147c
|
Fixed spaces added everywhere
|
2014-03-11 18:15:04 -07:00 |
|
Andrzej Kapolka
|
6c4223bcdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 18:12:12 -07:00 |
|
Atlante45
|
6fcb802a94
|
Added preview deplacement + fixed locking issue
|
2014-03-11 18:01:38 -07:00 |
|
Andrzej Kapolka
|
c21e18c220
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-11 17:35:52 -07:00 |
|
Andrew Meadows
|
793a760272
|
merge upstream master into "radians" project
|
2014-03-11 17:28:36 -07:00 |
|
Andrew Meadows
|
aa8c2fc8cb
|
use radians instead of degrees (almost) everywhere
|
2014-03-11 17:26:58 -07:00 |
|
Andrzej Kapolka
|
bf9929e64d
|
Since the bucky balls are showing up in the hot spots list when profiling,
don't simulate them if they're disabled.
|
2014-03-11 17:16:49 -07:00 |
|
ZappoMan
|
214866414c
|
tweak names
|
2014-03-11 17:09:44 -07:00 |
|
Stephen Birarda
|
19c60cef2d
|
Merge pull request #2249 from ddobrev/xmppchat
Added public chat based on XMPP
|
2014-03-11 17:06:14 -07:00 |
|
ZappoMan
|
1d17e75043
|
more noise suppression
|
2014-03-11 16:56:41 -07:00 |
|
ZappoMan
|
3c24121f5c
|
more noise suppression
|
2014-03-11 16:54:03 -07:00 |
|
ZappoMan
|
0017625442
|
fix unix compiler issue
|
2014-03-11 16:48:49 -07:00 |
|
ZappoMan
|
029b25ad29
|
make domain server less noisy about Agent assignments
|
2014-03-11 16:45:15 -07:00 |
|
Dimitar Dobrev
|
f427f524bf
|
Patched the Qt CMake function for auto-translations so that *.ts files
are not deleted on clean.
|
2014-03-12 01:24:31 +02:00 |
|
Dimitar Dobrev
|
52c8ccb698
|
Added a define to ensure the build works without qxmpp.
|
2014-03-12 01:24:31 +02:00 |
|
Dimitar Dobrev
|
fe2f9f5253
|
Prevented empty time stamps - when less then a minute has passed - from
appearing.
|
2014-03-12 01:24:31 +02:00 |
|
Dimitar Dobrev
|
858e9fa7df
|
Ensured sent chat messages are always wholly visible.
|
2014-03-12 01:24:31 +02:00 |
|
Dimitar Dobrev
|
e10dacdbfe
|
Changed the searcning for qxmpp to include debug libraries as well.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
ed90e45c96
|
Ensured messages are always aligned at the top to user names, and users
onine are deleted.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
60bf473be7
|
Improved the adherence to code conventions after a code review.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
acb2793053
|
Ensured messages are sent to the group chat rather than to individual
users.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
86643803cf
|
Moved the connection and configuration of XMPP to the log-in process.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
9eb217794c
|
Added time stamps to the chat. Enabled translations.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
437cadf360
|
Added a basic version of the chat window.
|
2014-03-12 01:24:30 +02:00 |
|
ZappoMan
|
12becb9d19
|
improve octree stats display
|
2014-03-11 16:22:35 -07:00 |
|
Dimitar Dobrev
|
1c2e752f3c
|
Integrated QXmpp in the build system.
|
2014-03-12 01:16:10 +02:00 |
|
Dimitar Dobrev
|
07d3eb886a
|
Added reading and storing of the XMPP password of the current user.
|
2014-03-12 01:16:10 +02:00 |
|
Clement
|
be6e7d0e97
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-11 16:03:43 -07:00 |
|
Clement
|
dcaef45f2e
|
More work on editVoxel.js
|
2014-03-11 16:01:21 -07:00 |
|
Andrzej Kapolka
|
5bfe2c2ed5
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-11 15:42:07 -07:00 |
|
Andrzej Kapolka
|
9798767261
|
Merge pull request #2267 from ey6es/visagefix
Two more Visage compilation fixes.
|
2014-03-11 15:39:50 -07:00 |
|
Andrzej Kapolka
|
8d69eff867
|
Need to reorder includes due to HANDLE definition conflict.
|
2014-03-11 15:38:19 -07:00 |
|
Andrzej Kapolka
|
ecb54600eb
|
Another compile fix.
|
2014-03-11 15:34:41 -07:00 |
|
Andrzej Kapolka
|
f8e6593bcf
|
Turn off mipmaps. Performance is actually substantially better without them.
|
2014-03-11 15:24:14 -07:00 |
|
Andrzej Kapolka
|
3d9d89e4a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-11 15:11:32 -07:00 |
|
Andrzej Kapolka
|
1cf559208e
|
Merge pull request #2266 from ey6es/visagefix
Fixes for Visage compile.
|
2014-03-11 14:43:27 -07:00 |
|