ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Seth Alves
3d23446dcb
remove a couple more sprintfs
2015-02-03 17:21:41 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Atlante45
0bd9ed469e
Changed NodeList::getInstance() calls to use the DM
2014-12-17 15:28:25 -08:00
Stephen Birarda
5c3e90f64f
resolve conflicts on merge with upstream master
2014-12-03 13:11:56 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
Stephen Birarda
ce02d79d41
update OctreeStatsDialog to new tbb node iteration
2014-11-06 15:22:30 -08:00
Stephen Birarda
63c5dacdd0
final changes to use new hash from LimitedNodeList
2014-11-05 15:12:42 -08:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
ZappoMan
027b1d58cc
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
interface/src/entities/EntityTreeRenderer.h
interface/src/models/ModelTreeRenderer.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
wangyix
d394c203b6
improved re-sync handling of SequenceNumberStats
...
removed "duplicate" category since it's not 100% accurate
2014-08-04 11:09:20 -07:00
wangyix
e1f905cb36
fixed >100% loss rate bug in SequenceNumberStats
2014-08-01 10:27:51 -07:00
ZappoMan
378b555046
fix entity server name and sending to servers when voxels not enabled
2014-07-28 21:21:54 -07:00
ZappoMan
865566414c
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
...
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
ZappoMan
ccc9eabd33
first cut at renaming Models to Entities
2014-06-26 16:39:52 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
ZappoMan
39ed7f7b65
renaming of AABox to AACube, introduction of actual AABox
2014-05-23 10:45:04 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
ZappoMan
86feabee99
add last scene packets, bytes and pps
2014-03-12 02:22:24 -07:00
ZappoMan
12becb9d19
improve octree stats display
2014-03-11 16:22:35 -07:00
ZappoMan
7fb872c1d7
remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats
2014-03-08 23:53:44 -08:00
