Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-07-14 19:07:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 20 branches 0 tags 1.1 GiB
Commit graph

635 commits

Author SHA1 Message Date
Seth Alves
54dafa0f83 be more careful about fixing up entities which arrived before their parents 2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d be more careful about fixing up entities which arrived before their parents 2017-05-19 13:48:29 -07:00
Seth Alves
936d0e2d50 be more careful about fixing up entities which arrived before their parents 2017-05-19 12:13:43 -07:00
Seth Alves
735e4b7d05 trying to get child collision hulls to be in the right place after import 2017-05-19 10:59:59 -07:00
Seth Alves
7220fe0ad8 set more physics flags dirty when an entity parent is found 2017-05-19 10:40:24 -07:00
Seth Alves
0c12baa258 call entityChanged after settings flags 2017-05-19 09:57:42 -07:00
Seth Alves
4007133423 collision hulls are still not always in the right place 2017-05-18 14:59:26 -07:00
Seth Alves
ef556fae9b when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds 2017-05-18 14:13:33 -07:00
Seth Alves
ec02887ae6 attempt to get imported entities into the correct octree-element 2017-05-18 13:20:44 -07:00
Seth Alves
10f1143278 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-16 20:49:53 -07:00
Seth Alves
d90843428d when importing entities, make a queryAACube that takes children into account 2017-05-16 16:54:16 -07:00
Seth Alves
1e4e2cc1b4 when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it 2017-05-16 16:22:40 -07:00
Seth Alves
b9005a9e76 fix up queryAACubes before sending imported entities to server 2017-05-16 14:32:55 -07:00
Seth Alves
630d95a812 fix constraint import some more 2017-05-12 13:03:51 -07:00
Seth Alves
80e6edda0c code review 2017-05-11 10:13:15 -07:00
Seth Alves
4f24a7618a cleanups 2017-05-09 10:23:04 -07:00
Seth Alves
4816e4f826 what does VS mean when it uses words? 2017-05-08 21:39:41 -07:00
Seth Alves
1346ce22b9 don't crash if imported entities make a reference to an unknown entity 2017-05-08 15:51:25 -07:00
Seth Alves
94dfbc81f3 entity export/import involving constraints now works 2017-05-08 15:44:31 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Seth Alves
d25db099b9 be more effecient about ignoring edits to unknown entities 2017-05-04 18:49:46 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Ryan Huffman
b9fffc10f8 Fix entity "unlock" edits not being propagated to clients 
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
 2017-04-03 15:51:19 -07:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
David Kelly
e6969321ca fix for not properly filtering entity adds 2017-02-15 09:15:35 -07:00
David Kelly
17acd8fa4f I should just build on linux exclusively 2017-02-14 13:30:43 -07:00
David Kelly
342584b2a8 Filter failure mode updated 
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.

Also - zone filters don't apply to the zone itself.  Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
 2017-02-14 13:05:12 -07:00
howard-stearns
487adc7f18 whitespace 2017-02-13 16:35:03 -08:00
howard-stearns
6241889e38 lastEditedBy is set by add/edit, but not by physics packets 2017-02-13 13:47:20 -08:00
David Kelly
8a7a3926c5 rest of issues w/linux and mac 2017-02-10 15:57:27 -07:00
David Kelly
cf780b3b73 fixed persist issue, working much better 2017-02-10 11:42:56 -07:00
David Kelly
8d666854c7 working it seems 
But, AABox for zones isn't very helpful (box is _small).  Time to use
the shape of the zone.
 2017-02-09 15:39:38 -07:00
David Kelly
ff7c9d3546 Working like before 
Single entity script running properly.  Now, need to add the zone
filters and execute them.
 2017-02-08 15:36:16 -07:00
howard-stearns
12720cac32 Pass filter type as an int, with constants to compare against. 2017-02-06 13:36:45 -08:00
howard-stearns
dacaa3df1d Send new entity physics packet from physics simulation, accept in server, 
and make it go through filter (when supplied) regardless of lock rights.
 2017-02-06 11:12:18 -08:00
howard-stearns
4499a92a82 filter gets isAdd argument 2017-02-02 13:07:08 -08:00
David Kelly
f25bbc9649 Merge pull request #9574 from howard-stearns/delete-failed-entity-adds 
cleanly log failed entity adds, and tell the client to delete his copy
 2017-02-01 10:12:17 -07:00
howard-stearns
e42853a96c cleanly log failed entity adds, and tell the client to delete his copy 2017-01-31 16:05:38 -08:00
Stephen Birarda
d4a161041e drop empty parts when splitting script whitelist 2017-01-31 15:32:47 -08:00
Brad Hefta-Gaub
619bcdeed8 Merge pull request #9553 from huffman/fix/polyvox-import 
Fix importing of PolyVox entities
 2017-01-31 08:42:28 -08:00
Ryan Huffman
f553656e36 Fix importing of PolyVox entities 
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
 2017-01-30 13:33:42 -08:00
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Howard Stearns
f36b968860 Merge branch 'edit-entity-filter' into entity-filter-resource 2017-01-25 19:39:12 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get 
the filter program from file
 2017-01-24 16:14:41 -08:00
howard-stearns
da914f0a4f bypass entity-server edit filter if you have lock/unlock rights 2017-01-24 11:59:31 -08:00
Stephen Birarda
9229a07f6a avoid failing scheme check 2017-01-23 16:46:59 -08:00
Stephen Birarda
7362bf16c1 use isParentOf to check script whitelist, clarify description in settings 2017-01-23 16:44:28 -08:00
Stephen Birarda
db398b7850 check URL host for script whitelist, not startsWith 2017-01-23 13:36:02 -08:00
howard-stearns
7b986dcac6 works, but removes an optimization we'd like to keep 2017-01-20 17:03:52 -08:00
Atlante45
8740481579 Remove unnecessary const from const bool 2017-01-20 13:54:49 -08:00
howard-stearns
90c9c5b137 logging change 2017-01-18 14:32:05 -08:00
howard-stearns
957b1d9ae4 pass just what is given to filter, more or less 2017-01-18 13:22:54 -08:00
howard-stearns
2e9b26057e refactor bumpTimestamp, and fix implementation of wasChanged 2017-01-18 10:27:32 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -07:00
Seth Alves
01c1cb328f don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP 2016-10-13 15:05:13 -07:00
Ryan Huffman
16d535c495 Move EntityTree RayArgs back to header 2016-10-04 20:20:48 -07:00
Ryan Huffman
ee50469213 Add collidableOnly arg to findRayIntersection 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Seth Alves
5f6e608207 don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't. 2016-07-19 11:23:21 -07:00
Seth Alves
b9f9b18083 if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime 2016-06-30 15:41:58 -07:00
Zander Otavka
2786061d71 Fix bug with entity adding w/o permission 
Entities could be added to the local tree, but be rejected by the server
because of a lack of permissions.
 2016-06-24 16:34:54 -07:00
Seth Alves
2fd38c1585 when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree 2016-06-23 13:10:15 -07:00
Seth Alves
c62b73bf61 when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree 2016-06-22 11:42:57 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
humbletim
e65e6dc9ce Fix entity lifetime guards (re: canRez/canRezTmp) 2016-06-19 13:40:03 -04:00
Brad Hefta-Gaub
da28b0f3e7 Merge pull request #8048 from ctrlaltdavid/20961 
fix import of invalid JSON file failing silently
 2016-06-12 19:42:53 -07:00
David Rowe
2953ca08cb Fix import of invalid JSON file failing silently 2016-06-10 12:04:41 +12:00
Seth Alves
bade215907 maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour 2016-06-09 10:41:30 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
David Rowe
2f3fa80b96 Add Clipboard.getContentsDimensions() JavaScript method 2016-05-26 09:52:22 +12:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
Seth Alves
7ea7bd3e1d set created-time for imported entities to 'now' 2016-05-19 10:21:04 -07:00
Seth Alves
ac506dc4b7 where needed, copy clientOnly into properties before calling queueEditEntityMessage 2016-05-11 12:46:16 -07:00
Seth Alves
e4e0be8fa3 relay owningAvatar from properties to entity on entity creation 2016-05-10 16:51:38 -07:00
Seth Alves
de4c9530c9 carry clientOnly flag over from properties when addEntity is called 2016-05-10 14:48:12 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Seth Alves
4c1f815870 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 10:09:40 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes 
Grab fixes
 2016-05-09 15:30:37 -07:00
Seth Alves
0e6d9a1eec avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them. 2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
Seth Alves
382a0c48da fix warning 2016-05-04 12:09:26 -07:00
Seth Alves
9e53055d43 parentID and parentJointIndex are now protected by simulation ownership 2016-05-03 15:48:50 -07:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
Seth Alves
95f446183f use for loop rather than iterator 2016-04-08 13:32:33 -07:00
Seth Alves
6088612ce0 guard access to _missingParent vector with a lock to allow safe access from multiple threads 2016-04-08 13:16:30 -07:00
howard-stearns
cec4175e9d whitespace 2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
howard-stearns
b09b9a4a0a snapshot after using tree from entity item. 2016-03-28 16:58:20 -07:00
howard-stearns
7a066afa26 Checkpoint for freakin edit.js again. 2016-03-28 14:25:51 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
howard-stearns
8858559247 Make access to entityToElementMap thread safe. 2016-03-21 14:02:18 -07:00
Seth Alves
db5c6d80d2 possibly fix a couple of crashes 2016-03-17 10:31:54 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Seth Alves
5f05d576cc move checkAndAdjustQueryAACube into SpatiallyNestable 2016-03-11 15:55:42 -08:00
Brad Hefta-Gaub
550b9a98b1 fix error in preload logic 2016-02-12 14:45:55 -08:00
Brad Hefta-Gaub
a40a562db2 handle two conner cases where preload would get called twice 2016-02-11 09:33:52 -08:00
Seth Alves
92d016f03a debugging prints for queryAACube 2016-02-08 15:09:34 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Ryan Huffman
963c71a476 Fix ES rejecting unowned entity physics updates 2016-02-03 09:28:49 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Seth Alves
1fef78f60f fix bug where entities that were children of avatars wouldn't be included in entity-server packets to interfaces 2016-01-20 19:03:41 -08:00
Andrew Meadows
19d24293e1 Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent 
don't persist entites with invalid parentIDs
 2016-01-20 10:38:26 -08:00
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Seth Alves
e365d93ed9 don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file 2016-01-18 16:50:26 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup 
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
 2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df cleanup API for removal from EntitySimulation 2016-01-07 10:19:46 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Seth Alves
ef7438958b better debugging prints for model joints 2016-01-04 12:30:55 -08:00
Seth Alves
f5bc58f606 back out off-brand change 2016-01-03 08:00:31 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
Seth Alves
473212e5b7 try to be more coherent about queryAABox meaning 2015-12-17 14:29:41 -08:00
Seth Alves
45d19167c9 fix a couple of missing-parent bugs 2015-12-16 10:09:46 -08:00
Seth Alves
165c41d843 add a way to remember which entities couldn't be properly placed in octree due to missing parents 2015-12-14 14:19:19 -08:00
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Seth Alves
7f11d2a4fe whitespace 2015-12-12 14:45:02 -08:00
Seth Alves
1492fd6090 merge from upstream 2015-12-12 12:37:57 -08:00
Seth Alves
24fb43e8cd first steps toward a puffed-out query-box for child entities 2015-12-12 12:33:14 -08:00
Atlante45
79fdb2e882 Fix warnings on windows 64bit 2015-12-11 16:31:27 -08:00
Seth Alves
920e2941b9 don't crash when a child no longer has a containing element 2015-12-11 15:31:56 -08:00
Seth Alves
6c033d9603 call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model 2015-12-11 11:35:42 -08:00
Seth Alves
dbde0b641e Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready 2015-12-10 11:38:08 -08:00
Atlante45
6f29d9e7b8 Use strongly typed enum instead of nested alias 2015-12-10 11:10:09 -08:00
Seth Alves
d09f70239c make entity-tree a global. change how network-requests to load model geometry are triggered 2015-12-10 09:03:53 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Seth Alves
3cc423ca03 remap IDs when importing entities 2015-12-06 17:55:48 -08:00
Seth Alves
138125faab fix-up parentJointIndex in terse logging 2015-12-06 05:42:51 -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
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Atlante45
a364e85e1d Remove DeleteHooks 2015-11-25 17:21:56 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
2f3cf82202 don't apply out of order edits to entities that have been deleted 2015-11-18 14:26:18 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -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
Seth Alves
7979fb38cf don't always send actiondata along with other physics related properties 2015-11-13 09:25:17 -08:00
Seth Alves
dbaea5770a include action data in properties suppressed by non-simulation ownership 2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
Seth Alves
cffe4551dd merge from upstream 2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0 more debugging prints 2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
Seth Alves
31ebe5dba1 terse logging for sim ownership 2015-11-11 08:51:10 -08:00
Seth Alves
39b92d2b52 terse log when ownership changes 2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub
3316b63bf6 add a fixme comment 2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Seth Alves
df5d161721 adjust how EntityMotionState updates its idea of what the server knows about an entity 2015-11-10 15:02:17 -08:00
Seth Alves
5e4f30b2bb improve terse entity logging. change how action data sending is triggered 2015-11-10 13:58:09 -08:00
Seth Alves
4ed8a1e5d1 changes to send an update to entity-server when AvatarActionHold releases an entity 2015-11-06 09:25:53 -08:00
Seth Alves
7b08d047b1 when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity 2015-10-22 16:59:56 -07:00
ericrius1
0373a481f8 Using EntityItemIDs instead of QUuids 2015-10-20 09:22:16 -07:00
ericrius1
dcb37ccd73 Removed whitelist and raypicking code from octree, fixed a small bug with polylines 2015-10-19 13:14:19 -07:00
ericrius1
8c229d88a8 moving whitelist code out of octree 2015-10-19 11:59:44 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -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
Seth Alves
a96520ca74 set up EntityItemPropertiesFromScript to either ignore or honor read-only properties 2015-05-29 13:43:18 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00