Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 01:23:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
69416 commits 76 branches 59 tags 1.2 GiB
Commit graph

782 commits

Author SHA1 Message Date
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster 
The client should render "something" for an avatar even if mesh or identity is not available
 2018-06-28 12:12:16 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default 
Disable flying by default
 2018-06-27 16:04:16 -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
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -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
Dante Ruiz
1fec900ba6 disable flying by default 2018-06-26 13:31:59 -07:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +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
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 Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode 
Center of Gravity Leaning
 2018-06-08 17:53:55 -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
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
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
David Rowe
0db440931e Miscellaneous JSDoc fixes 2018-05-30 10:02:30 +12:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -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
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
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12: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
Anthony J. Thibault
274ac98bd6 Merge branch 'master' into nativeCGCode 2018-05-14 09:12:08 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
luiscuenca
2ac7fcadd2 load scripts once on rigReady 2018-05-01 09:37:01 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
Thijs Wenker
9e086dda3c Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-30 17:32:49 +02:00
Anthony J. Thibault
c6b12307aa Added custom jsdoc tags to High Fidelity 
There are 4 new jsdoc tags:

* @hifi-interface - indicates that this namespace or class is available in Interface Scripts.
* @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts.
* @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts.
* @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts.

These tags should appear just after the @class or @namespace tag. For example:

    /**jsdoc
     * Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar.
     * For example, you can customize the avatar's appearance, run custom avatar animations,
     * change the avatar's position within the domain, or manage the avatar's collisions with other objects.
     *
     * @namespace MyAvatar
     *
     * @hifi-interface
     * @hifi-client-entity
     *
 2018-04-26 14:13:42 -07:00
luiscuenca
12f578c93c More fixes 2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
Thijs Wenker
bbd31d590b defaults 2018-04-26 03:12:44 +02:00
Thijs Wenker
8b7a07577c Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes 2018-04-26 03:09:44 +02:00
Thijs Wenker
484e20ea55 JSDOC - change bool type to boolean, to match JS type 2018-04-25 19:01:18 +02:00
Thijs Wenker
192e48a376 style fix + JSDocs 2018-04-25 13:47:00 +02:00