Commit graph

84255 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
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
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
Kalila
f1576aba78
Merge pull request from ctrlaltdavid/fix/interface-console
Remove "Console" options from Interface-only installer (Windows)
2020-12-20 16:34:25 -05:00
David Rowe
71cee734ec Merge branch 'master' into fix/interface-console
# Conflicts:
#	README.md
2020-12-18 19:44:20 +13:00
Kalila
89d1346644
Merge pull request 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 from JulianGro/gles
Fix building with GLES 3.2 on Linux
2020-12-17 20:23:26 -05:00
Kalila
2d22f9a395
Merge pull request from ctrlaltdavid/fix/update-links
Update GitHub links
2020-12-16 22:13:44 -05:00
Kalila
1b26220655
Merge pull request from vegaslon/documentation/contributing
Add Tips for making pull request to CONTRIBUTING.md
2020-12-16 20:37:25 -05:00
Adam Ivie
3a7195c21c
Remove artifact from resolving conflict
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
2020-12-16 18:37:19 -05:00
Julian Groß
b416ca1e17 Simplify code according to review 2020-12-16 16:50:54 +01:00
Julian Groß
dcd26c8ad6 Add comment about FILENAME being missing from ANDROID 2020-12-15 21:19:49 +01:00
Julian Groß
4e18382089 Work around android not building with set glad32es.zip filename 2020-12-15 13:53:17 +01:00
Adam Ivie
d20ffd30c6
Merge branch 'master' into documentation/contributing 2020-12-15 06:24:04 -05:00
David Rowe
086d46018b Merge branch 'master' into fix/update-links 2020-12-15 21:09:07 +13:00
ArcadeFever
65fb1320cc Upgraded Oculus SDKs to latest 2020-12-15 00:04:59 -08:00
Kalila
633c642d4a
Merge pull request from vircadia/fix/update-references
Fix/update references
2020-12-15 01:29:47 -05:00
Julian Groß
3485efd808 Fix failing builds 2020-12-15 05:00:58 +01:00
Julian Groß
0cebb700fb Change conditionals according to review 2020-12-15 04:15:44 +01:00
Kalila
0f87e4cd86
Merge pull request 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
0d9076cccc
Merge pull request from vircadia/feature/gha-sentry
Enable crash reporting on PR builds from GHA
2020-12-14 19:43:56 -05:00
Adam Ivie
e5802a29f1
Update CONTRIBUTING.md
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
2020-12-14 18:01:27 -05:00
Kalila
8c4ce96c63
Merge pull request from HifiExperiments/update
Entity update improvements 2
2020-12-14 17:56:01 -05:00
Kalila L
261c2e6cff Final stragglers...? 2020-12-13 23:57:04 -05:00
Adam Ivie
51ebb12d29 Add Tips for making pull request to CONTRIBUTING.md 2020-12-13 21:18:12 -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
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
David Rowe
5a4210a04f Further updates 2020-12-13 21:56:03 +13:00
Kalila
a3dfa6a25b
Update BUILD_ANDROID.md
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-12-13 03:07:49 -05:00
David Rowe
fe7380630e Further updates 2020-12-12 21:17:53 +13:00
David Rowe
e8a2de86bb Update GitHub links 2020-12-12 20:32:02 +13: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
Kalila
57c83b14da
Merge pull request from vircadia/dependabot/npm_and_yarn/screenshare/yargs-parser-13.1.2
Bump yargs-parser from 13.1.1 to 13.1.2 in /screenshare
2020-12-10 17:59:15 -05:00
Kalila
f0124de07e
Merge pull request from vircadia/dependabot/npm_and_yarn/screenshare/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7 in /screenshare
2020-12-10 17:58:16 -05:00
dependabot[bot]
15b1c51c49
Bump ini from 1.3.5 to 1.3.7 in /screenshare
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-10 22:54:46 +00:00
Kalila
3c44d11bfa
Merge pull request from AleziaKurdis/CreateApp_DEC2020
Create App. - Feature Bundle - Dec 2020
2020-12-10 17:54:10 -05:00
Kalila
16cc5304ec
Update pr_build.yml 2020-12-10 17:49:41 -05:00
daleglass
70f2866871
Merge pull request from makitsune/fix-alt-on-linux
Fix alt key on Linux
2020-12-10 23:45:55 +01:00
Alezia Kurdis
536bf4ef90
2 large import button in Desktop
In Desktop mode, the 2 import buttons
are now one over the other and full width.
The text was overlapping with the default Create Tools window size.
2020-12-04 23:50:44 -05:00
Alezia Kurdis
726901b087
Make the Create Tool window larger by default
Previously it was 490px wide (in Desktop)
Now it will be 750 px wide (in Desktop)
The properties tab is now with an acceptable size by default. (which is closer to the landscape display we have in HMD.)

No change in HMD or in-Tablet display.
2020-12-04 23:47:38 -05:00
kasenvr
ec1c8f2b87
Merge pull request from JulianGro/ubuntu_20_04_cmake
Fix hifi_qt.py reporting Ubuntu 20.04 as outdated
2020-12-03 17:47:33 -05:00
kasenvr
248de8f666
Merge pull request from kasenvr/feature/crash-rpt-cmd-option
Initial add of crash report arg option.
2020-12-03 17:46:12 -05:00
kasenvr
0f93c415ac
Merge pull request from kasenvr/fix/master-references
Fix references 'kasen/core' -> 'master'
2020-12-02 22:20:59 -05:00
Alezia Kurdis
670d832c8b
Minor code change
Minor code change
2020-12-01 23:32:52 -05:00
Alezia Kurdis
5a71881799
Minor code changes
Minor code changes
2020-12-01 23:04:10 -05:00
Alezia Kurdis
510eb08be1
Replace Overlays by Local Entities
1- Replace Overlays by Local Entities
2- Add the missing header with copyright and license 
(I have assumed that the author was the same person that make the grid parameter that is referenced there and only used in create App.)
3- Minor requested code change (0.0 instead of 0 in condition using real numbers)
2020-12-01 22:56:17 -05:00