Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
...
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
2019-01-30 17:00:12 -08:00
Brad Davis
67cf08e8ae
Quest frame player
2019-01-30 16:23:22 -08:00
Brad Davis
b1eb0b0a46
GPU tweaks
2019-01-30 16:23:21 -08:00
Brad Davis
5d1277e1bb
GL helpers cleanup
2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -08:00
Brad Davis
c46d73128b
Merge branch 'feature/quest_frame_player' into feature/quest
2019-01-30 16:16:51 -08:00
Seth Alves
f33e5ba5ae
cleanup
2019-01-30 14:47:38 -08:00
Bradley Austin Davis
c2dca9d0e8
Fix entities cmakelists.txt
2019-01-30 14:45:06 -08:00
Seth Alves
3ab2db96b6
deactivate grab action when grab is released
2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6
attempt to allow position edits in releaseGrab entity-method
2019-01-30 14:43:11 -08:00
Dante Ruiz
93a91cdba2
webengine fileselector
2019-01-30 13:57:49 -08:00
Simon Walton
08b21109c1
Include the new scale float in min remaining size calculation
2019-01-30 13:55:12 -08:00
Brad Davis
a310eec41e
Support relative paths in serialized frames
2019-01-30 13:15:23 -08:00
Brad Davis
6cea0d9012
Quest frame player
2019-01-30 13:15:23 -08:00
Brad Davis
f490a6c231
GPU tweaks
2019-01-30 13:15:23 -08:00
Brad Davis
1dfdf220c0
GL helpers cleanup
2019-01-30 13:15:23 -08:00
Brad Davis
20eec33b8b
CMake cleanup and modernization
2019-01-30 13:15:23 -08:00
Brad Davis
2f92e10142
Support using prefering mobile compressed textures on desktop
2019-01-30 13:15:22 -08:00
SamGondelman
93e32f1bd5
fix skybox depth testing
2019-01-30 12:25:48 -08:00
SamGondelman
57ee9786af
fix picks vs. local entities
2019-01-30 11:42:05 -08:00
SamGondelman
834e44dd3a
make polyline's with faceCamera not depend on normal
2019-01-30 11:02:24 -08:00
Brad Davis
10a7403d44
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-30 10:19:46 -08:00
Brad Davis
f146c9fe77
Quest frame player work
2019-01-30 10:17:57 -08:00
Sam Gateau
b47ecc9890
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-01-30 09:17:02 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
...
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent
...
Case 20867: Fix translucent textures not getting reset
2019-01-30 08:54:48 -08:00
SamGondelman
56096708d3
one more try
2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9
fix color space
2019-01-29 14:52:57 -08:00
Brad Davis
60912b7c76
Updated controller API
2019-01-29 14:23:12 -08:00
Brad Davis
0d34030135
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-29 14:13:11 -08:00
Antonina Savinova
5d49a3f6df
Merge pull request #14732 from kencooke/audio-distattn-improvements
...
Bug fixes and improvements to audio distance attenuation
2019-01-29 14:02:29 -08:00
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
SamGondelman
5be6a31b6c
possible fix for transparency
2019-01-29 12:20:46 -08:00
sabrina-shanman
203e8e2455
Realize joint properties isFree and freeLineage are unused, so tear them out
2019-01-29 11:55:35 -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
Andrew Meadows
e372cb668a
enable CCD for MyAvatar's RigidBody
2019-01-29 11:11:54 -08:00
Andrew Meadows
fb5ef95a5b
disable bf triangle collisions for flying MyAvatar
2019-01-29 11:00:18 -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
sabrina-shanman
eace901278
Fix not calculating joint freeLineage list properly
2019-01-29 10:29:12 -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
SamGondelman
7fa676a846
don't render text parts if alpha == 0
2019-01-29 08:25:17 -08:00
SamGondelman
a8dbe5e761
working on build errors
2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
Sam Gateau
3ab66fde5e
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-01-28 19:22:33 -08:00
SamGondelman
7b88efa42c
trying to fix web surfaces??
2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -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
Sam Gateau
e39a6b5a7d
Merging with master
2019-01-28 17:58:17 -08:00
sabrina-shanman
3e7a80ac4c
Move FST joint name and rig processing to the model preparation step
2019-01-28 17:49:29 -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
sabrina-shanman
ff9280a496
Remove unused properties related to mapping from FBXSerializer
2019-01-28 16:29:36 -08: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
Amer Cerkic
3ab86cfafa
removed duplicated code and type redefinition
2019-01-28 15:52:36 -08:00
Brad Davis
f1d3fc36e5
Cleaning up pre-master merge
2019-01-28 15:52:36 -08:00
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
SamGondelman
445608e163
fix entity selection tool
2019-01-28 15:30:19 -08:00
Roxanne Skelly
a4d105f24f
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 15:17:08 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
SamGondelman
2db45b3ec9
dante's keyboard changes + getProperty + some fixes
2019-01-28 14:03:43 -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
Roxanne Skelly
d3cffa50d6
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 11:11:28 -08:00
raveenajain
e112bf19cb
gltf color attribute
2019-01-28 11:08:09 -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 Gateau
a747bf4cbd
Exploring removing the COmpositing buffer in the display plugin, using srgb for swapchain and debuging from there
2019-01-27 23:48:55 -08:00
Sam Gondelman
4d83c7f6df
fix line rendering mode
2019-01-27 00:02:06 -08:00
SamGondelman
0dd729232b
simplify keyboard focus highlight
2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b
pointerevents are working!
2019-01-26 21:53:46 -08:00
Sam Gateau
a2bd802707
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-01-26 12:15:53 -08:00
SamGondelman
abd7d6bddf
some stuff is working!
2019-01-26 01:39:13 -08:00
SamGondelman
bb5c556657
working on conversion
2019-01-25 19:15:53 -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
becc9f4f8d
DELETE IT ALL
2019-01-25 16:06:59 -08:00
SamGondelman
a10f52c66d
merge with master
2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 14:06:44 -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
Roxanne Skelly
6123c4ec96
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 13:45:04 -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
SamGondelman
5ce8f566cc
more overlay wip
2019-01-25 11:10:11 -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
Roxanne Skelly
cfaf01b22a
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d
QML Marketplace
...
Checkpoint full functionality
2019-01-24 17:20:42 -08: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
SamGondelman
ca8d64bc05
removing overlays wip
2019-01-24 14:59:45 -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
SamGondelman
0bfcde67ea
remove overlays from application.cpp
2019-01-24 14:11:24 -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
217ff2b1b2
keyboardFocusOverlay
2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60
merge with master
2019-01-23 17:58:56 -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
Sam Gateau
f9891775fc
Enabling msaa framebuffer and testing for forward
2019-01-21 23:07:59 -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
SamGondelman
618146e885
fix animation url change
2019-01-18 15:36:10 -08:00
SamGondelman
d17e04967a
fix zone bugs
2019-01-18 13:49:16 -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
SamGondelman
9803043512
web entity fixes
2019-01-15 09:51:55 -08:00
Andrew Meadows
4771fa5f27
fix zones using FBX models with non-trivial mesh.modelTransform
2019-01-15 09:17:48 -08:00
Dante Ruiz
4ab7308669
addressing code review requests
2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07
fixes from 78
2019-01-14 13:36:21 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
sabrina-shanman
5173577a92
Fix issues with uv scale checking
2019-01-14 10:11:30 -08:00
Brad Hefta-Gaub
a115af6353
Merge pull request #14674 from kencooke/audio-asan-warnings3
...
Fix ASAN warning due to mixed signed/unsigned arithmetic
2019-01-14 09:32:22 -08:00
SamGondelman
6fd34bf1f0
setup qml surface contexts
2019-01-14 09:26:57 -08:00
sabrina-shanman
00a9e9e92f
Add support for Maya material uv scale/translation
2019-01-11 17:14:10 -08:00
sabrina-shanman
5b207775e7
Remove redundant TextureParam transform variables
2019-01-11 17:12:09 -08:00
Seth Alves
1ef047a329
revert unneeded change to LimitedNodeList
2019-01-11 16:49:09 -08:00
Dante Ruiz
8252481ce7
Delete domain entities only
2019-01-11 16:00:10 -08:00
Seth Alves
b71f4e0204
remove commented-out code
2019-01-11 15:53:49 -08:00
Seth Alves
6ca9ab6fba
avoid shutdown crash
2019-01-11 15:53:49 -08:00
Seth Alves
ecb34450bd
quiet uneeded logging
2019-01-11 15:53:49 -08:00
Seth Alves
114bcc003a
quiet build warnings
2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba
rename variable for consistency
2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a
fix a couple shutdown crashes and a class of asan warning
2019-01-11 15:53:49 -08:00
Seth Alves
6cd5770505
Merge pull request #14690 from sethalves/plugin-versioning
...
Plugin versioning
2019-01-11 15:20:05 -08:00
luiscuenca
19701ef333
Fix scale and add rayTest
2019-01-11 15:36:07 -07:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities
...
case 20020: faster avatar entities
2019-01-11 14:13:05 -08:00
Howard Stearns
62ed84aa19
more log purge
2019-01-11 12:34:44 -08:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
Andrew Meadows
bc19689910
remove unnecessary culling of properties
2019-01-10 17:32:52 -08:00
Seth Alves
d31cdd3779
review
2019-01-10 15:35:40 -08:00
Seth Alves
e941dbb4a9
review
2019-01-10 15:33:34 -08:00
Seth Alves
fd8702d5a6
use const references when querying plugin metadata
2019-01-10 15:20:53 -08:00
Seth Alves
6a88941166
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
2019-01-10 15:07:06 -08:00
Andrew Meadows
0098dedcbb
don't update server for AvatarEntity queryAACube
2019-01-09 18:25:12 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap
...
cap the number of considered message channels in PacketQueue
2019-01-09 17:43:36 -08:00
Andrew Meadows
9ea6968e35
fix bug where attached AvatarEntities do not update in timely fashion
2019-01-09 17:40:18 -08:00
Andrew Meadows
b9667a0679
fix merge conflict after rebase
2019-01-09 17:28:00 -08:00
Andrew Meadows
9d6acf007a
fix build after rebase
2019-01-09 17:28:00 -08:00
Andrew Meadows
c998ddbb9e
ScriptableAvatar::setAvatarEntityData() works
2019-01-09 17:28:00 -08:00
Andrew Meadows
63ed0a3a98
move blob conversion recipes to EntityItemProperties
2019-01-09 17:28:00 -08:00
Andrew Meadows
855497e604
MyAvatar.updateAvatarEntity(id, data) works in theory
2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0
MyAvatar.setAvatarEntityData() works
2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104
MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings
2019-01-09 17:28:00 -08:00