Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 05:29:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

34800 commits

Author SHA1 Message Date
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
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Alezia Kurdis
6c24f646bb
Added an hyperlink to preload in enterEntity JSdoc 
1- Added an hyperlink to "preload" signal in enterEntity JSdoc.
2- Removed the useless 
", but only if the entity has an entity method exposed for this event." 
from "enterEntity" and "leaveEntity" JSdoc (lines 2402 and 2413)
 2020-07-07 23:05:24 -04:00
kasenvr
f22c56038c
Update libraries/octree/src/Octree.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-06 22:21:39 -04:00
Alezia Kurdis
a78446dbef
JS Doc update for enterEntity 
JS Doc update for enterEntity:
Triggered when an avatar enters an entity, but only if the entity has an entity method exposed for this event. Note: At the initial loading of the script, if the avatar is already present inside the entity, it might be too late to catch this event when the script runs, so it won't trigger. The 'preload' signal can be used to handle those cases.

To solve issue #398
 2020-07-04 23:15:10 -04:00
kasenvr
bc249abe48
Merge pull request #474 from kasenvr/fix/anim-warning-spam 
Reduce Missing Joint Log Spam
 2020-07-04 19:46:59 -04:00
kasenvr
2cc5679ca2
Merge pull request #435 from HifiExperiments/model 
Possible fix for entity server crash
 2020-07-04 17:38:21 -04:00
kasenvr
ed2894a9f9
Merge pull request #480 from kasenvr/fix/gltf-corrupt-crash 
Prevent a crash for corrupted GLTF models.
 2020-07-04 17:20:24 -04:00
Kasen IO
44e5bbb591 Add init for timer to constructor. 2020-07-04 00:48:03 -04:00
Dale Glass
9f25891639 Increase maximum texture size to 8192 2020-07-03 23:43:18 +02:00
Kasen IO
7ba3eba3b9 Add missing constant. 2020-07-03 16:44:41 -04:00