Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 16:45:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34569 commits 25 branches 0 tags 1.1 GiB
Commit graph

2068 commits

Author SHA1 Message Date
Brad Hefta-Gaub
6b61ec569c more work on channels 2015-11-17 09:47:50 -08:00
ZappoMan
f712fae4d2 more hacking 2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub
12f206e2f0 more work on messages 2015-11-16 17:00:03 -08:00
Brad Hefta-Gaub
40e69f6946 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Stephen Birarda
584e35e4ab have killNodeWithUUID return success to avoid double lookup 2015-11-16 10:58:11 -08:00
Stephen Birarda
ea38c4cc49 don't allow domain check-ins while shutting down 2015-11-12 18:04:15 -08:00
Stephen Birarda
6b2987eef8 handle domain server node removal in NodeList 2015-11-12 17:47:51 -08:00
Stephen Birarda
e52e9be44c re-broadcast disconnects from domain-server 2015-11-12 17:23:39 -08:00
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -08:00
Stephen Birarda
8bdb81d832 send disconnect packet from node when leaving domain 2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160 cleanup string grabbing for PacketType enum 2015-11-12 14:43:25 -08:00
Stephen Birarda
288ee0e9e8 add a NodeDisconnect packet 2015-11-12 11:39:32 -08:00
ericrius1
31fe5fa953 Bump version num, use different shader for additive blending effect 2015-11-03 17:15:10 -08:00
samcake
393f6a4c76 Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version 2015-10-30 11:35:50 -07:00
Clément Brisset
a37c94bd3c Merge pull request #6202 from birarda/asset-parenting 
don't force parenting of AssetUpload/AssetRequest
 2015-10-30 09:45:42 -07:00
Stephen Birarda
06897aa474 don't force parenting of AssetRequest/AssetUpload 2015-10-27 19:29:54 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Stephen Birarda
76bfc6218a add back block removed in merge 2015-10-13 16:36:10 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
Atlante45
b7ba99380a Pretty up loading debug 2015-10-12 15:32:44 -07:00
Atlante45
7eadb11404 Remove optional upload caching 2015-10-12 15:09:17 -07:00
Atlante45
0e0a8301eb Collapse line 2015-10-12 15:06:51 -07:00
Atlante45
0cdad78581 Move debug to helper functions 2015-10-12 15:03:37 -07:00
Atlante45
4abac35c72 Cache on upload 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Stephen Birarda
b84109a781 Merge pull request #6040 from huffman/fix-null-node 
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
 2015-10-09 14:57:16 -07:00
Clément Brisset
a5f0b75e25 Merge pull request #6043 from huffman/fix-uninitialized-arr 
Fix uninitialized pointer in AssetResourceRequest
 2015-10-09 13:36:58 -07:00
Clément Brisset
aa221741e5 Merge pull request #6041 from birarda/packet-corruption 
fix for re-send timeout in SendQueue
 2015-10-09 13:33:34 -07:00
Ryan Huffman
c02df56ceb Fix uninitialized pointer in AssetResourceRequest 2015-10-09 13:15:13 -07:00
Stephen Birarda
58f9830a94 fix for re-send timeout in SendQueue 2015-10-09 10:04:35 -07:00
Ryan Huffman
36aaffce43 Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor" 
This reverts commit 4dddb508a8.
 2015-10-09 10:01:53 -07:00
Ryan Huffman
21e9d30bbe Move qdeclare/qregister calls to their respective class header 2015-10-09 09:58:32 -07:00
Ryan Huffman
4dddb508a8 Fix _packets not being cleaned up in ReceivedPacketProcessor 2015-10-09 09:21:36 -07:00
Clément Brisset
7caf8755d1 Merge pull request #6039 from birarda/packet-corruption 
hold the sent packets lock while re-sending a packet
 2015-10-08 19:57:08 -07:00
Stephen Birarda
8985427516 maintain sent packets lock while re-sending packet 2015-10-08 19:47:15 -07:00
Clément Brisset
6d694b877d Merge pull request #6036 from birarda/packet-corruption 
fix for registration of meta types in Socket
 2015-10-08 18:29:03 -07:00
Clément Brisset
a2b5748f54 Merge pull request #6027 from birarda/net-crashes 
clean up Nodes via deleteLater on the network thread
 2015-10-08 18:22:40 -07:00
Stephen Birarda
1cd76bb937 fix for registration of meta types in Socket 2015-10-08 18:17:24 -07:00
Stephen Birarda
aa2a8edc6f use _segmentStartIndex before changing its value 2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e constantize the PacketList write error 2015-10-08 15:40:49 -07:00