Commit graph

35410 commits

Author SHA1 Message Date
David Rowe
f264cc0548 Merge branch 'master' into dev/webapp-master-update 2021-10-08 08:34:03 +13:00
David Rowe
f5452a4324 Guard against invalid data channel address 2021-10-07 21:03:23 +13:00
Kalila
1d8da471a2
Merge pull request #1344 from digisomni/feature/new-domain-wizard
Overhaul the Domain server's onboarding wizard.
2021-10-04 16:10:31 -04:00
David Rowe
c03312319d Merge branch 'master' into dev/webapp-master-update
# Conflicts:
#	libraries/networking/src/NodeList.h
#	libraries/shared/src/shared/WebRTC.h
2021-10-03 12:51:47 +13:00
Kalila
939d0958c1
Merge pull request #1367 from daleglass/fix-recursive-mutex-warnings
Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex (solves approximately 1700 warnings).
2021-10-01 00:15:02 -04:00
Kalila
eab8dcd257
Merge pull request #1376 from JulianGro/gles_glvnd
Use GLVND on GLES.
2021-09-30 17:26:14 -04:00
Kalila
c87006c91b
Merge pull request #1346 from JulianGro/aarch64_gha
Add aarch64 Linux GHA builds.
2021-09-30 17:14:09 -04:00
David Rowe
de37734e18 Tidying to match the Web SDK 2021-10-01 09:09:07 +13:00
Julian Groß
da71fbf294 Use GLVND on GLES 2021-09-27 14:43:58 +02:00
Dale Glass
b8d1057e1f Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex
This fixes around 1700 warnings.
2021-09-26 01:27:19 +02:00
Dale Glass
891d555679
Merge pull request #1352 from odysseus654/pr/q_disable_copy
Code Review: use of Q_DISABLE_COPY.
2021-09-25 20:33:20 +02:00
Dale Glass
3349d02cef
Merge pull request #1349 from JulianGro/use_GLVND
Set GL preference to GLVND
2021-09-25 20:31:11 +02:00
Alezia Kurdis
ec74154042
Adjustment to Doc for "created" properties
Adjustment to Doc for "created" properties.
The doc was pretending that it is a string value but it's in fact a number (Unix Timestamp).

Addressing ISSUE #839
2021-09-23 22:07:56 -04:00
Heather Anderson
57a3cd3d63 replace the various disable-copy constructions with Q_DISABLE_COPY (or Q_DISABLE_COPY_MOVE) 2021-09-18 21:36:35 -07:00
David Rowe
6c4e105c06 Remove some unused audio stream method parameters 2021-09-18 10:01:21 +12:00
Julian Groß
babee7c527 Set GL preference to GLVND 2021-09-17 21:04:12 +02:00
Julian Groß
f03606ee60 Disable WebRTC on aarch64 Linux 2021-09-16 06:09:11 +02:00
Heather Anderson
6e4e0dfb6a remove unnecessary list copying when retrieving a list of plugins 2021-09-12 13:12:02 -07:00
Heather Anderson
05182af561 more (relatively useless) code review 2021-09-11 20:16:51 -07:00
Heather Anderson
bcce9a2091 convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate 2021-09-11 15:15:04 -07:00
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
Kalila L
c266b003fb Get Domain creation working; revise metaverse forwarding. (TLS init fail issue present) 2021-09-10 02:06:50 -04:00
Kalila L
74b185f6c6 Fix Qt warning: "QString::KeepEmptyParts" -> "Qt::KeepEmptyParts" 2021-09-09 18:57:43 -04:00
David Rowe
96708f5fe3 Move crash fix 2021-09-07 18:58:37 +12:00
David Rowe
e3c28a5dc8 Alternative crash fix 2021-09-06 16:28:38 +12:00
David Rowe
e9776541bd Use WebSocket address and port as WebRTC data channel ID 2021-09-05 22:54:58 +12:00
David Rowe
b5867fef48 Tidying 2021-09-04 14:31:20 +12:00
David Rowe
dddabecc84 Use domain server-assigned WebRTC data channel ID in assignment clients 2021-09-04 14:25:21 +12:00
David Rowe
911dc2aff3 Include socket type in domain packets
Required for user client info sent to assignment clients from the domain server.
2021-09-04 10:36:13 +12:00
David Rowe
ff72b422b3 Fix WebRTCDataChannels crash 2021-09-03 19:04:24 +12:00
David Rowe
65dec6dfd8 Socket type isn't used in all code 2021-09-02 15:00:26 +12:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
David Rowe
ac9229ace0 Fix avatar crash 2021-08-29 21:34:31 +12:00
Kalila
2a4ad7b163
Merge pull request #1251 from digisomni/fix/cmdline-discovery
Add disable domain port auto discovery by assignment client option.
2021-08-22 03:05:21 -04:00
David Rowe
1605039929 Tidying 2021-08-21 21:11:42 +12:00
Kalila
45e10f0670
Merge pull request #1303 from daleglass/qt5-fix-qtcpsocket-error
Replace deprecated QAbstractsocket::error with QAbstractSocket::error…
2021-08-19 20:51:27 -04:00
David Rowe
ace612d038 Assignment client type is not known at construction 2021-08-18 21:27:35 +12:00
David Rowe
5d15ebb723 WebRTC data channel with assignment clients 2021-08-18 20:21:56 +12:00
David Rowe
a3c1d50478 WebRTC signaling with assignment clients via domain server 2021-08-18 20:10:11 +12:00
David Rowe
9b2c773805 Move WebRTCSignalingServer into Domain Server 2021-08-17 22:37:43 +12:00
Kalila
29b4fea1d2
Merge pull request #1299 from ctrlaltdavid/dev/webrtc-doxygen
Fix a couple of WebRTC Doxygen typos
2021-08-16 00:05:44 -04:00
Kalila
019e012f2e
Apply suggestions from code review
Co-authored-by: Heather Anderson <heath@odysseus.anderson.name>
2021-08-12 23:01:13 -04:00
Dale Glass
ae9f2aa1ee Update slots to the new syntax, use QAbstractSocket::errorOccurred 2021-08-12 22:53:24 +02:00
Dale Glass
24ab523acc Replace deprecated QAbstractsocket::error with QAbstractSocket::errorOccurred 2021-08-06 23:26:02 +02:00
Dale Glass
24b2cdfcd2 Fix QString::SplitBehavior deprecation, replace with Qt:: 2021-08-06 20:16:10 +02:00
David Rowe
500da963ad Make parameter names consistent across usages 2021-08-04 16:11:04 +12:00
David Rowe
9be1c08c8c Fix domain server crash 2021-07-31 23:03:48 +12:00
David Rowe
8528422834 Fix WebRTC Doxygen typos 2021-07-30 14:18:34 +12:00
David Rowe
0ea6d88bf5 Fix function parameter ID 2021-07-30 14:14:36 +12:00
David Rowe
3603520c94 fillPacketHeader() can be private 2021-07-30 14:13:44 +12:00
David Rowe
fa01ead130 Add extra WebRTC debug 2021-07-30 14:13:15 +12:00
Dale Glass
b293dd2816
Merge pull request #1288 from digisomni/feature/add-talk-to-help
Add "Talk" link to "Help" menu.
2021-07-29 23:40:24 +02:00
Kalila
10e8d9f6d8
Update NetworkingConstants.h 2021-07-23 20:44:24 -04:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir
Cmake: build in build dir
2021-07-22 23:26:21 +02:00
David Rowe
38f7506c5e Fix erroneous domain server log message 2021-07-21 20:06:18 +12:00
David Rowe
320b5a2d22 Fix HifiSockAddr references 2021-07-21 19:54:40 +12:00
David Rowe
74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp
# Conflicts:
#	assignment-client/src/AssignmentClient.cpp
#	domain-server/src/DomainServer.cpp
#	libraries/networking/src/DomainHandler.cpp
#	libraries/networking/src/LimitedNodeList.cpp
#	libraries/networking/src/LimitedNodeList.h
#	libraries/networking/src/SockAddr.cpp
#	libraries/networking/src/SockAddr.h
#	libraries/networking/src/udt/Socket.cpp
#	libraries/networking/src/udt/Socket.h
#	tools/ice-client/src/ICEClientApp.cpp
2021-07-21 15:03:29 +12:00
Dale Glass
32c3725b5d Define _USE_MATH_DEFINES everywhere that uses math constants
On Win32, things are failing to build with messages like:

RenderableEntityItem.cpp(674,51): error C2065: 'M_PI': undeclared identifier

This is because as per Microsoft documentation, _USE_MATH_DEFINES is needed to
obtain constants like M_PI:

https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=msvc-160

It seems this worked previously due to some quirk of CMake, but stopped working
after some reordering. This change makes this definition explicit where it is needed.
2021-07-17 19:34:26 +02:00
Kalila
35948d7467
Merge branch 'master' into fix/cmdline-discovery 2021-07-15 22:21:47 -04:00
Kalila
42ffb5709c
Merge pull request #1270 from daleglass/use_qt_endl
Replace uses of endl on Qt classes with Qt::endl
2021-07-15 22:18:36 -04:00
Kalila
f62c964fdc
Typo, remove double definitions of constants. 2021-07-15 22:16:32 -04:00
Kalila
d75df82687
Merge pull request #1102 from HifiExperiments/materials2
Material improvements 2: reference textures/materials by entity ID
2021-07-15 17:42:40 -04:00
Kalila
8e4a0f8880
Merge branch 'master' into feature/add-talk-to-help 2021-07-15 17:34:29 -04:00
Kalila
0193e0f4d6
Merge pull request #1244 from digisomni/fix/lookup-string-spaces
Add ability for 'handleLookupString' to have spaces.
2021-07-12 17:07:29 -04:00
Kalila L
8df362ef1f Add "Talk" link to "Help" menu. 2021-07-10 18:05:28 -04:00
David Rowe
4dac611036 Fix build error 2021-07-08 15:30:51 +12:00
David Rowe
ed13cbd01b Merge branch 'webapp' into dev/webrtc-packet
# Conflicts:
#	libraries/networking/src/webrtc/WebRTCDataChannels.h
2021-07-08 14:54:21 +12:00
HifiExperiments
12833b9c93 CR and percent decoding 2021-07-06 19:13:33 -07:00
HifiExperiments
bdbb88084b CR 2021-07-05 21:02:40 -07:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
HifiExperiments
7f99ddca2e merge with master 2021-07-05 16:48:45 -07:00
David Rowe
cb89eabf74 Typo 2021-07-06 08:48:43 +12:00
David Rowe
28b46ed861 Log warning if try to set local port on WebRTC LimitedNodeList 2021-07-05 10:59:19 +12:00
David Rowe
319f3e7122 Misc fixes to AddressManager JSDoc 2021-07-05 10:43:50 +12:00
David Rowe
3ebb75acf5 Undo documentation improvements 2021-07-05 10:24:59 +12:00
David Rowe
7ecd9b6b8e Miscellaneous tidying 2021-07-04 16:38:47 +12:00
David Rowe
e682336cc2 Add missing Doxygen 2021-07-04 15:57:53 +12:00
David Rowe
f6a8ae285d Fix WebRTC peer connection not being closed properly 2021-07-04 15:50:52 +12:00
Dale Glass
be6a67b5eb Replace uses of endl on Qt classes with Qt::endl
This fixes a whole bunch of warnings
2021-07-03 19:08:03 +02:00
David Rowe
dacda8405c Typo 2021-07-03 08:43:31 +12:00
David Rowe
f02ffe1ed9 Use alternative signal/slot mechanism for Android compatibility 2021-07-02 12:05:29 +12:00
David Rowe
89c527f0d8 Update Doxygen group tags to use /// format 2021-07-01 15:59:58 +12:00
David Rowe
4d375c029f Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-packet 2021-07-01 12:14:52 +12:00
David Rowe
d0c89c7d91 Tidying 2021-06-30 22:21:38 +12:00
Kalila
40f81e4866
Merge pull request #1223 from odysseus654/pr/scripting-docs
Ensuring minimal documentation for classes declared in script-engine
2021-06-29 19:09:26 -04:00
David Rowe
a0a0e8db35 Merge branch 'webapp' into dev/webrtc-datachannel 2021-06-28 09:42:37 +12:00
Kalila
b86e4b98a9
Merge pull request #1249 from digisomni/fix/docs-links-dev
Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com".
2021-06-27 05:55:13 -04:00
Kalila L
88b9b7468e CR. 2021-06-27 04:31:14 -04:00
Kalila
a217f80ee3
Update NodeList.cpp 2021-06-27 04:14:21 -04:00
David Rowe
d6061289ec Merge branch 'master' into dev/webapp-master-update 2021-06-27 09:51:41 +12:00
Kalila
7442b14dce
Merge pull request #1258 from ctrlaltdavid/dev/webrtc-update
Update WebRTC Windows package
2021-06-26 14:29:24 -04:00
David Rowe
2a9ab98e41 Miscellaneous tidying and fixes 2021-06-26 22:07:48 +12:00
David Rowe
5a5cb6488c Multiplex UDP and WebRTC sockets in a QUdpSocket-style NetworkSocket 2021-06-26 22:07:01 +12:00
David Rowe
d65ecead9f Abstract WebRTCDataChannel into a QUdpSocket-style WebRTCSocket 2021-06-26 21:20:26 +12:00
David Rowe
5b937a1580 WebRTCSignalingServer and WebRTCDataChannels improvements 2021-06-26 20:07:26 +12:00
David Rowe
c9d4fe8558 Remove unused code 2021-06-26 17:23:58 +12:00
David Rowe
e48e02d8c6 Fix JSDoc typo 2021-06-22 20:59:06 +12:00
Kalila L
2d4da7ba71 Add disable domain port auto discovery by assignment client option. 2021-06-21 13:22:48 -04:00
Kalila L
d26e035764 Update copyright headers. 2021-06-21 12:06:52 -04:00
Kalila L
90aaa85089 Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com". 2021-06-21 12:01:37 -04:00
Kalila L
0625dbe53c Some URL updates. 2021-06-17 19:45:56 -04:00
Kalila L
1215ced6fa CR. 2021-06-15 15:02:03 -04:00
Kalila L
1411d55364 Add ability for 'handleLookupString' to have spaces. 2021-06-15 00:31:28 -04:00
Kalila L
51e6468abd Rename 'URL_SCHEME_HIFI' -> 'URL_SCHEME_VIRCADIA'. 2021-06-11 17:04:16 -04:00
David Rowe
2402a5e333 Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel
# Conflicts:
#	domain-server/src/DomainServer.h
2021-06-05 14:27:18 +12:00
David Rowe
4681475269 Merge branch 'master' into dev/webrtc-datachannel 2021-06-05 14:21:29 +12:00
Kalila
d8a0d13812
Merge pull request #1206 from odysseus654/pr/drop-script-debugging
drop remaining references to QScriptEngineDebugger
2021-06-03 18:01:40 -04:00
Kalila
229164c5b9
Merge pull request #1219 from ctrlaltdavid/dev/webrtc-signaling
WebRTC Signaling Channel
2021-06-02 05:44:03 -04:00
David Rowe
c28f4749ed Doxygen tidying 2021-06-01 09:34:38 +12:00
David Rowe
63ec933290 Code tidying 2021-06-01 09:34:17 +12:00
David Rowe
e6c49cf407 Fix data channel ID 2021-06-01 09:32:28 +12:00
David Rowe
6c37628468 Add WebRTC data channel 2021-05-31 12:29:48 +12:00
Heather Anderson
259cd20b87 Ensuring minimal documentation for classes declared in script-engine 2021-05-29 22:50:39 -07:00
David Rowe
aa1c32ec53 Rename new domain server environment variable 2021-05-29 09:25:15 +12:00
David Rowe
ce31b70a1d Update Windows WebRTC from version M81 to M84 2021-05-21 07:58:10 +12:00
David Rowe
6afb8044ea Add WebRTC signaling channel 2021-05-20 09:51:14 +12:00
David Rowe
adfb428796 Distinguish use of WebRTC features - audio versus data channel 2021-05-20 09:43:18 +12:00
David Rowe
8545b8c6c1 Fix missed JSDoc tag change 2021-05-16 21:44:16 +12:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
Heather Anderson
04f8ccd2b0 drop remaining references to QScriptEngineDebugger 2021-05-08 20:31:03 -07:00
Kalila
cb3a0b51fe
Merge pull request #1183 from ctrlaltdavid/feature/rpm-blendshapes
ReadyPlayerMe blendshapes support
2021-05-01 14:24:30 -04:00
Kalila
a3626c83f4
Merge pull request #692 from odysseus654/pr/move-connect-packet-type
The domain server should see Packet ID=1 as a (broken) attempt to connect to the domain server
2021-04-29 18:39:25 -04:00
David Rowe
58a6ac384e Replace some QMap occurrences with QHash 2021-04-29 08:15:37 +12:00
David Rowe
d1136c2d3e Merge branch 'master' into feature/rpm-blendshapes 2021-04-27 21:32:35 +12:00
Kalila
3629427cff
Merge pull request #1161 from ctrlaltdavid/fix/spinbox
Fix settings (QML) spin box stepping
2021-04-26 03:39:56 -04:00
Heather Anderson
9f5e06503a begin identifying Packet Type ID=1 as "domain connect" for a future version of the protocol, so we can detect protocol breaks when we shift to using this as our domain connect packet. 2021-04-24 23:28:53 -07:00
daleglass
c7e79a5e3e
Merge pull request #1181 from ctrlaltdavid/fix/gltf-colors
Fix glTF mesh colors
2021-04-24 20:24:26 +02:00
David Rowe
24ddbc0d56 Update ReadyPlayerMe default mapping 2021-04-24 09:10:32 +12:00
David Rowe
e9fa76ae6e Fix conditional application 2021-04-24 08:49:57 +12:00
Kalila
5ec026255c
Merge pull request #938 from vircadia/feature/qt-update
Update to Qt 5.15.2
2021-04-22 17:36:53 -04:00
David Rowe
f4af0be95b Conditionally apply ReadyPlayerMe synonyms 2021-04-21 10:14:46 +12:00
David Rowe
a6d8e150f0 Move and rename ReadyPlayerMe synonyms 2021-04-21 09:47:24 +12:00
David Rowe
bfb42c8233 Merge branch 'master' into feature/rpm-blendshapes 2021-04-21 08:57:52 +12:00
David Rowe
f67410a5e9 Merge branch 'master' into fix/gltf-colors 2021-04-21 08:31:17 +12:00
Kalila
dec3369583
Merge pull request #1178 from JulianGro/rename_fbx_to_model-serializers
Rename fbx to model serializers
2021-04-19 16:00:21 -04:00
David Rowe
0b536f0cae Support ReadyPlayerMe blendshapes in glTF files 2021-04-19 11:10:25 +12:00
David Rowe
71bcabfc0a Remove unused enum 2021-04-17 21:30:46 +12:00
David Rowe
a26f11a84f Adjust glTF mesh colors 2021-04-17 14:22:20 +12:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Julian Groß
12c3bd80e5 Fix GLTFSerializer not being up to date 2021-04-15 23:49:02 +02:00
Kalila
a35b9c4563
Merge pull request #1126 from daleglass/hash_all_fingerprints
Hash Windows and Mac machine fingerprints.
2021-04-15 17:46:17 -04:00
Julian Groß
8573425f68 Update library headers 2021-04-15 20:15:36 +02:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
David Rowe
312dc9ccb7 Update Chrome browser version 2021-04-12 15:30:23 +12:00
Dale Glass
b3db458091 Fix mismatched if in CMake warning
This should have no actual effect, just a warning fix
2021-04-11 23:00:46 +02:00
Kalila
1dba5bedfa
Merge pull request #1149 from daleglass/add_thread_debugging
Implement thread debugging with tsan
2021-04-08 17:17:07 -04:00
David Rowe
7088fc9d6c Merge branch 'master' into fix/spinbox 2021-04-05 10:41:31 +12:00
Dale Glass
240e070a46 Log authentication events in the domain server
This uses the vircadia.domain_server.auth logging category.
2021-04-03 17:29:51 +02:00
Kalila
cd2d6847ee
Merge pull request #1148 from daleglass/remove-unusued-GizmoEntityRenderer-variable
Remove unused variable
2021-04-02 16:24:31 -04:00
Kalila
6949c9a5cd
Merge pull request #1145 from daleglass/fix-getRotateForPicking
Fix ShapeEntityItem::getRotateForPicking()
2021-04-02 16:24:19 -04:00
Kalila
333e3d49c6
Merge pull request #1143 from daleglass/add-missing-override
Add missing override keywords.
2021-04-02 16:24:12 -04:00
Dale Glass
43f6fd82f4 Implement thread debugging with tsan
This is enabled with the VIRCADIA_THREAD_DEBUGGING environment variable.
It's incompatible with VIRCADIA_MEMORY_DEBUGGING, so only one of those
can be enabled for a build.
2021-04-02 20:41:23 +02:00
daleglass
f8574a99c9
Merge pull request #1127 from daleglass/fix_memory_debugging
Fix HIFI_MEMORY_DEBUGGING on Linux/gcc
2021-04-02 19:17:22 +02:00
Kalila
b586425ec2
Merge pull request #1141 from HifiExperiments/ktxFix
Fix ktx issue
2021-04-02 06:49:47 -04:00
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
Phil Palmer
3e25e32f18 Revert temporary "added pragmas" (optimize off)
This reverts commit 20e4f952ab.
2020-12-27 02:52:52 -05:00
Phil Palmer
c9cf7eb75d Merge branch 'fix/vr-recenter-PRAGMAS' into fix/vr-recenter 2020-12-26 23:22:16 -05:00
Phil Palmer
20e4f952ab added pragmas 2020-12-26 23:19:21 -05:00
daleglass
f894a0a141
Merge pull request #877 from vircadia/feature/domain-server-reporting-socket
Send address and port with each metaverse heartbeat.
2020-12-26 20:40:58 +01:00
HifiExperiments
1475cae504 wip 2020-12-23 21:29:59 -08:00
Phil Palmer
3b5eb2d24b Partial fix for spinner boxes not using the _step property of SpinnerPreference.
(https://github.com/vircadia/vircadia/issues/117)
- In SpinBoxPreference.qml, SpinBox was missing "realStepSize: preference.step".
- Had to change FloatPreference::step from float to double, because there is some truncation happening somewhere.  For example, a step of 0.01f was acting like 0.00 because (0.01f < 0.01).
- Changed FloatPreference::decimals (number of decimal places) from float to uint, because it seemed to make more sense.
- Changed the 'User real-world height' spinbox to use a resolution of 1cm (for display and step) rather than 1mm.
- Remaining bug: the up & down buttons of the spinbox fail to change the value, at some values, though the mouse wheel always works.  Repro:
Settings > Controls > User real-world height
Hover the mouse over the box and and scroll the mouse wheel down until the value is at 1.15.
Click the up button a few times and observe that the number can't be increased.
Scroll the mouse wheel forward and observe that the number increases correctly.
- Todo: Change all calls to FloatPreference::setStep to pass doubles, if this change to its parameter type is kept.
2020-12-23 22:53:43 -05:00
Phil Palmer
a489e9ddca Code style: made some little things more conformant with the coding standards and the rest of the codebase.
https://github.com/vircadia/vircadia/blob/master/CODING_STANDARD.md
2020-12-23 19:00:05 -05:00
Phil Palmer
6fc40385ca Fix compile error building macOS-latest: changed MINIMUM_TIME_REMAINING from const to constexpr in CharacterController::playerStep.
Error was: "static_assert expression is not an integral constant expression", "read of non-constexpr variable 'MINIMUM_TIME_REMAINING' is not allowed in a constant expression".
Error started in last commit (2179c153de).
2020-12-22 15:51:03 -05:00
Phil Palmer
2179c153de VR fixes for: couldn't sit on the floor, wrong walk directions.
- Divided the option "Avatar leaning behavior" into two options that work more usefully: "Allow my avatar to stand" and "Allow my avatar to lean" (PreferencesDialog.cpp).  Made the necessary fixes so that the avatar can be set to stand only when the user is standing (more details below).
- The logic controlling the direction of MyAvatar's action motor is now centralised in calculateScaledDirection (was previously split between there and updateMotors).  calculateScaledDirection now returns a velocity in world space.
- CharacterController::FollowHelper now uses separate follow timers for rotation, horizontal and vertical (previously followed all three based on the longest of their follow times).  Where appropriate, FollowHelper can now snap immediately to the desired rotation/horizontal/vertical independently (see FOLLOW_TIME_IMMEDIATE_SNAP).
- FollowHelper::FollowType has therefore moved to CharacterController::FollowType.
- MyAvatar::FollowHelper::postPhysicsUpdate: If MyAvatar is not allowed to stand when the user is sitting, this now avoids recentring the body based on the head height.
- Removed Q_PROPERTY(MyAvatar::SitStandModelType, as the sitting/standing/leaning model uses different enums now (see setAllowAvatarStandingPreference, setAllowAvatarLeaningPreference).
- Removed Q_PROPERTY(bool isSitStandStateLocked which is no longer used, because we now always track the user's real-world sit/stand state, regardless of what we're doing with it.
- MyAvatar::FollowHelper::shouldActivateHorizontal: If MyAvatar is not allowed to lean, this now returns true to recentre the footing if the head is outside the base of support.
- MyAvatar::FollowHelper::shouldActivateHorizontalCG: If MyAvatar is not allowed to lean, this now always returns true to recentre the footing.  Rearranged to avoid computing values that weren't used depending on the conditions.  Resolved some duplicated code.
- MyAvatar::setUserRecenterModel previously set HMDLeanRecenterEnabled based on the chosen mode, but it got reset when getting out of a sit.  Now HMDLeanRecenterEnabled is only controlled by the scripts.
- Added Rig::getUnscaledHipsHeight (like getUnscaledEyeHeight).  Refactored a little to avoid duplicated code.  Added DEFAULT_AVATAR_HIPS_HEIGHT which is the value that Rig::getUnscaledHipsHeight returns when using the default avatar.
- Fix for recentring not behaving as requested by the user after getting up from click-to-sit (always behaving like 'Auto') : MyAvatar::endSit now passes false to centerBody for 'forceFollowYPos'.
- Fix for incorrect vertical position of the avatar and viewpoint after changing lean recentre mode while not standing in the real world: MyAvatar::setAllowAvatarStandingPreference now calls centerBody with false for 'forceFollowYPos'.
- computeHipsInSensorFrame: The code now matches the comments in that it only skips the dampening of the hips rotation if the centre-of-gravity model is being used.
2020-12-22 14:22:27 -05:00
HifiExperiments
f33c7de67a Merge remote-tracking branch 'upstream/master' into pivot 2020-12-18 17:33:24 -08:00
Kalila
89d1346644
Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0
Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)
2020-12-17 20:24:37 -05:00
Kalila
f1c9614076
Merge pull request #917 from JulianGro/gles
Fix building with GLES 3.2 on Linux
2020-12-17 20:23:26 -05:00
HifiExperiments
7069e48073 working on pivot 2020-12-16 21:01:56 -08:00
ArcadeFever
65fb1320cc Upgraded Oculus SDKs to latest 2020-12-15 00:04:59 -08:00
Kalila
633c642d4a
Merge pull request #906 from vircadia/fix/update-references
Fix/update references
2020-12-15 01:29:47 -05:00
Julian Groß
0cebb700fb Change conditionals according to review 2020-12-15 04:15:44 +01:00
Kalila
0f87e4cd86
Merge pull request #838 from ctrlaltdavid/fix/hud-recentering
HUD overlay fixes and improvements
2020-12-14 20:46:02 -05:00
Julian Groß
5e17639bed Fix building with GLES 2020-12-15 02:43:39 +01:00
Kalila
8c4ce96c63
Merge pull request #830 from HifiExperiments/update
Entity update improvements 2
2020-12-14 17:56:01 -05:00
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
daleglass
70f2866871
Merge pull request #860 from makitsune/fix-alt-on-linux
Fix alt key on Linux
2020-12-10 23:45:55 +01:00
kasenvr
86cbcb53a3
Merge pull request #882 from ctrlaltdavid/fix/jsdoc-typo
Fix JSDoc typo
2020-12-01 05:58:31 -05:00
Dale Glass
182302c3e7 GL_TEXTURE_FREE_MEMORY_ATI returns 4 values, not just 1
This should fix a buffer overflow that happens on ATI cards.
2020-11-28 02:07:08 +01:00
HifiExperiments
9a5b956968
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-11-27 15:11:18 -08:00
HifiExperiments
c510a8fa3e add comment about material sphere scale 2020-11-27 15:10:14 -08:00
HifiExperiments
2ece568f09 fixing up simple-compound logic 2020-11-27 15:04:56 -08:00
Kalila L
97681786cd Potentially fix STUN IP+Port init for heartbeat issue? 2020-11-25 04:54:47 -05:00
HifiExperiments
2e780c34d1 Merge remote-tracking branch 'upstream/master' into update 2020-11-24 16:34:30 -08:00
kasenvr
4e1b6838cc
Merge pull request #871 from kasenvr/revert-868-revert-659-scriptEngine
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""
2020-11-24 18:43:33 -05:00
David Rowe
2222f8f4f6 Fix collision hull not necessarily being updated when model URL changed 2020-11-25 11:54:19 +13:00
David Rowe
eb70d15f77 Fix JSDoc typo 2020-11-23 19:13:48 +13:00
HifiExperiments
02f7f494fa Merge remote-tracking branch 'upstream/master' into gha 2020-11-16 21:48:46 -08:00
HifiExperiments
b6744588f4 loading fix 2020-11-16 21:25:25 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00
kasenvr
c3439a8ae7
Merge pull request #659 from HifiExperiments/scriptEngine
Split Local and owned Avatar Entity scripts into their own ScriptEngine
2020-11-15 23:12:54 -05:00
HifiExperiments
06f7624512 some more small improvements 2020-11-14 22:34:03 -08:00
Maki
ce8b9d4b24 Deleted old GLWidget code that breaks alt with current Qt on Linux 2020-11-12 22:17:15 +00:00
kasenvr
5080909bb9
Merge pull request #664 from kasenvr/feature/require-redownload
Feature/require redownload
2020-11-12 17:10:08 -05:00
kasenvr
8f4f15ba25
Merge pull request #853 from ctrlaltdavid/fix/enter-entity
Fix enterEntity event not firing in entity script after content reload
2020-11-12 01:02:55 -05:00
HifiExperiments
3b2c219e53 possibly more robust fix? 2020-11-10 21:39:15 -08:00
HifiExperiments
b3e9c1e8f8 Merge remote-tracking branch 'upstream/master' into scriptEngine 2020-11-09 22:00:11 -08:00
HifiExperiments
696239a97b try to fix android build 2020-11-09 21:27:40 -08:00
HifiExperiments
7bfbf3c99c Merge remote-tracking branch 'upstream/master' into update 2020-11-09 19:33:38 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
David Rowe
2cfd2c8d32 Merge branch 'master' into fix/hud-recentering 2020-11-10 09:27:05 +13:00
kasenvr
b091557cb5
Merge pull request #848 from humbletim/smarter-scriptcache
ScriptCache: add local file change detection
2020-11-05 17:20:04 -05:00
HifiExperiments
c8532a1ac5 another unused variable 2020-11-04 22:21:24 -08:00
HifiExperiments
a7e6332c0e fix alpha material bug 2020-11-04 22:09:11 -08:00
HifiExperiments
a3c85bd438 possible fix for collisions again 2020-11-04 19:41:01 -08:00
David Rowe
c6728be4e8 Fix enterEntity event not firing in entithy script after content reload 2020-11-04 11:23:47 +13:00
humbletim
f41ef31ef5 changes per CR 2020-10-31 13:50:47 -04:00
humbletim
a7fb294a1b
Update libraries/networking/src/ResourceRequest.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-31 13:39:29 -04:00
kasenvr
82a0815964
Merge pull request #599 from daleglass/fix-auto-texture-memory
Initial version of automatic texture memory size
2020-10-29 20:36:43 -04:00
kasenvr
5bb0c9bffc
Merge pull request #804 from daleglass/logging_improvements
Improve logging: color, ms timestamps, PID, thread id via environment variable
2020-10-29 20:12:18 -04:00
kasenvr
09f18a7d66
Merge pull request #791 from daleglass/fix-build-warnings-on-qt-5.15
Qt 5.15 fixes: Initialize flags with default constructor
2020-10-29 17:39:06 -04:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener
[enhancement] transition listener registration from member string name to member string pointer
2020-10-29 17:13:05 -04:00
daleglass
6c25b9470d
Update libraries/shared/src/LogHandler.cpp
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
2020-10-29 19:20:18 +01:00
humbletim
ae7aa3eb88 update ScriptCache to detect local script modifications 2020-10-29 11:30:33 -04:00
humbletim
f012772fa3 add toHttpDateString helper method 2020-10-29 11:29:26 -04:00
Dale Glass
3284313399 Mark font textures as something that shouldn't be downscaled 2020-10-27 18:24:08 +01:00
kasenvr
5c945c1524
Merge pull request #840 from kasenvr/fix/ess-logging-crash
Prevent crash on entity-script-server due to logging interface.
2020-10-25 23:09:05 -04:00
kasenvr
4b2c71cf61
Update libraries/script-engine/src/ScriptEngine.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-25 19:49:59 -04:00
Kalila L
50067e3361 Prevent crash on entity-script-server for due to logging interface. 2020-10-25 18:36:20 -04:00
David Rowe
01cd4aa22d Reduce horizontal size of HUD overlay from 270 deg to 180 deg 2020-10-24 16:05:17 +13:00
David Rowe
4d70651c69 Make default reticle depth be HUD overlay radius 2020-10-24 16:00:55 +13:00
David Rowe
436bed3a69 Increase HUD overlay radius 2020-10-24 16:00:39 +13:00
HifiExperiments
f413ad3312 small fixes 2020-10-21 16:05:30 -07:00
HifiExperiments
115229da92 build error 2020-10-20 19:31:03 -07:00
HifiExperiments
081e2b13af small fixes 2020-10-20 17:49:06 -07:00
HifiExperiments
2dd612b926 more improvements 2020-10-20 17:12:23 -07:00
HifiExperiments
c664991f6f models seem to be working! 2020-10-20 15:06:21 -07:00
Kalila L
413c21f482 Append Vircadia to the environment variable for the metadata exporter port. 2020-10-19 01:07:07 -04:00
Dale Glass
7a186bba34 Fix issues with integer overflow in memory pressure calculations 2020-10-18 22:13:28 +02:00
Dale Glass
0d4987878e Review fixes 2020-10-18 20:35:19 +02:00
Dale Glass
482211d6eb Try the MESA pathway always if not ATI or NVIDIA
This will work fine on non-Linux systems, because the query should
simply fail on systems that don't support it.

This should improve functionality on nouveau
2020-10-18 20:35:19 +02:00
Dale Glass
991cfdae69 Automatic texture memory based on free memory 2020-10-18 20:35:19 +02:00
Dale Glass
349ba16a3c Review fixes 2020-10-18 20:35:19 +02:00
Dale Glass
8615ec5596 Initial version of automatic texture memory size 2020-10-18 20:35:19 +02:00
Dale Glass
1124590422 Enable color by default on Unix, change to comma separators.
Also emit a message if an unrecognized log option is used.
2020-10-16 20:16:44 +02:00
kasenvr
2b3b3fb88f
Merge pull request #788 from kasenvr/fix/hifi-production-migration
Update hifi-production links
2020-10-15 17:17:36 -04:00
Dale Glass
8084bd0c5e Initialize flags with default constructor
Fixes a lot of:

warning: ‘constexpr QFlags<T>::QFlags(QFlags<T>::Zero) [with Enum = QFileDialog::Option; QFlags<T>::Zero = int QFlags<QFileDialog::Option>::Private::*]’ is deprecated: Use default constructor instead [-Wdeprecated-declarations]
2020-10-15 00:32:24 +02:00
HifiExperiments
44b34e0341 what about...this 2020-10-14 13:21:07 -07:00
HifiExperiments
9142b7123d collisions and dimensions seem to be working 2020-10-13 16:27:48 -07:00
kasenvr
908774ae53
Merge pull request #806 from daleglass/use_legacy_opengl
Set OpenGL_GL_PREFERENCE to LEGACY
2020-10-13 19:17:23 -04:00
Dale Glass
895d4d4172 Improve logging: color, ms timestamps, PID, thread id via environment variable
Set VIRCADIA_LOG_OPTIONS to a string containing these keywords:

	color
	milliseconds
	process_id
	thread_id

The separator doesn't matter. Example:

    $ export VIRCADIA_LOG_OPTIONS="color milliseconds"
2020-10-13 20:22:01 +02:00
Dale Glass
7b6fbe1f69 Set OpenGL_GL_PREFERENCE to LEGACY
GLVND appears to break the entire UI on ATI video cards.

It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.

An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
2020-10-13 20:13:45 +02:00
kasenvr
3a665c6eac
Merge pull request #773 from ctrlaltdavid/fix/gltf-crash
Fix handling of missing glTF blendshape target meshes
2020-10-13 05:25:43 -04:00
kasenvr
36a4ab8c12
Merge pull request #789 from kasenvr/fix/apidocs-find-entities
Update API docs to specify entity-server-script findEntities caveat.
2020-10-13 05:20:43 -04:00
HifiExperiments
ae7a46fbca more updates 2020-10-12 22:31:39 -07:00
HifiExperiments
5a8c1a0374 starting improve entity updates pt 2 2020-10-12 18:50:46 -07:00
kasenvr
d12cd36eb3
Merge pull request #677 from HifiExperiments/mouse
Add option to capture mouse
2020-10-12 13:19:36 -04:00
Kalila L
05ad300894 CR. 2020-10-11 00:50:41 -04:00
Kalila L
36f5fd9636 Merge branch 'master' into feature/require-redownload 2020-10-11 00:15:52 -04:00
HifiExperiments
e028943645 CR 2020-10-09 13:33:48 -07:00
Kalila L
af8ee9980c CR 2020-10-09 00:43:05 -04:00
kasenvr
114b255668
Update libraries/entities/src/EntityScriptingInterface.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-09 00:41:59 -04:00
kasenvr
76093185b7
Merge pull request #763 from daleglass/fix-opengl-cmake-warning
Set GL preference to GLVND
2020-10-08 19:03:34 -04:00
Kalila L
fbae2d902b Update API docs to specify entity-server-script findEntities caveat. 2020-10-07 20:40:29 -04:00
Kalila L
60b31000d7 hifi-production DomainContent -> vircadia-content 2020-10-07 19:44:14 -04:00
kasenvr
b182a7b371
Merge pull request #669 from odysseus654/pr/script-logging
add more details to messages logged in entity scripts
2020-10-06 04:35:11 -04:00
kasenvr
01185c94b4
Merge pull request #761 from daleglass/fix-more-warnings
Fix more warnings
2020-10-03 14:25:09 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
kasenvr
c975d1acec
Update libraries/script-engine/src/ScriptEngine.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-02 15:32:05 -04:00
Kalila L
853c8052f4 Merge branch 'master' into pr/669 2020-10-02 15:29:51 -04:00
David Rowe
6b7b1c5040 Fix handling of missing glTF blendshape target meshes 2020-10-02 16:23:00 +13:00
Dale Glass
1c44bc96d9 Set GL preference to GLVND
This should be a no-op, besides generating less build warnings,
since:

"CMake 3.11 and above prefer to choose GLVND libraries."

And 3.11 is a few years old at this point
2020-09-27 20:37:12 +02:00
Dale Glass
8761b26079 Remove unused variable 2020-09-26 23:01:05 +02:00
Dale Glass
2fac1ddf2c Add missing 'override'
Fixes:
warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override]
2020-09-26 22:58:44 +02:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
kasenvr
faadb9e340
Merge pull request #668 from kasenvr/fix/URL-migrations
New Metaverse PR
2020-09-26 01:21:17 -04:00
kasenvr
1c818bc8eb
Merge pull request #657 from daleglass/fix-build-on-qt-5.14
Fix build on qt 5.14
2020-09-24 17:11:42 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings
Fix warnings emitted by GCC
2020-09-24 17:06:16 -04:00
daleglass
fffb6619b3
Update libraries/shared/src/BufferParser.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-24 22:17:22 +02:00
daleglass
ed4164b59e
Update libraries/shared/src/GeometryUtil.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-24 22:17:16 +02:00
Dale Glass
9b4d115a5d Review fixes
Make it ignore a // at the beginning of the URL
2020-09-24 19:37:14 +02:00
Dale Glass
1d58ac4d79 Sanitize the URL further by removing leading slashes and any duplicated ones 2020-09-23 23:33:22 +02:00
Dale Glass
b243d382fc Fix warning due to multiline comment 2020-09-23 22:34:01 +02:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
David Rowe
ba7242f4dc Script.getExternalPath() and related JSDoc 2020-09-23 17:23:40 +12:00
kasenvr
dcf1e41086
Update libraries/entities/src/EntityScriptingInterface.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-22 23:49:07 -04:00
David Rowe
3344c7423d Fix up types 2020-09-22 20:52:15 +12:00
Kalila L
9db333a555 Update CDN URLs in NetworkingConstants.h 2020-09-21 16:07:56 -04:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Kalila L
f465ecb53b Update STUN server 2020-09-20 17:56:54 -04:00
kasenvr
88fc213644
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-19 23:53:04 -04:00
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04:00
Dale Glass
929f395503 Spend more less time in the lock, do a sanity check, normalize path 2020-09-20 02:09:54 +02:00
Dale Glass
25a9716642 Fix crash due to incorrect assert 2020-09-20 02:08:22 +02:00
Dale Glass
2de0934598 Some missed review fixes 2020-09-20 01:57:44 +02:00
David Rowe
2c84478dc1 Register metatype 2020-09-20 01:29:32 +02:00
Dale Glass
89aa89e9d3 Review fixes (non-working)
Trouble with:

> Script.getExternalPath(Script.ExternalPaths.Assets, "hi")

[UncaughtException evaluate] Error: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType()) in about:console:1 [Backtrace] <global>() at about:console:1
TypeError: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType())
2020-09-20 01:29:32 +02:00
Dale Glass
792854ccb7 Applied code formatter 2020-09-20 01:29:32 +02:00
Dale Glass
84e01630ee Make base URLs for external resources modifiable 2020-09-20 01:29:32 +02:00
Dale Glass
e0e4ffb214 Review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
26bcaa420d Better enum registration 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
HifiExperiments
e4f32f1cea add camera sensitivity slider 2020-09-19 11:23:59 -07:00
kasenvr
68cefda3e5
Merge pull request #718 from kasenvr/feature/domain-server-metaverse-switching
Domain Metaverse Switching & Interface Support Improved
2020-09-18 22:55:43 -04:00
Kalila L
bcd5f242b9 Added type and filename doc for Script API. 2020-09-18 18:52:49 -04:00
kasenvr
cf26f6bc4b
Merge pull request #694 from ctrlaltdavid/fix/import-json-textures
Support relative JSON URLs in model textures property
2020-09-18 17:00:13 -04:00
Kalila L
9a35323295 Update entities API docs to show entity properties at top. 2020-09-18 16:27:42 -04:00
Kalila L
9f3978d3d5 Update system to use a checkbox + setting instead. 2020-09-17 18:40:01 -04:00
Kalila L
8eb12a873b Revert forceRedownload functionality. 2020-09-17 14:14:32 -04:00
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -04:00
kasenvr
0236f49779
Merge pull request #705 from ctrlaltdavid/fix/bs-property-warning
Quiet warning for unused blendshapeCoefficients property
2020-09-16 22:39:29 -04:00
Kalila L
8a71c66fcc Added comments. 2020-09-16 20:01:47 -04:00
kasenvr
fd5b84b6eb
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-16 19:57:58 -04:00
Kalila L
4224c8120f Set metaverse and ice to Vircadia again. 2020-09-15 21:06:27 -04:00
Kalila L
9b0ac9d75f Update endpoints to be consistent and work with the updates. 2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af Add support for metaverse API's with paths. 2020-09-15 20:07:00 -04:00
Kalila L
d5f5c76878 Update NetworkingConstants.h URLs to Vircadia Metaverse. 2020-09-15 19:57:30 -04:00
Kalila L
932a3b9e91 Update AudioClient.cpp
Fix double locking attempt if waitForFinished causes prepareLocalAudioInjectors to be called on this thread.

Co-Authored-By: Heather Anderson <1115056+odysseus654@users.noreply.github.com>
2020-09-14 02:58:36 -04:00
kasenvr
e6f3ba4458
Merge pull request #311 from odysseus654/pr/webpage-restrict-from-polling
[shutdown-deadlock] Restructure ContextAwareProfile from polling to notifications
2020-09-12 22:17:50 -04:00
kasenvr
370c2700be
Merge pull request #640 from kasenvr/feature/package-startup-interface
Add ability to package Interface with a custom startup location (also tacks on some build docs updates)
2020-09-12 22:17:25 -04:00
kasenvr
ad28067cbe
Merge pull request #699 from ctrlaltdavid/fix/gltf-raycasting
Fix pick rays not intersecting glTF models
2020-09-12 22:15:05 -04:00
HifiExperiments
954e8096bb
Merge pull request #309 from HifiExperiments/modelShader
Procedural Shader applies to entities other than target
2020-09-12 11:13:57 -07:00
David Rowe
432090e2e9 Quiet warning for unused blendshapeCoefficients property 2020-09-10 21:01:04 +12:00
David Rowe
84cb3b2515 Fix pick rays not intersecting glTF models 2020-09-10 08:58:35 +12:00
HifiExperiments
9546cebe3c CR 2020-09-09 08:32:54 -07:00
David Rowe
dc04622a1d Fix some JSDoc noticed in passing 2020-09-08 22:10:40 +12:00
David Rowe
d8a119c1b3 Support relative JSON URLs in model textures poperty 2020-09-08 22:10:24 +12:00
HifiExperiments
932f5dbfb3 CR 2020-09-06 22:41:17 -07:00
kasenvr
8a007a4edf
Apply suggestions from code review
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-07 01:38:44 -04:00
Kalila L
d25adf9b6f Merge branch 'master' into feature/require-redownload 2020-09-06 23:44:59 -04:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes
Fix and extend glTF blendshapes support
2020-09-03 13:57:57 -04:00
Kalila L
ab46b1fc9e Update ScriptEngine.cpp
Just some revisions...
2020-09-03 01:41:31 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items
Don't display domain log-in items unless relevant
2020-09-02 18:51:14 -04:00
kasenvr
e2c5504be4
Merge pull request #441 from odysseus654/pr/cxx-crashing
improve crashpad reporting of unhandled c++ exceptions
2020-09-02 18:51:01 -04:00
HifiExperiments
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07:00
David Rowe
9fc9b203ae Rename constant 2020-09-02 12:45:44 +12:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
kasenvr
60e6d99aff
Merge branch 'master' into feature/package-startup-interface 2020-09-01 17:40:37 -04:00
David Rowe
2bfdaa31ab Add FIXME for missing relative URL handling case 2020-09-02 09:20:35 +12:00
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
HifiExperiments
ae944fd985 merge with master 2020-09-01 09:34:54 -07:00
David Rowe
4214182b2f Tidy JSON relative URLs importing 2020-09-01 21:08:52 +12:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting
Improving performance of entity updates
2020-09-01 04:34:51 -04:00
kasenvr
6a872ef525
Merge pull request #586 from makitsune/relative-urls
Allow resolving relative urls when importing entities json
2020-09-01 04:34:12 -04:00
HifiExperiments
776b1071a0 try to do it without QCursor::setPos 2020-08-31 15:44:06 -07:00
David Rowe
22e6ae9710 Fix hasBlendedMeshes() value 2020-08-31 21:44:19 +12:00
David Rowe
bd1be872a8 Support using blendshapes in file without needing an FST 2020-08-31 21:31:55 +12:00
Heather Anderson
ee43cfd892 add more details to messages logged in entity scripts 2020-08-30 23:47:54 -07:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
Kalila L
6e39e048be First pass at centralizing some URLs. 2020-08-31 00:43:30 -04:00
David Rowe
0fcc73d5cd Fix multiple blendshapes targeted to one model blendshape 2020-08-31 11:20:56 +12:00
David Rowe
5d02e0fe28 Fix blendshapes on planar meshes 2020-08-29 16:12:10 +12:00
David Rowe
128745ef36 Make blendshapes work for glTF with multiple mesh parts 2020-08-29 16:11:35 +12:00
David Rowe
a819b140dc Don't weight blendshapes by default blendshape values 2020-08-29 14:17:54 +12:00
David Rowe
f946791791 Make blendshaps work for glTF with single mesh part 2020-08-29 14:17:13 +12:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
David Rowe
e0767e2f8c Add HFM model dump for FBX files 2020-08-29 11:02:54 +12:00
David Rowe
98cef38aea Initial tidying 2020-08-29 09:14:49 +12:00
HifiExperiments
2e4a6ee1b5 fix build errors 2020-08-28 11:22:08 -07:00
HifiExperiments
2a1857e9ec split entity script engines into two 2020-08-27 16:50:32 -07:00
Dale Glass
5a8be4de4b Fix -Wclass-memaccess warnings 2020-08-27 19:49:48 +02:00
Dale Glass
baa0fd34f4 Fix unsigned warnings 2020-08-27 19:48:27 +02:00
Dale Glass
afa44dccf6 Fix initialization order warning
https://stackoverflow.com/questions/30364585/will-be-initialized-after-wreorder
2020-08-27 19:27:11 +02:00
Dale Glass
a8ab9307d0 Add fall-through comments to fix GCC warnings
Unfortunately the attribute can't be used since we're not on C++17 yet.
2020-08-27 19:27:11 +02:00
Dale Glass
e6bd75d497 Fix incorrect fall-through in RenderPipelines 2020-08-27 19:27:11 +02:00
Kalila L
2645547f48 Add forceRedownload parameter to Script.require 2020-08-27 05:57:28 -04:00
Dale Glass
5327ffeec4 Fix build under Qt 5.14 and later.
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
2020-08-26 00:01:29 +02:00
Dale Glass
61a159034c Fix build under Qt 5.14 and later.
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
2020-08-25 23:32:24 +02:00
Kalila L
6b96832db6 Wording. 2020-08-24 18:44:23 -04:00
Kalila L
26d4eb8e67 Updates per CR.
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-08-24 18:43:03 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
David Rowe
eb8ae74245 Tidying 2020-08-23 16:06:16 +12:00
David Rowe
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
David Rowe
29e5bfdb94 Ignore residual "connection denied" packets from previous domain 2020-08-23 14:34:10 +12:00
Kalila L
a032ac66b1 Update AddressManager links to NetworkingConstants. 2020-08-22 20:03:57 -04:00
David Rowe
6926cd205a Ignore residual "connection denied" packets from previous domain 2020-08-20 17:12:57 +12:00
HifiExperiments
af82860751 fix shape issue that alezia found 2020-08-19 19:51:16 -07:00
David Rowe
662b2bfc5e Handle log in for multiple domains with domain login 2020-08-20 12:32:03 +12:00
Kasen IO
91e453c694 Add API docs property. 2020-08-19 12:51:17 -04:00
Kasen IO
c70a041490 Merge branch 'master' into feature/domain-metadata-exporter 2020-08-18 21:35:51 -04:00
Kasen IO
103288b8de Update bool name "isTransparentWeb" -> "transparent" 2020-08-18 20:04:27 -04:00
Kasen IO
204789bd42 Further fix up web entity property processing on reload.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
2020-08-18 19:22:54 -04:00
Kasen IO
8d904d39ce Semi-working fixes for updates to web entities.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
2020-08-18 04:17:29 -04:00
Kasen IO
c379f6c92f Fix transparency check bug.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
2020-08-18 03:21:34 -04:00
Kasen IO
fe1ea6ca72 Bump protocol. 2020-08-18 02:22:56 -04:00
Kasen IO
b05cb8b6ac useBackground property added. 2020-08-18 01:48:27 -04:00
David Rowe
bf60cf5b4c Tidying 2020-08-18 16:33:47 +12:00
David Rowe
9bb5add1ca Don't display domain login status in title bar unless relevant 2020-08-18 11:42:35 +12:00
HifiExperiments
e78ece7fc5 CR 2020-08-17 14:16:41 -07:00
Kasen IO
ca97450464 Centralizing some more networking constants. 2020-08-17 02:44:26 -04:00
Kasen IO
cd5bdf6160 Added transparent + colored background web entity capability dynamically. 2020-08-15 00:56:19 -04:00
Kasen IO
21167a0f6a Maybe fix scriptURL on WebEntities bug 2020-08-14 23:53:01 -04:00
Heather Anderson
34e3d9dd2b improved listener lifetime controls (in case a deferred invoke takes longer than expected) 2020-08-09 15:44:41 -07:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
Kasen IO
95e0907b90 Merge branch 'master' into oauth2-wordpress 2020-08-06 19:11:11 -04:00
Kasen IO
c6a178f72d Update default texture memory from Auto (1GB) -> Auto (2GB). 2020-08-05 20:43:58 -04:00
Kasen IO
5ba33a521f Merge branch 'master' into oauth2-wordpress 2020-08-05 15:41:13 -04:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
HifiExperiments
87fd039f99 fix merge issue 2020-08-04 08:54:44 -07:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
David Rowe
3a43283e7b Provide domain name to domain login dialog 2020-08-04 19:42:02 +12:00
David Rowe
bc56eb5ac7 Update to work with WordPress plugin 2020-08-04 17:12:31 +12:00
Heather Anderson
37c613c3d4 more changes from code review 2020-08-03 20:50:10 -07:00
Maki
3783c98976 Allow resolving relative urls when importing entities json 2020-08-04 01:33:19 +01:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
26e6ce07d7 Further networking tidying 2020-08-03 11:26:11 +12:00
Heather Anderson
0c7aab1556 minor code review 2020-08-02 14:38:55 -07:00
David Rowe
43b6e77235 Tidy networking code 2020-08-03 09:17:12 +12:00
David Rowe
c3769a5f74 Get WordPress API path from domain server settings 2020-08-02 17:33:13 +12:00
David Rowe
8cdd76a42e Verify user at domain server 2020-08-02 16:17:04 +12:00
David Rowe
15c6baceb8 Send OAuth2 username and tokens to domain server 2020-08-01 18:57:21 +12:00
David Rowe
aff3275207 Initial OAuth2 login working 2020-08-01 10:17:27 +12:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
Heather Anderson
4f5f46a623 restructured the code to using a set of ContextAwareProfile objects rather than subscribing to an intermediate object
changed _isRestricted from QAtomicInt to std::atomic<bool>
2020-07-30 22:49:54 -07:00
David Rowe
c3d248a404 Merge branch 'oauth2-wordpress' into feature/oauth2-login 2020-07-31 15:20:32 +12:00
kasenvr
75bd885efc
Merge pull request #564 from HifiExperiments/zoneImport
renderWithZones works on import from JSON
2020-07-30 17:16:41 -04:00
kasenvr
180b7f1bd3
Merge pull request #547 from HifiExperiments/scaled
Fix lag on restart with scaled avatar
2020-07-30 17:15:50 -04:00
Kasen IO
5706a42b56 Implement further handling of Interface OAuth2
This is preliminary, needs to be revisited in a more dynamic and clean fashion with time.
2020-07-29 01:53:21 -04:00
David Rowe
429b4ceefa Flesh out domain groups code 2020-07-28 21:23:55 +12:00
Heather Anderson
47c96fcff5 (re-)discovered QMutexLocker, good for tightening up the code a bit 2020-07-25 20:44:52 -07:00
Heather Anderson
3cff3f8b5d found and removed another STL-ism 2020-07-25 20:44:52 -07:00
Heather Anderson
84a8c640e4 cleaned up variables names, replaced std::shared_ptr with QSharedPointer 2020-07-25 20:44:51 -07:00
Heather Anderson
61e6e8dfc9 Restructure ContextAwareProfile from a (thread-blocking) polling to a threadsafe-notification 2020-07-25 20:44:51 -07:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +12:00
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
82252cdc08 Get basics working 2020-07-25 16:22:52 +12:00
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12:00
David Rowe
d923936854 Merge branch 'master' into feature/oauth2-master-update 2020-07-25 10:06:18 +12:00
David Rowe
0b667e34a2 Regularize naming 2020-07-24 22:02:23 +12:00
David Rowe
6d310eb999 Generate "NotAuthorizedDomain" condition 2020-07-24 21:22:00 +12:00
David Rowe
9b13f0bebb Merge branch 'feature/oauth2-groups' into feature/oauth2-login-required 2020-07-24 11:14:47 +12:00
David Rowe
2e9355da58 Distinguish not logged into metaverse vs domain 2020-07-24 11:13:41 +12:00
kasenvr
65d1a88a0c
Merge pull request #545 from ctrlaltdavid/fix/fbx-single-color
Fix display of FBX models with only one color for vertices
2020-07-23 17:27:12 -04:00
kasenvr
ce6573333c
Merge pull request #543 from HifiExperiments/alpha
Fix shape alpha 0 issue
2020-07-23 17:23:20 -04:00
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent
Fix/move user agent
2020-07-23 17:13:18 -04:00
David Rowe
07504232a9 Move new connection refused reason to end to maintain compatability 2020-07-24 08:43:40 +12:00
Kasen IO
a5d0c80c87 Revert "Remove supposedly unused logic?"
This reverts commit 9fd3f764ec.
2020-07-23 00:37:50 -04:00
Kasen IO
9fd3f764ec Remove supposedly unused logic? 2020-07-23 00:18:11 -04:00
Kasen IO
d3320ab17b Separate domain vs metaverse login denials for Interface. 2020-07-23 00:18:04 -04:00
David Rowe
e4c9657ab9 Initial auxiliary groups code 2020-07-23 16:08:09 +12:00
HifiExperiments
1c8f783be6 try to fix renderWithZones from JSON 2020-07-22 14:38:33 -07:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
HifiExperiments
8274ee3ca9 put back old last edited logic 2020-07-20 15:10:48 -07:00
HifiExperiments
cbce911e83 fix lag on restart with scaled avatar 2020-07-17 14:40:40 -07:00
David Rowe
335bc7b4db Fix display of FBX models with only one color for vertices 2020-07-17 20:17:08 +12:00
HifiExperiments
e635d0ff87 fix alpha 0 issue 2020-07-16 15:29:58 -07:00
HifiExperiments
a7861855a7 properties update over wire 2020-07-16 14:34:02 -07:00
Kasen IO
ad2c3f08e6 Update further links. 2020-07-10 18:50:58 -04:00
HifiExperiments
c9684b8c6d Merge remote-tracking branch 'upstream/master' into parenting 2020-07-10 11:43:03 -07:00
Kasen IO
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00
kasenvr
4b3765c9b3
Merge pull request #507 from AleziaKurdis/issue398
JS Doc update for enterEntity signal.
2020-07-09 17:34:35 -04:00
kasenvr
d5b5bdc382
Merge pull request #505 from daleglass/increase_max_texture_size
Increase maximum texture size to 8192
2020-07-09 17:33:51 -04:00
kasenvr
56b6d370fb
Merge pull request #504 from kasenvr/fix/import-entities-any-domain
Import entities now works on domains that you do not have rights on.
2020-07-09 17:18:48 -04:00