Seth Alves
1cc0aa18bb
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-26 13:31:07 -08:00
Brad Hefta-Gaub
1ef01d670d
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:07:14 -08:00
James B. Pollack
4cff1ab9df
Merge pull request #6919 from ctrlaltdavid/20790
...
Make entity properties be undefined after entity is unloaded
2016-01-25 15:12:10 -08:00
David Rowe
8a8e14f54a
Rework initializers
2016-01-25 11:22:31 +13:00
Brad Davis
a843331626
Still trying to kill OSX warning
2016-01-23 22:07:00 -08:00
David Rowe
840bf7cfb4
Fix OSX and Linux build warning
...
And a typo noticed in passing.
2016-01-24 10:53:40 +13:00
David Rowe
d020114e59
Make entity properties return undefined value after entity is deleted
2016-01-24 08:39:49 +13:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Seth Alves
b6af8ee0cc
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Brad Hefta-Gaub
b41301d226
Merge pull request #6879 from sethalves/fix-aa-cube-bug
...
fix query-cube vs lod bug
2016-01-21 21:02:42 -08:00
Seth Alves
cbed542682
MyAvatar updates the entity-server about queryAACubes of children entities
2016-01-21 15:53:19 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
ae6cba85e8
More atmosphere removal
2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Seth Alves
5027157575
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
2016-01-21 09:31:51 -08:00
Seth Alves
729998bbf3
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 09:19:47 -08:00
Seth Alves
311e0cee67
Merge pull request #6820 from AndrewMeadows/collision-mask
...
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -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
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
Seth Alves
28d673cb97
try again to make this thread safe
2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2
try again to make this thread safe
2016-01-19 15:55:56 -08:00
Seth Alves
edea0320e6
try again to make this thread safe
2016-01-19 15:44:22 -08:00
Seth Alves
f265656e74
expose getJointNames for entities to js
2016-01-19 12:55:17 -08:00
Andrew Meadows
db77f22a61
use "collidesWith" instead of "collisionMask"
...
but make "collisionMask" work for those who want it
2016-01-19 11:41:22 -08:00
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
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
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
