Angus Antley
|
eba4a27329
|
added newline to the end of AvatarManager.cpp
|
2018-06-27 05:59:53 +01:00 |
|
amantley
|
39edc21423
|
spaced comment fixed
|
2018-06-26 17:47:36 -07:00 |
|
amantley
|
8b13905d6c
|
final final final coding standards
|
2018-06-26 17:43:45 -07:00 |
|
amantley
|
a89c2ea734
|
removed crust
|
2018-06-26 16:40:51 -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 |
|
Dante Ruiz
|
3cf36bed55
|
making small adjustments
|
2018-06-26 14:57:15 -07:00 |
|
Dante Ruiz
|
1fec900ba6
|
disable flying by default
|
2018-06-26 13:31:59 -07:00 |
|
amantley
|
fa1a9d04e0
|
everything working before trying to move otheravatar to interface
|
2018-06-26 13:18:26 -07:00 |
|
Angus Antley
|
b8dea4b869
|
adding changes to add the orb when an avatar is processed by the avatar mixer
and when a new model is being loaded for an avatar. The orb is removed
when the geometry has loaded.
|
2018-06-26 06:27:18 +01:00 |
|
Andrew Meadows
|
756f34761f
|
don't build AvatarMotionStates until physics enabled
|
2018-06-25 10:37:54 -07:00 |
|
David Rowe
|
af3861def8
|
Code review
|
2018-06-25 16:33:05 +12:00 |
|
David Rowe
|
40fb627504
|
Merge branch 'master' into 21892
|
2018-06-25 16:04:44 +12:00 |
|
Simon Walton
|
0dca842102
|
Add avatar identity requests to analytics
|
2018-06-22 17:06:33 -07:00 |
|
Simon Walton
|
269d803812
|
New approach to tracking no-identity duration
|
2018-06-22 16:42:37 -07:00 |
|
John Conklin II
|
b7069fff71
|
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
|
2018-06-22 13:27:11 -07:00 |
|
Simon Walton
|
e5b35b1cd9
|
Clang doesn't support digit separators yet
|
2018-06-22 12:01:00 -07:00 |
|
Sam Gondelman
|
44a7d04b2a
|
Merge pull request #13426 from SamGondelman/avatarPriority
Highest loading priorities for avatars and attachments
|
2018-06-22 11:22:10 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
amantley
|
3027f8242c
|
added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp
|
2018-06-21 17:23:03 -07:00 |
|
Simon Walton
|
6796af4b6a
|
Move sendAvatarIdentityRequest() to a more logical location
|
2018-06-21 15:00:51 -07:00 |
|
amantley
|
e4ca6c6303
|
added the fixes for the lurch that happens when driving or flying
|
2018-06-21 11:22:26 -07:00 |
|
amantley
|
8fc04776f9
|
starting to implement the step detection code in MyAvatar.cpp
|
2018-06-21 10:59:07 -07:00 |
|
Simon Walton
|
d789c4573b
|
Add couple of comments
|
2018-06-20 17:44:58 -07:00 |
|
SamGondelman
|
8f411ad6c8
|
CR
|
2018-06-20 16:13:10 -07:00 |
|
SamGondelman
|
8014f61243
|
loading priorities for avatars and attachments
|
2018-06-20 12:29:28 -07:00 |
|
Simon Walton
|
d638bdd986
|
First pass at requesting ID for unknown data
Keep list of AvatarData that was created from a
data packet without a matching ID. If items get
old enough send an ID request and remove them.
|
2018-06-20 12:21:39 -07:00 |
|
sabrina-shanman
|
a8b2da14cf
|
Format numeric constant in strafe crash commit to match coding standards
|
2018-06-20 08:45:12 -07:00 |
|
sabrina-shanman
|
45fdf3d68f
|
Fix crash when walking sideways
|
2018-06-19 17:23:00 -07:00 |
|
Andrew Meadows
|
085130e3c9
|
avatars collide again again
|
2018-06-18 13:17:32 -07:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +12:00 |
|
David Rowe
|
249f72758e
|
Fix entity detaching from head joint not becoming visible
|
2018-06-15 16:36:16 +12:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
Anthony J. Thibault
|
608575cf17
|
Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
|
2018-06-07 15:31:40 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
amantley
|
97831e61f0
|
removed stray comments
|
2018-06-07 12:54:46 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
Anthony J. Thibault
|
558711f906
|
Smooth hips transition between idle and fly.
Also, take dt into account for the critically damped spring lerp calculation.
|
2018-06-04 16:57:41 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
amantley
|
3bda5bf6a0
|
added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h
|
2018-05-31 17:58:37 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
amantley
|
7cc5e96f2d
|
Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
|
2018-05-31 10:35:31 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
samcake
|
2e9076c71e
|
Clean up and trying to get ready for merge
|
2018-05-30 11:14:49 -07:00 |
|
samcake
|
873cabe284
|
Cleaning the code
|
2018-05-29 17:46:25 -07:00 |
|
David Rowe
|
0db440931e
|
Miscellaneous JSDoc fixes
|
2018-05-30 10:02:30 +12:00 |
|
samcake
|
82503a9e64
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-29 08:59:37 -07:00 |
|
Sam Gateau
|
678effdb48
|
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
|
2018-05-26 23:28:59 -07:00 |
|
Sam Gateau
|
aa49595a23
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 18:19:55 -07:00 |
|
NissimHadar
|
d01482bf68
|
Now looks for an actual change in the boom length (vs a change has been requested).
|
2018-05-24 17:44:39 -07:00 |
|
NissimHadar
|
9ed8c04097
|
Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode
|
2018-05-24 17:40:21 -07:00 |
|
Anthony Thibault
|
eae5215d94
|
Merge pull request #13206 from ctrlaltdavid/21872-c
JSDoc fixes
|
2018-05-24 16:44:55 -07:00 |
|
samcake
|
44a8d880fa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 14:31:53 -07:00 |
|
Andrew Meadows
|
31dd59d212
|
double bits in collision groups
|
2018-05-24 11:28:52 -07:00 |
|
Sam Gateau
|
13d02011f3
|
There and back again...
|
2018-05-24 00:53:29 -07:00 |
|
samcake
|
5bede45c85
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-23 11:26:07 -07:00 |
|
NissimHadar
|
e07e716d40
|
Fixed stupid gcc warning.
|
2018-05-23 07:35:25 -07:00 |
|
NissimHadar
|
06203d44d8
|
Correct Camera.mode command.
|
2018-05-22 17:08:28 -07:00 |
|
David Rowe
|
6d4f704279
|
Regularize some JSDoc usage
|
2018-05-21 09:32:10 +12:00 |
|
samcake
|
3aaa01788c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-18 17:42:30 -07:00 |
|
samcake
|
36a08fdd84
|
Friday night end of the day, last compilation.... almost
|
2018-05-18 17:41:28 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
samcake
|
aa18aaa7b1
|
Maybe
|
2018-05-17 18:06:46 -07:00 |
|
David Rowe
|
6db4dd8673
|
Merge branch 'master' into 21872-b
# Conflicts:
# interface/src/ui/Snapshot.h
|
2018-05-17 20:11:14 +12:00 |
|
samcake
|
735db27919
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-16 17:18:23 -07:00 |
|
John Conklin II
|
8d437892cb
|
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing
Fix hips position when flying
|
2018-05-16 12:37:07 -07:00 |
|
Dante Ruiz
|
e676348c4f
|
fixing some menu reog bugs
|
2018-05-16 10:40:28 -07:00 |
|
luiscuenca
|
7b48dc2370
|
normalize vector
|
2018-05-16 10:17:38 -07:00 |
|
David Rowe
|
f629022b8c
|
AvatarList API JSDoc stubs
|
2018-05-16 10:16:13 +12:00 |
|
David Rowe
|
fdeb0e3305
|
Avatar API JSDoc stubs
|
2018-05-16 09:20:54 +12:00 |
|
luiscuenca
|
4b09f1dc30
|
Fix vector transformation when calculating flying hip position
|
2018-05-15 14:19:17 -07:00 |
|
Andrew Meadows
|
c5773cbe84
|
restore 'virtual' keyword for overrides
|
2018-05-15 13:59:22 -07:00 |
|
Thijs Wenker
|
8b4298514e
|
send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false
|
2018-05-15 21:39:17 +02:00 |
|
Thijs Wenker
|
bfe210da75
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
|
2018-05-15 16:48:51 +02:00 |
|
Anthony J. Thibault
|
ec638d9d91
|
Avatar can now look straight down without spinning 180.
Also, come code clean up and removal of unnecessary Y_180 flips.
|
2018-05-14 13:48:04 -07:00 |
|
Andrew Meadows
|
a30e06d594
|
don't blend avatar position when far from target
|
2018-05-14 09:58:16 -07:00 |
|
Anthony J. Thibault
|
1cc7eb635f
|
Fix ubuntu warning by removing cancelOutRollAndPitch2()
|
2018-05-14 09:13:26 -07:00 |
|
Anthony J. Thibault
|
274ac98bd6
|
Merge branch 'master' into nativeCGCode
|
2018-05-14 09:12:08 -07:00 |
|
vladest
|
0a67fc3b36
|
Merge conflicts
|
2018-05-12 11:24:35 +02:00 |
|
Andrew Meadows
|
6de175e794
|
avatars collide again
|
2018-05-11 17:01:48 -07:00 |
|
John Conklin II
|
5cd225e4de
|
Merge pull request #12947 from jherico/feature/splash2
Additional work on splash screen
|
2018-05-11 11:26:37 -07:00 |
|
amantley
|
20c960c0da
|
removed white space in MyAvatar.cpp
|
2018-05-09 15:00:20 -07:00 |
|
amantley
|
eff84de99f
|
added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT
|
2018-05-09 14:55:10 -07:00 |
|