Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-28 02:10:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62161 commits 74 branches 59 tags 1.2 GiB
Commit graph

3456 commits

Author SHA1 Message Date
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
Seth Alves
41fb05ecf7 bump protocol version 2017-04-14 16:26:54 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Seth Alves
7695d2ac05 put the protocol version back to what's in master, for now 2017-04-13 11:29:40 -07:00
Seth Alves
1ab3a1eb60 bump entity-protocol version 2017-04-12 16:36:04 -07:00
Chris Collins
c86acfafef Merge pull request #10120 from huffman/feat/stick-default-avatar 
Change default avatar to ball and stick avatar
 2017-04-11 12:56:25 -07:00
Seth Alves
938fab6f59 Merge pull request #10061 from humbletim/fix-cached-ResourceCache 
Fix cached ResourceCache::prefetch() state updates
 2017-04-11 07:04:06 -07:00
Ryan Huffman
af11f5f327 Update avatar mixer packet version for stick+ball avatar 2017-04-10 21:27:47 -07:00
Seth Alves
a1cab2c0d1 working toward fixing compound hulls 2017-04-09 17:23:56 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
humbletim
6f2f1d6452 call finished() when cached resource has already failed to load 2017-03-29 19:42:19 -04:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Brad Davis
82d502ae9f Correctly initialize a file cache with the proper key 2017-03-24 13:35:37 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Brad Davis
b8ded015c6 Fix packetlist compilation on VS 2017 2017-03-15 15:20:41 -07:00
Brad Davis
3e68018a12 Fix node persmissions hash 2017-03-15 14:33:32 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
463f6454f8 use Local instead of Roaming for FileCache 2017-03-13 17:26:38 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Zach Pomerantz
a0c56618b3 update FileCache to rm manifest 2017-03-13 13:41:44 -04:00
Brad Davis
43d8433d9a Removing unused include 2017-03-10 09:19:00 -08:00
Bradley Austin Davis
8a438948b9 Fix OSX link failure 2017-03-09 10:42:56 -08:00
Zach Pomerantz
170df4a1f4 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-06 17:14:11 -07:00
Andrew Meadows
6ea6477c73 Merge pull request #9683 from jherico/cache_flush 
Clear caches on domain switch
 2017-03-06 11:05:44 -08:00
Zach Pomerantz
6a7ee4321b suppress logs for file_cache 2017-03-02 13:30:51 -05:00
Zach Pomerantz
cca1f2fb25 include <atomic> in FileCache 2017-03-02 11:28:49 -05:00
Zach Pomerantz
1425eb0936 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-01 21:01:37 -05:00
Zach Pomerantz
febeeeca3a namespace cache::FileCache and use unique_ptr 2017-03-01 20:58:00 -05:00
Zach Pomerantz
c71e614dd5 add loading from persisted files 2017-03-01 20:18:31 -05:00
Zach Pomerantz
a6a0fd3851 fix FileCache persistence 2017-03-01 11:32:11 -05:00
David Kelly
efe44425a6 cr feedback, plus something I missed 2017-03-01 09:26:03 -07:00
Zach Pomerantz
de23a11dee wip 2017-02-28 17:25:56 -05:00
David Kelly
c10b0389de Add a getAvatarGain method to NodeList and UsersScriptingInterface 2017-02-28 14:45:34 -07:00
Zach Pomerantz
b03f51dd26 fix double fclose 2017-02-28 16:08:54 -05:00
Zach Pomerantz
8969d7df1d FileCache 2017-02-27 17:58:48 -05:00
Seth Alves
73774a6590 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-24 11:34:59 -08:00
Seth Alves
0a2a1b1637 include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet 2017-02-23 15:25:09 -08:00
Brad Hefta-Gaub
05995163cf add support for tuning sorting 2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
a58ddad3aa Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub
a526db1779 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-21 14:18:36 -08:00
Stephen Birarda
3b996f2b7f bump packet version for new JSON query options 2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
d49c83cac3 fix build buster, some tweaks 2017-02-16 14:19:14 -08:00
Brad Hefta-Gaub
d532b3a4b8 more work on multi-core 2017-02-16 13:25:51 -08:00
Stephen Birarda
a3c123818d Merge pull request #9661 from Atlante45/fix/possible-race 
Fix possible race condition
 2017-02-15 18:38:01 -08:00
Brad Davis
127a014b46 Clear caches on domain switch 2017-02-15 15:21:08 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Zach Pomerantz
2f52c09320 alphabetize io_stats 2017-02-14 23:17:11 +00:00
Zach Pomerantz
276c1abd0a Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in 2017-02-14 23:06:36 +00:00
Brad Hefta-Gaub
f433347362 Merge pull request #9652 from sethalves/avatar-as-child-fixes 
some fixes for when an avatar is a child of something else
 2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e Merge pull request #9656 from humbletim/21114-part1 
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
 2017-02-14 06:49:05 -08:00
David Kelly
156e365eff update version 
since new property was added, things will appear broken if this
version is used with old version (server or client).
 2017-02-13 15:02:31 -07:00
Seth Alves
3d7633a11f Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-13 13:44:05 -08:00
Atlante45
a1371a4f06 Fix possible race 2017-02-13 13:20:31 -08:00
Seth Alves
27d55d6ff0 bump avatar-mixer protocol version 2017-02-13 07:30:33 -08:00
Brad Hefta-Gaub
d82edaa36e implement support for larger message payloads 2017-02-12 13:33:07 -08:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Zach Pomerantz
9b0f9e8d33 log full i/o stats 2017-02-10 04:32:42 -05:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
Atlante45
fcb74bce10 First draft for entity script server log streaming 2017-02-09 13:04:43 -08:00
samcake
24a3a514a4 Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size 
Cap fbx texture size
 2017-02-07 12:46:22 -08:00
David Kelly
9788b4bdaf Merge pull request #9601 from davidkelly/dk/deadlockPrevention 
Minor cleanup
 2017-02-07 12:56:03 -07:00
Seth Alves
e3af5032c0 send UserActivityLogger events when tablet is opened or closed 2017-02-06 16:49:26 -08:00
Andrew Meadows
b3ae6f9aec cap size of textures from FBX files 2017-02-06 11:53:37 -08:00
howard-stearns
8b44e83d9e Add new EntityPhysics packet type. 2017-02-06 11:11:18 -08:00
David Kelly
8612302f07 Revert "I like this better" 
This reverts commit 069c85c7c2.
 2017-02-03 10:08:46 -07:00
David Kelly
069c85c7c2 I like this better 2017-02-03 08:52:33 -07:00
David Kelly
93fee0cf83 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/deadlockPrevention 2017-02-03 08:29:28 -07:00
David Kelly
77ca4cf515 Avoid holding 2 locks at same time 
If they are always called in same order, you are fine.  But just in
case, lets instead grab one lock, update the data, release it and then
grab the other.  No possible deadlock in that, even if the order is
changed in one place or another.
 2017-01-26 17:38:32 -07:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Clément Brisset
6da188b6ae Merge pull request #33 from huffman/feat/entity-server-script-property 
Fix compilation error and move MessageID to CilentServerUtils
 2017-01-20 17:37:01 -08:00
Ryan Huffman
e9c6e9dd5c Move MessageID to ClientServerUtils 2017-01-20 16:43:11 -08:00
Stephen Birarda
7e9dffc028 fix version number for EntityQuery JSON filter 2017-01-20 14:08:28 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics 
Some initial analytics for PAL usage
 2017-01-20 08:30:46 -08:00
Atlante45
3203e8c7c2 Use Huffman's version of getEntityScriptDetails 2017-01-19 15:49:40 -08:00
Ryan Huffman
091c353a85 Add comment to endif in EntityScriptUtils 2017-01-19 15:47:52 -08:00
Ryan Huffman
36a46c1bd6 Add EntityScriptUtils 2017-01-19 15:44:15 -08:00
Ryan Huffman
ff65d0c8cb Fix property assignment in GetScriptStatusRequest 2017-01-19 15:33:17 -08:00
Ryan Huffman
465f5c6789 Add getters to ScriptStatusRequest 2017-01-19 15:09:16 -08:00
Ryan Huffman
fa28933464 Update EntityScriptClient to receive more status information 2017-01-19 13:27:44 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Clément Brisset
89d1242925 Merge pull request #10 from huffman/feat/entity-server-script-property 
Entity script status + reload
 2017-01-19 11:19:40 -08:00
Stephen Birarda
ed68d5a7a2 add JSON filter to OctreeQuery 2017-01-18 14:58:36 -08:00
Zach Fox
0ec01c0dc5 CR feedback 2017-01-18 14:55:53 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Ryan Huffman
3b5b88e719 Move MessageID to AssetUtils 2017-01-18 11:17:13 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
Zach Fox
7a568ed8a7 Merge pull request #9401 from zfox23/PAL_DisplayName 
PAL: Editable Display Names & Immediate Update
 2017-01-17 16:00:41 -08:00
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Zach Fox
246f5fb7f5 Add log; fix whitespace 2017-01-17 11:51:09 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
Zach Fox
1e8effdcc4 Packet verison bump 2017-01-16 15:28:53 -08:00
ZappoMan
c884b276e2 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-14 22:15:22 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8 Fixme 2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Brad Davis
e256f7cccc Remove sendqueue spam in traces 2017-01-11 14:27:27 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1 Remove errant //FIXME 2017-01-05 21:55:09 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115 I'm about to refactor this. 2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
David Kelly
38a3ee4104 Some code review feedback 
more to come
 2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565 naming consistentcy. No functional changes. 2016-12-27 10:17:39 -08:00
howard-stearns
8b9c1446cd protocol versions 2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc fixes 2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a unignore checkpoint (untested) 2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
02a6060b5e hacking on new format 2016-12-22 16:16:44 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
David Kelly
4a25b727d8 Add comment back, with interest 2016-12-20 14:26:45 -08:00
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4 Merge pull request #9235 from davidkelly/dk/fingerprintInPAL 
Expose Machine Fingerprint in PAL
 2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
David Kelly
4feec85337 CR feedback 
Though this seems like a hard place to remember, when we make further
changes.
 2016-12-19 17:23:24 -08:00
David Kelly
5b9c19b39e Versioning 2016-12-19 16:06:12 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
Ryan Huffman
8f536fcf5e Fix syntax error in UserActivityLogger 2016-12-16 15:05:17 -08:00
Ryan Huffman
f3f6317c91 Add controller name and update version in tutorial user stats 2016-12-16 15:05:17 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
David Kelly
2566778654 Handle no setting manager case 
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file.  Found this when
I noticed needed to initialize com for all the assignment clients
 2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
David Rowe
a52d8d1982 Merge branch 'master' into 21089 2016-12-10 11:47:43 +13:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Zach Pomerantz
e6dfc5204d expose mutex in LimitedNodeList 2016-11-28 17:13:21 -05:00
howard-stearns
b37feb20de signal from ignoreNodesInRadius 2016-11-23 11:23:06 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
howard-stearns
9f2b6dc40b location cleanup 2016-11-16 12:53:57 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking 
Protect against empty packet lists
 2016-11-11 15:28:46 -08:00
Atlante45
a38846aeed Protect against empty packet lists 2016-11-11 14:32:52 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
humbletim
2139e979da map specific HTTP errors to corresponding ResourceRequest enums 2016-11-06 10:31:02 -05:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket 
group udt::Socket errors as debug logs
 2016-10-31 10:31:10 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep 
Add tutorial tracking for going through the welcome portal
 2016-10-28 16:26:40 -07:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a add slightly more information to last packet debug in Socket 2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7 output last seq number and last socket before readyRead sticks 2016-10-27 21:50:29 -07:00
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -07:00
Stephen Birarda
4abc4adde9 add a timer to check for readyRead backup 2016-10-26 16:18:12 -07:00
Chris Collins
de419c2818 Merge pull request #8912 from Atlante45/nodelist-race 
Fix potential race in NodeList
 2016-10-26 13:00:05 -07:00
Brad Hefta-Gaub
2fa4f53c4c Merge pull request #8915 from highfidelity/stable 
Stable to master
 2016-10-25 18:52:29 -07:00
Stephen Birarda
b16f5a4752 include BuildInfo for USE_STABLE_GLOBAL_SERVICES 2016-10-25 17:42:12 -07:00
Atlante45
384f3d9321 Fix potential race in NodeList 2016-10-25 16:58:21 -07:00
Brad Hefta-Gaub
4aa96c9acc add location and build info to user activity stats 2016-10-25 15:48:03 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Stephen Birarda
b753871fc1 don't change DF or buffer sizes for ice-server 2016-10-25 11:20:10 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 
fix some data-races in logging system
 2016-10-21 15:33:40 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler 
quiet warnings in Linux build
 2016-10-19 17:41:19 -07:00
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -07:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Seth Alves
b936252609 quiet compiler 2016-10-18 17:56:57 -07:00
Seth Alves
a801f27c7c Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1 2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 17:33:57 -07:00
Stephen Birarda
22e0e649b1 add a comment for ack count calculations 2016-10-18 16:16:09 -07:00
Stephen Birarda
5bd6cc9fac fix comparison for reno slow start 2016-10-18 16:01:35 -07:00
Seth Alves
af5be8d1d9 reduce data-races in logging 2016-10-18 15:59:00 -07:00
Stephen Birarda
ddce913095 cleanup math for leftover ACKs 2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91 break slow start on vegas timeout loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0 add some additional comments to reno congestion avoidance 2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519 cleanup initialization of min RTT member variables 2016-10-18 15:54:25 -07:00
Stephen Birarda
b817e72976 comment clarity and readability improvements 2016-10-18 15:54:25 -07:00
Stephen Birarda
d5a450ad30 add comment about Jacobson's formula for RTT estimation 2016-10-18 15:54:25 -07:00
Stephen Birarda
1041443796 use __FUNCTION__ and clearup zero us RTT comment 2016-10-18 15:54:25 -07:00
Stephen Birarda
13c38760b3 switch to wireSize, use time only, remove double public 2016-10-18 15:54:25 -07:00
Stephen Birarda
7567cff590 fix comment for ACK interval of 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
41d48b12bd add a comment clearing up onACK return 2016-10-18 15:54:25 -07:00
Stephen Birarda
7480d1e45d switch default hifi address back to welcome 2016-10-18 15:54:25 -07:00
Stephen Birarda
9407efbbc5 protect against an overflow in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
7ef596a9f0 use ova-welcome for default hifi address 2016-10-18 15:54:25 -07:00
Stephen Birarda
ef660722cd force duplicated sends to use highest RTT, not lowest 2016-10-18 15:54:25 -07:00
Stephen Birarda
d15cb6171d fix bubble up of duplicated packet info 2016-10-18 15:54:25 -07:00
Stephen Birarda
0a7d799abf don't double set _lastACK in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
fdcface8cb use enum in PacketHeaders, coding standard fixes in Connection 2016-10-18 15:54:25 -07:00
Stephen Birarda
e7c0ed035f remove SendQueue fast re-transmit debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71 push version for asset packets to mismatch for TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
af969231e7 remove some extra lines 2016-10-18 15:54:25 -07:00
Stephen Birarda
54b28e646a remove congestion window halving on reno dupe loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
ec51f01c59 remove debugs from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
a075bb6b1c slow down new UDT debug for asset-server tests 2016-10-18 15:54:25 -07:00
Stephen Birarda
b03bb6b73f halve the congestion window on 3rd duplicate ACK 2016-10-18 15:54:25 -07:00
Stephen Birarda
b74a967c95 fix an additional reference to preAIWindowSize 2016-10-18 15:54:25 -07:00
Stephen Birarda
d05e3e1dd6 drop CWS to 2 if reno fast re-transmit is hit 2016-10-18 15:54:25 -07:00
Stephen Birarda
64a0239248 add reno fallback for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
0b2e0a4167 initial re-implementation of reno cong avoid 2016-10-18 15:54:25 -07:00
Stephen Birarda
dbbdda3468 keep track of num RTT and debug reno fallback 2016-10-18 15:54:25 -07:00
Atlante45
2c026d7b0f Disable packet probes 2016-10-18 15:54:25 -07:00
Atlante45
202641a349 Debug tweaks 2016-10-18 15:54:25 -07:00
Stephen Birarda
5174891b66 move receive time of packet higher in Socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
afc59eea19 grab earliest possible receive time in socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
6a3dd15887 emit packetSent signal immediately after send 2016-10-18 15:54:25 -07:00
Stephen Birarda
b0192df04f allow congestion control to disable ACK2 2016-10-18 15:54:25 -07:00
Atlante45
3d0f449afb Ignore ack syn when using vegas 2016-10-18 15:54:25 -07:00
Stephen Birarda
9760fdc906 use MAX_PACKETS_IN_FLIGHT as receiver max flow window 2016-10-18 15:54:25 -07:00
Stephen Birarda
5ffbd2d11e start num ACKs since FRT to 3 2016-10-18 15:54:25 -07:00
Stephen Birarda
456bcbca67 use max and not min for CW clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
c0219d9ddf remove numRTT from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
995f383edb default EWMA RTT and variance to first value 2016-10-18 15:54:25 -07:00
Atlante45
f0dcc54a18 Start in slow start 2016-10-18 15:54:25 -07:00
Atlante45
f143e9bf3f Register SequenceNumber and time_point 2016-10-18 15:54:25 -07:00
Stephen Birarda
7731b407bd only attempt SQ sleep with > 0 PSP 2016-10-18 15:54:25 -07:00
Stephen Birarda
3ecfd6af67 added debug for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
c794c4af1a adjust EWMA RTT start values in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
96ef1fa483 add FRT debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
7cc1f3261e use last adjustment time to adjust every RTT 2016-10-18 15:54:25 -07:00
Stephen Birarda
0d2e83e0fc cleanup according to Vegas paper, add fast retransmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
ecbba3d4cd send time point with packet sent signal 2016-10-18 15:54:25 -07:00
Atlante45
75d4b156f1 Added shouldNAK to CC class 2016-10-18 15:54:25 -07:00
Atlante45
eee617e39c Remove congestion window size clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
0954d5bf93 cleanup sent packet time hash after RTT calc 2016-10-18 15:54:25 -07:00
Stephen Birarda
8e05a2893a change congestion window size to an int 2016-10-18 15:54:25 -07:00
Stephen Birarda
5e637c31de rename congestion window size var in TCPRenoCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
b232a44c8d don't send sync ACK when interval is == 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
69ca0d2675 point TCPVegasCC at correct TCPRenoCC base 2016-10-18 15:54:25 -07:00
Stephen Birarda
8c9b46c1e0 fix method signatures, adjust ssthresh increases 2016-10-18 15:54:25 -07:00
Stephen Birarda
eb180b15d8 only raise ssthresh if not reducing cwnd 2016-10-18 15:54:25 -07:00
Stephen Birarda
8304bb81d1 create the base of the TCPVegasCC class 2016-10-18 15:54:25 -07:00
Atlante45
59bcd724ea More Reno work 2016-10-18 15:54:25 -07:00
Atlante45
bad96d54ea TCP congestion control first draft 2016-10-18 15:54:25 -07:00
Seth Alves
21ccc58e04 don't pass statsObject by reference 2016-10-18 14:41:33 -07:00
Seth Alves
0c6dedff45 avoid various data-races related to stats collection and delivery 2016-10-18 13:05:53 -07:00
Seth Alves
0cda01f105 send stats to domain-server with networking thread 2016-10-18 10:29:35 -07:00
Atlante45
3955c6c4c6 Don't override place name path with index path 2016-10-17 14:41:05 -07:00
Chris Collins
1c30d98cf9 Merge pull request #8823 from ZappoMan/shutdownSandbox 
Auto-shutdown of sandbox if it was launched by interface
 2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Stephen Birarda
d1cd99e035 remove a useless two dots 2016-10-14 18:24:39 -07:00
Stephen Birarda
9184a500a0 move faked handshake logic to Socket for handshake req flag 2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9 only emit client connection reset on requested handshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55 fix magic numbers and hide sendFakedHandshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2 fix for dual alias in LimitedNodeList std::bind 2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c remove define of UDT connection debug 2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f make faked handshake request usable in dev/PR 2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1 bubble up receiver handshake from udt::Connection 2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479 add forced kill of AS for test 2016-10-14 14:46:58 -07:00
Stephen Birarda
5704335b66 add quick fails for no active socket to other AssetClient calls 2016-10-14 14:46:58 -07:00
Stephen Birarda
055df48e8d make the asset server a solo node type 2016-10-14 14:46:58 -07:00
Stephen Birarda
7fd25ae450 fix returns for missing active socket in LNL 2016-10-14 14:46:58 -07:00
Stephen Birarda
3c70a25a40 immediately error in AssetClient if no active socket for AS 2016-10-14 14:46:58 -07:00
Stephen Birarda
ca94fbc219 refuse to send packets if connection should not be created 2016-10-14 14:46:58 -07:00
Stephen Birarda
f41188b0e8 default last receiver response in send queue to queue creation time 2016-10-14 14:46:58 -07:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Ryan Huffman
6cf4802cc2 Change default hifi address from dev-welcome to welcome 2016-10-13 16:06:07 -07:00
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries 
Update ds path queries to be reliable
 2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Stephen Birarda
33e426bfd2 Merge pull request #8778 from Atlante45/asset-client 
Fix crash in AssetClient handleProgressCallback
 2016-10-11 18:36:23 -07:00
Stephen Birarda
504e92607a change format of debug message 2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98 change QLoggingCategory include casing 2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5 set the initial last progress debug 5s back 2016-10-11 13:21:15 -07:00
Stephen Birarda
a0c27e2130 remove timer forced timeouts in ARR, occasionally ouput DL progress 2016-10-11 13:17:57 -07:00
Atlante45
e7e9c71625 Fix AssetClient crash 
Do not access message data until message is complete
 2016-10-11 13:05:57 -07:00
Stephen Birarda
826c2f1a9f push the AssetResourceRequest timeout to 15s 2016-10-11 09:55:16 -07:00
Stephen Birarda
ec5850b82b emit ReceivedMessage progress signals more frequently for new timeout 2016-10-11 09:55:05 -07:00
Ryan Huffman
408cc1cd04 Update default hifi address to dev-welcome 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c6eae36a7 Update tutorial progress keys 2016-10-07 10:30:18 -07:00
Ryan Huffman
e24a01d1fe Add path parameter to goToSandbox 2016-10-07 10:30:18 -07:00
Ryan Huffman
4efeb928e2 Add user activity logging to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
4171fdd2e1 Remove extraneous log line from AssetRequest 2016-10-05 19:27:24 -07:00
Ryan Huffman
17a1f9b5ae Make timer child of QObject instead of attaching to destroyed 2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
Ryan Huffman
ca4022814e Add extra logging to asset client 2016-10-04 16:43:13 -07:00
Ryan Huffman
1fff480b73 Add timeout to AssetResourceRequest 2016-10-04 16:43:12 -07:00
Atlante45
573d5898cc Make static control packets class members 2016-10-03 13:46:55 -07:00
Thijs Wenker
4f7fdfc345 eliminated else, this might look cleaner 2016-09-30 03:31:35 +02:00
Thijs Wenker
5025b4a5ed NodeList set the sessionUUID before emitting the connectedToDomain signal 2016-09-29 22:15:53 +02:00
Zach Pomerantz
aacfa7d6c5 back out AudioVersion::CurrentVersion 2016-09-27 10:41:00 -07:00
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Seth Alves
2e0cc158de ice test-client uses stun server to get public address 2016-09-16 17:21:28 -07:00
Seth Alves
babe8f95bc tool for testing ice-server 2016-09-16 13:34:05 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
12eb65c0c4 Make setSocketLocalPort invokable 2016-09-06 10:18:42 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
bba5e46533 Don't reset the NodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Atlante45
713be9fd73 Rename NLs nodeUpdated signal to nodeSocketUpdated 2016-09-06 10:16:00 -07:00
Atlante45
d938e518a0 Start new hole punch when the socket is updated 2016-09-06 10:16:00 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Stephen Birarda
7d7cba4dd2 fix networking compile for android setsockopt 2016-08-31 11:30:47 -07:00
Seth Alves
3d436d4c26 bump entity protocol version 2016-08-30 16:23:11 -07:00
Seth Alves
2a9ffc1529 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Ken Cooke
28a99a7a03 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-08-29 12:38:17 -07:00
Seth Alves
3b278adba3 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 17:28:18 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Andrew Meadows
ef597265d7 remove unimplemented declaration 2016-08-24 22:26:56 -07:00
Brad Davis
479d90a462 Merge remote-tracking branch 'upstream/stable' 2016-08-24 19:31:11 -07:00
Brad Davis
5cdb30357f Add checking for failed downloads in the textures 2016-08-24 18:03:56 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
Stephen Birarda
fbe784155e add a shareable address return to address manager 2016-08-23 11:19:14 -07:00
Stephen Birarda
edd4f5853e use temporary domain name as place name on ID lookup 2016-08-23 11:19:14 -07:00
Stephen Birarda
2b5d862263 request shareable name in AddressManager once connected 2016-08-23 11:19:14 -07:00
Anthony J. Thibault
c6ea64926c Sensor space entity support 
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space.  Essentially, this
gives you the ability to place objects in the user's physical room.

WebTablets now are located in this feature and no longer jitter.
 2016-08-23 10:13:06 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ken Cooke
87d5ec2437 Bump protocol version. Audio packets are now exactly 10ms (240/480 samples). 2016-08-18 08:31:43 -07:00
Stephen Birarda
3355a90e7d Merge pull request #8413 from huffman/feat/atp-bandwidth 
Add asset server bandwidth to stats
 2016-08-16 15:54:11 -07:00