Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
80254 commits 75 branches 59 tags 1.2 GiB
Commit graph

24308 commits

Author SHA1 Message Date
Andrew Meadows
7cf0899d59 more correct safeLanding trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
c8c704eb57 revert last change 2019-08-20 17:33:29 -07:00
Andrew Meadows
6d7565a568 CharacterController don't fight MyaAvatar::safeLanding() 2019-08-20 17:33:29 -07:00
Ryan Huffman
de476d0569
Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos 
BUGZ-374: Fix Mac getting stuck in mouse look
 2019-08-20 16:25:02 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes 
Avatar sitting bug fixes
 2019-08-20 11:09:25 -07:00
Shannon Romano
1569c4049f
Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust 
BUGZ-1247: Better handling of other-avatar verify-failed appearance
 2019-08-19 17:32:27 -07:00
Ryan Huffman
8097ecef11 Fix cmd-leftclick not working correctly on Mac OS 
On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
on Mac, the MouseButtonRelease event for these mouse presses are sent to the top
level QWidgetWindow, but are not propagated further. The change here gets around
this problem by capturing these pseudo-RightClicks, and re-emitting them as
"pure" RightClicks.
 2019-08-19 15:53:20 -07:00
Zach Fox
ca2cdfc533 Fix some engine bugs that fix muted state in all UIs including simplifiedUI 2019-08-19 11:13:11 -07:00
Simon Walton
150b4e45d4 More robust handling of the avatar verify-failed property 2019-08-16 17:30:28 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes 
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
 2019-08-16 10:57:03 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown 
BUGZ-984: Wait for client entity-scripts to unload when shutting down
 2019-08-16 10:12:38 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate 
BUGZ-902: Drastically reduce locking and branching necessary for render updates
 2019-08-15 09:35:17 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Sam Gateau
9a1e1a001a Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-13 10:00:59 -07:00
Zach Fox
a225a009cd BUGZ-1233: Remove keyboard shortcut to LoD tools 2019-08-12 11:27:34 -07:00
Sam Gateau
53642763c9 Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse 2019-08-11 21:57:36 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation 
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
 2019-08-09 17:28:46 -07:00
sabrina-shanman
16593ec3c9 Remove invalid deprecated comment 2019-08-09 16:32:31 -07:00
sabrina-shanman
07ea79689e Fix build warnings 2019-08-09 13:34:55 -07:00
Sam Gateau
fe08609b0c Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-09 11:25:03 -07:00
Brad Hefta-Gaub
555a875405
Merge pull request #16047 from jherico/fix/bugz-1097 
BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs
 2019-08-09 09:51:38 -07:00
Shannon Romano
1993ff6277
Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2 
BUGZ-993: Bump minimum threadpool size to 2
 2019-08-09 09:20:55 -07:00
Brad Davis
c28d850514 BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs 2019-08-09 08:13:20 -07:00
sabrina-shanman
99a774c89c Do not display high viewing distance as 20:0 vision 2019-08-08 13:03:40 -07:00
sabrina-shanman
1571c2be27 Fix LOD math 2019-08-08 13:03:20 -07:00
sabrina-shanman
9c16fcfdef Make the LOD half angle the definitive LOD variable 2019-08-07 17:23:04 -07:00
Sam Gateau
c01ab954e3 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-07 16:39:11 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug 
(BUGZ-1059) Improve debug API for picks/pointers
 2019-08-07 12:01:26 -07:00
sabrina-shanman
66dbb08b01 Be explicit about pickType/pointerType being returned when getting script parameters 2019-08-07 10:44:43 -07:00
sabrina-shanman
4cb925e973 Fix jsdoc for getPointerScriptParameters 2019-08-07 10:04:44 -07:00
sabrina-shanman
8cde93973d Disambiguate pick and pointer types in the returned properties 2019-08-07 09:56:23 -07:00
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07:00
sabrina-shanman
6db6890bac Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale 2019-08-06 15:54:28 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses 
visibilityDistance
 2019-08-06 15:46:10 -07:00
Simon Walton
baa586939c Merge branch 'master' into min_threadpool_2 2019-08-06 14:25:37 -07:00
Shannon Romano
93d5d9bd3f
Merge pull request #15988 from ctrlaltdavid/DOC-98 
DOC-98, DOC-114: PlatformInfo API changes JSDoc
 2019-08-06 13:22:36 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84 
DOC-84: Update JSDoc with glTF
 2019-08-06 13:22:04 -07:00
Shannon Romano
8c981140b0
Merge pull request #16005 from ctrlaltdavid/DOC-61 
DOC-61: Render API JSDoc
 2019-08-06 13:18:17 -07:00
jennaingersoll
f487d094fe
Merge pull request #15959 from ctrlaltdavid/DOC-124 
DOC-124: Tidy JSDoc from some recent API changes
 2019-08-06 11:57:28 -07:00
Shannon Romano
9d3d5b7701
Merge pull request #15992 from hyperlogic/feature/reaction-fixes 
Refined reaction and sitting animations
 2019-08-06 09:15:44 -07:00
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -07:00
David Rowe
1abf0eb207 Merge branch 'master' into DOC-124 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
 2019-08-06 10:59:50 +12:00
Sam Gateau
3a053c32f4 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-05 14:26:18 -07:00
sabrina-shanman
30482c2db4 Give the pointer its own copy of the script parameters in case its pick is deleted 2019-08-05 13:36:15 -07:00
David Rowe
f97417932c Fix typo 2019-08-06 08:08:08 +12:00
David Rowe
419044021b Merge branch 'master' into DOC-61 2019-08-06 08:03:12 +12:00
Zach Fox
34bc71fba9 Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users 2019-08-05 15:12:29 -04:00
Sam Gateau
d55f143300 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-05 09:49:14 -07:00
Anthony J. Thibault
704a2d2ac9 Merge branch 'master' into feature/reaction-fixes 2019-08-05 09:43:32 -07:00