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
|
bd7fa266cf
|
Bit of cleanup
|
2015-12-16 14:27:26 -08:00 |
|
Brad Hefta-Gaub
|
2fbabf20db
|
properly handle repack attempts
|
2015-12-10 14:03:06 -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 |
|
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 |
|
Brad Hefta-Gaub
|
0c05ffe9ce
|
remove coverage map and occulusion culling, since it was always disabled
|
2015-12-03 10:20:04 -08:00 |
|
Brad Hefta-Gaub
|
1e51a90204
|
add edit times and entity ids to the viewer stats
|
2015-12-02 14:43:00 -08:00 |
|
Brad Hefta-Gaub
|
08ba535c38
|
add some basic send tracking
|
2015-12-02 13:43:05 -08:00 |
|
Atlante45
|
c3e2d920ee
|
Move timing at the top
|
2015-12-02 09:45:51 -08:00 |
|
Atlante45
|
0bc914bf19
|
Don't grab subTree outside lock
|
2015-12-01 19:33:44 -08:00 |
|
Atlante45
|
4aaa9ca02f
|
Make OctreeElementBag safer to use
|
2015-11-30 15:23:49 -08:00 |
|
Seth Alves
|
89ed3751ae
|
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
|
2015-11-14 14:00:20 -08:00 |
|
Brad Hefta-Gaub
|
83e7eb58b9
|
add special packets and nack packets to outbound stats
|
2015-11-12 16:36:06 -08:00 |
|
Seth Alves
|
a78b1619be
|
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
|
2015-11-12 14:20:23 -08:00 |
|
Brad Hefta-Gaub
|
14a6e1fb6b
|
fix mac compiler error
|
2015-11-12 13:24:25 -08:00 |
|
Brad Hefta-Gaub
|
66a2b38f50
|
switch various status to use thread safe atomics
|
2015-11-12 13:09:51 -08:00 |
|
Seth Alves
|
be86748200
|
oops
|
2015-11-11 16:38:28 -08:00 |
|
Seth Alves
|
cffe4551dd
|
merge from upstream
|
2015-11-11 16:15:07 -08:00 |
|
Brad Hefta-Gaub
|
866116d285
|
more debugging
|
2015-11-11 12:13:47 -08:00 |
|
Seth Alves
|
5e4f30b2bb
|
improve terse entity logging. change how action data sending is triggered
|
2015-11-10 13:58:09 -08:00 |
|
Brad Davis
|
9b81842850
|
Merge branch 'master' into homer
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
|
2015-09-11 16:31:18 -07:00 |
|
Brad Davis
|
aa989c3687
|
Fixing some entity race condition crashes
|
2015-09-10 20:53:17 -07:00 |
|
Seth Alves
|
9c4fdfd653
|
merge from upstream
|
2015-09-08 18:01:07 -07:00 |
|
Seth Alves
|
31fcd55d47
|
octree uses shared pointers
|
2015-09-08 11:59:48 -07:00 |
|
Stephen Birarda
|
862c788aec
|
move payload adjustments to Packet
|
2015-07-23 15:27:32 -07:00 |
|
Stephen Birarda
|
e127c5c06d
|
rename Packet methods for clarity
|
2015-07-15 10:40:40 -07:00 |
|
Stephen Birarda
|
0327a8d477
|
fix bytesAvailable, don't double seek in Packet
|
2015-07-14 20:47:16 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Atlante45
|
957e6394a9
|
sendPacket function take Node& not a pointer
|
2015-07-13 11:57:20 -07:00 |
|
Stephen Birarda
|
a38cb56c1c
|
fix an accidental comment add
|
2015-07-09 11:56:24 -07:00 |
|
Atlante45
|
cc0e0e6a1f
|
Compile fixes in assignment client
|
2015-07-09 11:35:36 -07:00 |
|
Atlante45
|
605b004514
|
Assigment client compile fixes
|
2015-07-09 11:19:36 -07:00 |
|
Stephen Birarda
|
631c745784
|
allow equal for piggyback check in OctreeSendThread
|
2015-07-07 16:21:14 -07:00 |
|
Stephen Birarda
|
ff18a05507
|
CR fixes for octree classes
|
2015-07-07 15:21:10 -07:00 |
|
Stephen Birarda
|
e953b36f58
|
handle stats + data packet combination in OctreeSendThread
|
2015-07-07 12:56:20 -07:00 |
|
Stephen Birarda
|
01b1c46237
|
more networking API changes in octree classes
|
2015-07-07 12:31:22 -07:00 |
|
Seth Alves
|
32cc0eacfc
|
improve a debug print
|
2015-05-22 15:21:26 -07:00 |
|
Seth Alves
|
53fe41ef4d
|
improve a debug print
|
2015-05-22 15:11:56 -07:00 |
|
Seth Alves
|
945a84d24f
|
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
|
2015-05-22 15:01:43 -07:00 |
|
Seth Alves
|
866a6fba9b
|
Merge pull request #4823 from birarda/master
repairs to AC stop and clean shutdown
|
2015-05-11 18:11:52 -07:00 |
|
Seth Alves
|
83748096ef
|
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
|
2015-05-11 11:37:53 -07:00 |
|
Stephen Birarda
|
3d06a86670
|
drop packets on floor when shutting down
|
2015-05-08 11:57:25 -07:00 |
|
Stephen Birarda
|
fe1b8cc52b
|
fix entity tree reset / add OST assert for myServer
|
2015-05-08 11:04:22 -07:00 |
|