Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:00:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10617 commits 76 branches 59 tags 1.2 GiB
Commit graph

10617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
f85f49caa6 Might as well update this. 2014-03-12 14:03:22 -07:00
Andrzej Kapolka
43ad9b4048 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 13:54:45 -07:00
Stephen Birarda
9ec2f2acde Merge pull request #2283 from ddobrev/xmppchat 
Filtered received messages, accepting only group ones.
 2014-03-12 13:52:20 -07:00
Andrzej Kapolka
800be7eef4 One more degree conversion. 2014-03-12 13:38:16 -07:00
Dimitar Dobrev
6caf6b2c31 Filtered received messages, accepting only group ones. 2014-03-12 22:36:50 +02:00
Andrzej Kapolka
6fb313cc43 Allow streaming uints. 2014-03-12 13:03:59 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
f1145272eb Signed/unsigned fix. 2014-03-12 12:29:01 -07:00
Andrzej Kapolka
064f784db1 More OS X warning fixes. 2014-03-12 12:23:23 -07:00
Andrzej Kapolka
ffb9273da8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 12:11:43 -07:00
Andrzej Kapolka
4c7737443e Fix for OS X warning. 2014-03-12 12:11:30 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Andrew Meadows
e68241d2a9 using glm::degrees() instead of DEGREES_PER_RADIAN 2014-03-12 12:08:27 -07:00
Andrew Meadows
c3e8d51694 orientation stored in dataserver is in degrees 2014-03-12 12:06:59 -07:00
AndrewMeadows
b1f4edb3a5 Merge pull request #2271 from ZappoMan/QWaitCondition 
Fix runaway JurisdictionListener thread and other improvements
 2014-03-12 11:54:48 -07:00
Andrzej Kapolka
6cb1345ad8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 11:45:19 -07:00
AndrewMeadows
1f80a5a074 Merge pull request #2269 from ey6es/master 
Fix for white flashes when loading avatars, performance improvements.
 2014-03-12 11:43:13 -07:00
Andrzej Kapolka
ffe5715d18 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 11:42:52 -07:00
AndrewMeadows
0d38f1c320 Merge pull request #2260 from ey6es/metavoxels 
Yet another metavoxel checkpoint: work on streaming spanners, LOD/subdivision bits, etc.
 2014-03-12 11:34:59 -07:00
Stephen Birarda
c34ea83fd0 Merge pull request #2279 from ddobrev/xmppchat 
Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.
 2014-03-12 11:19:30 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02: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
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
f5cdb98efb switch ReceivedPacketProcessor to using QWaitCondition 2014-03-11 20:32:02 -07:00
Andrzej Kapolka
6c4223bcdf Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 18:12:12 -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
Stephen Birarda
19c60cef2d Merge pull request #2249 from ddobrev/xmppchat 
Added public chat based on XMPP
 2014-03-11 17:06:14 -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
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
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