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

351 commits

Author SHA1 Message Date
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
luiscuenca
ad09007bd8 Fix flickering holded entity, renames and refactors 2018-10-13 16:32:51 -07:00
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -07:00
luiscuenca
de1b6e717f Cancel animation on chained trasits 2018-10-11 11:35:56 -07:00
luiscuenca
1adac78828 fix errors and set new anim parameters 2018-10-11 10:45:35 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Seth Alves
de8ae9156c fix build on clang 7 2018-10-09 12:25:01 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00