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 |
|
John Conklin II
|
730dce31e3
|
Merge pull request #12444 from zfox23/commerce_extendedCerts_1
Commerce: Extended Certificate Support, V1
|
2018-02-22 15:19:57 -08:00 |
|
Stephen Birarda
|
fc9af39745
|
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes
Add #include of Forward.h to AudioMixer.h
|
2018-02-22 16:09:24 -07: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 |
|
Simon Walton
|
a0a12258bf
|
Merge branch 'master' into moc-fixes
|
2018-02-22 11:06:53 -08:00 |
|
Zach Fox
|
3d4e6de6ab
|
Quick bugfix
|
2018-02-22 10:49:11 -08:00 |
|
Olivier Prat
|
ebe05d1f6f
|
Still have to fix TAA when GPU is slower than game
|
2018-02-22 18:59:25 +01:00 |
|
Liv
|
478ec48b63
|
Merge pull request #12463 from misslivirose/fix/edit-bugs
Fix two bugs with Create Menu
|
2018-02-22 09:43:50 -08: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 |
|
Seth Alves
|
c534e3a6e4
|
Merge pull request #12356 from ctrlaltdavid/21742
Handle tablet entities and overlays not being available
|
2018-02-22 08:48:13 -08:00 |
|
Olivier Prat
|
aa46d16699
|
A bit of cleanup in TAA shaders
|
2018-02-22 10:09:03 +01:00 |
|
John Conklin II
|
37645022f6
|
Merge pull request #12344 from ctrlaltdavid/21739
Recording app fixes
|
2018-02-21 17:03:54 -08: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 |
|
Liv Erickson
|
aba1cae36d
|
get rid of magic number
|
2018-02-21 16:19:50 -08:00 |
|
tapalisa
|
1f958c247f
|
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final
[Case 4315] Fixes ColorPicker Color Preview functionality
|
2018-02-21 16:09:47 -08:00 |
|
Liv Erickson
|
990e848de6
|
fix typo that was breaking popup dialog
|
2018-02-21 15:54:00 -08:00 |
|
Liv Erickson
|
68f0c0391a
|
Initial fix - need a little style fixing
|
2018-02-21 15:44:23 -08:00 |
|
David Rowe
|
fa1f2267cf
|
Support RC63
|
2018-02-22 10:06:00 +13:00 |
|
Sam Gateau
|
0af8507ce2
|
Merge pull request #12453 from SamGondelman/materialUI
Fix new material UI indentation
|
2018-02-21 12:14:32 -08:00 |
|
Zach Fox
|
74655bde49
|
Fix skeletonmodelURLchanged signal
|
2018-02-21 12:12:20 -08:00 |
|
Zach Fox
|
b548567f5a
|
Apps protection
|
2018-02-21 11:17:47 -08:00 |
|
Simon Walton
|
619901caa0
|
Move up main #include for other AudioMixer*
Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
|
2018-02-21 11:12:09 -08:00 |
|
Zach Fox
|
1fbc16aae2
|
Fix noPermissionGlyph margin
|
2018-02-21 10:52:17 -08:00 |
|
SamGondelman
|
4dde178b93
|
fix new material UI
|
2018-02-21 10:33:15 -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 |
|
Simon Walton
|
16ffcc7fe2
|
Add #include of Forward.h to AudioMixer.h
This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
|
2018-02-21 09:48:15 -08:00 |
|
Seth Alves
|
cfbe082074
|
Merge pull request #12438 from ctrlaltdavid/21757
Fix selecting values when tabbing between entity properties fields
|
2018-02-21 09:22:46 -08:00 |
|
Seth Alves
|
220d9abbfc
|
Merge pull request #12435 from vladest/fix_flickable_tablethome
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-21 09:21:45 -08:00 |
|
John Conklin II
|
9e1ea191b3
|
Merge pull request #12443 from zfox23/commerce_SendMoneyUiFix1
Commerce: Wallet/Send Money UI fixes
|
2018-02-21 09:02:13 -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
|
f08c66e3ac
|
Remove debug code
|
2018-02-20 14:16:55 -08:00 |
|
Zach Fox
|
fd6f4b569f
|
Fix active focus issue
|
2018-02-20 13:19:31 -08:00 |
|
Zach Fox
|
eb29bdf5d2
|
Don't allow tabs or newlines
|
2018-02-20 13:06:10 -08:00 |
|
Ryan Huffman
|
acda90577a
|
Merge pull request #11997 from ZappoMan/oldPropsFilters
giving more info to entity edit filters to allow more flexibility
|
2018-02-20 12:57:44 -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 |
|
Zach Fox
|
9bde9f5a4f
|
Fix height of Optional Message in Send Money
|
2018-02-20 12:36:11 -08:00 |
|
Zach Fox
|
11f897beb0
|
Initial app support
|
2018-02-20 10:39:36 -08:00 |
|
John Conklin II
|
6148c407a5
|
Merge pull request #12422 from misslivirose/fix-overlay-lines
Show outline for zones when rotating
|
2018-02-20 09:30:22 -08:00 |
|
John Conklin II
|
aa67a98d02
|
Merge pull request #12426 from ElderOrb/FB11508
fix for toolbar slowly drifting on switching between HMD/Desktop modes
|
2018-02-20 09:30:01 -08:00 |
|
Olivier Prat
|
4edfe6c9ab
|
Trying to keep track of a better previous correction
|
2018-02-20 14:48:21 +01:00 |
|