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
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix
2019-01-07 14:57:38 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
SamGondelman
b5b7574c48
set created
2019-01-04 16:52:11 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Jeff Clinton
c2c744b44e
Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed
...
Correctly set avatar-scale timestamp when changing in Avatar class
2019-01-04 10:00:46 -08:00
Anthony Thibault
fa137f0586
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-03 13:19:11 -08:00
Seth Alves
3c0243419b
trying again on avatar-entity grab releases
2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1
fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again
2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de
don't crash when releasing an entity that has expired
2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
Anthony Thibault
d87bc3e898
Update eye look at interest calculation
...
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
luiscuenca
bd21d0589a
Merge branch 'master' into otherAvatarMotionStates01
2018-12-30 10:55:05 -07:00
luiscuenca
4a8bbd79fe
other avatars motion states
2018-12-30 10:53:28 -07:00
Simon Walton
9cb53af023
Correct set avatar-scale timestamp when changing in Avatar class
2018-12-19 16:13:12 -08:00
amantley
42a17980cb
fixed mac build conflict, unused variable
2018-12-17 16:21:22 -08:00
Angus Antley
77fa4e7d13
took out the unnecessary hfm.jointindex code
2018-12-16 17:29:16 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays
2018-12-06 11:29:06 -08:00
SamGondelman
e282d51883
CR
2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
...
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
SamGondelman
df1a848811
fix fade out
2018-11-12 12:58:40 -08:00
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
Andrew Meadows
6ecf850159
clarify ShapeInfo::setCapsuleY() API and use it correctly
2018-11-06 12:37:55 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
...
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix
...
Extra joints on soft entities keep their local transform
2018-11-01 09:29:16 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
luiscuenca
b8cd5045c7
Extra joints on soft entities keep their local transform
2018-10-24 12:54:09 -07:00
SamGondelman
a3c42363cc
please for the love of god
2018-10-24 12:43:01 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation
...
Add animations to Avatar Transit
2018-10-24 10:51:21 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix
...
Sit State for the seated user in HMD: Squatty Potty Fix
2018-10-23 15:20:49 -07:00
SamGondelman
0efbdc1ab5
merge with master
2018-10-23 14:33:57 -07:00
Brad Davis
c8e664a0a1
New SPIRV Shader toolchain
2018-10-23 10:40:12 -07:00
amantley
cce2f295a1
fixed conflict in myskeletonmodel.cpp
2018-10-22 17:49:30 -07:00
SamGondelman
09ea32dcc0
fix fading and highlighting issues
2018-10-22 14:12:43 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape
...
Move blendshape buffers to render thread
2018-10-19 11:55:44 -07:00
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
SamGondelman
47c6825aea
CR
2018-10-18 11:08:53 -07:00
luiscuenca
078baa86e4
Sitting abort post transit animation
2018-10-16 13:16:01 -07:00
