Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 11:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85083 commits 22 branches 28 tags 1.2 GiB
Commit graph

34833 commits

Author SHA1 Message Date
Kalila
4cb9459736
Merge pull request #1047 from Phil-Palmer/optimisation/myavatar 
Small optimisations and tidying related to MyAvatar
 2021-03-26 20:41:38 -04:00
HifiExperiments
7ff796af3e web textures work on image entities, create supports negative materialMappingScale 2021-03-22 20:52:39 -07:00
David Rowe
41bd3c10c0 Fix up node permissions debug order 2021-03-23 15:22:08 +13:00
HifiExperiments
6b82c7fe90
Update RenderableImageEntityItem.cpp 2021-03-22 18:37:29 -07:00
David Rowe
71b025f7f0 Separate API vs. internal versions of clearAvatarEntity() 2021-03-22 15:36:57 +13:00
HifiExperiments
e5f108b022 bump ktx version to force clear cache 2021-03-21 14:51:21 -07:00
Kalila L
cfac34bf7e CR. 2021-03-21 13:20:05 -04:00
Kalila
12d5687c6a
Update libraries/script-engine/src/UsersScriptingInterface.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-03-21 13:13:24 -04:00
HifiExperiments
35e836d34d image caching must maintain original image information and pass it around 2021-03-19 22:32:29 -07:00
HifiExperiments
a87d6e5182 on json import, material/texture references are updated to new ids 2021-03-19 17:39:22 -07:00
Kalila L
f067feb37a Add docs for ban functionality. 2021-03-19 04:44:58 -04:00
Kalila L
fd592dfb06 CR. 2021-03-19 04:11:26 -04:00
Kalila
9dadc44f6c
Update UserActivityLoggerScriptingInterface.h 2021-03-18 17:57:49 -04:00
Kalila
da7bcf1584
Update NodeList.cpp 2021-03-18 17:53:21 -04:00
HifiExperiments
15ba6c8637 fix build 2021-03-17 21:14:22 -07:00
Kalila L
be0bd3940d Finish flag work on kick functionality. 2021-03-17 23:25:08 -04:00
HifiExperiments
5fd4f215f1 more docs 2021-03-17 19:18:30 -07:00
HifiExperiments
3fdb398829 fixing up material entity logic, refresh reference material on material change 2021-03-17 19:10:29 -07:00
Kalila L
0216b34681 State of refactoring 2021-03-17 19:37:06 -04:00
David Rowe
ddcfe6351b Tidying 2021-03-18 12:13:41 +13:00
HifiExperiments
9514ade844 add reference materials and support reference texture changes 2021-03-15 21:21:32 -07:00
David Rowe
2030d24523 Tidying 2021-03-16 14:37:16 +13:00
David Rowe
b48d3e0387 Tidy disabling of avatar entity manipulation if don't have permission 2021-03-16 12:00:34 +13:00
David Rowe
0c1f775dc5 Don't warn user if permission removed while they're connected 2021-03-15 20:55:42 +13:00
David Rowe
e23251df4e Ignore Entities.addEntity() for avatar entities if don't have permission 2021-03-15 20:25:18 +13:00
David Rowe
0adfd8b806 Ask user whether to continue to a domain if their wearables won't rez 2021-03-15 16:30:46 +13:00
HifiExperiments
f5e2cb6e2b update docs 2021-03-14 18:13:44 -07:00
Dale Glass
1ed767df41 Implement Linux machine fingerprints 
We do this by using either /etc/machine-id, or hashing the MACs of all
non-virtual networking devices.

We make this fingerpint unique to our platform by adding our own string
to the hash, and add some stretching for good measure. This way Vircadia's
fingerprint isn't going to match the system's ID or anything another
application generates.
 2021-03-14 21:15:33 +01:00
HifiExperiments
828e653849 able to reference entity ids as textures 2021-03-13 22:34:48 -08:00
David Rowe
1b33339995 Make avatar mixer remove clients' unremoved avatar entities 2021-03-12 22:15:26 +13:00
Kalila
5e2cc4c4bf
Merge pull request #1068 from daleglass/fix_resource_totals 
Set resource total size to content size when using a qrc:// resource
 2021-03-11 18:30:56 -05:00
Kalila
d8a3d56da2
Merge branch 'master' into feature/preloaded-whitelist 2021-03-11 17:38:07 -05:00
Kalila
90fb70e041
Merge pull request #1013 from HifiExperiments/haptics 
triggerHapticPulse supports arbitrary device index instead of just two hands
 2021-03-11 17:29:45 -05:00
David Rowe
db0f7a9884 Fix flash of avatar entity when domain restarts 2021-03-11 20:14:03 +13:00
Kalila L
78cc98bc7b Add improved functionality for Users.kick API. 
Add banByUsername, banByFingerprint, and banByIP parameters.
 2021-03-11 01:03:54 -05:00
David Rowe
38738a69ac Fix locking 2021-03-11 14:56:24 +13:00
Kalila
1f4cb7b9d6
Update ScriptGatekeeper.cpp 2021-03-10 01:27:32 -05:00
Kalila
3dc11637ed
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-03-10 01:27:05 -05:00
HifiExperiments
9a247172f3 non-parented material use the right cull mode 2021-03-09 21:09:48 -08:00
David Rowe
091efaee60 Don't rez own avatar entities if don't have permission 2021-03-09 11:15:26 +13:00
Kalila L
b5d89c44bf Rename "INITIAL_STARTUP_LOCATION" -> "PRELOADED_STARTUP_LOCATION". 2021-03-08 02:01:53 -05:00
Kalila L
3ed98d0f3e Add "ScriptGatekeeper" class and "PRELOADED_SCRIPT_WHITELIST" variable. 2021-03-08 02:00:34 -05:00
David Rowe
dd674c395e Default canRezAvatarEntities on domains without new permission 2021-03-05 16:27:32 +13:00
HifiExperiments
1abb408a93 type 2021-03-03 18:58:09 -08:00
Kalila
672bceee1c
Merge pull request #1007 from digisomni/feature/manual-noise-reduction-gate 
Add manual mode to noise reduction + add noise reduction threshold
 2021-03-03 21:18:59 -05:00
HifiExperiments
68c20ce73d text backgrounds have texcoord if not simple 2021-03-03 17:47:03 -08:00
Kalila
053548cd14
Merge pull request #1033 from HifiExperiments/skyboxShape 
Non-uniformly scaled sphere zones and models behave like ellipsoids (and fix EntityItem::contains sphere case)
 2021-03-03 16:15:47 -05:00
Kalila L
bc2b345709 Merge branch 'master' into feature/manual-noise-reduction-gate 2021-03-03 02:47:34 -05:00
Kalila L
4dd3ee6e1e "Test your voice" now takes into account noise gate state. 2021-03-03 02:47:19 -05:00
HifiExperiments
ccda630a3a fixing _glColor4f 2021-03-02 21:44:06 -08:00
Kalila
3f97b4da13
Merge pull request #1066 from vircadia/fix/crash-avi-ik 
Fix AnimInverseKinematics crash
 2021-03-02 06:02:04 -05:00
David Rowe
3beceb4d7d Clear user's avatar entities if rez permissions change to "no" 2021-03-01 22:03:02 +13:00
David Rowe
8b6182e756 Misc fixes 2021-03-01 15:24:13 +13:00
Dale Glass
b102b3477a Set resource total size to content size when using a qrc:// resource 
When a Resource is requested from qrc://, the Resource::handleDownloadProgress
event is never called, and therefore _bytesTotal remains at zero. This confuses
ResourceCache later, which has a sanity check that doesn't pass when resources
are retrieved, yet no data accumulates.

Fixes #1065
 2021-02-26 20:04:53 +01:00
Kalila L
6b5cffa5e4 Initial pass at adding canRezAvatarEntities. 2021-02-26 06:14:06 -05:00
Kalila L
df7fd920d7 Change INVALID_JOINT_INDEX to AnimSkeleton::INVALID_JOINT_INDEX 2021-02-25 23:28:00 -05:00
HifiExperiments
c47351c4f2 merge with master 2021-02-25 19:39:09 -08:00
HifiExperiments
826eb709ce more work on materials 2021-02-25 19:03:42 -08:00
Kalila L
0e03eccbdf Change NO_PARENT_INDEX to INVALID_JOINT_INDEX. 2021-02-25 21:43:17 -05:00
Kalila L
4276ea295c Change -1 to NO_PARENT_INDEX. 2021-02-25 21:29:54 -05:00
Kalila
c79eb479f0
Update AnimInverseKinematics.cpp 2021-02-25 20:36:45 -05:00
Kalila
080d42be39
Update AnimInverseKinematics.cpp 2021-02-25 20:35:02 -05:00
David Rowe
5ad2f9d192 Fix OSX crash on shutdown 2021-02-26 09:05:52 +13:00
HifiExperiments
186f505b15 images support materials 2021-02-24 20:56:14 -08:00
HifiExperiments
25e4f59d55 gizmos have materials, working on images 2021-02-23 20:54:57 -08:00
Phil Palmer
26369ca2a9 Fix for some spinner boxes not changing value when using their buttons or the mouse wheel. 
Changed the default value of FloatPreference::_step from 0.1f to 1, because FloatPreference::_decimals defaults to 0.  Also because before this branch, all spinners used a step of 1 rather than SpinnerPreference::_step.
Spinners such as Settings > General > Desktop Tablet Scale / VR Tablet Scale work again.
 2021-02-22 22:34:04 -05:00
Kalila
ba54dd755c
Merge pull request #1034 from vircadia/v2021.1.0-rc 
merge V2021.1.0 rc into master
 2021-02-22 00:16:36 -05:00
HifiExperiments
5677b5d5dc docs 2021-02-20 23:03:30 -08:00
HifiExperiments
30cf1555e4 fix keepAspectRatio, give text entities naturalDimensions 2021-02-20 22:47:33 -08:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
eefe809950 CR 2021-02-19 19:31:06 -08:00
Phil Palmer
72725e783a Small optimisations and tidying of things that were noticed in passing. No behaviour should change. 
* Removed the deprecated MyAvatar.setToggleHips script function and the "Toggle Hips Following" option from the Developer menu.  They had no effect on any code.
* In CharacterController::applyMotor, prevented unnecessary calls to btVector3::rotate() when the motor has no rotation.  This change also improves readability through the use of clearly-named lambdas.
* In AvatarData::getFauxJointIndex, prevented unnecessary string comparisons when the named joint is a real joint rather than a faux one.
* In Avatar::getJointIndex, removed an unnecessary call to QHash<QString, int>::contains(), by supplying a default index for QHash<QString, int>::value().
* Removed unnecessary condition "forwardLeanAmount < 0" in MyAvatar::FollowHelper::shouldActivateHorizontal_userSitting.
* Corrected the return type of MyAvatar::getSitStandStateChange from float to bool.
* Added a missing 'f' suffix to a float literal in PreferencesDialog.cpp.
 2021-02-19 21:55:08 -05:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
HifiExperiments
f9b88c68e0 treat non-uniform spheres as ellipsoids everywhere 2021-02-15 21:13:58 -08:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
Kalila
26894b4325
Merge pull request #1020 from HifiExperiments/alignment 
Text Entity alignment property
 2021-02-13 01:28:41 -05:00
HifiExperiments
51bf54c703 fix EntityItem::contains sphere case 2021-02-12 12:27:35 -08:00
HifiExperiments
56fa4698da potential fix for offset soft attachments 2021-02-11 20:07:46 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
a18c24832a fix android build 2021-02-11 18:01:33 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
HifiExperiments
b6e7466804 triggerHapticPulse supports arbitrary device index instead of hands 2021-02-09 17:14:13 -08:00
Kalila L
5a40007758 Update default threshold value. 2021-02-09 00:46:46 -05:00
Kalila L
d2875c2c4f Add manual mode to noise reduction + add noise reduction threshold 2021-02-09 00:44:01 -05:00
HifiExperiments
766b91f1a3 add note about only supporting 0,0,0 pivot 2021-02-05 20:46:14 -08:00
HifiExperiments
ace6bf6c5b dirty physics on useOriginalPivot change, other small fix for compound shapes 2021-02-03 17:35:17 -08:00
HifiExperiments
56fa143ee6 Merge remote-tracking branch 'upstream/master' into pivot 2021-02-02 22:27:49 -08:00
HifiExperiments
8f3ed5d66d
Merge pull request #971 from HifiExperiments/apitraceFix 
Fix crashes when running with QML disabled in VR
 2021-02-01 21:56:11 -08:00
Phil Palmer
a2e4b81ed8 * Add more rounding in SpinBox.qml, allowing FloatPreference::step to work reliably for the spinners without needing double precision (suggestion from ctrlaltdavid: https://github.com/vircadia/vircadia/pull/930#issuecomment-765838930). 
* Change FloatPreference::step from double back to float.
 2021-02-01 20:26:18 -05:00
HifiExperiments
4554aa338b
Update BillboardMode.cpp 2021-01-30 00:28:25 -08:00
Kalila L
c57b1a92f3 CR + update user agent. 2021-01-30 02:16:53 -05:00
HifiExperiments
19cd0fa6ad CR 2021-01-29 22:31:17 -08:00
HifiExperiments
3d9142d8cb
Update libraries/ui/src/InfoView.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-29 17:11:10 -08:00
Kalila
af8ce1ba3d
Merge pull request #937 from daleglass/skip_repeated_log_entries 
Skip repeated log entries
 2021-01-28 17:22:51 -05:00
Kalila L
f8119daa47 Remove user agent overwriting in RequestFilters. 2021-01-23 18:49:21 -05:00
HifiExperiments
7bed9b0754 Merge remote-tracking branch 'origin/pivot' into pivot 2021-01-21 21:05:28 -08:00
HifiExperiments
bb898aac33 non-exact collisions should work on models with pivots and useOriginalPivot=true 2021-01-21 21:05:00 -08:00
HifiExperiments
54d57afdae use rotation property to determine which axis is facing you 2021-01-21 19:21:38 -08:00
Kalila
a1fe046350
Merge pull request #953 from Phil-Palmer/fix/alpha-zwrite 
Disable z-write for transparent draws
 2021-01-21 17:54:59 -05:00
Kalila L
82313eccbf Add userAgent property for web entities. 2021-01-21 01:51:37 -05:00
HifiExperiments
2667af3682 more safeguards 2021-01-20 21:25:30 -08:00
HifiExperiments
3335c040e5 hurr durr I'm an idiot 2021-01-18 18:39:12 -08:00
HifiExperiments
4bf952260f fix crashes when running with qml disabled in VR 2021-01-18 12:57:44 -08:00
HifiExperiments
7030798d41 cleanup 2021-01-17 22:47:26 -08:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08:00
HifiExperiments
1f71a23082 optimize picking 2021-01-17 13:09:09 -08:00
daleglass
06b1a8e17c
Merge pull request #928 from Phil-Palmer/fix/vr-recenter 
VR fixes for: couldn't sit on the floor, wrong walk directions.
 2021-01-16 20:51:03 +01:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
6d1667df5a better picking against billboarded shapes other than spheres 2021-01-10 16:48:44 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
Dale Glass
aab5b22e25 Skip duplicated log entries 
This helps with log flooding. Successive repeated log messages will be skipped and counted,
the count will be output when a different message is logged.

A new option of 'keep_repeats' has been added to VIRCADIA_LOG_OPTIONS to disable this.
 2021-01-09 19:39:32 +01:00
Phil Palmer
1cdc3610c3 Disable z-write for transparent fonts, grid entities and teleport beams 
as suggested in the review here: https://github.com/vircadia/vircadia/pull/953#pullrequestreview-560779456
 2021-01-05 06:47:33 -05:00
HifiExperiments
1ccdfe37a6
Update libraries/entities/src/EntityItemProperties.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-04 12:14:35 -08:00
Phil
646a5798e6
Apply suggestions from code review 
Tidying (bracing style, spaces, remove final comma from enum, fix JSDoc comments).

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-01-04 00:12:57 -05:00
HifiExperiments
030524c3ee CR and actually send property over wire 2021-01-03 21:03:43 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
Phil Palmer
4f71cb5945 Disable z-write when drawing web entities with alpha < 1. 2021-01-03 22:59:31 -05:00
Phil Palmer
90799e10da Fix z-write enabled for transparent draws. 
Fix z-write being enabled for transparencies in GeometryCache::getSimplePipeline and Procedural::Procedural (fixes https://github.com/vircadia/vircadia/issues/224).
Z-write is controlled by the 'writeMask' parameter of gpu::State::setDepthTest.
 2021-01-03 16:31:51 -05:00
HifiExperiments
5dc45e895c more fixes and create checkbox defaults to checked 2021-01-02 19:18:54 -08:00
HifiExperiments
a072010b02 Merge remote-tracking branch 'upstream/master' into pivot 2021-01-02 17:13:24 -08:00
HifiExperiments
20e0c24163 cleanup + create 2021-01-02 00:04:24 -08:00
HifiExperiments
002271a4cc finishing touches 2021-01-01 21:52:16 -08:00
Phil Palmer
8c7c91ed6f Remove const from variable declarations as suggested in the review. 
Suggested here: https://github.com/vircadia/vircadia/pull/928/files#r549830690

The ones I've left are either
- values known at compile time, eg. const float MIN_LENGTH_FOR_NORMALIZE = 0.061f;
- consts that were already there in the previous code, eg. const float MAX_DISPLACEMENT = 0.5f * _radius;
 2020-12-29 19:31:35 -05:00
HifiExperiments
0f9f95f716 possible fix for physics 2020-12-28 23:46:37 -08:00
Phil Palmer
3e25e32f18 Revert temporary "added pragmas" (optimize off) 
This reverts commit 20e4f952ab.
 2020-12-27 02:52:52 -05:00
Phil Palmer
c9cf7eb75d Merge branch 'fix/vr-recenter-PRAGMAS' into fix/vr-recenter 2020-12-26 23:22:16 -05:00
Phil Palmer
20e4f952ab added pragmas 2020-12-26 23:19:21 -05:00
daleglass
f894a0a141
Merge pull request #877 from vircadia/feature/domain-server-reporting-socket 
Send address and port with each metaverse heartbeat.
 2020-12-26 20:40:58 +01:00
HifiExperiments
1475cae504 wip 2020-12-23 21:29:59 -08:00
Phil Palmer
3b5eb2d24b Partial fix for spinner boxes not using the _step property of SpinnerPreference. 
(https://github.com/vircadia/vircadia/issues/117)
- In SpinBoxPreference.qml, SpinBox was missing "realStepSize: preference.step".
- Had to change FloatPreference::step from float to double, because there is some truncation happening somewhere.  For example, a step of 0.01f was acting like 0.00 because (0.01f < 0.01).
- Changed FloatPreference::decimals (number of decimal places) from float to uint, because it seemed to make more sense.
- Changed the 'User real-world height' spinbox to use a resolution of 1cm (for display and step) rather than 1mm.
- Remaining bug: the up & down buttons of the spinbox fail to change the value, at some values, though the mouse wheel always works.  Repro:
Settings > Controls > User real-world height
Hover the mouse over the box and and scroll the mouse wheel down until the value is at 1.15.
Click the up button a few times and observe that the number can't be increased.
Scroll the mouse wheel forward and observe that the number increases correctly.
- Todo: Change all calls to FloatPreference::setStep to pass doubles, if this change to its parameter type is kept.
 2020-12-23 22:53:43 -05:00
Phil Palmer
a489e9ddca Code style: made some little things more conformant with the coding standards and the rest of the codebase. 
https://github.com/vircadia/vircadia/blob/master/CODING_STANDARD.md
 2020-12-23 19:00:05 -05:00
Phil Palmer
6fc40385ca Fix compile error building macOS-latest: changed MINIMUM_TIME_REMAINING from const to constexpr in CharacterController::playerStep. 
Error was: "static_assert expression is not an integral constant expression", "read of non-constexpr variable 'MINIMUM_TIME_REMAINING' is not allowed in a constant expression".
Error started in last commit (2179c153de).
 2020-12-22 15:51:03 -05:00
Phil Palmer
2179c153de VR fixes for: couldn't sit on the floor, wrong walk directions. 
- Divided the option "Avatar leaning behavior" into two options that work more usefully: "Allow my avatar to stand" and "Allow my avatar to lean" (PreferencesDialog.cpp).  Made the necessary fixes so that the avatar can be set to stand only when the user is standing (more details below).
- The logic controlling the direction of MyAvatar's action motor is now centralised in calculateScaledDirection (was previously split between there and updateMotors).  calculateScaledDirection now returns a velocity in world space.
- CharacterController::FollowHelper now uses separate follow timers for rotation, horizontal and vertical (previously followed all three based on the longest of their follow times).  Where appropriate, FollowHelper can now snap immediately to the desired rotation/horizontal/vertical independently (see FOLLOW_TIME_IMMEDIATE_SNAP).
- FollowHelper::FollowType has therefore moved to CharacterController::FollowType.
- MyAvatar::FollowHelper::postPhysicsUpdate: If MyAvatar is not allowed to stand when the user is sitting, this now avoids recentring the body based on the head height.
- Removed Q_PROPERTY(MyAvatar::SitStandModelType, as the sitting/standing/leaning model uses different enums now (see setAllowAvatarStandingPreference, setAllowAvatarLeaningPreference).
- Removed Q_PROPERTY(bool isSitStandStateLocked which is no longer used, because we now always track the user's real-world sit/stand state, regardless of what we're doing with it.
- MyAvatar::FollowHelper::shouldActivateHorizontal: If MyAvatar is not allowed to lean, this now returns true to recentre the footing if the head is outside the base of support.
- MyAvatar::FollowHelper::shouldActivateHorizontalCG: If MyAvatar is not allowed to lean, this now always returns true to recentre the footing.  Rearranged to avoid computing values that weren't used depending on the conditions.  Resolved some duplicated code.
- MyAvatar::setUserRecenterModel previously set HMDLeanRecenterEnabled based on the chosen mode, but it got reset when getting out of a sit.  Now HMDLeanRecenterEnabled is only controlled by the scripts.
- Added Rig::getUnscaledHipsHeight (like getUnscaledEyeHeight).  Refactored a little to avoid duplicated code.  Added DEFAULT_AVATAR_HIPS_HEIGHT which is the value that Rig::getUnscaledHipsHeight returns when using the default avatar.
- Fix for recentring not behaving as requested by the user after getting up from click-to-sit (always behaving like 'Auto') : MyAvatar::endSit now passes false to centerBody for 'forceFollowYPos'.
- Fix for incorrect vertical position of the avatar and viewpoint after changing lean recentre mode while not standing in the real world: MyAvatar::setAllowAvatarStandingPreference now calls centerBody with false for 'forceFollowYPos'.
- computeHipsInSensorFrame: The code now matches the comments in that it only skips the dampening of the hips rotation if the centre-of-gravity model is being used.
 2020-12-22 14:22:27 -05:00
HifiExperiments
f33c7de67a Merge remote-tracking branch 'upstream/master' into pivot 2020-12-18 17:33:24 -08:00
Kalila
89d1346644
Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0 
Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)
 2020-12-17 20:24:37 -05:00
Kalila
f1c9614076
Merge pull request #917 from JulianGro/gles 
Fix building with GLES 3.2 on Linux
 2020-12-17 20:23:26 -05:00
HifiExperiments
7069e48073 working on pivot 2020-12-16 21:01:56 -08:00
ArcadeFever
65fb1320cc Upgraded Oculus SDKs to latest 2020-12-15 00:04:59 -08:00
Kalila
633c642d4a
Merge pull request #906 from vircadia/fix/update-references 
Fix/update references
 2020-12-15 01:29:47 -05:00
Julian Groß
0cebb700fb Change conditionals according to review 2020-12-15 04:15:44 +01:00
Kalila
0f87e4cd86
Merge pull request #838 from ctrlaltdavid/fix/hud-recentering 
HUD overlay fixes and improvements
 2020-12-14 20:46:02 -05:00
Julian Groß
5e17639bed Fix building with GLES 2020-12-15 02:43:39 +01:00
Kalila
8c4ce96c63
Merge pull request #830 from HifiExperiments/update 
Entity update improvements 2
 2020-12-14 17:56:01 -05:00
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
daleglass
70f2866871
Merge pull request #860 from makitsune/fix-alt-on-linux 
Fix alt key on Linux
 2020-12-10 23:45:55 +01:00
kasenvr
86cbcb53a3
Merge pull request #882 from ctrlaltdavid/fix/jsdoc-typo 
Fix JSDoc typo
 2020-12-01 05:58:31 -05:00
Dale Glass
182302c3e7 GL_TEXTURE_FREE_MEMORY_ATI returns 4 values, not just 1 
This should fix a buffer overflow that happens on ATI cards.
 2020-11-28 02:07:08 +01:00
HifiExperiments
9a5b956968
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-11-27 15:11:18 -08:00
HifiExperiments
c510a8fa3e add comment about material sphere scale 2020-11-27 15:10:14 -08:00
HifiExperiments
2ece568f09 fixing up simple-compound logic 2020-11-27 15:04:56 -08:00
Kalila L
97681786cd Potentially fix STUN IP+Port init for heartbeat issue? 2020-11-25 04:54:47 -05:00
HifiExperiments
2e780c34d1 Merge remote-tracking branch 'upstream/master' into update 2020-11-24 16:34:30 -08:00
kasenvr
4e1b6838cc
Merge pull request #871 from kasenvr/revert-868-revert-659-scriptEngine 
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""
 2020-11-24 18:43:33 -05:00
David Rowe
2222f8f4f6 Fix collision hull not necessarily being updated when model URL changed 2020-11-25 11:54:19 +13:00
David Rowe
eb70d15f77 Fix JSDoc typo 2020-11-23 19:13:48 +13:00
HifiExperiments
02f7f494fa Merge remote-tracking branch 'upstream/master' into gha 2020-11-16 21:48:46 -08:00
HifiExperiments
b6744588f4 loading fix 2020-11-16 21:25:25 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00
kasenvr
c3439a8ae7
Merge pull request #659 from HifiExperiments/scriptEngine 
Split Local and owned Avatar Entity scripts into their own ScriptEngine
 2020-11-15 23:12:54 -05:00
HifiExperiments
06f7624512 some more small improvements 2020-11-14 22:34:03 -08:00
Maki
ce8b9d4b24 Deleted old GLWidget code that breaks alt with current Qt on Linux 2020-11-12 22:17:15 +00:00
kasenvr
5080909bb9
Merge pull request #664 from kasenvr/feature/require-redownload 
Feature/require redownload
 2020-11-12 17:10:08 -05:00
kasenvr
8f4f15ba25
Merge pull request #853 from ctrlaltdavid/fix/enter-entity 
Fix enterEntity event not firing in entity script after content reload
 2020-11-12 01:02:55 -05:00
HifiExperiments
3b2c219e53 possibly more robust fix? 2020-11-10 21:39:15 -08:00
HifiExperiments
b3e9c1e8f8 Merge remote-tracking branch 'upstream/master' into scriptEngine 2020-11-09 22:00:11 -08:00
HifiExperiments
696239a97b try to fix android build 2020-11-09 21:27:40 -08:00
HifiExperiments
7bfbf3c99c Merge remote-tracking branch 'upstream/master' into update 2020-11-09 19:33:38 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
David Rowe
2cfd2c8d32 Merge branch 'master' into fix/hud-recentering 2020-11-10 09:27:05 +13:00
kasenvr
b091557cb5
Merge pull request #848 from humbletim/smarter-scriptcache 
ScriptCache: add local file change detection
 2020-11-05 17:20:04 -05:00
HifiExperiments
c8532a1ac5 another unused variable 2020-11-04 22:21:24 -08:00
HifiExperiments
a7e6332c0e fix alpha material bug 2020-11-04 22:09:11 -08:00
HifiExperiments
a3c85bd438 possible fix for collisions again 2020-11-04 19:41:01 -08:00
David Rowe
c6728be4e8 Fix enterEntity event not firing in entithy script after content reload 2020-11-04 11:23:47 +13:00
humbletim
f41ef31ef5 changes per CR 2020-10-31 13:50:47 -04:00
humbletim
a7fb294a1b
Update libraries/networking/src/ResourceRequest.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-31 13:39:29 -04:00
kasenvr
82a0815964
Merge pull request #599 from daleglass/fix-auto-texture-memory 
Initial version of automatic texture memory size
 2020-10-29 20:36:43 -04:00
kasenvr
5bb0c9bffc
Merge pull request #804 from daleglass/logging_improvements 
Improve logging: color, ms timestamps, PID, thread id via environment variable
 2020-10-29 20:12:18 -04:00
kasenvr
09f18a7d66
Merge pull request #791 from daleglass/fix-build-warnings-on-qt-5.15 
Qt 5.15 fixes: Initialize flags with default constructor
 2020-10-29 17:39:06 -04:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener 
[enhancement] transition listener registration from member string name to member string pointer
 2020-10-29 17:13:05 -04:00
daleglass
6c25b9470d
Update libraries/shared/src/LogHandler.cpp 
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
 2020-10-29 19:20:18 +01:00
humbletim
ae7aa3eb88 update ScriptCache to detect local script modifications 2020-10-29 11:30:33 -04:00
humbletim
f012772fa3 add toHttpDateString helper method 2020-10-29 11:29:26 -04:00
Dale Glass
3284313399 Mark font textures as something that shouldn't be downscaled 2020-10-27 18:24:08 +01:00
kasenvr
5c945c1524
Merge pull request #840 from kasenvr/fix/ess-logging-crash 
Prevent crash on entity-script-server due to logging interface.
 2020-10-25 23:09:05 -04:00
kasenvr
4b2c71cf61
Update libraries/script-engine/src/ScriptEngine.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-25 19:49:59 -04:00
Kalila L
50067e3361 Prevent crash on entity-script-server for due to logging interface. 2020-10-25 18:36:20 -04:00
David Rowe
01cd4aa22d Reduce horizontal size of HUD overlay from 270 deg to 180 deg 2020-10-24 16:05:17 +13:00
David Rowe
4d70651c69 Make default reticle depth be HUD overlay radius 2020-10-24 16:00:55 +13:00
David Rowe
436bed3a69 Increase HUD overlay radius 2020-10-24 16:00:39 +13:00
HifiExperiments
f413ad3312 small fixes 2020-10-21 16:05:30 -07:00
HifiExperiments
115229da92 build error 2020-10-20 19:31:03 -07:00
HifiExperiments
081e2b13af small fixes 2020-10-20 17:49:06 -07:00
HifiExperiments
2dd612b926 more improvements 2020-10-20 17:12:23 -07:00
HifiExperiments
c664991f6f models seem to be working! 2020-10-20 15:06:21 -07:00