Commit graph

1144 commits

Author SHA1 Message Date
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Andrzej Kapolka
a761a4862b Merge pull request #2398 from AndrewMeadows/emergency-fixes
explicitly send neck angles in avatar data
2014-03-20 11:19:13 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing
Model browsing
2014-03-20 11:15:35 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
2014-03-19 16:24:47 -07:00
Tony Hagale
7f2a92d759 #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:28:12 -05:00
Tony Hagale
5f94e44cde #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:26:45 -05:00
Atlante45
d239aecbfb Added names to signals argument 2014-03-19 10:17:28 -07:00
ZappoMan
584adfda08 cleanup headers 2014-03-19 00:32:38 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -07:00
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
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -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
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -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
ZappoMan
9411519dc9 fix SimpleMovingAverage::reset() 2014-03-17 16:37:07 -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
ZappoMan
aab2ca826f Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:01:25 -07:00
ZappoMan
96572d3752 fix some Q_OBJECT macros in class headers 2014-03-17 10:57:53 -07:00
ZappoMan
cbdd159213 fix constness 2014-03-17 10:55:43 -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
Atlante45
f07725d017 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-14 17:47:39 -07:00
Atlante45
a88872a21f Simple class to download files (sync/async) 2014-03-14 17:41:22 -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