Olivier Prat
c04bf095ec
Limited sharpen range
2018-02-26 16:48:10 +01:00
Olivier Prat
16cd1e3fd5
Adjusted bloom effect to work with antialiasing
2018-02-26 15:26:12 +01:00
Olivier Prat
419e064e65
Moved antialiasing before tonemapping
2018-02-26 14:57:59 +01:00
Olivier Prat
d3114cbc67
Android compilation fixes again
2018-02-23 21:52:45 +01:00
Olivier Prat
65f3408458
Fixed compilation error with GLES backend on Android
2018-02-23 20:19:55 +01:00
Olivier Prat
37fdf81f1b
Fix warnings on mac and ubuntu
2018-02-23 19:37:12 +01:00
Olivier Prat
ee253143ff
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-23 14:53:14 +01:00
Olivier Prat
6a550e983f
Disable sharpen with FXAA
2018-02-23 14:46:37 +01:00
Olivier Prat
095f426f31
Adjusted default sharpen
2018-02-23 14:43:22 +01:00
Olivier Prat
c9a6d6bf14
Added adjustable post sharpen filter
2018-02-23 11:53:05 +01:00
Olivier Prat
d316b6e074
Fixed broken TAA on desktop... grrr.
2018-02-23 11:28:00 +01:00
Olivier Prat
4636f43728
Simplified camera view history and TAA is now working in all circumstances.
2018-02-23 10:19:05 +01:00
Olivier Prat
7432c8361e
Added some comments to try to help understand the correction pipeline
2018-02-23 09:11:17 +01:00
Olivier Prat
ae63610582
Added history of view to try to adjust for GPU slower than game
2018-02-22 23:03:33 +01:00
Olivier Prat
ebe05d1f6f
Still have to fix TAA when GPU is slower than game
2018-02-22 18:59:25 +01:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
Olivier Prat
aa46d16699
A bit of cleanup in TAA shaders
2018-02-22 10:09:03 +01:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
...
Remove some deprecated JavaScript API items
2018-02-21 16:31:16 -08:00
John Conklin II
9ba1532c26
Merge pull request #12446 from sethalves/more-logging-for-fb-11748
...
more logging for fogbugz 11748
2018-02-21 09:49:51 -08:00
John Conklin II
92249a2bee
Merge pull request #12396 from ElderOrb/double-connection-fix
...
fix 4x 'fromQml' slots execution
2018-02-21 09:01:47 -08:00
Olivier Prat
dca7b7aaba
TAA is working on HMD! Still some issues when game rate is low
2018-02-21 17:34:51 +01:00
Olivier Prat
093a1491cd
Renamed resourcering to resourceswapchain
2018-02-21 15:43:19 +01:00
Olivier Prat
f53c2f41a5
Merge branch 'master' of http://github.com/highfidelity/hifi into prev
2018-02-21 09:46:38 +01:00
Seth Alves
bf73df1265
more logging for fogbugz 11748
2018-02-20 15:45:47 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Olivier Prat
4edfe6c9ab
Trying to keep track of a better previous correction
2018-02-20 14:48:21 +01:00
Olivier Prat
247a1f5769
Working ring frame buffer with antialiasing but still issues with TAA on HMD
2018-02-20 09:22:19 +01:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
Olivier Prat
18af60f3eb
Added RingBuffer mechanism to gpu lib
2018-02-19 18:48:58 +01:00
Olivier Prat
9cfe53be3e
Merged from orgin taa
2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e
Merged with master
2018-02-19 17:28:39 +01:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
...
Bug fix for Scrambled Avatars
2018-02-18 19:06:53 -08:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities
...
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
2018-02-16 09:48:19 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
...
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue
...
Introduce task abort feature for early exit of task branch
2018-02-15 15:50:43 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Dante Ruiz
bbcf865db3
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities
2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:02:45 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
samcake
c70b655fbc
A bit more explanations to the Task Flow class
2018-02-15 11:55:16 -08:00
Anthony J. Thibault
f07b1fa4c5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6
.
Because remainingModels is a QSet, the order is not guaranteed.
Therefore the same code iterating over the same items will sometimes have a different ordering.
See docs for QSet, http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
2018-02-15 11:32:29 -08:00
samcake
b21b98c810
Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work
2018-02-15 11:24:20 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Alexander Ivash
beb595266d
fix 4x 'fromQml' slots execution
...
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
2018-02-15 21:45:35 +03:00
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings
...
initial separation of DS into domain settings and content settings
2018-02-15 10:04:36 -08:00
samcake
246ac25d0a
Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight
2018-02-14 17:36:46 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00