Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07: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
Seth Alves
b1c5a04531
respond to code review
2015-09-11 09:29:52 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -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
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Stephen Birarda
6860f3d126
add readWithoutCopy for clarity in Packet read
2015-08-19 14:32:26 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
8921f59e23
fix entity packet send from interface client
2015-07-16 12:09:35 -07:00
Ryan Huffman
44c99ef89a
Replace bytesAvailable with bytesLefToRead
2015-07-15 10:44:51 -07:00
Stephen Birarda
0327a8d477
fix bytesAvailable, don't double seek in Packet
2015-07-14 20:47:16 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Atlante45
846e9f8105
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 19:10:06 -07:00
Stephen Birarda
c2ae73650c
go back to writing the number of deleted IDs
2015-07-08 19:03:42 -07:00
Atlante45
4bc71bb39e
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:55:14 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Atlante45
d4e01742e5
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:40:18 -07:00
Atlante45
e2718d5c94
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-08 18:26:36 -07:00
Stephen Birarda
5dc09692b4
more packet creation fixes for entitites
2015-07-08 18:13:06 -07:00
Stephen Birarda
ac40790841
remove a bad replacement from PacketType in EntityTree
2015-07-08 16:54:56 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Stephen Birarda
ffa6edc904
fix spaces created by xcode find/replace
2015-07-07 15:01:19 -07:00
ZappoMan
a59fd44014
quiet some log spam
2015-07-07 09:04:20 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Stephen Birarda
812b18c74e
Merge pull request #5205 from SeijiEmery/unit-tests
...
Unit tests
2015-07-02 20:58:09 -04:00
Stephen Birarda
b3c3e5a6c8
more PacketType to PacketType::Value replacements
2015-07-02 16:49:19 -07:00
ZappoMan
b568e895ec
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ZappoMan
5c4d4893de
added bytes per edit stats
2015-07-02 13:44:28 -07:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
ZappoMan
24b4614703
add more detailed edit timing to entity server
2015-07-01 16:11:08 -07:00
Seth Alves
7d7e3769f6
suppress a log message
2015-06-30 09:56:15 -07:00
Seiji Emery
374150a39f
Merge https://github.com/highfidelity/hifi
2015-06-29 11:56:50 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Andrew Meadows
e18506c77f
promote volunteer priority
...
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514
more work on simulator priority
...
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
2015-06-26 21:57:04 -07:00
Andrew Meadows
82ba5cd4b6
sim ownership uses expiry, apply priority rules
2015-06-26 21:57:04 -07:00
Seiji Emery
dfe58a5ed4
Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point.
2015-06-22 17:42:07 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Seth Alves
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00
Andrew Meadows
aff751b4e6
remove old debug assert
2015-06-04 11:26:35 -07:00
Seth Alves
9cae11cc3c
clean up actions when DeleteEntityOperator's list is processed rather than as it's made
2015-06-04 09:55:25 -07:00
Seth Alves
d634663bb1
simple action is working. destructor sequense is still suspicous
2015-06-03 17:33:55 -07:00
