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

34806 commits

Author SHA1 Message Date
HifiExperiments
ab1b69ebe3 fix ktx issue 2021-04-01 23:39:00 -07:00
Dale Glass
790d110596 Remove unused variable 2021-04-02 01:15:37 +02:00
Kalila
f5b91b17ea
Merge pull request #1124 from ctrlaltdavid/fix/avatar-parts-rotating 
Fix avatar parts rotating
 2021-04-01 19:11:52 -04:00
Kalila
749c2674b0
Merge pull request #1098 from digisomni/feature/security-package-feb-mar-2021 
Add avatarEntities permissions
 2021-04-01 18:53:40 -04:00
Dale Glass
aa0f8a8304 Fix ShapeEntityItem::getRotateForPicking() 
It declared a variable it didn't use, and instead used the unlocked version.
 2021-04-02 00:24:45 +02:00
Dale Glass
6e9e11993c Add missing override keywords. 
Fixes warnings like:

/libraries/entities-renderer/src/RenderableTextEntityItem.h:47:18: warning: ‘virtual bool render::entities::TextEntityRenderer::needsRenderUpdate() const’ can be marked override [-Wsuggest-override]
   47 |     virtual bool needsRenderUpdate() const;
      |                  ^~~~~~~~~~~~~~~~~
 2021-04-02 00:04:46 +02:00
Dale Glass
2de61898e1 Review style fixes 2021-04-01 23:41:37 +02:00
Kalila
668dbc9ffb
Merge pull request #1134 from daleglass/fix-new-delete-type-mismatch-scripts-model 
Add virtual destructor to TreeNodeBase
 2021-04-01 17:32:10 -04:00
Kalila
4ae4886f36
Merge pull request #1132 from daleglass/fix_renderablemodelentityitem_crash 
Capture by value rather than by reference in RenderableModelEntityItem
 2021-04-01 17:32:00 -04:00
Kalila
f062d64223
Merge pull request #1076 from HifiExperiments/materials 
Material improvements
 2021-03-31 00:13:54 -04:00
Kalila
edf835e48f
Merge pull request #1123 from ctrlaltdavid/fix/gltf-vertex-colors 
Fix glTF vertex colors
 2021-03-30 17:56:07 -04:00
HifiExperiments
7d58c772cb
Merge branch 'master' into materials 2021-03-30 14:31:11 -07:00
Dale Glass
a51c5057ca Add virtual destructor to TreeNodeBase 
Fixes #1131, possibly solves a crash on exit.
 2021-03-30 17:14:45 +02:00
Dale Glass
1759e360b1 Capture by value rather than by reference 
This fixes a stack-use-after-return error in RenderableModelEntityItem.

Fixes #1128
 2021-03-29 22:44:34 +02:00
David Rowe
6a7f4a0426 Redisplay "continue without avatar entities" when re-enter address 2021-03-29 21:14:00 +13:00
David Rowe
c45007d038 Merge branch 'master' into fix/can-rez-attachment 
# Conflicts:
#	interface/src/Application.h
 2021-03-29 15:28:08 +13:00
Kalila
58fde3c159
Merge pull request #1090 from digisomni/feature/expand-kick-functionality 
Add improved functionality for `Users.kick` API.
 2021-03-28 21:05:59 -04:00
Dale Glass
5ffc05f7a7 Fix HIFI_MEMORY_DEBUGGING on Linux/gcc 
It seems that libasan was running into some sort of trouble due to static linking.

Additionally, -fstack-protector-strong has been enabled by disabling the usage of
the FIR_1x4_AVX512 function under memory debugging.
 2021-03-28 18:42:35 +02:00
Dale Glass
e02daae267 Hash Windows and Mac machine fingerprints. 
Now all the fingerprints are hashed. This has the following benefits:

* It doesn't expose raw system IDs. The actual ID is hashed with a
  value unique to Vircadia, so that it doesn't match any other identifier.

* It should be more future-proof. Apple doesn't promise that the platform
  ID will have any particular format. The hashing means it doesn't matter
  if it stops being a valid UUID at some point.
 2021-03-28 17:08:26 +02:00
David Rowe
12ceb0d93e Fix avatar parts rotating 2021-03-28 21:11:58 +13:00
David Rowe
10e2cb1e09 Fix comment typo 2021-03-28 16:42:03 +13:00
David Rowe
f97dfaa3f0 Fix use of glTF normalized values 2021-03-28 16:41:44 +13:00
Kalila
409cc5835c
Merge pull request #1050 from HifiExperiments/imageAspectFix 
Image Entities: fix keepAspectRatio, implement naturalDimensions
 2021-03-27 15:24:43 -04:00
Kalila
4cb9459736
Merge pull request #1047 from Phil-Palmer/optimisation/myavatar 
Small optimisations and tidying related to MyAvatar
 2021-03-26 20:41:38 -04:00
HifiExperiments
7ff796af3e web textures work on image entities, create supports negative materialMappingScale 2021-03-22 20:52:39 -07:00
David Rowe
41bd3c10c0 Fix up node permissions debug order 2021-03-23 15:22:08 +13:00
HifiExperiments
6b82c7fe90
Update RenderableImageEntityItem.cpp 2021-03-22 18:37:29 -07:00
David Rowe
71b025f7f0 Separate API vs. internal versions of clearAvatarEntity() 2021-03-22 15:36:57 +13:00
HifiExperiments
e5f108b022 bump ktx version to force clear cache 2021-03-21 14:51:21 -07:00
Kalila L
cfac34bf7e CR. 2021-03-21 13:20:05 -04:00
Kalila
12d5687c6a
Update libraries/script-engine/src/UsersScriptingInterface.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-03-21 13:13:24 -04:00
HifiExperiments
35e836d34d image caching must maintain original image information and pass it around 2021-03-19 22:32:29 -07:00
HifiExperiments
a87d6e5182 on json import, material/texture references are updated to new ids 2021-03-19 17:39:22 -07:00
Kalila L
f067feb37a Add docs for ban functionality. 2021-03-19 04:44:58 -04:00
Kalila L
fd592dfb06 CR. 2021-03-19 04:11:26 -04:00
Kalila
9dadc44f6c
Update UserActivityLoggerScriptingInterface.h 2021-03-18 17:57:49 -04:00
Kalila
da7bcf1584
Update NodeList.cpp 2021-03-18 17:53:21 -04:00
HifiExperiments
15ba6c8637 fix build 2021-03-17 21:14:22 -07:00
Kalila L
be0bd3940d Finish flag work on kick functionality. 2021-03-17 23:25:08 -04:00
HifiExperiments
5fd4f215f1 more docs 2021-03-17 19:18:30 -07:00
HifiExperiments
3fdb398829 fixing up material entity logic, refresh reference material on material change 2021-03-17 19:10:29 -07:00
Kalila L
0216b34681 State of refactoring 2021-03-17 19:37:06 -04:00
David Rowe
ddcfe6351b Tidying 2021-03-18 12:13:41 +13:00
HifiExperiments
9514ade844 add reference materials and support reference texture changes 2021-03-15 21:21:32 -07:00
David Rowe
2030d24523 Tidying 2021-03-16 14:37:16 +13:00
David Rowe
b48d3e0387 Tidy disabling of avatar entity manipulation if don't have permission 2021-03-16 12:00:34 +13:00
David Rowe
0c1f775dc5 Don't warn user if permission removed while they're connected 2021-03-15 20:55:42 +13:00
David Rowe
e23251df4e Ignore Entities.addEntity() for avatar entities if don't have permission 2021-03-15 20:25:18 +13:00
David Rowe
0adfd8b806 Ask user whether to continue to a domain if their wearables won't rez 2021-03-15 16:30:46 +13:00
HifiExperiments
f5e2cb6e2b update docs 2021-03-14 18:13:44 -07:00
Dale Glass
1ed767df41 Implement Linux machine fingerprints 
We do this by using either /etc/machine-id, or hashing the MACs of all
non-virtual networking devices.

We make this fingerpint unique to our platform by adding our own string
to the hash, and add some stretching for good measure. This way Vircadia's
fingerprint isn't going to match the system's ID or anything another
application generates.
 2021-03-14 21:15:33 +01:00
HifiExperiments
828e653849 able to reference entity ids as textures 2021-03-13 22:34:48 -08:00
David Rowe
1b33339995 Make avatar mixer remove clients' unremoved avatar entities 2021-03-12 22:15:26 +13:00
Kalila
5e2cc4c4bf
Merge pull request #1068 from daleglass/fix_resource_totals 
Set resource total size to content size when using a qrc:// resource
 2021-03-11 18:30:56 -05:00
Kalila
d8a3d56da2
Merge branch 'master' into feature/preloaded-whitelist 2021-03-11 17:38:07 -05:00
Kalila
90fb70e041
Merge pull request #1013 from HifiExperiments/haptics 
triggerHapticPulse supports arbitrary device index instead of just two hands
 2021-03-11 17:29:45 -05:00
David Rowe
db0f7a9884 Fix flash of avatar entity when domain restarts 2021-03-11 20:14:03 +13:00
Kalila L
78cc98bc7b Add improved functionality for Users.kick API. 
Add banByUsername, banByFingerprint, and banByIP parameters.
 2021-03-11 01:03:54 -05:00
David Rowe
38738a69ac Fix locking 2021-03-11 14:56:24 +13:00
Kalila
1f4cb7b9d6
Update ScriptGatekeeper.cpp 2021-03-10 01:27:32 -05:00
Kalila
3dc11637ed
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-03-10 01:27:05 -05:00
HifiExperiments
9a247172f3 non-parented material use the right cull mode 2021-03-09 21:09:48 -08:00
David Rowe
091efaee60 Don't rez own avatar entities if don't have permission 2021-03-09 11:15:26 +13:00
Kalila L
b5d89c44bf Rename "INITIAL_STARTUP_LOCATION" -> "PRELOADED_STARTUP_LOCATION". 2021-03-08 02:01:53 -05:00
Kalila L
3ed98d0f3e Add "ScriptGatekeeper" class and "PRELOADED_SCRIPT_WHITELIST" variable. 2021-03-08 02:00:34 -05:00
David Rowe
dd674c395e Default canRezAvatarEntities on domains without new permission 2021-03-05 16:27:32 +13:00
HifiExperiments
1abb408a93 type 2021-03-03 18:58:09 -08:00
Kalila
672bceee1c
Merge pull request #1007 from digisomni/feature/manual-noise-reduction-gate 
Add manual mode to noise reduction + add noise reduction threshold
 2021-03-03 21:18:59 -05:00
HifiExperiments
68c20ce73d text backgrounds have texcoord if not simple 2021-03-03 17:47:03 -08:00
Kalila
053548cd14
Merge pull request #1033 from HifiExperiments/skyboxShape 
Non-uniformly scaled sphere zones and models behave like ellipsoids (and fix EntityItem::contains sphere case)
 2021-03-03 16:15:47 -05:00
Kalila L
bc2b345709 Merge branch 'master' into feature/manual-noise-reduction-gate 2021-03-03 02:47:34 -05:00
Kalila L
4dd3ee6e1e "Test your voice" now takes into account noise gate state. 2021-03-03 02:47:19 -05:00
HifiExperiments
ccda630a3a fixing _glColor4f 2021-03-02 21:44:06 -08:00
Kalila
3f97b4da13
Merge pull request #1066 from vircadia/fix/crash-avi-ik 
Fix AnimInverseKinematics crash
 2021-03-02 06:02:04 -05:00
David Rowe
3beceb4d7d Clear user's avatar entities if rez permissions change to "no" 2021-03-01 22:03:02 +13:00
David Rowe
8b6182e756 Misc fixes 2021-03-01 15:24:13 +13:00
Dale Glass
b102b3477a Set resource total size to content size when using a qrc:// resource 
When a Resource is requested from qrc://, the Resource::handleDownloadProgress
event is never called, and therefore _bytesTotal remains at zero. This confuses
ResourceCache later, which has a sanity check that doesn't pass when resources
are retrieved, yet no data accumulates.

Fixes #1065
 2021-02-26 20:04:53 +01:00
Kalila L
6b5cffa5e4 Initial pass at adding canRezAvatarEntities. 2021-02-26 06:14:06 -05:00
Kalila L
df7fd920d7 Change INVALID_JOINT_INDEX to AnimSkeleton::INVALID_JOINT_INDEX 2021-02-25 23:28:00 -05:00
HifiExperiments
c47351c4f2 merge with master 2021-02-25 19:39:09 -08:00
HifiExperiments
826eb709ce more work on materials 2021-02-25 19:03:42 -08:00
Kalila L
0e03eccbdf Change NO_PARENT_INDEX to INVALID_JOINT_INDEX. 2021-02-25 21:43:17 -05:00
Kalila L
4276ea295c Change -1 to NO_PARENT_INDEX. 2021-02-25 21:29:54 -05:00
Kalila
c79eb479f0
Update AnimInverseKinematics.cpp 2021-02-25 20:36:45 -05:00
Kalila
080d42be39
Update AnimInverseKinematics.cpp 2021-02-25 20:35:02 -05:00
David Rowe
5ad2f9d192 Fix OSX crash on shutdown 2021-02-26 09:05:52 +13:00
HifiExperiments
186f505b15 images support materials 2021-02-24 20:56:14 -08:00
HifiExperiments
25e4f59d55 gizmos have materials, working on images 2021-02-23 20:54:57 -08:00
Phil Palmer
26369ca2a9 Fix for some spinner boxes not changing value when using their buttons or the mouse wheel. 
Changed the default value of FloatPreference::_step from 0.1f to 1, because FloatPreference::_decimals defaults to 0.  Also because before this branch, all spinners used a step of 1 rather than SpinnerPreference::_step.
Spinners such as Settings > General > Desktop Tablet Scale / VR Tablet Scale work again.
 2021-02-22 22:34:04 -05:00
Kalila
ba54dd755c
Merge pull request #1034 from vircadia/v2021.1.0-rc 
merge V2021.1.0 rc into master
 2021-02-22 00:16:36 -05:00
HifiExperiments
5677b5d5dc docs 2021-02-20 23:03:30 -08:00
HifiExperiments
30cf1555e4 fix keepAspectRatio, give text entities naturalDimensions 2021-02-20 22:47:33 -08:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
eefe809950 CR 2021-02-19 19:31:06 -08:00
Phil Palmer
72725e783a Small optimisations and tidying of things that were noticed in passing. No behaviour should change. 
* Removed the deprecated MyAvatar.setToggleHips script function and the "Toggle Hips Following" option from the Developer menu.  They had no effect on any code.
* In CharacterController::applyMotor, prevented unnecessary calls to btVector3::rotate() when the motor has no rotation.  This change also improves readability through the use of clearly-named lambdas.
* In AvatarData::getFauxJointIndex, prevented unnecessary string comparisons when the named joint is a real joint rather than a faux one.
* In Avatar::getJointIndex, removed an unnecessary call to QHash<QString, int>::contains(), by supplying a default index for QHash<QString, int>::value().
* Removed unnecessary condition "forwardLeanAmount < 0" in MyAvatar::FollowHelper::shouldActivateHorizontal_userSitting.
* Corrected the return type of MyAvatar::getSitStandStateChange from float to bool.
* Added a missing 'f' suffix to a float literal in PreferencesDialog.cpp.
 2021-02-19 21:55:08 -05:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
HifiExperiments
f9b88c68e0 treat non-uniform spheres as ellipsoids everywhere 2021-02-15 21:13:58 -08:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
Kalila
26894b4325
Merge pull request #1020 from HifiExperiments/alignment 
Text Entity alignment property
 2021-02-13 01:28:41 -05:00
HifiExperiments
51bf54c703 fix EntityItem::contains sphere case 2021-02-12 12:27:35 -08:00
HifiExperiments
56fa4698da potential fix for offset soft attachments 2021-02-11 20:07:46 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
a18c24832a fix android build 2021-02-11 18:01:33 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
HifiExperiments
b6e7466804 triggerHapticPulse supports arbitrary device index instead of hands 2021-02-09 17:14:13 -08:00
Kalila L
5a40007758 Update default threshold value. 2021-02-09 00:46:46 -05:00
Kalila L
d2875c2c4f Add manual mode to noise reduction + add noise reduction threshold 2021-02-09 00:44:01 -05:00
HifiExperiments
766b91f1a3 add note about only supporting 0,0,0 pivot 2021-02-05 20:46:14 -08:00
HifiExperiments
ace6bf6c5b dirty physics on useOriginalPivot change, other small fix for compound shapes 2021-02-03 17:35:17 -08:00
HifiExperiments
56fa143ee6 Merge remote-tracking branch 'upstream/master' into pivot 2021-02-02 22:27:49 -08:00
HifiExperiments
8f3ed5d66d
Merge pull request #971 from HifiExperiments/apitraceFix 
Fix crashes when running with QML disabled in VR
 2021-02-01 21:56:11 -08:00
Phil Palmer
a2e4b81ed8 * Add more rounding in SpinBox.qml, allowing FloatPreference::step to work reliably for the spinners without needing double precision (suggestion from ctrlaltdavid: https://github.com/vircadia/vircadia/pull/930#issuecomment-765838930). 
* Change FloatPreference::step from double back to float.
 2021-02-01 20:26:18 -05:00
HifiExperiments
4554aa338b
Update BillboardMode.cpp 2021-01-30 00:28:25 -08:00
Kalila L
c57b1a92f3 CR + update user agent. 2021-01-30 02:16:53 -05:00
HifiExperiments
19cd0fa6ad CR 2021-01-29 22:31:17 -08:00
HifiExperiments
3d9142d8cb
Update libraries/ui/src/InfoView.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-29 17:11:10 -08:00
Kalila
af8ce1ba3d
Merge pull request #937 from daleglass/skip_repeated_log_entries 
Skip repeated log entries
 2021-01-28 17:22:51 -05:00
Kalila L
f8119daa47 Remove user agent overwriting in RequestFilters. 2021-01-23 18:49:21 -05:00
HifiExperiments
7bed9b0754 Merge remote-tracking branch 'origin/pivot' into pivot 2021-01-21 21:05:28 -08:00
HifiExperiments
bb898aac33 non-exact collisions should work on models with pivots and useOriginalPivot=true 2021-01-21 21:05:00 -08:00
HifiExperiments
54d57afdae use rotation property to determine which axis is facing you 2021-01-21 19:21:38 -08:00
Kalila
a1fe046350
Merge pull request #953 from Phil-Palmer/fix/alpha-zwrite 
Disable z-write for transparent draws
 2021-01-21 17:54:59 -05:00
Kalila L
82313eccbf Add userAgent property for web entities. 2021-01-21 01:51:37 -05:00
HifiExperiments
2667af3682 more safeguards 2021-01-20 21:25:30 -08:00
HifiExperiments
3335c040e5 hurr durr I'm an idiot 2021-01-18 18:39:12 -08:00
HifiExperiments
4bf952260f fix crashes when running with qml disabled in VR 2021-01-18 12:57:44 -08:00
HifiExperiments
7030798d41 cleanup 2021-01-17 22:47:26 -08:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08:00
HifiExperiments
1f71a23082 optimize picking 2021-01-17 13:09:09 -08:00
daleglass
06b1a8e17c
Merge pull request #928 from Phil-Palmer/fix/vr-recenter 
VR fixes for: couldn't sit on the floor, wrong walk directions.
 2021-01-16 20:51:03 +01:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
6d1667df5a better picking against billboarded shapes other than spheres 2021-01-10 16:48:44 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
Dale Glass
aab5b22e25 Skip duplicated log entries 
This helps with log flooding. Successive repeated log messages will be skipped and counted,
the count will be output when a different message is logged.

A new option of 'keep_repeats' has been added to VIRCADIA_LOG_OPTIONS to disable this.
 2021-01-09 19:39:32 +01:00
Phil Palmer
1cdc3610c3 Disable z-write for transparent fonts, grid entities and teleport beams 
as suggested in the review here: https://github.com/vircadia/vircadia/pull/953#pullrequestreview-560779456
 2021-01-05 06:47:33 -05:00
HifiExperiments
1ccdfe37a6
Update libraries/entities/src/EntityItemProperties.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-04 12:14:35 -08:00
Phil
646a5798e6
Apply suggestions from code review 
Tidying (bracing style, spaces, remove final comma from enum, fix JSDoc comments).

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-04 00:12:57 -05:00
HifiExperiments
030524c3ee CR and actually send property over wire 2021-01-03 21:03:43 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
Phil Palmer
4f71cb5945 Disable z-write when drawing web entities with alpha < 1. 2021-01-03 22:59:31 -05:00
Phil Palmer
90799e10da Fix z-write enabled for transparent draws. 
Fix z-write being enabled for transparencies in GeometryCache::getSimplePipeline and Procedural::Procedural (fixes https://github.com/vircadia/vircadia/issues/224).
Z-write is controlled by the 'writeMask' parameter of gpu::State::setDepthTest.
 2021-01-03 16:31:51 -05:00
HifiExperiments
5dc45e895c more fixes and create checkbox defaults to checked 2021-01-02 19:18:54 -08:00
HifiExperiments
a072010b02 Merge remote-tracking branch 'upstream/master' into pivot 2021-01-02 17:13:24 -08:00
HifiExperiments
20e0c24163 cleanup + create 2021-01-02 00:04:24 -08:00
HifiExperiments
002271a4cc finishing touches 2021-01-01 21:52:16 -08:00
Phil Palmer
8c7c91ed6f Remove const from variable declarations as suggested in the review. 
Suggested here: https://github.com/vircadia/vircadia/pull/928/files#r549830690

The ones I've left are either
- values known at compile time, eg. const float MIN_LENGTH_FOR_NORMALIZE = 0.061f;
- consts that were already there in the previous code, eg. const float MAX_DISPLACEMENT = 0.5f * _radius;
 2020-12-29 19:31:35 -05:00
HifiExperiments
0f9f95f716 possible fix for physics 2020-12-28 23:46:37 -08:00