Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 08:07:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75543 commits 69 branches 56 tags 1.2 GiB
Commit graph

31012 commits

Author SHA1 Message Date
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
Brad Davis
1d93b6ada0 Support gpu timing on systems with disjoint timer extension 2019-01-28 15:52:21 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
Jeff Clinton
9b09c09aeb
Merge pull request #14770 from sabrina-shanman/hfm_prep_tangents 
(case 20822) Add normal/tangent generation to HFM preparation step
 2019-01-28 12:41:55 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11 
Case 20700: Add missing pulse properties to certain Entity types
 2019-01-28 10:51:00 -08:00
Shannon Romano
b9b21b7f87
Merge pull request #14712 from AndrewMeadows/shaped-zones-2 
case 20597: fix zones using FBX models with non-trivial mesh.modelTransform
 2019-01-25 17:33:45 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Shannon Romano
fc12975231
Merge pull request #14780 from davidkelly/dk/20362 
Transmit octree string parameters as utf-8 strings
 2019-01-25 17:29:02 -08:00
Adam Smith
e648ce38c0
Merge pull request #14679 from sabrina-shanman/bug_uv-scale 
(case 20096) Fix missing support for UV scaling parameters in FBX files
 2019-01-25 16:21:15 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough 
Case 20241: Material entity fallthrough
 2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
Wayne Chen
6f49914167 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9 more code review feedback 2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1 code review feedback 2019-01-25 11:36:58 -08:00
Brad Davis
81a7fa17bf PR feedback 2019-01-25 11:14:40 -08:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale 
20565 Avatar::_collideWithOtherAvatars does not scale
 2019-01-25 11:06:36 -08:00
Jamil Akram
7e6af92700
Merge pull request #14771 from hyperlogic/bug-fix/avatar-translation-bug 
Bug fixes for avatarData protocol
 2019-01-25 10:52:15 -08:00
Shannon Romano
fd04996853
Merge pull request #14755 from hyperlogic/bug-fix/joint-mesh-name-collisions 
Bug fix for avatars that have mesh/joint name duplicates
 2019-01-25 09:59:44 -08:00
Shannon Romano
6baa9d9d8c
Merge pull request #14763 from SimonWalton-HiFi/pluginmanager-filtering 
Allow filtering on plugin metadata to avoid inappropriate plugins
 2019-01-25 09:51:12 -08:00
David Kelly
05d56a5fe9 Transmit octree string parameters as utf-8 strings 2019-01-25 08:43:56 -07:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix 
Shape type and compound shape property fixes
 2019-01-24 16:18:34 -08:00
sabrina-shanman
5993aab174 Fix linker error and build warnings 2019-01-24 14:43:43 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00
Anthony Thibault
77fb20801f Bug fixes for avatarData protocol 
Two issues were recently discovered after they were introduced by PR #14733

1) The Avatar Mixer would sometimes have incorrect translation scale when splitting BulkAvatarData across multiple MTUs
2) Old avatar recordings would no longer work properly.

This PR should fix both of these issues.
 2019-01-24 14:24:11 -08:00
sabrina-shanman
64ef8b6919 Do not pass in whole hfm::Model by reference to tangent calculation prep steps 2019-01-24 13:03:51 -08:00
sabrina-shanman
fe60b8e69b Remove now redundant tangent generation code 2019-01-24 13:03:51 -08:00
sabrina-shanman
9bb7e4dced Create normal/tangent calculation tasks for meshes/blendshapes 2019-01-24 13:03:44 -08:00
Simon Walton
cc6caa61a7
Change common warning to debug 2019-01-23 21:02:52 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
Simon Walton
74748b15fd Add a filter functor to the plugin manager and use it in AudioMixer 2019-01-23 17:28:18 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Sam Gateau
3ec9290dca
Merge pull request #14619 from SamGondelman/matTarget 
Case 20240: Better material entity targeting
 2019-01-23 15:47:22 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision 
Avatar Protocol: Fix for precision issues with translation
 2019-01-23 14:07:58 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
David Back
ea5705907b fix shape type and compound shape URL properties/tooltips 2019-01-22 18:22:13 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats 
cases 20709 and 20715: wear and see mexico hats
 2019-01-22 12:58:56 -08:00
John Conklin II
4050e4d998
Merge pull request #14740 from AndrewMeadows/fix-case-20731 
Case 20731: send updates when grabbing AvatarEntities
 2019-01-22 12:33:25 -08:00
Anthony Thibault
5146f3dfae Bug fix for avatars that have mesh/joint name duplicates 
This change has two parts.  First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
 2019-01-22 10:47:01 -08:00
Brad Davis
6fb869126e GPU state cleanup 2019-01-22 10:37:08 -08:00
SamGondelman
49947d9f6d better default values 2019-01-21 16:51:08 -08:00
raveenajain
3f2aa56187 feedback changes 2019-01-21 13:24:07 -08:00
SamGondelman
5b1ea24d20 glsl initializer lists are 4.2 2019-01-21 12:35:48 -08:00
Anthony Thibault
5dbd62cc67 code review feedback 2019-01-18 17:52:53 -08:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -08:00
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
Sam Gondelman
17ac4138b6
typos 2019-01-18 13:43:56 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00