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

167 commits

Author SHA1 Message Date
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Dante Ruiz
bbcf865db3 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities 2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8 don't update avatar entities if the avatars ID is AVATAR_SELF_ID 2018-02-15 15:02:45 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
samcake
6357f36a97 Fixing names 2018-02-14 10:39:14 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
samcake
a98f55298b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-02-13 13:06:58 -08:00
samcake
f64e5f2444 Introducing the cull group 2018-02-13 13:06:26 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
SamGondelman
c8aded0688 watch for attachment texture loading 2018-01-18 12:40:02 -08:00
Seth Alves
45406177e5 avoid a deadlock when clearing avatar entities 2018-01-17 17:56:25 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08:00
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Dante Ruiz
980807c657 make changes 2018-01-10 16:50:41 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix 
Fix avatar texture loading
 2018-01-08 14:01:15 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Dante Ruiz
597cb6ae9e remove unused variables 2018-01-04 13:57:15 -08:00
Dante Ruiz
a204685566 don't do unnecessary work 2018-01-04 13:44:04 -08:00
Dante Ruiz
527d00871a making relaying translation work 2018-01-04 11:57:51 -08:00
Dante Ruiz
e1a7f9bfb8 working on imporving soft-entities 2018-01-03 08:47:11 -08:00
Dante Ruiz
6fa3446c57 joints are being relayed to children 2018-01-02 13:54:13 -08:00
Dante Ruiz
be9bf31843 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-02 08:04:26 -08:00
druiz17
0ebbb76b49 fixed property over written issue and start relaying joints 2017-12-29 16:12:40 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Brad Davis
c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov 2017-12-16 16:20:16 -08:00
Brad Davis
6cff86b0f3 Fix polyvox archive, correct build errors, add additional libraries 2017-12-12 18:29:36 -08:00
Seth Alves
d095d4ef44 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-08 07:19:33 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Anthony J. Thibault
095bedcd3f code review feedback 2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00