Seth Alves
8ba800fda8
Merge pull request #6851 from AndrewMeadows/collisionless2
...
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Howard Stearns
5caf10beed
Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck
...
Include checking the angular size of entities on the server side for LOD support
2016-01-18 14:13:34 -08:00
Seth Alves
823428290d
Merge branch 'master' of github.com:highfidelity/hifi into various-fixes
2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub
b8747709ef
CR feedback, dead code cleanup
2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -08:00
Seth Alves
d6e3b85237
fix javascript access via localPosition and localRotation
2016-01-18 11:15:32 -08:00
Brad Hefta-Gaub
88af387214
cleanup
2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub
2774df38bc
check for entity size before including it for LOD
2016-01-18 09:06:57 -08:00
Andrew Meadows
952f5b23f6
namechange collisionsWillMove --> dynamic
2016-01-15 15:21:25 -08:00
U-GAPOS\andrew
0126684a96
collisionMask shouldn't override ignoreForCollisions
2016-01-13 16:58:34 -08:00
Andrew Meadows
c52c543ab8
use strings for JS collisionGroup API
2016-01-12 15:11:27 -08:00
Andrew Meadows
222398e5cc
no packet version check for collision mask
2016-01-12 15:10:18 -08:00
Andrew Meadows
6c49d81475
collision mask bit reinterpretation
...
also cache sessionID in static methods inside PhysicsEngine
2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Andrew Meadows
4f29156da1
fixing asserts for EntityItem delete pipeline
2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -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
f5d24a87ca
remove entities from physics before we delete them
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
Brad Hefta-Gaub
f0338690c8
whitespace change
2016-01-06 14:54:50 -08:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
f7041136ff
put new property in right place
2016-01-05 13:26:16 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
3db68e3151
add model joints to debugging
2016-01-04 18:16:20 -08:00
Seth Alves
3026415f03
add some missing property handling boilerplate
2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294
debugging
2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772
debugging
2016-01-04 15:52:58 -08:00
Seth Alves
9304477233
split out calls for rotation and translation
2016-01-04 15:29:06 -08:00
Seth Alves
5beba58e5f
debugging
2016-01-04 15:05:08 -08:00
Seth Alves
bd35532c5d
debugging
2016-01-04 15:02:45 -08:00
Seth Alves
ef8673610f
debugging
2016-01-04 14:58:13 -08:00
Seth Alves
cd92a9fa1a
adjust timestamps
2016-01-04 14:51:43 -08:00
Seth Alves
9a708f2e74
try splitting edit into 2 packets
2016-01-04 14:48:49 -08:00
Seth Alves
6c8eb90ee0
debugging
2016-01-04 14:42:37 -08:00
Seth Alves
7f2e0cd103
expose a way to set translation and rotation of all model joints at once
2016-01-04 14:13:08 -08:00
Seth Alves
2147b0d78e
fix locking
2016-01-04 12:31:58 -08:00
Seth Alves
c9ed36f9a6
include joint data in script properties
2016-01-04 12:31:45 -08:00
Seth Alves
ef7438958b
better debugging prints for model joints
2016-01-04 12:30:55 -08:00
Seth Alves
768934ae11
update entity timestamps when sending joint information
2016-01-04 11:29:15 -08:00
Seth Alves
9e49fcf0a4
include model-joints in debugging output
2016-01-04 11:29:01 -08:00
Seth Alves
f5bc58f606
back out off-brand change
2016-01-03 08:00:31 -08:00
Seth Alves
40a25f859a
cleanups
2016-01-03 08:00:23 -08:00
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
Anthony J. Thibault
8f71a5fda5
ModelEntityItem: Fix for missing pre-rotations for animated models.
...
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
2015-12-30 10:17:18 -08:00
ericrius1
8e7dfc07c0
Added logic to blacklist entities from raypicking
2015-12-24 11:59:47 -08:00