Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 14:47:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69406 commits 25 branches 0 tags 1.1 GiB
Commit graph

1858 commits

Author SHA1 Message Date
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
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -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
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
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -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
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
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
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
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
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
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
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
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
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -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
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
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
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
amantley
50f225777a removed debug code from cg code in MyAvatar.cpp 2018-05-09 11:31:19 -07:00
amantley
a7955b642a removed the follow hips code from pre physics update 2018-05-09 11:27:04 -07:00
amantley
77aedc1512 changed lerp to saferLerp in cg code 2018-05-09 11:14:13 -07:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
amantley
6051f4b8ff Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode 
synching the branch with the remote repo
 2018-05-08 10:55:14 -07:00
amantley
544967ef3b added test function to cancel out roll and pitch 2018-05-08 10:55:10 -07:00
amantley
bbf8c73572 code review changes to declare functions static 2018-05-08 10:52:28 -07:00