Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 11:29:33 +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
Stephen Birarda
4042e04946 add isDownstream for cleaner conditionals 2017-06-12 16:29:20 -07:00
Stephen Birarda
88af8b5842 use new downstream/upstream nomeclature 2017-06-12 16:29:20 -07:00
Stephen Birarda
fe668b1bb1 make codec negotiation stateless for replicated agents 2017-06-12 16:29:20 -07:00
Stephen Birarda
2929573cb0 do not punch to replicant nodes 2017-06-12 16:29:20 -07:00
Stephen Birarda
d5b466e3ae fix replicant handling slot, add node strings for replicants 2017-06-12 16:29:20 -07:00
Ryan Huffman
a1d3c0dc7b Fix initialization ordering error in Node 2017-06-12 15:27:24 -07:00
Ryan Huffman
eb2a417448 Add parent back to Node ctor 2017-06-12 15:24:14 -07:00
Ryan Huffman
3b3465ea05 Add isUpstream to Node 2017-06-12 14:59:45 -07:00
Ryan Huffman
4851d3b564 Remove superfluous node log 2017-06-12 14:52:02 -07:00
Ryan Huffman
3142842d5d Fix Node initialization warnings 2017-06-12 14:51:08 -07:00
Ryan Huffman
84e1a6f893 Rename isReplicant to isReplicated 2017-06-12 13:38:58 -07:00
Ryan Huffman
2ff065f751 Add isReplicant to node list packet processing 2017-06-12 13:38:57 -07:00
Ryan Huffman
ff2800e8d5 Add isReplicant to Node 2017-06-12 13:37:49 -07:00
Atlante45
dc7c331d4c Merge branch 'fix/node-leak' into replicants 2017-06-12 11:32:11 -07:00
Stephen Birarda
8ebf1db9a8 switch to replicator/replicant and add new node types 2017-06-12 10:58:34 -07:00
Atlante45
0b847488d7 Fix comment 2017-06-12 10:54:22 -07:00
Stephen Birarda
b5c26b596e seek past source UUID in mirrored packets 2017-06-12 02:39:54 -07:00
Stephen Birarda
e629881665 mirror audio format negotiation 2017-06-12 02:18:27 -07:00
Stephen Birarda
45bb323723 experimental support for mirrored audio packets to other mixers 2017-06-12 00:19:24 -07:00
Stephen Birarda
3582e5110e Merge pull request #10644 from seefo/fb5005 
Resolved FB5005
 2017-06-09 11:55:45 -07:00
seefo
06a5d0970c Fixed issue with invalid time being sent when logging 2017-06-09 10:58:07 -07:00
seefo
fce3badd1d Resolved FB#5005 2017-06-08 11:57:44 -07:00
Atlante45
7b10b8a6c3 Fix SharedNodePointer leak 2017-06-06 19:04:12 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Chris Collins
6cc6cd3bf6 Merge pull request #10604 from highfidelity/RC-42 
Beta Release 42 - Includes up to Developer Release 6626
 2017-06-05 09:13:19 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker 
Update server-console to watch interface via pid rather than marker
 2017-06-02 15:57:44 -07:00
Ryan Huffman
a5296d50fc Replace static use of qApp with QCoreApplication 2017-06-02 13:51:39 -07:00
Stephen Birarda
f5d732f332 initial version of the ClosureEventSender using std::thread 2017-06-02 13:21:28 -07:00
Chris Collins
34201ea1da Merge pull request #10599 from jherico/ktx_cache_wipe 
Add versioning support to the KTX cache
 2017-06-02 13:02:18 -07:00
Ryan Huffman
0d96f82888 Merge pull request #10592 from birarda/close-report 
Send a close event to API on shutdown
 2017-06-02 10:57:41 -07:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
Ryan Huffman
aa48f3f063 Rename watchProcessShutdown to shutdownWith 2017-06-01 18:13:27 -07:00
Stephen Birarda
6a89726a6a Merge pull request #10593 from birarda/log-api-session-id 
print the metaverse session ID to the debug log
 2017-06-01 18:02:17 -07:00
Stephen Birarda
2de6162d38 change the packet version across the board for avatar mixer 2017-06-01 17:35:23 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
Stephen Birarda
2c2f154360 push packet version for default mannequin avatar 2017-06-01 17:13:08 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
Stephen Birarda
06b3ecfdc3 also log metaverse session ID during ctor of AccountManager 2017-06-01 15:50:56 -07:00
Stephen Birarda
3d98f1b3ee print metaverse session ID to debug log 2017-06-01 13:46:37 -07:00
Ryan Huffman
aaf9b9ac7f Update server-console to watch interface via pid rather than marker 2017-06-01 11:20:36 -07:00
Stephen Birarda
1d9d83b157 initial version of the ClosureEventSender using std::thread 2017-05-31 19:00:41 -07:00
Brad Davis
a77491ccb1 FileCache refactoring and tests 2017-05-31 13:45:59 -07:00
Ryan Huffman
4a52f4090d Merge pull request #10552 from huffman/fix/multiple-nic-lockup 
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
 2017-05-30 13:05:01 -07:00
Chris Collins
5db0975554 Merge pull request #10556 from highfidelity/RC-41 
Beta Release 41 - Includes up to Developer Release 6603
 2017-05-30 12:52:30 -07:00
Zach Fox
21d396bbb5 Pull out ownership bidding changes 2017-05-26 13:25:25 -07:00
Zach Fox
827daade1b Make this PR a protocol change 2017-05-26 13:24:38 -07:00
Ryan Huffman
f0c3a0ac28 Fix SendQueue not updating lastReceiverResponse when recv handshake ack 2017-05-25 13:39:47 -07:00
Zach Fox
b86b07c08f Pull out ownership bidding changes 2017-05-25 13:01:40 -07:00
Zach Fox
acd85b379f Make this PR a protocol change 2017-05-25 13:01:40 -07:00
Brad Hefta-Gaub
a0484c5f0b Merge pull request #10544 from birarda/bug/refresh-access-token 
require a valid access token and expiry to attempt token refresh
 2017-05-25 08:35:18 -07:00
Brad Hefta-Gaub
ca87b792de Merge pull request #10531 from Atlante45/fix/current-address 
Never store an address with an empty host
 2017-05-25 08:33:16 -07:00
Stephen Birarda
d7b3ee9bcb check for cached ATP assets in right place 2017-05-24 19:22:44 -07:00
Stephen Birarda
a04fc41e17 don't capture strong pointer to stat tracker 2017-05-24 17:54:07 -07:00
Stephen Birarda
c37fd335e1 track the number of local socket changes 2017-05-24 17:41:52 -07:00
Atlante45
05f69ade32 Never store an address with an empty host 2017-05-24 17:39:27 -07:00
Stephen Birarda
48c4db1ca4 nest the download stats so they are cleaner 2017-05-24 17:36:21 -07:00
Stephen Birarda
3743cd23b4 add detailed download stats for file/http/atp 2017-05-24 17:22:38 -07:00
Stephen Birarda
9cd11a32e2 add a debug log for failed token refresh 2017-05-24 13:47:24 -07:00
Stephen Birarda
14ff6a06b4 require a valid access token and expiry to attempt refresh 2017-05-24 13:16:26 -07:00
Chris Collins
b0efb6d956 Merge pull request #10525 from seefo/master 
Added refreshing of Account Managers access token
 2017-05-22 21:42:16 -07:00
seefo
a638704a8c Modified AccountManager code to better meet style guidelines 2017-05-22 17:01:37 -07:00
seefo
e77e900812 Added refreshing of Account Manager's access token 
Changed indentention style to match guidelines
 2017-05-22 14:46:44 -07:00
anshuman64
bfb44693a3 Merge pull request #10482 from ctrlaltdavid/21361 
Fix AC playback script not logging
 2017-05-22 12:58:20 -07:00
Marko Kudjerski
986d63cdbb making sure that the first time landing in *welcome domain is updated for dev builds too 2017-05-19 10:17:02 -07:00
Marko Kudjerski
303bb05b3d changing the location in welcome to which a user is sent on the first run 2017-05-19 10:17:02 -07:00
David Kelly
057718bde3 remove clockSkew, reference new version for Avatar packets 2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad Switch from timestamp to sequence id for avatar identity 2017-05-17 14:22:36 -07:00
David Rowe
e69c322fd3 Get UserActivityLogger working in AC scripts 2017-05-17 14:30:32 +12:00
Atlante45
201f81f20a Don't wait on the sandbox 2017-05-16 14:41:57 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00
Atlante45
9138ec53e9 Don't send avatars to previous lookup on server restart 2017-05-11 14:07:36 -07:00
Ryan Huffman
d92bdbf0ed Fix unsigned/signed comparision warning 2017-05-10 09:43:55 -07:00
Ryan Huffman
6e4c5d1ab4 Update FileCache writing to check QSaveFile::write return value 2017-05-09 16:29:57 -07:00
Ryan Huffman
542001b14f Update FileCache to use QSaveFile for atomic writes 2017-05-09 14:08:43 -07:00
Ryan Huffman
d86071d783 Fix possible corruption of ktx cache files 
When creating a file like this:

  1. Create file
  2. Write file
  3. Close file

there is an opening before the file is written and closed where, if the
application were to crash (or not finish for any other reason), the file
would be left in an undefined state. Instead, this change updates it to
do this:

  1. Create temp file
  2. Write temp file
  3. Close temp file
  4. Move temp file to final path

This ensures that at step 3 we have a valid file, before we rename it.
We should never end up with a final file in an undefined state, but it is
possible to end up with a temp file that is an undefined state if we,
for instance, crash during step 2.
 2017-05-09 12:08:52 -07:00
Chris Collins
1264c34f6c Merge pull request #10349 from birarda/machine-guid-fingerprint 
use MachineGuid for slightly safer windows machine fingerprint
 2017-05-08 10:42:14 -07:00
Clément Brisset
479e810173 Merge pull request #10364 from huffman/fix/ktx-skybox-loading 
Fix progressive loading of KTX skybox textures
 2017-05-05 14:11:03 -07:00
Stephen Birarda
1857b297e0 don't re-grab the machine fingerprint every DS connection 2017-05-04 16:00:46 -07:00
Stephen Birarda
f39411656a use machine GUID from registry for machine ID 2017-05-04 16:00:46 -07:00
Chris Collins
7d1ffe181f Merge pull request #10340 from huffman/fix/obj-atp 
Fix OBJ material loading not working over ATP
 2017-05-04 15:50:52 -07:00
Seth Alves
a259d00b63 Merge pull request #10332 from sethalves/bullet-constraints-5 
Bullet constraints
 2017-05-03 16:30:34 -07:00
Ryan Huffman
7999ed6f60 Fix Resource::refresh for NetworkTexture 2017-05-03 11:26:52 -07:00
Ryan Huffman
0263021c0c Fix loaded being reset to false for KTX resources 2017-05-03 11:26:52 -07:00
Stephen Birarda
5d1abe4499 Merge pull request #10307 from huffman/fix/ktx-crash 
Fix for resource downloads getting capped
 2017-05-03 11:25:51 -07:00
Ryan Huffman
c839118c6b Add ResourceManager::resourceExists 2017-05-01 13:22:23 -07:00
Ryan Huffman
074a11306c Add support for atp and file urls in OBJReader 2017-05-01 13:22:02 -07:00
Seth Alves
1b67a8b251 cleanups 2017-04-30 12:23:34 -07:00
Seth Alves
6623028d71 ball-and-socket constraint 2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4 2017-04-29 07:01:44 -07:00
Stephen Birarda
fed747a545 Merge pull request #10325 from huffman/atp-range-caching 
Fix for stuck ATP downloads
 2017-04-28 16:54:21 -07:00
Ryan Huffman
89fb0a917b Fix poorly indented if in AssetRequest 2017-04-28 16:27:44 -07:00
Ryan Huffman
765a061086 Fix stuck ATP downloads 
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
 2017-04-28 16:26:03 -07:00
Stephen Birarda
c518aa55be Merge pull request #10312 from birarda/upload-new-models-to-entity 
add an entity file replacement via domain-server content page
 2017-04-28 16:06:05 -07:00
Stephen Birarda
b44a56db80 don't save ATP requests to cache if they are range requests 2017-04-28 10:32:06 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Ryan Huffman
4b0bd80c27 Fix NetworkTexture not cleaning itself up on destruction 2017-04-27 13:03:42 -07:00
Seth Alves
68b59e4601 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b expose bullet slider constraint to javascript 2017-04-27 07:56:35 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx 
Add progressive load for KTX textures
 2017-04-26 18:36:01 -07:00
ZappoMan
a26dca73b1 more logging 2017-04-26 18:02:09 -07:00
Ryan Huffman
f5b7feccde Update AssetClient/Request to use const byteRange 2017-04-26 18:01:56 -07:00
ZappoMan
3de92121e0 more logging 2017-04-26 15:28:10 -07:00
Andrew Meadows
08972da843 remove unused Node::_isAlive cruft 2017-04-26 12:47:56 -07:00
Ryan Huffman
1555fc3088 Update Resource to only clear load priorities if successful 2017-04-26 11:37:48 -07:00
Ryan Huffman
01724c9c90 Update default load priority to be 0 2017-04-26 11:37:47 -07:00
Ryan Huffman
4f16eb9bcc Cleanup KTX logging and add fragment to resource url to indicate mip level 2017-04-26 11:32:35 -07:00
Atlante45
043c587395 Fix byte range for file resource requests 2017-04-26 10:49:23 -07:00
Atlante45
8269e01474 Fix atp-get compile error 2017-04-26 10:49:23 -07:00
Stephen Birarda
3928e11611 fix valid byte range check and send asset from 0 2017-04-26 10:48:57 -07:00
Stephen Birarda
814970c4e2 cleanup invalid byte range handling 2017-04-26 10:48:57 -07:00
Stephen Birarda
fab1bdaeb7 push asset server packet versions for range requests 2017-04-26 10:48:57 -07:00
Stephen Birarda
7ae8c741c5 pass the byte range to asset client from AssetResourceRequest 2017-04-26 10:48:57 -07:00
Stephen Birarda
229a481232 add byte range handling to FileResourceRequest 2017-04-26 10:48:57 -07:00
Stephen Birarda
397a29039e add support for byte range requests to ATP 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
4e58341631 Remove http proxy 2017-04-26 10:48:24 -07:00
Ryan Huffman
18fb695614 Disable pipelining in HTTPResourceRequest 2017-04-26 10:48:24 -07:00
Ryan Huffman
ce12a216c0 I think it might be working. 2017-04-26 10:48:24 -07:00
Ryan Huffman
70b816827e Improve handling of KTX downloads in NetworkTexture 2017-04-26 10:48:24 -07:00
Ryan Huffman
11751611e1 Update NetworkTexture to track current KTX download state 2017-04-26 10:48:23 -07:00
Ryan Huffman
39c3fee838 Add caching of imageOffset to ktx ImageDescriptor 2017-04-26 10:47:32 -07:00
Ryan Huffman
cf3dc12542 Add object labels to GL objects and add ktx min mip kv 2017-04-26 10:47:32 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b Add extended ktx header/high-mip request handling to NetworkTexture 2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68 Add basic mip writing to gpu::Texture 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Ryan Huffman
105d17e85e Add byte range support to HTTPResourceRequest 2017-04-26 10:45:14 -07:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Andrew Meadows
157dc1475b Merge pull request #10281 from birarda/bug/session-refresh-login 
force DS to use new node ID if connect is re-sent
 2017-04-25 15:02:57 -07:00
Stephen Birarda
c00dfcc7d7 send the domain disconnect packet before UUID is cleared 2017-04-25 14:32:21 -07:00
David Rowe
c05954ee4b Add logAction() method to UserActivityLogger JavaScript API 2017-04-25 13:40:57 +12:00
ZappoMan
d179135a87 remove dead code 2017-04-24 18:21:22 -07:00
ZappoMan
95a3e0a092 fix whitespace 2017-04-24 18:06:33 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
ZappoMan
da68c49dc1 more cleanup 2017-04-21 13:31:40 -07:00
ZappoMan
f07884602a more CR feedback 2017-04-21 13:13:29 -07:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
ff45ad53a3 some more CR cleanup 2017-04-21 10:40:41 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
7f1a87ac4f remove random http failure 2017-04-20 17:31:20 -07:00
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