Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-19 15:43:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 25 branches 28 tags 1.2 GiB
Commit graph

31397 commits

Author SHA1 Message Date
Phil Palmer
3cc08022fc Leaning and lean recentering now work as intended at any avatar scale. 
Individually tested each of these scale fixes in third-person view.
Simplify withinBaseOfSupport.
Change input parameter from float& to float (isWithinThresholdHeightMode).
Debug: remove unnecessary Y offset that didn't scale properly with the avatar (drawBaseOfSupport).
 2020-12-31 05:09:06 -05:00
Phil Palmer
4a0bde415b Fix an old confusing comment from 952b112271 2020-12-31 00:06:25 -05:00
Phil Palmer
c5fe49bc30 Decouple MyAvatar.centerOfGravityModelEnabled from the user standing state. 
Engine code no longer controls MyAvatar.centerOfGravityModelEnabled.  Maybe we should deprecate it now, since its reason to exist seemed to be only to disable the CG model while the user was sitting, which is now done more explicitly (see below).

MyAvatar::FollowHelper:
- rename shouldActivateHorizontal to shouldActivateHorizontal_userSitting, now private.
- rename shouldActivateHorizontalCG to shouldActivateHorizontal_userStanding, now private.
- add new shouldActivateHorizontal that calls one of the above based on the user's sit/stand state.
- these functions no longer modify their 'myAvatar' parameter.

Add USER_CAN_TURN_BODY_WHILE_SITTING (false), which retains the old rotation behaviour of lean recentering:
a lean recenter doesn't rotate the body if the user is sitting (new: unless the feet are tracked).
In other words, the lean recentering assumes the user isn't on a swivel chair and keeps the avatar pointing in the same direction.  It might be good to expose that as an option.  (Regardless, rotation recentering does kick-in if they turn too far).
 2020-12-30 23:14:42 -05:00
Phil Palmer
a95d29d327 Fix leaning not using center-of-gravity model in mode 'Allow avatar to stand: When I'm standing'. 
computeHipsInSensorFrame was accidentally setting useCenterOfGravityModel to false if !getHMDCrouchRecenterEnabled.  Now it sets it to true if !getHMDCrouchRecenterEnabled.  So if artificial standing is disabled, it uses center-of-gravity regardless of the user's sit/stand state.
 2020-12-30 21:36:24 -05:00
Phil Palmer
44324584b4 Fix accidental change of bracing style. 2020-12-30 04:30:52 -05:00
Phil Palmer
8d3e2ae9ee Remove MyAvatar "squat" recenter from ad6bbc7ff6 
The "squat" recenter pre-dates the sit/stand detection, but the current version basically came from ad6bbc7ff6 in 2018.  I'm removing it because it doesn't seem useful anymore (with or without the other changes in this branch).

What it did (on the current master) :
- If "Avatar leaning behavior" was "Auto"
- and the user was standing
- but their head was more than 5cm below standing height
- and their chest was upright
- for 30 seconds
- do a vertical recenter so that the avatar stands straight (instead of having knees bent).
When the user stood up straight after that recenter, the avatar would hover off the ground until the next recenter (eg. walking).
 2020-12-30 04:21:24 -05:00
Phil Palmer
8cf7660993 Replace a tab with spaces. 2020-12-30 02:00:28 -05:00
Phil Palmer
8ca6421376 Correct the name of a scale factor (had inverted meaning). 2020-12-30 01:56:05 -05:00
Phil Palmer
cba79c72f5 Re-added API features that are no longer used internally; marked them as deprecated. 
As suggested in the review here: https://github.com/vircadia/vircadia/pull/928/files#r549821976

Re-added and deprecated MyAvatar.userRecenterModel.  Retained the functionality of setUserRecenterModel, and approximated that of getUserRecenterModel (some stand+lean preference pairs had no equivalent before).

Re-added and deprecated MyAvatar.isSitStandStateLocked.  Approximated the functionality of getIsSitStandStateLocked.
Didn't retain that of setIsSitStandStateLocked, because it wouldn't be useful on its own; someone using it would probably want setUserRecenterModel instead (or new functions to set the standing and leaning preferences).

isSitStandStateLocked's reason to exist was that we could stop keeping track of the user's real-world sit/stand state (in updateSitStandState), and instead pretend the user was always standing (for SitStandModelType::ForceStand) or always sitting (for SitStandModelType::ForceSit).
That determined whether the avatar was allowed to lean (wouldn't lean if the user was sitting or in ForceSit).
Now though, the user explicitly chooses when the avatar may lean: never / just when the user is standing / even when the user is sitting.

These API features were removed in 2179c153de ("VR fixes for: couldn't sit on the floor, wrong walk directions").
 2020-12-30 01:01:35 -05: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
Phil Palmer
d49cdfff6b Remove accidental change of style in a variable declaration. 2020-12-29 18:31:42 -05:00
Phil
7e5680b2a6
Apply suggestions from code review 
Tidying (bracing style, spaces, remove final comma from enum, fix JSDoc comment).

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-29 18:25:17 -05:00
Phil Palmer
1e54d41f95 Remove static variable from MyAvatar::update (made it a member). 2020-12-28 05:37:06 -05:00
Phil Palmer
2be87fe7dc Fix VR recentering cases that gave incorrect vertical position. 
Fix for MyAvatar sometimes hovering off the ground after foot tracking was enabled.  MyAvatar's body is now recentered when foot-tracking starts or ends (in MyAvatar::update).
Repro:
- Start without foot tracking, 'Allow my avatar to stand: Always'.
- Crouch, and wait a few seconds for the avatar to pop back to the standing position.
- Slowly stand straight so that the avatar raises off the ground without recentering (PS: is this a bug?).  If it recenters, retry from previous step.
- Calibrate foot tracking.  Previously the avatar would remain hovering off the ground until MyAvatar::centerBody was called.

Fix for MyAvatar popping to a standing position if the left foot lost tracking.  The recentering now takes into account if either of the feet are tracked.
Repro:
- Enable foot tracking (and ideally hips tracking).
- Sit on the floor.
- Cover the left foot sensor so it loses tracking.  Previously the avatar and viewpoint would pop to a standing position.

Optimisation: MyAvatar::update now stores bools indicating which body parts are tracked (_isBodyPartTracked).  This avoid unnecessary computations that came from using getControllerPoseInAvatarFrame to convert controller::Pose from sensor space to world space and then to avatar space, only to check if the pose was valid.
 2020-12-27 22:13:09 -05:00
Phil Palmer
3e25e32f18 Revert temporary "added pragmas" (optimize off) 
This reverts commit 20e4f952ab.
 2020-12-27 02:52:52 -05:00
Phil Palmer
dec9e9d338 VR fix for different avatar scales. 
Previously, if the avatar scale wasn't 1, the body and viewpoint would given the wrong vertical position in some situations, eg: getting up from click-to-sit; changing the 'Allow my avatar to stand' setting.
The avatar scale was being taken into account where it shouldn't have in MyAvatar::deriveBodyFromHMDSensor.
The bug started in 8b839fe71b ("VR fixes for different user heights and avatar scales".
Repro:
1. Set 'Allow my avatar to stand: Always'
2. Reduce the avatar scale to the minumum.
3. Set 'Allow my avatar to stand: When I stand'
4. Previously, the viewpoint would suddenly be below the floor.
 2020-12-27 02:50:29 -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
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
8b839fe71b VR fixes for different user heights and avatar scales. 
- The user's real-world height is now taken into account in MyAvatar::deriveBodyFromHMDSensor.  Therefore, for any user height, the floor stays correctly positioned in all modes of 'Allow my avatar to stand'.
- Whenever the user's real-world height is changed, centerBodyInternal is now called to position the body accordingly.  The floor therefore stays correctly positioned in all modes of 'Allow my avatar to stand'.  (MyAvatar::setUserHeight)
- Fix for walk speeds in VR being too fast at large avatar scale and too slow at small avatar scale.  The action motor velocity was being scaled once too many by the sensor-to-world scale.  The bug existed before this branch.  (MyAvatar::scaleMotorSpeed)
 2020-12-23 07:54:59 -05:00
Phil Palmer
287f710ea1 Fix MyAvatar::centerBody breaking existing scripts (eg. away.js) by having a new parameter: 
Moved the body of the function to a private internal method (centerBodyInternal), which takes the parameter instead.
Previously, when leaving 'away' state, the 'Away' overlay would stay on screen because of the bug.
The bug started in "VR fixes for: couldn't sit on the floor, wrong walk directions." (2179c153de).
 2020-12-22 19:32:43 -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
HifiExperiments
7069e48073 working on pivot 2020-12-16 21:01:56 -08:00
Kalila
633c642d4a
Merge pull request #906 from vircadia/fix/update-references 
Fix/update references
 2020-12-15 01:29:47 -05: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
Kalila
8c4ce96c63
Merge pull request #830 from HifiExperiments/update 
Entity update improvements 2
 2020-12-14 17:56:01 -05:00
Kalila
1634138c62
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-13 16:24:42 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
Kalila L
f5485e858c Licensing headers. 2020-12-10 18:56:04 -05:00
kasenvr
9b253c3a32
Update interface/src/main.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-11-25 16:27:46 -05:00
HifiExperiments
2e780c34d1 Merge remote-tracking branch 'upstream/master' into update 2020-11-24 16:34:30 -08:00
David Rowe
b865e9bc8c Fix laser intersection with HUD overlay dialogs 
Also fixes dialog resize outline being drawn in the wrong position
(desktop and HMD).
 2020-11-23 16:02:32 +13:00
Kalila L
f7b0437bc8 Initial add of crash report arg option. 2020-11-21 00:03:56 -05:00
kasenvr
9dbf41647e
Merge pull request #852 from ctrlaltdavid/feature/email-domain-login 
Enable username or e-mail for domain login
 2020-11-15 22:56:25 -05:00
kasenvr
5080909bb9
Merge pull request #664 from kasenvr/feature/require-redownload 
Feature/require redownload
 2020-11-12 17:10:08 -05:00
kasenvr
ec36621d40
Merge pull request #847 from humbletim/modkit-example-revamp 
Example "modkit" JS Plugin renovation
 2020-11-12 00:41:40 -05: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
a123a2171b
Merge pull request #833 from AleziaKurdis/CreataAppOCT2020 
Create Application: Improvements October 2020
 2020-11-04 17:08:18 -05:00
David Rowe
e28b2025a9 Prompt for username or e-mail for domain login 2020-11-03 20:47:48 +13:00
kasenvr
4cb3287764
Merge pull request #842 from ctrlaltdavid/fix/hide-wallet-mention 
Hide "Secure Transactions" section in Settings > Security
 2020-10-29 20:10:32 -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
humbletim
f54b1c5fed revamped modkit plugin example 2020-10-28 21:26:01 -04:00
David Rowe
d31d7f0a18 Hide "secure transactions" section in Settings > Security 2020-10-26 14:36:36 +13:00
David Rowe
cbef9d2926 Fix HUD content displaying only every second HUD recentering 2020-10-24 21:28:49 +13:00
David Rowe
9f95b101fe Enable "center UI" to be triggered on rotation 2020-10-24 16:37:38 +13:00
David Rowe
d2b15d7cba Reduce "center UI" trigger distance from 0.99m to 0.33m 2020-10-24 16:27:03 +13:00
David Rowe
436bed3a69 Increase HUD overlay radius 2020-10-24 16:00:39 +13:00
Alezia Kurdis
affad6741c
Better icons for Hierarchy 
Better icons for Hierarchy
 2020-10-21 22:44:55 -04:00
Alezia Kurdis
35210fdb32
Add Hierarchy display in List and Selection 
Add Hierarchy display in List and Selection
 2020-10-21 01:12:48 -04:00
kasenvr
d2d10d2975
Merge pull request #821 from JulianGro/apidoc 
Update decimatedTextureCount apidoc
 2020-10-17 14:31:01 -04:00
Julian Groß
41d15b6fc3 Update decimatedTextureCount apidoc 2020-10-17 12:06:31 +02:00
kasenvr
bfd45a0d53
Merge pull request #760 from AleziaKurdis/754_CreateApp_HMD_Improvments 
Create App: HMD missing functionalities
 2020-10-16 02:06:00 -04: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
kasenvr
97c823ab4d
Merge pull request #808 from JulianGro/valve_calibration_workaround 
Workaround: Add Valve Index to calibratable devices
 2020-10-15 17:11:45 -04: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
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
Julian Groß
1a3f97bdc8 Change to Davids suggestion 2020-10-13 18:33:15 +02:00
Julian Groß
2b38c07aab Add Valve Index to calibratable devices 2020-10-13 02:50:53 +02: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
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
dc554bb8c6 Update some descriptions. 2020-10-07 19:37:10 -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
ea4ae45d9e
Merge pull request #778 from ctrlaltdavid/feature/chat-open-browser 
Open chat hyperlinks in Interface browser window
 2020-10-06 04:34:48 -04:00
David Rowe
081c0672bf Fix JSDoc 2020-10-03 17:05:28 +13:00
David Rowe
cd7e1d0865 Miscellaneous tidying 2020-10-03 17:01:46 +13:00
David Rowe
64eb4d11e1 Add URL parameter to Window.openUrl() API function 2020-10-03 17:00:43 +13:00
David Rowe
7ea6452de0 Fix Interface crash when using About.openUrl() in script 2020-10-03 16:06:38 +13:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
Kalila L
853c8052f4 Merge branch 'master' into pr/669 2020-10-02 15:29:51 -04:00
Alezia Kurdis
4f3f2a079e
Added Parent and Unparent icon 
Added Parent and Unparent icons:
Link (K) / Unlink (L)
 2020-09-30 00:37:59 -04:00
Alezia Kurdis
e1e09546cf
Add HMD MultiSelect icon 
Add HMD MultiSelect icon
 2020-09-28 23:07:16 -04:00
Kalila L
71f8d37754 Update tutorial JSON. 2020-09-28 04:28:36 -04: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
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
Alezia Kurdis
4f353ec668
New fonts for pictograms 
New fonts for pictograms
since "hifi-glyphs.ttf" has no more room for new icons.

This contains icons for copy, cut, paste, duplicate, undo, redo... and a V logo.
 2020-09-26 00:38:53 -04:00
Kalila L
46875a6cf1 Update tutorial to Vircadia EU CDN. 2020-09-25 20:55:57 -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
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04:00
David Rowe
32b7823a73 Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource 
# Conflicts:
#	libraries/networking/src/ExternalResource.h
 2020-09-23 23:25:42 +12:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
32efb2443e Don't store current CDN paths in Interface.json at present 2020-09-23 22:15:40 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
Kalila L
24d4076079 Fix another URL. 2020-09-23 03:56:50 -04:00
Kalila L
ec15b51110 Fix typo. 2020-09-23 02:52:20 -04:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
ff46a40741 Update avatarbookmarks.json and allow parsing of new 'avatarIcon' property. 2020-09-22 20:16:15 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
David Rowe
4959ca4975 Move ExternalResource call into method 
Fixes Interface crash on Windows.
 2020-09-22 20:52:52 +12: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
David Rowe
8227705ed7 Fix GLB files not being able to be added from Asset Server 2020-09-21 11:59:02 +12:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04: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
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
Kalila L
f6ec13704b Copyright header updates. 2020-09-18 16:31:57 -04:00
Kalila L
9f3978d3d5 Update system to use a checkbox + setting instead. 2020-09-17 18:40:01 -04:00
Kalila L
bba8aecc4c Fix typo. 2020-09-17 17:15:33 -04:00
Kalila L
ed79f03755 Include metaverse URL in window title. 2020-09-16 22:59:47 -04:00
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -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
David Rowe
d6a49439b8 Fix "Serverless" capitalization in title bar 2020-09-15 15:57:34 +12: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
David Rowe
2985ac2262 Twek browser bar layout 2020-09-10 13:15:56 +12:00
HifiExperiments
9546cebe3c CR 2020-09-09 08:32:54 -07:00
HifiExperiments
932f5dbfb3 CR 2020-09-06 22:41:17 -07:00
David Rowe
29b96432bc Clear favicon image when page is changed 2020-09-06 21:04:13 +12:00
David Rowe
1d27c0138c Fix browsing history 2020-09-06 21:00:45 +12:00
David Rowe
7da2fa1315 Add open-in-externa-window button 2020-09-06 20:56:44 +12:00
David Rowe
9d3b763256 Add hover state to browser window buttons 2020-09-06 20:49:29 +12:00
David Rowe
fd2535ecaf Fix browser window buttons and Web page favicon display 2020-09-06 20:40:07 +12: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
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
kasenvr
c7fbddf024
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp 
Test moving to qt image error handling in avatar app
 2020-09-02 18:50:31 -04:00
kasenvr
9004fb8060
Merge pull request #624 from ctrlaltdavid/feature/vircadia-about 
Add "About" JavaScript API and platform string
 2020-09-02 18:50:09 -04:00
HifiExperiments
1403f8908f don't capture mouse when other windows or menus are active 2020-09-02 11:58:22 -07:00
HifiExperiments
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07: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
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting 
Improving performance of entity updates
 2020-09-01 04:34:51 -04:00
HifiExperiments
776b1071a0 try to do it without QCursor::setPos 2020-08-31 15:44:06 -07:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12: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
kasenvr
2ac6cbd808
Update interface/resources/qml/+webengine/BrowserWebView.qml 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-26 13:49:34 -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
feac9683c4 Remove unneeded if checks for INITIAL_STARTUP_LOCATION assignment. 2020-08-23 01:52:53 -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
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
Vegaslon
c6fbe08a8f Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down. 2020-08-20 08:59:57 -04:00
Kasen IO
0e609b6777 Fixed web entities useBackground on reload. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-08-18 18:49:28 -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
Kasen IO
7e5e513dc1 Update Web3DSurface.qml 2020-08-17 15:13:07 -04:00
Kasen IO
ca97450464 Centralizing some more networking constants. 2020-08-17 02:44:26 -04:00
David Rowe
66cdefa4b3 Add a new "About.platform" property 2020-08-17 11:47:56 +12:00
David Rowe
70fd954ef4 Replace the "HifiAbout" API with a new "About" API 2020-08-17 11:34:58 +12:00
Kasen IO
4336291635 Fix bool. 2020-08-15 01:33:18 -04:00
Kasen IO
2590dfbaa7 Remove unused tests for backgroundColor. 2020-08-15 00:57:10 -04:00
Kasen IO
cd5bdf6160 Added transparent + colored background web entity capability dynamically. 2020-08-15 00:56:19 -04: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
1601ea9231 Just to prove it works... needs to be done better. 2020-08-07 15:08:00 -04:00
Kasen IO
95e0907b90 Merge branch 'master' into oauth2-wordpress 2020-08-06 19:11:11 -04:00
David Rowe
81c402ab9c Code review 2020-08-06 21:40:36 +12:00
kasenvr
3ba78163da
Update PerformanceManager.cpp 
I got that typo for sure this time.
 2020-08-06 01:12:37 -04:00
Kasen IO
9607491ea2 Add graphics settings menu bar button. 2020-08-05 23:37:45 -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
d89cf867d2 Center error text correctly. 2020-08-05 02:41:39 -04:00
kasenvr
b948f24a56
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:26 -04:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:10 -04:00
Kasen IO
658e14be25 Remove unused aliases. 2020-08-05 02:30:30 -04:00
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
c42adc9e00 Add menu items and triggers. 2020-08-05 00:14:27 -04:00
Kasen IO
2881f1147f Metaverse login display working correctly. 2020-08-05 00:09:09 -04:00
Kasen IO
d81ec3a4b8 Domain login display working correctly. 2020-08-04 23:46:39 -04:00
Kasen IO
8f55e13aa2 Disable login screen for all first-time users. 2020-08-04 23:14:40 -04:00
Kasen IO
352a3f4ab1 Fix domain vs metaverse logins slightly. 2020-08-04 21:17:57 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
Kasen IO
ffce0a9d27 Update QML. 2020-08-04 19:12:31 -04:00
Kasen IO
09f2153057 Update login QML to display domain URL. 2020-08-04 15:48:10 -04:00
Kasen IO
f066eccba0 Merge branch 'oauth2-wordpress' into feature/oauth2-kalila 2020-08-04 14:17:48 -04: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
Kasen IO
482922d986 First pass at making login dialog more clear. 2020-08-04 01:28:19 -04:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +12: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
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
6b28f3ea0d Reinstate TODOs 2020-07-31 15:20:13 +12:00
kasenvr
856e1f1ca3
Update interface/src/ui/DialogsManager.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-30 22:25:24 -04:00
kasenvr
7a25376131
Merge pull request #574 from ctrlaltdavid/fix/url-parameter 
Fix --url command line parameter to work with both "=" and " "
 2020-07-30 17:18:54 -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
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -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
c6af3d23c9 Fix --url command line parameter to work with both "=" and " " 2020-07-26 19:41:30 +12:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +12:00
David Rowe
361ab97d83 Fix saving metaverse login 2020-07-25 20:53:23 +12:00
David Rowe
0618427d0f Wire up domain login dialog 2020-07-25 20:40:52 +12:00
David Rowe
fec0e7a8bc Merge branch 'feature/oauth2-kalila' into feature/oauth2-login-display 2020-07-25 16:53:43 +12:00
Heather Anderson
2f00c3e0bd minor review of formatting 2020-07-24 21:32:22 -07:00
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12:00
kasenvr
ec09f1a9d9
Merge pull request #550 from ctrlaltdavid/feature/resolution-scale-max 
Increase graphics settings' resolution scale item maximum to 2.0
 2020-07-24 01:11:29 -04:00
Kasen IO
cd9f47004b Added loginDomain stub. 2020-07-23 22:14:35 -04:00
Kasen IO
d7c0493b7a Updated login QML to handle domain logins. 2020-07-23 22:14:21 -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
kasenvr
ac3147fa66
Merge pull request #544 from kasenvr/fix/goto-explore 
Update the connection failure dialog 'go to' -> 'explore'
 2020-07-23 17:05:28 -04:00
kasenvr
befdaec03b
Merge pull request #524 from JulianGro/macos-rebrand 
Change strings, comments and folders to Vircadia rebrand
 2020-07-23 17:04:49 -04:00
Kasen IO
f4016bb0d5 Add API call to retrieve user agent. 2020-07-21 02:36:55 -04:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
kasenvr
de082ce61d
Update TabletConnectionFailureDialog.qml 2020-07-18 14:26:26 -04:00
kasenvr
a973855085
Update ConnectionFailureDialog.qml 2020-07-18 14:25:50 -04:00
David Rowe
233deae44d Increase graphics settings' resolution scale item maximum to 2.0 2020-07-18 20:50:52 +12:00
HifiExperiments
cbce911e83 fix lag on restart with scaled avatar 2020-07-17 14:40:40 -07:00
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
HifiExperiments
ed5c84548c Merge remote-tracking branch 'upstream/master' into parenting 2020-07-16 13:33:46 -07:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option 
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
 2020-07-11 08:14:13 +12: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
ec7ad0d805
Merge pull request #526 from kasenvr/v2020.2.2-rc 
V2020.2.2 rc -> master
 2020-07-09 17:35:59 -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
ab95e109ca
Merge pull request #468 from JulianGro/move-audio 
Little "Audio" settings UI improvements
 2020-07-09 17:15:35 -04:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
Julian Groß
dce34b8d90 Change strings, comments and folders to Vircadia 2020-07-09 16:03:07 +02:00
Kasen IO
3ccaa46563 Update API docs URLs. 2020-07-08 14:18:32 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Julian Groß
6737068b02 Test 2020-07-07 00:28:19 +02:00
David Rowe
52389e5804 Add correct privacy policy URL 2020-07-05 11:17:56 +12:00
Dale Glass
9f25891639 Increase maximum texture size to 8192 2020-07-03 23:43:18 +02:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
motofckr9k
bb91c1c89b Fix blocks 2020-07-03 10:22:06 +02:00
kasenvr
bfe08f23c7
Merge pull request #497 from kasenvr/feature/paste-entities-host-type 
Add ability to paste entities to any host type
 2020-07-02 17:29:13 -04:00
kasenvr
b7b902b755
Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item 
Add Help > Tutorial menu item
 2020-07-02 17:10:38 -04:00
kasenvr
e1ab52d97e
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-02 16:52:12 -04:00
HifiExperiments
37ce2996c8 Merge remote-tracking branch 'upstream/master' into parenting 2020-07-01 14:56:36 -07:00
Kasen IO
859c78d8aa Further updates. 2020-07-01 16:05:15 -04:00
Kasen IO
5f0caf7de8 Update pasteEntities to const per suggestion. 2020-07-01 01:29:47 -04:00
Kasen IO
d881e1e3c2 Alter references per suggestion. 2020-06-30 18:24:21 -04:00
Kasen IO
d9e0605b4d Improve code per HiFiExperiments' suggestions. 2020-06-30 15:46:26 -04:00
Kasen IO
12446bdb45 Add ability to paste entities to any host type. Default "domain" 2020-06-30 15:18:51 -04:00
David Rowe
06010dbcae Fix position of recommended puck placement dialog 2020-06-27 15:54:28 +12:00
David Rowe
258fc8a2f4 Improve some text and make checkboxes square 2020-06-27 15:54:15 +12:00
David Rowe
2e9a8e2b33 Add option to enable Vive PRO Eye eye tracking 2020-06-27 15:14:21 +12:00
David Rowe
147bea6ba9 Fix indentation 2020-06-22 21:12:46 +12:00
Julian Groß
5b0855fa6e
Fix indentation 2020-06-22 06:18:05 +02:00
Julian Groß
3fe1dddee2
Replace tabs with spaces 2020-06-22 04:19:10 +02:00
Julian Groß
ef5d6bfc2f
Remove unnessesary copyright 2020-06-22 04:11:34 +02:00
Julian Groß
34887ec604
Remove unnessesary whitespaces 2020-06-22 04:10:21 +02:00
Heather Anderson
af6d2b2e56 added timer to detect if the unhandle exception hook has been broken 
added internal documentation on the structures and functions involved
 2020-06-20 20:54:24 -07:00
motofckr9k
56362461fc Fix "or" not dissappearing in popup window 2020-06-21 05:51:37 +02:00
motofckr9k
75f6246ac9 Move them even closer 2020-06-21 03:16:19 +02:00
motofckr9k
41563b14a8 Move signUpContainer closer to loginContainer 2020-06-21 03:05:54 +02:00
motofckr9k
3da755fb95 Change button text, and move it to answer "Don't have an account?" 2020-06-21 02:53:05 +02:00
motofckr9k
e8a3009b96 Remove color from dismissButton 2020-06-21 01:51:05 +02:00
motofckr9k
bf230a415a Initial commit 2020-06-21 01:51:04 +02:00
Heather Anderson
033726fc64 realizing the current logic is catching first-chance exceptions 2020-06-19 18:28:01 -07:00
Heather Anderson
b6e1c9e3af added "c++ crash" to crash menu 2020-06-19 18:26:26 -07:00
Heather Anderson
d92bb16d0c replacing the use of std::mutex with a spinlock, which we can try to lock but exit if the attempt times out. 2020-06-19 16:35:57 -07:00
Heather Anderson
9af8b6b452 documenting the magic numbers a bit better (or just giving them names) 2020-06-19 16:35:57 -07:00
Heather Anderson
7038cfdeb3 handle C++ exceptions, unpacking the internal structures to get the variable type (and any superclasses) being thrown 2020-06-19 16:35:56 -07:00
motofckr9k
878c6c68c8 Fix inputView if statement 2020-06-19 23:46:04 +02:00
motofckr9k
3aefa6ad9c Remove if statements that are not needed anymore 2020-06-19 23:37:26 +02:00
motofckr9k
0c8cc0a806 Try to remove empty space when "Test your voice" button is not visible 2020-06-19 23:32:52 +02:00
motofckr9k
845cc4454c Add Vircadia contributors line 2020-06-19 21:47:09 +02:00
motofckr9k
4a0d011b53 Shorten PushToTalk text on vr, since it didn't fit into the window 2020-06-19 21:39:53 +02:00
motofckr9k
d4f79413eb Fix seperator and move up inputLevel 2020-06-19 21:27:41 +02:00
motofckr9k
ee6de9e868 Move "Test your voice" and "Test your sound" to top of their category 2020-06-19 21:10:48 +02:00
motofckr9k
8284dd16cf Revert last commit and add spacer item to bottom. 2020-06-19 20:19:03 +02:00
motofckr9k
b0eb08c03f Try to add bottom margin 2020-06-19 19:54:49 +02:00
motofckr9k
6b8519c7ff Fix "Test your sound" 2020-06-19 19:38:03 +02:00
motofckr9k
eaf2ce89e0 Actually move it up this time 2020-06-19 19:23:51 +02:00
motofckr9k
37bded0a9b Move volume control up from bottom 2020-06-19 18:48:43 +02:00
kasenvr
63e3c001c3
Merge pull request #411 from Misterblue/fix/central-metaverse-urls 
Move metaverse server URL info into central files for easier updating
 2020-06-18 17:23:05 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand 
Rebranding stuff
 2020-06-18 17:12:47 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
motofckr9k
256b466e84 Add vircadia-banner.svg for login dialogs 2020-06-18 09:12:01 +02:00
David Rowe
f11091cab4 Add Help > Tutorial menu item that goest to serverless tutorial 2020-06-16 12:25:28 +12:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++ 
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
 2020-06-13 07:04:58 -07:00
Kasen IO
1575611082 Set UAL to disabled by default in the setting checkbox. 2020-06-11 20:14:14 -04:00
kasenvr
e19267e191
Merge pull request #440 from daleglass/disable-crash-logger-by-default 
Disable crash logger by default
 2020-06-11 17:29:26 -04:00
kasenvr
d52a21c515
Merge pull request #437 from kasenvr/fix/overlay-login-branding 
Update login overlay to Vircadia.
 2020-06-11 17:17:49 -04:00
kasenvr
80fc2d8332
Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable 
Fix visibility of values in Wearables dialog
 2020-06-11 17:15:49 -04:00
Dale Glass
b681f99d21 Rename the crash reporting settings to force new default value 
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
 2020-06-11 20:00:47 +02:00
Dale Glass
02eb4ccd33 Disable crash logger by default 2020-06-11 01:26:21 +02:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
Kasen IO
a75c43e073 Update login overlay to Vircadia. 2020-06-08 23:39:23 -04:00
Kasen IO
c55f365af4 Fix tablet login dialog logo size. 2020-06-07 20:47:53 -04:00
Kasen IO
c3337f6c32 Update interface and server-console icons. 2020-06-07 20:43:38 -04:00
Kasen IO
085b9e11c5 Fix tabletAboutDialog fit for logo. 2020-06-06 20:21:17 -04:00
Kasen IO
fda40d56d4 Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
Kasen IO
01b02881dc Height, width, and centering updates. 2020-06-06 18:40:19 -04:00
Kasen IO
b74ccef418 Address CR from Thoys and David. 2020-06-06 18:35:02 -04:00
David Rowe
8494e6e6b5 Fix visibility of values in Wearables dialog 2020-06-06 15:15:03 +12:00
kasenvr
250ec64edf
Merge pull request #410 from kasenvr/fix/vircadia-packaging 
Update packaging parameters for Vircadia
 2020-06-04 16:50:29 -04:00
kasenvr
103fd8eef2
Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
kasenvr
d69c89583f
Merge pull request #394 from ctrlaltdavid/feature/enable-vr-flying 
Enable flying in VR by default
 2020-06-03 22:40:05 -04:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Kasen IO
cefda3f7f2 Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2 
Improve performance of MyAvatar::simulate when you have lots of descendants
 2020-05-31 14:47:22 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1 
Merge K2.1 into Master
 2020-05-30 18:49:38 -04:00
Kasen IO
4f55bfe512 Update window title. 2020-05-27 18:09:01 -04:00
David Rowe
d451012d08 Enable flying in VR by default 2020-05-28 09:12:17 +12:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
kasenvr
22e9aec0dd
Merge pull request #296 from kasenvr/fix/qml-whitelist-default 
Add community-apps repo to default QML whitelist.
 2020-05-19 16:49:29 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
f908d5bb0a Undo logo change. 2020-05-17 22:20:02 -04:00
Marcus Llewellyn
e6505baf9d Update help dialogs for Vircadia branding. 2020-05-17 15:37:58 -05:00
Marcus Llewellyn
d19c474d65 Rebrand login screens for Vircadia. 2020-05-17 15:17:26 -05:00
Marcus Llewellyn
ce4aa67506 Change Window Titles to Vircadia 
Also strips trailing whitespaces from interface's Applicaction.cpp.
 2020-05-17 14:30:36 -05:00
Marcus Llewellyn
187a2749c3 Rebrand the About dialog to Vircadia. 
Also removes trailing whitespace from Menu.cpp.
 2020-05-17 14:26:45 -05:00
Marcus Llewellyn
445ebbd861 Replace KasenVR icons with Vircadia icons. 2020-05-17 14:10:07 -05:00
kasenvr
8b410c662e
Removed unused variable. 2020-05-16 16:35:16 -04:00
Kasen IO
f4bcc82dd6 Corrections. 2020-05-16 02:27:45 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
HifiExperiments
ebc9dae78d
Merge branch 'master' into parenting 2020-05-07 13:35:32 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
Heather Anderson
aad54a0580 renaming more of the annotations to be in a form Sentry is more likely to understand 2020-05-06 22:15:04 -07:00
MotoFufu9k
a710142871
Change "FILENAME_PATH_FORMAT" to "vircadia..." 2020-05-05 00:39:25 +02:00
MotoFufu9k
0d02f62ad5
Change all mentions of "hifi-snap-by-" to "vircadia-snap-by-" 2020-05-05 00:37:41 +02:00
David Rowe
5e997d7b60 Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
Seth Alves
7d956198cd re-enable prefer finger over stylus 2020-04-26 12:20:05 -07:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
Heather Anderson
e29271d8ca rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>) 
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
 2020-04-25 20:32:38 -07:00
Heather Anderson
2d6d205bf2 The original patch was more appropriate. We need to figure out what this needs to do, enough dancing. 
This reverts commit bc5dd45187.
 2020-04-21 23:15:08 -07:00
Kasen IO
e85c50e712 Update URL. 2020-04-19 23:44:11 -04:00
Kasen IO
84e5a27b32 Add community-apps repo to default QML whitelist. 2020-04-15 21:14:32 -04:00
Heather Anderson
bc5dd45187
Update interface/src/ui/PreferencesDialog.cpp 
Removed extraneous ! from value retrieval (as if there aren't enough of them in here)
 2020-04-10 22:51:20 -07:00
Heather Anderson
9187a680cd
Apply suggestions from code review 
Adding suggested changes from ctrlaltdavid

Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-04-10 17:10:41 -07:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
HifiExperiments
9b1635f9cc improve performance of MyAvatar::simulate when you have lots of entity descendants 2020-04-07 15:56:32 -07:00
Kasen IO
9dce990e8f Help dialog updated. 2020-04-07 18:48:24 -04:00
Kasen IO
e9297eb131 Correction. 2020-04-07 16:17:09 -04:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
HifiExperiments
eb26d9b4e3 working on parenting fixes 2020-04-06 13:41:01 -07:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
Heather Anderson
7cea4fc574 separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes 2020-04-03 02:38:53 -07:00
Thijs Wenker
6d9f040bfd
Merge pull request #158 from daleglass/linux_dynamic_build 
Force dynamic build on Linux
 2020-02-22 20:36:19 +01:00
Marcus Llewellyn
8ab06f5e0e
Change to Project Athena in Task Manager 2020-02-19 16:37:22 -06:00
kasenvr
cb0a080be1
Merge pull request #113 from ctrlaltdavid/fix/missing-scrollbars 
Always display vertical scrollbar in Settings dialogs that scroll
 2020-02-19 16:32:53 -05:00
kasenvr
86d18e3706
Merge pull request #160 from ctrlaltdavid/fix/http-serverless 
Add support for serverless domains via HTTP/HTTPS
 2020-02-19 16:24:56 -05:00
kasenvr
78e3d65031
Merge pull request #145 from vegaslon/feature/AvatarAppThumbnail 
feature: Allow users to set avatar thumbnails that show in avatar app.
 2020-02-12 08:59:23 -05:00
Vegaslon
c2b375862c Style changes as requested 2020-02-11 21:50:40 -05:00
Vegaslon
6db15510db Change name of variable and fix indention 2020-02-10 16:20:22 -05:00
kasenvr
48ae156db7
Merge pull request #104 from daleglass/implicit_copy_constructor 
Make default copy constructors explicit
 2020-02-08 14:45:44 -05:00
David Rowe
e6c54faaf2 Merge branch 'kasen/core' into fix/http-serverless 2020-02-07 11:32:38 +13:00
David Rowe
7c87f89712 Add FIXME for Clipboard.importEntities() 2020-02-07 11:12:54 +13:00
Dale Glass
39f23b52c3 Force dynamic build on Linux, fixes #151 2020-02-05 23:30:04 +01:00
David Rowe
4f0cc2ebd5 Remove dead code 2020-02-06 11:28:51 +13:00