Commit graph

84468 commits

Author SHA1 Message Date
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 #824 from ctrlaltdavid/fix/interface-console
Remove "Console" options from Interface-only installer (Windows)
2020-12-20 16:34:25 -05:00
HifiExperiments
f33c7de67a Merge remote-tracking branch 'upstream/master' into pivot 2020-12-18 17:33:24 -08:00
David Rowe
71cee734ec Merge branch 'master' into fix/interface-console
# Conflicts:
#	README.md
2020-12-18 19:44:20 +13:00
Alezia Kurdis
7ff8236da2
Minor Code Adjustments
Minor Code Adjustments
2020-12-17 22:07:11 -05: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
Kalila
2d22f9a395
Merge pull request #908 from ctrlaltdavid/fix/update-links
Update GitHub links
2020-12-16 22:13:44 -05:00
Kalila
1b26220655
Merge pull request #916 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
Kalila
2a849358f8
Update BUILD_ANDROID.md 2020-12-15 04:13:18 -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
daf3ab3e92
Apply suggestions from code review 2020-12-15 01:42:37 -05:00
Kalila
db9a4143df
Apply suggestions from code review
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
2020-12-15 01:34:47 -05: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ß
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 #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
0d9076cccc
Merge pull request #878 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 #830 from HifiExperiments/update
Entity update improvements 2
2020-12-14 17:56:01 -05:00
Kalila L
5c9b1edb86 Convert QString to QJsonObject. 2020-12-14 01:03:36 -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
dependabot[bot]
663fb3491b
Bump electron from 6.0.12 to 7.2.4 in /screenshare
Bumps [electron](https://github.com/electron/electron) from 6.0.12 to 7.2.4.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v6.0.12...v7.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-12 19:44:53 +00: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
0468c98c30 CR, move duplicate consts to top of file. 2020-12-11 15:55:24 -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
Kalila
57c83b14da
Merge pull request #708 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 #905 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 #894 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 #860 from makitsune/fix-alt-on-linux
Fix alt key on Linux
2020-12-10 23:45:55 +01:00
Alezia Kurdis
28e53c9c86
Migrate from 3dImage Overlay to Local Entities
Migrate from 3dImage Overlay to Local Entities
2020-12-08 23:54:32 -05:00
Alezia Kurdis
aea3e7936f
Add Material icons in edit mode
1- This adds a new Material icon to identify the material entities that are linked to a parent.
Since those material entities become invisible, this help to figure their presence.

2- The Create App - Preference: "Show Zones in Create Mode"
has been removed, since it was doing nothing for a couple of years now.
the method behind is still in the API, but do nothing. 
(abandoned since it was only drawing a box that wasn't useful to figure the shape of the zone)
There was no real value to bring this back in a different way.

3- The Create App - Preference: "Show Lights and Particle Systems in Create Mode"
has been renamed for "Show Icons in Create Mode"
since this setting was also managing all the icons (including Zones and now the Parented Materials)
The objective of the setting is mainly to simplify the display at the edit when a scene is very dense.
(In the future, we might want to make this "à la carte". For now, I think we can try as is. )
2020-12-08 23:52:04 -05:00
Alezia Kurdis
5a3f4b59c8
Add a Name on the Material of the shape visualizer
Add a Name on the Material of the shape visualizer
to be able to exclude it when a zone is selected.
2020-12-08 23:39:26 -05:00