Commit graph

28871 commits

Author SHA1 Message Date
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
David Back
c4236d7442 allow rendering empty web entity 2018-07-10 13:53:18 -07: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
Olivier Prat
6814c487ec Fixed slot collision between fade map and material texture table 2018-07-10 16:16:51 +02:00
Olivier Prat
50d16eca80 Added object fade parameters to shape pipeline locations 2018-07-10 12:26:51 +02:00
Olivier Prat
777ca7e010 Using shader locations directly in ShapePipeline 2018-07-10 12:11:30 +02:00
Olivier Prat
dfe51b57e8 Fade object params are now passed through uniform buffer 2018-07-10 10:53:38 +02:00
Wayne Chen
bf5cdb0e5f removing unused variables from lambda capture expressions 2018-07-09 22:31:49 -07:00
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
2018-07-09 15:20:18 -07:00
SamGondelman
fcc523fbef parabola sphere intersection 2018-07-09 15:15:36 -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
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -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
SamGondelman
bbe9a0005d parabola vs. web and text 2018-07-05 17:02:55 -07: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
Cristian Luis Duarte
a878ad5a33 Android - remove logs from pause/resume and pending requests 2018-07-05 14:58:55 -03:00
SamGondelman
7130b5aa7f fixing findRayIntersection bugs 2018-07-05 10:27:12 -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
Cristian Luis Duarte
736fc41bb9 Android - Remove resume code that tries the next pending download as entering domains asks for resources anyway 2018-07-04 19:37:12 -03: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
SamGondelman
bfcf4f7865 add parabola test, performance optimization 2018-07-03 15:14:43 -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
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
Ryan Huffman
a5a7f56a32 Fix crash when editing clientOnly entity with no myAvatar 2018-07-03 10:25:52 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Thijs Wenker
3f6793b462 - center default native window
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
2018-07-03 18:42:39 +02:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gondelman
5daf84d690
Merge pull request #13523 from SamGondelman/blur
Fix blurry tablet if overlay is drawing
2018-07-03 09:19:32 -07:00
Olivier Prat
aa115786e3 Invalidate uniform buffer cache when binding camera correction 2018-07-03 17:27:27 +02:00
Olivier Prat
bda0c0a89f Discard fragments all the time if opacity is under threshold 2018-07-03 16:51:56 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
Olivier Prat
74a9b03a5e Merge branch 'master' of http://github.com/highfidelity/hifi into transparent 2018-07-03 09:26:29 +02:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
2018-07-02 15:27:26 -07:00
Andrew Meadows
ff6c309d8b add comment 2018-07-02 15:20:51 -07:00
Anthony J. Thibault
3a88582f42 Bug fix for feet poleVector smoothing.
This bug was introduced when I renamed the variable from poleVector to sensorPoleVector for readablity.
2018-07-02 15:16:47 -07:00
Andrew Meadows
5b4b0a7c25 fix server-side bug in kinematics 2018-07-02 15:04:11 -07:00
Andrew Meadows
9c32a38fb6 fix deactivation slow-spinning kinematics 2018-07-02 15:04:11 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
SamGondelman
773efe8cf0 fix blurry tablet if overlay is drawing 2018-07-02 13:32:25 -07:00
Stephen Birarda
cd3df3f1a7
Merge pull request #13509 from birarda/bug/stuck-udt-connection
fix case where vegas congestion control would not re-send lost ACK
2018-07-02 13:09:44 -07:00
John Conklin II
f7bc79729d
Merge pull request #13515 from Zvork/shadow
Shadow on Mac bug fix
2018-07-02 12:37:52 -07:00
John Conklin II
7834bca39a
Merge pull request #13508 from wayne-chen/crashEntityAppendPoint-case-12473
Fixing crash on appending a point to an entity
2018-07-02 12:36:51 -07:00
David Back
54664855ac
Merge pull request #13494 from dback2/zeroOutSpreads
Particle spreads backwards compatibility
2018-07-02 10:43:34 -07:00
Olivier Prat
51fe60ec45 Fixed android compilation error and removed _glUniformi call 2018-07-02 14:59:09 +02:00
Olivier Prat
1a5c382d88 Fixed on Android 2018-07-02 12:41:24 +02:00
Olivier Prat
d2a612580c Fixed NaN with specular on transparent objects 2018-07-02 12:20:55 +02:00
Olivier Prat
419e8e6eb9 Forgot to put back linear filtering on single shadow map 2018-07-02 11:32:33 +02:00
Sam
1f90e86b87 fix shader shadow bug on mac 2018-07-02 11:08:14 +02:00
Sam
a6cbc44885 Merged with zvork fix 2018-07-02 10:50:37 +02:00
Sam
c1856a5e36 Make shadows work with one cascade 2018-07-02 10:46:53 +02:00
Olivier Prat
933a2eb2cf Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-07-02 10:01:13 +02:00
Anthony J. Thibault
fff4348a0f Bug fix for poleVector smoothing
Needs to occur in sensor space rather then avatar space.
2018-06-29 17:54:21 -07:00
luiscuenca
f770bcd389 Better eyePitch computation 2018-06-29 17:15:03 -07:00
Clement
ba53e7add8 Fix ACs startup crash 2018-06-29 16:29:32 -07:00
Stephen Birarda
dce9cb0404 fix case where TCP Vegas would not re-send lost ACK 2018-06-29 15:42:59 -07:00
Wayne Chen
9e3626cca3 returning false if there is no entity to connect to 2018-06-29 14:42:33 -07:00
luiscuenca
97a0edf026 spaces 2018-06-29 14:38:43 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
John Conklin II
d68815ba27
Merge pull request #13501 from danteruiz/fix-billboard-crash
Fix web entity crash
2018-06-29 12:02:31 -07:00
sabrina-shanman
e4377a6c95 Prevent type conversion in ~ResourceManager constant 2018-06-29 10:55:01 -07:00
Thijs Wenker
c6e264edac fix OSX build (Clang errors) for QA 2018-06-29 19:16:35 +02:00
sabrina-shanman
8cbe5e4541 Merge branch 'mac-shutdown-crash-frame-dtor' into fix-osx-crash-on-exit 2018-06-29 09:38:23 -07:00
Sam Gateau
3435e7ca87
Merge pull request #13499 from hyperlogic/bug-fix/space-process-resets-crash
Guard against memory corruption in Space::processResets()
2018-06-29 17:56:44 +02:00
Olivier Prat
de831ffea9 Switched shadow maps to sampler2DArrayShadow to try to fix on Mac 2018-06-29 16:55:33 +02:00
luiscuenca
2264425f9f Fix eyelid behaviour 2018-06-28 16:41:39 -07:00
Dante Ruiz
8c96597aba Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-crash 2018-06-28 16:25:52 -07:00
Dante Ruiz
847cad46ca fix billboard crash 2018-06-28 16:25:34 -07:00
Anthony J. Thibault
17f9a01fa2 Fix signed unsigned compare warning 2018-06-28 15:29:01 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix
Fix memory corruption when running scripts using Script.require().
2018-06-28 14:18:56 -07:00
Anthony J. Thibault
9772fc4e22 Guard against memory corruption in Space::processResets()
Check the proxyID before reading from the _proxies vector and writing into the _owners vector.
2018-06-28 14:04:59 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster
The client should render "something" for an avatar even if mesh or identity is not available
2018-06-28 12:12:16 -07:00
David Back
a8e231c5af floats .0f 2018-06-28 11:33:38 -07:00
Anthony J. Thibault
ac6fcf092c Fix memory corruption via lambdas that capture local variables by reference.
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.

This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
2018-06-28 11:15:25 -07:00
David Back
f373880af7 Merge branch 'master' of https://github.com/highfidelity/hifi into zeroOutSpreads 2018-06-28 11:07:35 -07:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve
Fix audio device sometimes being on the wrong thread
2018-06-28 09:59:00 -07:00
David Back
4f5a1bc340 zero out spread values for previous versions 2018-06-27 19:02:55 -07:00
John Conklin II
3f6be6d259
Merge pull request #13476 from luiscuenca/avatarClusterScaleFix
Fix scaling avatar points twice
2018-06-27 16:03:46 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master
move AddressManager to NodeList thread, make AccountManager safer
2018-06-27 15:58:56 -07:00
John Conklin II
1f4346d221
Merge pull request #13427 from ctrlaltdavid/21897
Stop desktop app window's QML source from running when window is closed
2018-06-27 13:46:50 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892
Fix entity detaching from head joint not becoming visible
2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup
Always roll hifi-log.txt when starting
2018-06-27 12:32:20 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
John Conklin II
e7d5ea561b
Merge pull request #13469 from hyperlogic/safeLandingFix4
Fix for landing on the roof of some domains.
2018-06-27 10:23:35 -07:00
sabrina-shanman
4afb19e091 Remove assert in ~Frame causing shutdown crash on Mac in dev build 2018-06-27 09:59:48 -07:00
Seth Alves
01632ddd29
Merge pull request #13345 from ctrlaltdavid/21890
Fix memory leak when reloading scripts
2018-06-27 09:39:53 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
ea76def2b5 more white space errors 2018-06-26 17:18:35 -07:00
amantley
1fcaf16b0c removed editor auto format errors 2018-06-26 17:07:55 -07:00
amantley
7ecf8c24df Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with upstream master
2018-06-26 16:44:34 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
luiscuenca
fe571e9638 Fix scaling model twice 2018-06-26 16:37:12 -07:00
Sam Gondelman
7fb2e535ff
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
2018-06-26 15:45:44 -07:00
amantley
2b6d470467 Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with master
2018-06-26 15:16:41 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07:00
SamGondelman
97ee02811c disable shadows in secondary camera 2018-06-26 12:27:59 -07:00
Dante Ruiz
d8834af749 make requested changes 2018-06-26 11:53:45 -07:00
Dante Ruiz
17f4a27ceb Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2 2018-06-26 10:55:27 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID
Include shapeID in RayPick results
2018-06-26 10:25:39 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
John Conklin II
0c9f0cbe03
Merge pull request #13443 from samcake/punk
report FIx from rc69 to master: Fix for the point light test flashing in HMD
2018-06-26 08:28:03 -07:00
Angus Antley
232dc21c7b add orb code added to otheravatar.cpp 2018-06-26 06:38:09 +01:00