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

31050 commits

Author SHA1 Message Date
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2 
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
 2019-01-29 13:12:51 -08:00
Ken Cooke
b0f8afa772 CR: don't expose "position" when not set 2019-01-29 11:21:17 -08:00
Ken Cooke
fa08e42da6 Restore legacy attenuation behavior for system sounds and scripts that do not set position. 
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
 2019-01-29 11:21:02 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature 
MS20874: Only initialize plugin if started through Oculus Store
 2019-01-29 10:57:03 -08:00
Jamil Akram
f4ead69549
Merge pull request #14722 from luiscuenca/multiSphereAvatar04 
Multi-sphere avatar detailed collisions
 2019-01-29 10:10:04 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
luiscuenca
70d0ebfbec Optimization 2019-01-28 18:39:16 -07:00
luiscuenca
a6dce5dd84 Merge branch 'master' into multiSphereAvatar04 2019-01-28 17:48:22 -07:00
luiscuenca
fced9e2814 Review fixes 2019-01-28 17:43:51 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it 
case 20701: fixes for grab
 2019-01-28 15:57:36 -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
Wayne Chen
0f1aebea82 adding init/shutdown for plugin init 2019-01-28 14:35:41 -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
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
luiscuenca
cc73649ef8 Merge branch 'master' into multiSphereAvatar04 2019-01-28 11:57:04 -07: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
Andrew Meadows
f2b9f088b4 fix bad comparison causing undeleted grabs 2019-01-28 08:58:57 -08:00
Sam Gondelman
4d83c7f6df
fix line rendering mode 2019-01-27 00:02:06 -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
luiscuenca
f54f9e5bfd Merge branch 'master' into multiSphereAvatar04 2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb More fixes 2019-01-25 13:42:18 -07: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
Andrew Meadows
c9ef439a7f fix more grab bugs 2019-01-25 08:46:24 -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
Andrew Meadows
09fe9735fa plug grab leak, more correct names 2019-01-24 14:57:54 -08:00
sabrina-shanman
5993aab174 Fix linker error and build warnings 2019-01-24 14:43:43 -08:00
Andrew Meadows
ee3fde9df1 unravel spaghetti, prefer std over Qt containers 2019-01-24 14:39:00 -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
Andrew Meadows
aff1244e09 make method protected because we can 2019-01-23 23:19:48 -08:00
Andrew Meadows
b73187aed9 fix typo in comment 2019-01-23 23:19:33 -08:00