Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:13:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36467 commits 71 branches 56 tags 1.2 GiB
Commit graph

1808 commits

Author SHA1 Message Date
Seth Alves
9271209d89 another 2015-12-19 08:13:53 -08:00
Seth Alves
8b9de716f1 fix bad pointer juju 2015-12-19 08:08:10 -08:00
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Seth Alves
b9fc368857 Merge pull request #6633 from huffman/agent-spatial-finder 
Add AssignmentParentFinder to Agent
 2015-12-14 09:35:27 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Ryan Huffman
66ed8dc053 Add AssignmentParentFinder to Agent 2015-12-11 14:51:14 -08:00
Brad Hefta-Gaub
a7a924153a Merge pull request #6617 from huffman/entity-query-keyhole 
Add keyhole radius to OctreeQuery
 2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub
c1fe30ff49 Merge pull request #6620 from huffman/fix-agent-entity-delete 
Fix EntityErase packets not being handled on agents
 2015-12-10 17:27:21 -08:00
Ryan Huffman
4c8b7aa800 Fix EntityErase packets not being handled on agents 2015-12-10 16:26:16 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Brad Hefta-Gaub
2fbabf20db properly handle repack attempts 2015-12-10 14:03:06 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Seth Alves
62b4eac875 fix avatar-mixer parents-related crash 2015-12-04 16:41:56 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
46946212cf remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true 2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21 remove WANT_DELTA from OctreeQuery 2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub
0d9d5375c7 remove optional WANT_COMPRESSION from OctreeQuery 2015-12-04 13:29:18 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc remove coverage map and occulusion culling, since it was always disabled 2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174 Revert "Cruft removal" 2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
1a5bc5d111 removing optional compression 2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
Brad Hefta-Gaub
0c05ffe9ce remove coverage map and occulusion culling, since it was always disabled 2015-12-03 10:20:04 -08:00
Ryan Huffman
ce882a9c11 Replace QSharedPointer ctor with ::create 2015-12-03 09:43:36 -08:00
Brad Hefta-Gaub
4497d21aec remove nodes that disconnect from out viewer stats 2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
1e51a90204 add edit times and entity ids to the viewer stats 2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00