Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
69870 commits 69 branches 56 tags 1.2 GiB
Commit graph

28753 commits

Author SHA1 Message Date
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze 
Fix haze on Mac (bug #15515)
 2018-07-11 20:04:22 +02:00
Seth Alves
4cf706dd96
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children 
more correct kinematic motion of grabbed things
 2018-07-11 10:34:44 -07:00
Sam Gateau
377c072e6d
Merge pull request #13557 from Zvork/bloom 
Fix Bloom on Mac and hopefully Windows AMD (bug #15434)
 2018-07-11 19:29:44 +02:00
Andrew Meadows
8ea18e3359 integrate active kinematic even when grabbed 2018-07-10 11:20:18 -07:00
Andrew Meadows
dd6be374fa cleanup and optimization rotational integration 2018-07-10 11:18:38 -07:00
Andrew Meadows
9171fcbe8b explicit insert/erase into _simpleKinematicEntities 2018-07-10 11:17:13 -07:00
Andrew Meadows
0b87df45b5 cleanup return statement 2018-07-10 11:16:56 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
Wayne Chen
8f23fb01a4 removing unused variables 2018-07-10 07:30:02 -07:00
Wayne Chen
bf5cdb0e5f removing unused variables from lambda capture expressions 2018-07-09 22:31:49 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
amantley
a2f8e024fb added avatar constants changed for posterior and head velocity 2018-07-09 13:59:56 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Simon Walton
607a898c32 Transmit a maximum number of identity requests before giving up 2018-07-06 15:16:13 -07:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
John Conklin II
1bd698a5dc
Merge pull request #13558 from danteruiz/fix-falling-through-floor 
Fix falling through floor
 2018-07-06 13:44:08 -07:00
John Conklin II
c4733d6c29
Merge pull request #13550 from AndrewMeadows/fix-workload-crash 
fix crash in workload on timeout with entity-server
 2018-07-06 12:12:10 -07:00
Dante Ruiz
fdf58ab2b5 fixing edge case 2018-07-06 11:09:59 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
e79d8b2f43 Revert "potential fix for the issue with inability to query correct wearables right after deletion wearable (discuss with Dante later)" 
This reverts commit 2872d37726bba3d0274eba3a07c0a9faa529f2d5.
 2018-07-06 21:00:53 +03:00
Alexander Ivash
2055f30ed1 potential fix for the issue with inability to query correct wearables right after deletion wearable (discuss with Dante later) 2018-07-06 21:00:52 +03:00
John Conklin II
f2d0f1ffbc
Merge pull request #13458 from SimonWalton-HiFi/aggressive-domain-checkins 
Send repeated check-in requests for greater resilience
 2018-07-06 10:58:46 -07:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
Dante Ruiz
3cc54c5118 another round of small adjustments 2018-07-06 09:11:42 -07:00
Dante Ruiz
6d8fe870e4 some clean up 2018-07-06 09:00:00 -07:00
Dante Ruiz
533164e1e4 some more fixes 2018-07-06 08:55:20 -07:00
Dante Ruiz
09627dd3d9 first pass on trying to fix falling through floor 2018-07-06 08:28:43 -07:00
Olivier Prat
a75b4a2410 Switched to uniform buffer for Highlight 2018-07-06 13:56:04 +02:00
Olivier Prat
74a6c25b86 Used shape pipeline slots in haze 2018-07-06 12:35:48 +02:00
Olivier Prat
0cc6471c7f Merge branch 'master' of http://github.com/highfidelity/hifi into haze 2018-07-06 12:35:26 +02:00
Olivier Prat
63c03e79d3 BloomApply now uses uniform buffer 2018-07-06 11:52:24 +02:00
Olivier Prat
1097e666d6 Using uniform buffer for bloom threshold 2018-07-06 11:13:42 +02:00
Simon Walton
33ae04f9ea Change sense of DomainHandler::checkInPacketTimeout() return value 2018-07-05 16:39:13 -07:00
John Conklin II
a97d4f655a
Merge pull request #13548 from luiscuenca/slantedAvatarFix 
Fix avatar become more and more slanted over time while in HMD mode
 2018-07-05 15:53:45 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes 
Entity Script Server memory leak when taking down EntityTree
 2018-07-05 15:30:45 -07:00
Andrew Meadows
59fcee6bc0 improved clear() and avoid bad indices 2018-07-05 13:30:48 -07:00
luiscuenca
b2e02e20cc Fix inaccurate delta rotation axis 2018-07-05 11:47:10 -07:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix 
Fix closed eyelids when head is tilted down
 2018-07-05 08:50:22 -07:00
Sam Gateau
c7c1cdd8c3
Merge pull request #13529 from Zvork/transparent 
Fix number of rendering issues with some transparent objects on Mac and AMD GPUs
 2018-07-05 17:20:24 +02:00
Olivier Prat
d2763841be Working background blend on haze 2018-07-05 17:15:39 +02:00
Olivier Prat
4b7b14f4d3 Added lighting model to haze to be able to turn it on/off 2018-07-05 16:25:40 +02:00
Olivier Prat
4a25090a23 Fixing haze bug on Mac, and potentially AMD 2018-07-05 15:48:33 +02:00
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing 
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
 2018-07-03 21:50:57 -07:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Simon Walton
ec67b8ad56 Address reviewer comments 2018-07-03 15:31:34 -07:00
John Conklin II
8f838397a4
Merge pull request #13525 from AndrewMeadows/slow-kinematics 
fix for erroneous deactivation of slow-spinning kinematic objects
 2018-07-03 12:05:42 -07:00