Commit graph

28 commits

Author SHA1 Message Date
Andrew Meadows
fab3e5e3fd remember hash of AvatarEntityItemData 2019-02-11 16:13:56 -08:00
luiscuenca
f54f9e5bfd Merge branch 'master' into multiSphereAvatar04 2019-01-25 13:54:01 -07:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -08:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
luiscuenca
65896b3b6f Fix shape LOD 2019-01-13 11:30:39 -07:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
Andrew Meadows
9ea6968e35 fix bug where attached AvatarEntities do not update in timely fashion 2019-01-09 17:40:18 -08:00
luiscuenca
39dc25ea92 Merge branch 'master' into multiSphereAvatar04
# Conflicts:
#	interface/src/avatar/OtherAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
2019-01-08 15:41:33 -07:00
luiscuenca
f19201fc92 Other avatar detailed collisions on motion state 2019-01-08 14:09:13 -07:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
luiscuenca
21a4da4d5f fix collisions for newly added avatars 2019-01-03 13:36:26 -07:00
luiscuenca
4a8bbd79fe other avatars motion states 2018-12-30 10:53:28 -07:00
Andrew Meadows
a3f946dee1 activate OtherAvarar in physics sim on position change 2018-09-24 16:27:37 -07:00
Andrew Meadows
c1d65f5118 update avatar shape after it loads 2018-09-24 12:07:08 -07:00
Anthony Thibault
bc5d9a46a2 Avatar loading orb now indicates status
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
Andrew Meadows
87223946ad add/remove avatars according to workload region 2018-08-23 12:59:28 -07:00
Andrew Meadows
3ecabb6583 cleanup after removing spaghetti 2018-08-23 12:59:28 -07:00
Andrew Meadows
99aafb1f95 move code from Avatar to OtherAvatar 2018-08-23 12:59:28 -07:00
Andrew Meadows
615b8addd0 fix order of includes 2018-08-23 12:59:28 -07:00
Andrew Meadows
3c01433e12 stub for avatars changing workload regions 2018-08-23 12:59:28 -07:00
Andrew Meadows
21adbf49c0 remove cruft 2018-08-23 12:59:28 -07:00
Andrew Meadows
15665b25e8 give OtherAvatars a proxy in workload 2018-08-23 12:59:28 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also
added the virtual keyword to the createOrb virtual method in OtherAvatar
2018-06-27 14:31:39 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
amantley
1804422df0 remove orb in the otherAvatar destructor, and check
_otherAvatarOrbMeshPlaceholder pointer before updating the position
2018-06-27 11:15:42 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00