Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 13:42:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10784 commits 25 branches 0 tags 1.1 GiB
Commit graph

10784 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
fd201c450b Multiple destinations implementation 2014-03-12 23:02:21 +01:00
Andrzej Kapolka
bab74e9cd4 Push the distance back even more. 2014-03-12 15:01:09 -07:00
Andrzej Kapolka
889c1358fc Increase the distance at which avatars glow when moving. 2014-03-12 14:56:52 -07:00
Dimitar Dobrev
d67381d85e Changed the font used in the chat to Helvetica, with Arial as a 
fallback.
 2014-03-12 23:45:10 +02:00
Atlante45
728a5f6251 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-12 14:09:27 -07:00
Atlante45
5941ad0dd1 Changed lockForWrite() to lockForRead() 2014-03-12 14:08:23 -07:00
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
Philip Rosedale
902112437a Merge branch 'master' of https://github.com/worklist/hifi 2014-03-12 15:49:56 -05: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
Atlante45
a2acdc01ab Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-12 12:21:56 -07:00
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
stojce
7afd6c3d0c Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	libraries/shared/src/AccountManager.h
 2014-03-12 18:54:59 +01:00
stojce
95d0128c74 Using new API client 2014-03-12 18:53:25 +01: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