Zach Fox
f05c709693
Remove static certificate verification for now
2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952
Updates now that endpoint exists; add pending timer
2017-10-11 11:46:35 -07:00
Zach Fox
0ae69b6ad9
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-10 12:38:14 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
Zach Fox
c70ee6055f
Don't clear cert ID if static properties change; updates to DDV
2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6
Checkpoint; lotsa changes...
2017-10-06 16:55:05 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
Seth Alves
f4dedf05bb
move variables into block that needs them
2017-10-06 11:02:26 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Zach Fox
4cfb860e23
Wow, this actually seems to be working
2017-10-04 15:45:12 -07:00
Zach Fox
f974672e7b
Working way better than I expected
2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8
Throw a bunch of code at the wall and hope some sticks
2017-10-04 15:06:55 -07:00
Zach Fox
f7ea50ef3b
Free memory
2017-10-04 14:02:28 -07:00
Zach Fox
cf7c1934f8
Progress?
2017-10-04 13:16:33 -07:00
Zach Fox
ab08dc6bd6
Progress?
2017-10-04 12:33:58 -07:00
Zach Fox
2cdd5c29f3
Uncertified rez rights
2017-10-04 09:58:29 -07:00
Zach Fox
ed40e41b94
Potential progress? Not totally sure
2017-10-03 16:18:29 -07:00
Zach Fox
b7e50c5b73
First steps
2017-10-03 14:36:22 -07:00
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Andrew Meadows
8134e2b7f9
fix const violation
2017-09-29 11:34:36 -07:00
Andrew Meadows
f5f1a64c92
use const ref on pointer, and use dynamic_cast
2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026
remove dupe addToNeedsParentFixupList() call
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
0ad5f47bfd
trying to fix entity editing bugs, needs testing
2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd
add state to entity tree send thread
2017-09-29 11:34:34 -07:00
Andrew Meadows
8d535f9c5a
remove bump to changeFromRemote for server case (revert)
2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386
on server: note time of entity edit by remote
2017-09-29 11:34:33 -07:00
Andrew Meadows
82ed19386f
make Octree::readBitstreamToTree() virtual
2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a
don't use octcode data in entity update packets
2017-09-29 11:34:32 -07:00
Seth Alves
72cacc4cef
server only deletes and entity if it's still the child of an avatar, not if it has ever been
2017-09-28 19:56:15 -07:00
Zach Fox
0f66fb41fd
Fix entity add after incomplete rezCertified implementation
2017-09-28 16:07:15 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Andrew Meadows
8fc4d1f43e
make UNEXPECTED logs warnings
2017-07-13 13:30:57 -07:00
Andrew Meadows
02bc9b9610
minimize the lock context
2017-07-13 13:30:57 -07:00
Andrew Meadows
f71ef554b7
use copy of _entityMap for debug logging
2017-07-13 13:30:57 -07:00
Andrew Meadows
fe79514b08
lock when changing EntityTree elements
2017-07-13 13:30:57 -07:00
Andrew Meadows
a0c6c49360
bump some "debug" messages to "warning" status
2017-07-13 13:30:57 -07:00
Andrew Meadows
7ea1e7285f
map EntityItemID to EntityItemPointer
2017-07-13 13:30:57 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Brad Hefta-Gaub
5af95c8fdf
Merge pull request #10476 from sethalves/fix-imported-children-querybox
...
fix up queryAACubes before sending imported entities to server
2017-05-25 08:29:23 -07:00
Stephen Birarda
cecbf43129
make server entity scripts respect script whitelist
2017-05-22 16:17:01 -07:00
Seth Alves
5c94147f40
children collision hulls appear to be in the right place, now
2017-05-19 17:09:42 -07:00
Seth Alves
67f222cb3f
be more careful about fixing up entities which arrived before their parents
2017-05-19 15:19:16 -07:00
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
