Andrew Meadows
39e5259e03
remove unused variable
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
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Seth Alves
428dc81083
Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race
...
ignore remote update younger than recent ownership bid
2017-06-20 10:42:54 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Andrew Meadows
8d19395b0a
ignore remote update younger than recent bid
2017-06-14 16:04:52 -07:00
Andrew Meadows
29a05d7eb4
bid immediately when creating new entity
...
also clear EntityMotionState::_numInactiveUpdates on new ownership
2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8
minor formatting fix
2017-06-01 17:39:21 -07:00
samcake
6dbbd6c8d0
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-25 11:25:46 -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
samcake
e7b808cbc1
Merging with upstream
2017-05-23 12:12:31 -07:00
Stephen Birarda
cecbf43129
make server entity scripts respect script whitelist
2017-05-22 16:17:01 -07:00
Seth Alves
381de7a1e2
tabs
2017-05-21 08:42:53 -07:00
Seth Alves
c68efc2ed0
treat locked like other properties that affect simulation
2017-05-21 08:29:35 -07:00
Seth Alves
2512b39848
don't dirty motion-type if lock value isn't actually changing
2017-05-20 14:14:33 -07:00
Seth Alves
8f38ea8c6a
force locked entities to be static in bullet
2017-05-20 11:54:42 -07:00
Seth Alves
a442181859
remove some redundancy
2017-05-20 08:51:44 -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
386c76545c
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:21:05 -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
77ce8a19cf
call entityChanged after settings flags
2017-05-19 10:11:02 -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
1b0eeb9c2c
try harder to put things in place when their parent entities are discovered
2017-05-18 14:35:39 -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
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
Seth Alves
b8567e0550
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-18 09:10:58 -07:00
Seth Alves
b05cb4af3b
fix nan
2017-05-17 20:51:34 -07:00
Seth Alves
0dc355cf86
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub
0d3f7058ec
Merge pull request #10483 from AndrewMeadows/cap-velocities
...
cap scripted linear and angular velocity inputs
2017-05-17 16:15:42 -07:00
Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Andrew Meadows
97ed719506
cap scripted linear and angular velocity inputs
2017-05-17 10:40:45 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Seth Alves
8ab676e627
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 09:09:04 -07:00
Thijs Wenker
278bc610d4
Merge pull request #10466 from misslivirose/feat-find-entities-by-type
...
Add function findEntitiesByType EntityScriptingInterface
2017-05-17 15:06:04 +02: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
Andrew Meadows
e6accb61b0
more purging of legacy 'Spring' action
2017-05-16 08:09:20 -07:00
Andrew Meadows
9e08dadaf4
Remove ObjectActionSpring
2017-05-15 22:11:42 -07:00
Liv Erickson
32fd905918
style pass
2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf
changing models to more generally reference entities in comment
2017-05-15 20:33:22 -07:00
Liv Erickson
a606f8a8d4
Fixing code style
2017-05-15 20:28:48 -07:00
Liv
08eb6442b5
Add function findEntitiesByType EntityScriptingInterface
...
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
2017-05-15 18:36:36 -07:00
samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07:00
Seth Alves
630d95a812
fix constraint import some more
2017-05-12 13:03:51 -07:00
Seth Alves
bc6fb182eb
pull out motor action, fix import of slider and cone-twist constraints
2017-05-12 10:32:28 -07:00
Seth Alves
80e6edda0c
code review
2017-05-11 10:13:15 -07:00
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -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
de589a32f3
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
2017-05-08 16:36:51 -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
7a1a9d6496
start on code to remap constraint IDs during import
2017-05-07 19:42:04 -07:00
Seth Alves
5d539bcc17
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-06 07:49:02 -07:00
Sam Cake
db3d634840
Adding the change notifications
2017-05-05 00:11:22 -07:00
Seth Alves
7f4399b0a3
fix name in entity-edit-an-overlay warning
2017-05-04 19:16:15 -07:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
a7c684e007
entity scripting call to get the nestable-type of an object, by id
2017-05-04 19:05:29 -07:00
Seth Alves
d25db099b9
be more effecient about ignoring edits to unknown entities
2017-05-04 18:49:46 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
Seth Alves
74a82f92df
return null uuid for failure
2017-05-04 10:05:17 -07:00
Seth Alves
9171995ed3
add a comment
2017-05-03 21:41:00 -07:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
Seth Alves
03f416ff4d
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-03 20:32:08 -07:00
Seth Alves
0fff7678bf
code review
2017-05-03 19:07:46 -07:00
Seth Alves
e96c3e84b4
if a script attempts to edit a non-entity, don't send the edit packet over the wire
2017-05-03 13:58:49 -07:00
Seth Alves
7f69bdecb2
first try at angular-velocity setting action
2017-05-01 07:06:21 -07:00
Seth Alves
4c4e0dffcc
bullet cone-twist constraint
2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71
ball-and-socket constraint
2017-04-29 08:35:55 -07:00
Seth Alves
e2e9371e96
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
2017-04-29 08:04:31 -07:00
1st-BrainStormer
953a3f7a6f
Update EntityDynamicInterface.cpp
...
Grammar correction.
2017-04-28 20:14:01 -07:00
Seth Alves
b196dd082b
expose bullet slider constraint to javascript
2017-04-27 07:56:35 -07:00
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Chris Collins
889b054085
Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations
...
Fix Entities.setLocalJointTranslations
2017-04-19 09:32:28 -07:00
Seth Alves
21ca767b7c
remove setPosition and setRotation for actions because they were never finished and never used.
2017-04-18 11:59:16 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Seth Alves
b1dc5be316
make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar
2017-04-14 11:48:06 -07:00
Seth Alves
2dab3069da
fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.
2017-04-14 11:06:40 -07:00
Seth Alves
afa8fc161b
allow hinge constraint between two entities
2017-04-13 15:37:28 -07:00
Seth Alves
9b12956909
formatting
2017-04-12 16:34:34 -07:00
Seth Alves
507f658a5f
update comment
2017-04-12 07:37:41 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Stephen Birarda
602d65a71a
Merge pull request #10001 from birarda/cleanup-ebp
...
cleanup EncodeBitstreamParams to use nodeData when possible
2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
Andrew Meadows
b9c7d6351f
Merge pull request #10135 from samcake/ambient
...
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Brad Davis
15f7e895aa
More thread safety
2017-04-04 15:09:21 -07:00
Brad Davis
cd7c1643a3
More thread safety
2017-04-04 14:03:30 -07:00
