Brad Davis
03c6275268
more thread safety
2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789
Thread safety for property getter/setters on entities
2017-04-04 10:50:53 -07:00
Andrew Meadows
a16760278e
remove debug code
2017-03-09 17:58:53 -08:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Seth Alves
aaefc550f0
avoid bootstrapping self with something that has someone else as simulation owner
2017-02-06 14:16:47 -08:00
Seth Alves
2ea07390c8
when the parentID is changed by a network update, set physics flags
2017-02-06 12:10:26 -08:00
Seth Alves
81bf5ee655
another AVATAR_SELF_ID adjustment
2017-02-03 16:47:03 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
howard-stearns
6f4441028d
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-02-01 09:41:08 -08:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01:00
Anthony J. Thibault
e2e19884bb
Tablet should work even when not connected to any domain.
...
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.
I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.
There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
howard-stearns
18f8c2b866
comment
2017-01-31 13:31:33 -08:00
howard-stearns
8d8b338c66
dry up custom setters, per code review
2017-01-31 12:07:48 -08:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Thijs Wenker
e445af74aa
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:39:39 +01:00
howard-stearns
1ddc804e10
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-01-31 10:58:49 -08:00
Thijs Wenker
c3f9663ab0
- Fix for simulation owned entities moving to 0,0,0 after cache reload
...
- Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()
2017-01-31 01:25:59 +01:00
howard-stearns
fe8fe816f4
accept forced physics results from entity server (e.g., when filtered)
2017-01-30 16:14:40 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -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
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Stephen Birarda
304618f51d
cleanup comment and scoping for server script URL changes
2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9
a simple hack to accept newer server scripts
2017-01-25 12:39:41 -08:00
howard-stearns
7b986dcac6
works, but removes an optimization we'd like to keep
2017-01-20 17:03:52 -08:00
Stephen Birarda
33cde412b1
make getJSONParameters thread-safe
2017-01-18 17:49:54 -08:00
Stephen Birarda
a1ad496772
handle match on non-default serverScripts property during entity send
2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034
leverage JSON filter changes to OctreeQuery in EntityServer
2017-01-18 14:58:36 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
Seth Alves
35577f49d0
change the test for when MY_AVATAR collisions are short-circuited
2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba
set DIRTY_COLLISION_GROUP flag when parentID changes
2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6
re-evaluate an entities in-bullet status when parentID changes
2017-01-09 15:28:05 -08:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
Faye Li Si Fi
0556661d13
getting rid of uneccessary flag, fix formatting, and getting it to work yay
2016-12-07 15:40:21 -08:00
samcake
a05e42138c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-14 09:58:12 -08:00
Seth Alves
850361f222
lastEditedBy property for entities
2016-11-10 15:26:28 -08:00
samcake
b563e280e4
Commuting the LIghtEntityItem changes correctly to the LightRenderItem
2016-08-31 13:55:41 -07:00
Andrew Meadows
19cd4648ad
scale collision render mesh correctly
2016-08-24 22:26:56 -07:00
SamGondelman
ccca6d935f
don't fade after physics kick in
2016-08-12 14:35:22 -07:00
SamGondelman
36d9f92101
performance optimization to minimize calling usecTimestampNow
2016-08-09 13:10:02 -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
Andrew Meadows
8009d23f70
more STATIC_MESH and dynamic overlap prevention
2016-06-22 15:20:45 -07:00
Andrew Meadows
702e83ba6a
prevent incompatible entity properties combos
2016-06-21 14:03:21 -07:00
Brad Hefta-Gaub
7ed35399e9
make the application of redundant physics update idempotent to improve action glitches
2016-06-02 18:01:23 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
