Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-27 11:46:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75649 commits 6 branches 1 tag 1.1 GiB
Commit graph

31065 commits

Author SHA1 Message Date
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
Andrew Meadows
fd457a9c0e remove cruft and fix a resource leak 2019-01-23 23:19:20 -08:00
Andrew Meadows
d948168727 computeMotionType() returns KINEMATIC for things with grab 2019-01-23 21:30:15 -08:00
Andrew Meadows
965d0ccf60 reduced priority for AvatarEntities 2019-01-23 21:29:49 -08:00
Andrew Meadows
de68f6ca49 use Hold action 
use Hold action for any non-dynamic Entity with Body in phys simulation
also set DIRTY_MOTION_TYPE bit, add to changed list on add/remove grab
 2019-01-23 21:26:57 -08:00
Andrew Meadows
1bdcf8f0cb MyAvatar bids for ownerhsip on grab 2019-01-23 21:26:10 -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
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -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
luiscuenca
a947c894c2 Suggested changes 2019-01-23 17:23:36 -07: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
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits 
case 15962: case 20481: Mouse grab with traits
 2019-01-18 11:56:41 -08:00
luiscuenca
43244193e8 Mesh picking against default pose with transformed ray 2019-01-18 12:46:18 -07:00
Anthony Thibault
e68a8794ce Remove unused variable 2019-01-17 16:18:43 -08:00
SamGondelman
717da1b6fa track texture loading 2019-01-17 15:59:32 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277 
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
 2019-01-17 15:36:31 -08:00
Shannon Romano
0370268f56
Merge pull request #14723 from SimonWalton-HiFi/connection-parented-to-socket 
Make Connection class a Qt-child of Socket class
 2019-01-17 15:35:29 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
Andrew Meadows
e22024b0dd revert attempted fix for non-zero velocity for hats 2019-01-17 13:34:36 -08:00
Seth Alves
4fbc257be0 don't cauterize head-children when they are grabbed 2019-01-17 13:34:36 -08:00
Seth Alves
2bf7ac2745 fix bug that was introducing a local velocity to an entity when it was parented to a moving avatar 2019-01-17 13:34:36 -08:00
John Conklin II
d64858b1c7
Merge pull request #14724 from sethalves/fix-excessive-cauterization-update 
case 15942: fix bug that caused avatar cauterization code to run constantly
 2019-01-17 12:59:57 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
SamGondelman
8d2e81a13b Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-17 10:27:43 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
SamGondelman
62b853816a deprecate the new property so that people hopefully don't use it 2019-01-16 19:35:15 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
d38a657c54 filling username with oculus username, checking create error 2019-01-16 17:05:54 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4 better check for if oculus is running 2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0 fixing typos in callback implementation 2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b changing request to have a callback function passed 2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4 migrating platform plugin 2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58 more staging 2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718 oculus functions live in the display plugin; display plugins update 2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6 staging 2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6 adding new plugin 2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
SamGondelman
3835796419 deprecate the new property so that people hopefully don't use it 2019-01-16 14:01:05 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
Seth Alves
1104e56bc3 fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level 2019-01-16 13:23:27 -08:00
Simon Walton
024cb70fce Change member-initializer order to fix warnings 2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d Pass udt::Socket pointer in initializer-list for udt::Connection 2019-01-16 12:08:02 -08:00
Ken Cooke
328809f008 More robust approximation of distance attenuation at extreme settings. 
Fixes artifacts that occur when attenuation zone coef = 1.0 and distance > 32m.
 2019-01-16 11:10:38 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv 
pepper AssociatedTraitValues with some needed comments
 2019-01-16 10:59:08 -08:00
birarda
a63c2b3e29 pepper AssociatedTraitValues with some needed comments 2019-01-16 10:15:04 -08:00
luiscuenca
67cc5bd7f2 Fix warnings and wrong shapes position for myAvatar 2019-01-16 10:52:34 -07:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
Anthony Thibault
104084d811 Avatar Mixer Protocol: Normalize translation before compression 2019-01-15 18:56:09 -08:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04 
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
 2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
SamGondelman
1d2270e9c7 web entity fixes 2019-01-15 16:51:36 -08:00
Seth Alves
c4fc884bce ignore position edits from server when grabs are in effect 2019-01-15 16:35:20 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge 
log purge
 2019-01-15 16:19:03 -08:00
Seth Alves
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
Roxanne Skelly
6317ceb9b3 Case20277 - Ignoring user causes loading orb to appear at /0,0,0 
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
 2019-01-15 13:34:29 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large 
Log a warning if an entity's property is too large
 2019-01-15 12:00:04 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
sabrina-shanman
df17614fc3 Actually, don't support 3d vectors for Maya uv scale/offset 2019-01-15 11:16:22 -08:00
sabrina-shanman
f02d6433e3 Be more descriptive about Maya uv scale/translation property, and better guess for 3d vector case 2019-01-15 11:09:16 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280 
fix a couple shutdown crashes and a class of asan warning
 2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix 
Fix the distance attenuation of stereo local injectors
 2019-01-15 10:54:54 -08:00
sabrina-shanman
c875492d50 Be more efficient with MaterialParam in FBXSerializer::getTexture 2019-01-15 10:29:12 -08:00