Stephen Birarda
|
f86b793c96
|
only output version mismatch once per sender per packet
|
2014-03-18 17:14:57 -07:00 |
|
Stephen Birarda
|
281f2c6614
|
return false in packetVersionAndHashMatch on version mismatch
|
2014-03-18 17:04:27 -07:00 |
|
Andrzej Kapolka
|
500f9d1485
|
Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
|
2014-03-18 13:57:30 -07:00 |
|
Andrew Meadows
|
a2fea49f58
|
bump version of PacketTypeAvatarData from 1 to 2
|
2014-03-18 12:36:48 -07:00 |
|
Stephen Birarda
|
b6a41eeaaa
|
resolve conflicts on merge with upstream master
|
2014-03-18 10:37:04 -07:00 |
|
Andrzej Kapolka
|
6aa1f286bb
|
Alpha is the new default.
|
2014-03-18 10:13:23 -07:00 |
|
Stephen Birarda
|
7ba595338e
|
guard around update to last heard for a NULL matching node
|
2014-03-17 17:39:08 -07:00 |
|
Stephen Birarda
|
61594b9a1e
|
fixes to silent audio frame sending
|
2014-03-17 16:27:49 -07:00 |
|
Stephen Birarda
|
9f24bd9c47
|
have the AudioMixer handle silent audio, send silence from Interface when gate closed
|
2014-03-17 15:12:02 -07:00 |
|
Brad Hefta-Gaub
|
c6f8d34ded
|
fix unix warning
|
2014-03-14 18:16:38 -07:00 |
|
Brad Hefta-Gaub
|
c0ee3fa1f0
|
fix unix warning
|
2014-03-14 18:14:54 -07:00 |
|
Brad Hefta-Gaub
|
0e7e337807
|
fixed uninitialized variable warning
|
2014-03-14 18:05:40 -07:00 |
|
Andrew Meadows
|
d4c7e25f8e
|
Merge branch upstream/master into "hands" project
|
2014-03-14 14:28:50 -07:00 |
|
Andrew Meadows
|
a045a87cca
|
Remove arm stretching, add sixense calibration
|
2014-03-14 11:11:00 -07:00 |
|
Atlante45
|
423f26f669
|
Review comments
|
2014-03-13 15:26:02 -07:00 |
|
Atlante45
|
e5b5778caf
|
Upload FST
|
2014-03-13 15:04:22 -07:00 |
|
Atlante45
|
51585acd25
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
|
2014-03-13 10:53:24 -07:00 |
|
Andrzej Kapolka
|
e249b29b45
|
Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
|
2014-03-12 12:10:29 -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
|
3aa534d47c
|
Added the send method
|
2014-03-12 11:48:41 -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
|
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 |
|
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 |
|
Dimitar Dobrev
|
60bf473be7
|
Improved the adherence to code conventions after a code review.
|
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
|
7d1a44fbea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 12:52:13 -07:00 |
|
Andrzej Kapolka
|
ae6a59ef78
|
Ray intersections for models, don't load resources if there's no network
manager installed.
|
2014-03-10 17:53:20 -07:00 |
|
Andrzej Kapolka
|
34ddddae1b
|
Basic LRU cache. Closes #2234.
|
2014-03-10 12:06:07 -07:00 |
|
Andrzej Kapolka
|
9731159b82
|
Merge branch 'master' of https://github.com/highfidelity/hifi into joints
|
2014-03-10 10:57:48 -07:00 |
|
Andrzej Kapolka
|
d2f947aee1
|
Working on LRU cache for resources.
|
2014-03-10 10:49:38 -07:00 |
|
ZappoMan
|
e2415642f0
|
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
|
2014-03-09 00:10:31 -08:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Atlante45
|
8faaa28bc1
|
FST ploader base
|
2014-03-07 11:55:02 -08:00 |
|
Andrew Meadows
|
9d2758ee14
|
fix warning about malformed case statement
|
2014-03-07 09:32:12 -08:00 |
|
Andrzej Kapolka
|
c5ab32235f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into joints
|
2014-03-06 17:09:24 -08:00 |
|
Andrzej Kapolka
|
3adea84b81
|
Basic joint data sending. Closes #2166.
|
2014-03-06 17:07:29 -08:00 |
|
ZappoMan
|
c81bac2ac4
|
Merge pull request #2224 from birarda/resources
cleanup switchToResourcesParentIfRequired hack
|
2014-03-06 16:51:31 -08:00 |
|
Stephen Birarda
|
0f22168e42
|
Merge pull request #2230 from ey6es/master
Add a five second download timeout timer: if that much time passes witho...
|
2014-03-06 16:22:54 -08:00 |
|
Stephen Birarda
|
8cbdf5d94a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into resources
|
2014-03-06 15:49:45 -08:00 |
|
Stephen Birarda
|
ac66f09157
|
Merge pull request #2194 from AndrewMeadows/cleanup
g++ warnings
|
2014-03-06 15:49:22 -08:00 |
|
Andrzej Kapolka
|
8ec7a5e600
|
When we time out, report the last received/total counts.
|
2014-03-06 15:08:34 -08:00 |
|
Andrew Meadows
|
0b2c399713
|
memcmp() returns a signed int!
|
2014-03-06 14:33:59 -08:00 |
|