Commit graph

66996 commits

Author SHA1 Message Date
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
Brad Davis
575520fe30 Ensure we actually delete the QML scenegraph! 2018-04-27 15:08:10 -07:00
Brad Davis
5f8149fd68 Remove debugging pragma 2018-04-27 13:57:22 -07:00
Brad Davis
f2172d84a0 Add stress test for QML web content 2018-04-27 08:35:20 -07:00
Brad Davis
e892694bf5 Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity 2018-04-27 08:13:35 -07:00
Brad Davis
1b612d373f Explicitly delete QML context before releasing engine 2018-04-27 08:11:11 -07:00
Brad Davis
6640313256 Fix memory leak in QML surfaces 2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce Fix bad virtual cast on qml surface destruction 2018-04-27 08:09:31 -07:00
Brad Davis
2662dc9b4e Suppress tracing log spam when tracing is not active 2018-04-27 08:03:48 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre
Bloom and Temporal Anti-Aliasing improvements
2018-04-25 11:16:56 -07:00
John Conklin II
91b93db0c5
Merge pull request #12981 from birarda/bug/revert-hmac
revert HMAC packet verification for now
2018-04-25 10:07:36 -07:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
Olivier Prat
eb01f25621 Merge branch 'taapre' of http://github.com/Zvork/hifi into taapre 2018-04-25 08:35:50 +02:00
Olivier Prat
c0b5bc8ffd
Merge pull request #1 from samcake/taa-zvork
Fixing the crash on mac
2018-04-25 08:35:32 +02:00
John Conklin II
6062f21da1
Merge pull request #12961 from Atlante45/fix/es-deadlock
Enforce correct lock order between EntityTree and EntitySimulation
2018-04-24 15:40:32 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
John Conklin II
ce14dfb9a4
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage
don't try to build convex hulls with nan data
2018-04-24 14:11:25 -07:00
Atlante45
d82333534c Ensure the tree lock is always taken before the simulation lock 2018-04-24 13:46:05 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
2018-04-24 13:29:41 -07:00
Stephen Birarda
63491588cb Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth"
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
2018-04-24 12:44:51 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857 Fixing the crash on mac 2018-04-24 11:25:40 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
2018-04-24 11:22:48 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash
Attempt to shutdown web surfaces more consistently
2018-04-24 10:15:25 -07:00
Olivier Prat
f5296e9d97 Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-24 17:17:52 +02:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio
Fix audio level meter
2018-04-23 14:56:57 -07:00
John Conklin II
2e6a563c87
Merge pull request #12959 from davidkelly/dk/14375
Don't populate user list in pal until you connect the events up
2018-04-23 14:47:31 -07:00
Andrew Meadows
ae186d46c6 don't try to build convex hulls with nan data 2018-04-23 14:46:23 -07:00
John Conklin II
6af6423056
Merge pull request #12905 from dback2/desktopEquip
Desktop equip/unequip
2018-04-23 14:35:29 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix
Fix for null sourceNode use
2018-04-23 14:11:06 -07:00
Stephen Birarda
0de1a49c78
Merge pull request #12949 from birarda/feat/installer-marketing-images
add default or campaigned marketing slideshow during install
2018-04-23 13:52:53 -07:00
John Conklin II
70689dd297
Merge pull request #12968 from birarda/bug/wrong-domain-local-id
fix setting of domain local ID from domain list
2018-04-23 13:50:21 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
2018-04-23 13:49:41 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert
Minimum entity dimension (1mm)
2018-04-23 13:40:53 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox
Fix SpinBox.
2018-04-23 13:02:01 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Simon Walton
2f72b789a3 Fix for null sourceNode use 2018-04-23 12:13:31 -07:00
Andrew Meadows
577f9a03e6 fix bug: animation reset on 'hold' 2018-04-23 12:08:40 -07:00
Andrew Meadows
748af5a65f worry about multi-threads when updating animation props 2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092 fix bug: animation should reset on start running 2018-04-23 12:08:40 -07:00
Andrew Meadows
b48e9495a5 rollback change to MaterialEntityItem, we'll fix later 2018-04-23 12:08:40 -07:00
Andrew Meadows
75508385cf more correct needsToCallUpdate() implementations 2018-04-23 12:08:40 -07:00
Andrew Meadows
e36dbab838 remove unused data member 2018-04-23 12:08:40 -07:00
SamGondelman
1deb38f06d fix copy error 2018-04-23 12:05:30 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq
Fix AMD shader compilation
2018-04-23 10:17:35 -07:00