Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10750 commits 71 branches 56 tags 1.2 GiB
Commit graph

10750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
9402a5852c Fixed review comments 2014-03-12 12:20:43 -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
Atlante45
5cb9ea8402 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-12 11:49:20 -07:00
Atlante45
3aa534d47c Added the send method 2014-03-12 11:48:41 -07:00
Atlante45
b9ee60ba41 FstReader not a member anymore 2014-03-12 11:47:47 -07:00
Atlante45
855f6fcf59 Moved Avatar upload to file Menu 2014-03-12 11:46:41 -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
ZappoMan
4b60c549e7 add LOD to overlay display 2014-03-12 11:10:52 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
Atlante45
1c4051b288 Added importBoundaries 2014-03-12 10:35:22 -07:00
Atlante45
5ccba0b080 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-12 10:27:27 -07:00
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