Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:24:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30823 commits 25 branches 0 tags 1.1 GiB
Commit graph

30823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c80c4a9b45 resolve conflicts on merge with origin/protocol 2015-08-27 14:45:22 -07:00
Stephen Birarda
183a2ab996 Merge pull request #18 from Atlante45/protocol 
Cleanup connections
 2015-08-27 14:41:00 -07:00
Stephen Birarda
fa3cdce46e Merge pull request #19 from huffman/atp-server 
Asset server
 2015-08-27 14:40:52 -07:00
Ryan Huffman
dabea21d66 Remove unused variable 2015-08-27 14:30:48 -07:00
Ryan Huffman
5aa5bca8f7 Add path to headers 2015-08-27 14:29:54 -07:00
Stephen Birarda
1da9eeab1f handle double handshake in Connection 2015-08-27 14:27:29 -07:00
Ryan Huffman
755c33e551 Remove unused variable 2015-08-27 14:11:40 -07:00
Ryan Huffman
24eef654e0 Remove unnecessary debug 2015-08-27 14:11:29 -07:00
Ryan Huffman
4fcfd5b8f8 Fix indentation 2015-08-27 13:58:28 -07:00
Ryan Huffman
b401a62d7f Disable request limiting for ATP requests in ResourceCache 2015-08-27 13:58:17 -07:00
Ryan Huffman
12d3cf557a Remove assert in ScriptCache 2015-08-27 12:58:57 -07:00
Ryan Huffman
33d6f561eb Reintroduce request limit in ResourceCache 2015-08-27 12:52:11 -07:00
Ryan Huffman
750080fe66 Remove early return in Model::restoreJointPosition 2015-08-27 12:52:01 -07:00
Ryan Huffman
b30a008162 Fix bug with NetworkTexture occasionally breaking on assert 2015-08-27 12:48:55 -07:00
Ryan Huffman
a49a1eb0d6 Add extension to atp requests 2015-08-27 11:51:45 -07:00
Ryan Huffman
c6493b1720 Remove extension from hash in AssetResourceRequest 2015-08-27 10:27:12 -07:00
Ryan Huffman
628f275013 Fix asset server upload errors 2015-08-27 10:07:53 -07:00
Ryan Huffman
1d45293184 Fix lambda callback affinity in BatchLoader 2015-08-27 09:56:26 -07:00
Ryan Huffman
667db200c0 Cleanup BatchLoader 2015-08-27 09:39:12 -07:00
Ryan Huffman
8765329a46 Add ASSET_TOO_LARGE to AssetUtils 2015-08-27 09:32:39 -07:00
Ryan Huffman
92dbe9997c Clean up AssetRequest 2015-08-27 09:31:50 -07:00
Ryan Huffman
15854c6715 Make AssetClient methods private 2015-08-27 09:31:34 -07:00
Ryan Huffman
b72e7e356d Clean up AssertClient 2015-08-27 09:31:17 -07:00
Ryan Huffman
3731091d5e Remove max chunk requesting from SendAssetTask 2015-08-27 09:30:47 -07:00
Ryan Huffman
f95957a271 Cleanup AssetServer 2015-08-27 09:30:34 -07:00
Ryan Huffman
c2fcf5865a Update log message for uploading assets 2015-08-26 16:02:47 -07:00
Ryan Huffman
4105b7369c Remove AssetScriptingInterface 2015-08-26 15:55:29 -07:00
Ryan Huffman
59b32751f0 Cleanup AssetScriptingInterface 2015-08-26 15:54:02 -07:00
Ryan Huffman
4ed5748afa Fix new asset loading in directory 2015-08-26 15:37:58 -07:00
Ryan Huffman
287f2533eb Remove AssetServer dtor 2015-08-26 15:37:38 -07:00
Ryan Huffman
d66c521200 Move SendAssetTask to separate file 2015-08-26 15:37:23 -07:00
Ryan Huffman
34f7aa74f3 Move SendAssetTask declaration to header 2015-08-26 14:27:46 -07:00
Ryan Huffman
2e585256ff Update asset hash to Sha256 2015-08-26 14:20:24 -07:00
Ryan Huffman
269d5bb6da Resolve bugs with *Cache changes 2015-08-26 14:04:55 -07:00
Ryan Huffman
aed1ba31c4 Fix bugs in Menu.cpp 2015-08-26 12:26:24 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Atlante45
5b5dc94335 Make DoubleLock thread-safe but not self-unlocked 2015-08-26 20:03:04 +02:00
Atlante45
b1fa12cc43 Better debug message 2015-08-26 19:38:24 +02:00
Atlante45
cd8d6df287 Use high_resolution_clock instead of clock 2015-08-26 19:36:18 +02:00
Atlante45
7a5ed24485 typo (I can't spell inactive correctly) 2015-08-26 19:31:33 +02:00
Stephen Birarda
3a918eedca resolve conflicts on merge with upstream master 2015-08-26 10:01:24 -07:00
Ryan Huffman
c878eb0cd9 Fix atomics not being initialized in SendQueue 2015-08-26 09:31:03 -07:00
Ryan Huffman
868558b4f0 Add registration of QSharedPointer<NLPacketList> meta type 2015-08-26 09:29:46 -07:00
Ryan Huffman
24faab2089 Add sendPacketList that take Node 2015-08-26 09:29:15 -07:00
Ryan Huffman
9b174bfbf4 Remove extension from filename 2015-08-26 09:28:19 -07:00
Ryan Huffman
d503c5293a Remove commented out line 2015-08-26 09:28:06 -07:00
Ryan Huffman
d90ceb200a Add asset uploader to Menu 2015-08-26 09:27:50 -07:00
Atlante45
3184dee10a Emit queueInnactive when flow window is full for too long 2015-08-26 17:49:17 +02:00
Atlante45
8049819beb Tweak DoubleLock 2015-08-26 17:11:32 +02:00
Atlante45
b64faea1e3 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 16:54:57 +02:00