samcake
ade1d6c056
use the correct call to toggle the debugFXAA on the AaConfig
2018-05-16 15:37:13 -07:00
samcake
adc8a07d3c
Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn
2018-05-16 13:14:14 -07:00
samcake
21e069c90c
Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa
2018-05-16 13:09:55 -07:00
John Conklin II
9c9f375bb5
Merge pull request #13178 from samcake/rc67.2-translucents
...
Rc67.2 : Fixing translucents objects in ambient lighting
2018-05-16 12:18:15 -07:00
samcake
179801dab6
FIxing the transparent ambient lighting bug
2018-05-15 17:22:28 -07:00
John Conklin II
808fb5a5d9
Merge pull request #13173 from Zvork/taabug
...
TAA fix for highlight
2018-05-15 15:32:20 -07:00
Olivier Prat
0941e02523
Merge branch 'RC67.2' of http://github.com/highfidelity/hifi into taabug
2018-05-15 21:14:46 +02:00
Olivier Prat
d10b5a16f2
Turned off jitter with FXAA
2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a
Fixed bug with highlighting and TAA
2018-05-15 12:27:04 +02:00
John Conklin II
0991bf106d
Merge pull request #13155 from highfidelity/RC67.1
...
Beta Release 67.1 - branched at Developer Release 8260
2018-05-11 10:09:36 -07:00
John Conklin II
5866442bf6
Merge pull request #13156 from Zvork/RC67.1
...
Bug fix for Manuscript issue 15019 : "Translucent Model over Procedural SHader is broken"
2018-05-11 07:53:16 -07:00
Olivier Prat
ff88911f93
Protected procedural skyboxes from NaNs and negative values returned by procedural shader
2018-05-11 12:26:03 +02:00
Olivier Prat
9e462e777c
Fixed compilation error with transparent procedurals
2018-05-11 11:01:24 +02:00
John Conklin II
b0d19bc08e
Merge pull request #13149 from SamGondelman/cherry-pick
...
RC67.1: Fixed procedural shaders
2018-05-10 23:47:16 -07:00
John Conklin II
e1e68c0dfa
Merge pull request #13153 from hyperlogic/bug-fix/vive-puck-calibration-fix-rc67
...
[RC67.1] Bug fix for Vive Tracker Calibration Settings
2018-05-10 23:46:51 -07:00
SamGondelman
de4a2ca3b2
update procedural skybox on user data change
2018-05-10 18:44:53 -07:00
Anthony J. Thibault
0ac12fa317
Bug fix for Vive Tracker Calibration Settings
...
This issue was inadvertently introduced by the name change of the Vive display plugin.
2018-05-10 17:56:54 -07:00
Olivier Prat
ec439086a2
Extended to other shaders
...
(cherry picked from commit 328f1dec9b
2018-05-10 15:41:34 -07:00
Olivier Prat
29355ba8fb
Fixed procedural shaders
...
(cherry picked from commit eab7dd6006
2018-05-10 15:41:04 -07:00
John Conklin II
befb411f6e
Merge pull request #13025 from highfidelity/RC67
...
Beta Release 67 - branched at developer release 8181
2018-05-10 10:11:23 -07:00
John Conklin II
4d224af7c7
Merge pull request #13137 from sethalves/fix-serverless-sim-ownership-rc67
...
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 12:34:42 -07:00
John Conklin II
e9ad50159c
Merge pull request #13136 from zfox23/RC67_MS14951
...
RC67: MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:11:33 -07:00
Seth Alves
db03265a6b
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 10:53:46 -07:00
Zach Fox
542e707de8
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:40:51 -07:00
John Conklin II
d8e6ecba35
Merge pull request #13129 from druiz17/fix-hmd-js
...
Fix hmd js
2018-05-09 07:45:52 -07:00
John Conklin II
a811c6aba3
Merge pull request #13132 from zfox23/RC67_MS14937
...
MS14937: Fix Replace button for content sets during Checkout
2018-05-09 06:47:47 -07:00
Zach Fox
22c26c348d
MS14937: Fix Replace button for content sets during Checkout
2018-05-08 16:37:11 -07:00
Dante Ruiz
1a0ded4526
adding windows
2018-05-08 15:10:57 -07:00
Dante Ruiz
0513204781
fix hmd.js
2018-05-08 15:05:55 -07:00
Stephen Birarda
10b9546104
Merge pull request #13124 from birarda/66-2-to-67
...
Merge 66.2 back to 67
2018-05-08 14:03:07 -07:00
Stephen Birarda
ae2c45bddd
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-08 10:23:14 -07:00
John Conklin II
a6eed27bdd
Merge pull request #13123 from druiz17/RC67
...
remove highlight on entity when point to the sky (RC67)
2018-05-08 07:25:40 -07:00
Dante Ruiz
a593209ec1
remove highlight when point to the sky
2018-05-07 15:33:12 -07:00
Dante Ruiz
9d6019e78c
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
2018-05-07 15:33:00 -07:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818
...
Fix for 'Login page for steam is blank'
2018-05-07 11:26:39 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758
...
RC67: MS14758: Fix avatar reset when gifting worn avatar
2018-05-07 10:10:41 -07:00
John Conklin II
8f8c5b4f08
Merge pull request #13105 from druiz17/another-highlight-f-x
...
fix-another-highlighting-issue
2018-05-07 10:05:59 -07:00
John Conklin II
2eb171be1c
Merge pull request #13107 from zfox23/RC67_MS14639
...
RC67: Fix for crash deep in QML after useFullAvatarURL
2018-05-07 10:05:16 -07:00
Alexander Ivash
b4cfea2fbc
FB14818 Login page for steam is blank
2018-05-06 17:17:06 +03:00
Anthony J. Thibault
8480bb962b
Fix for crash deep in QML after useFullAvatarURL
...
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c
MS14758: Fix avatar reset when gifting worn avatar
2018-05-04 16:04:05 -07:00
Dante Ruiz
176d69444f
fix-another-highlighting-issue
2018-05-04 14:23:46 -07:00
Dante Ruiz
607de3dfb4
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5
fix-another-highlighting-issue
2018-05-04 14:20:17 -07:00
John Conklin II
ea230d8698
Merge pull request #13100 from druiz17/fix-entity-highlighting-during-editing
...
Don't highlight entities during edit mode
2018-05-04 11:32:24 -07:00
Dante Ruiz
a57c72df6e
fix entity highlighting during edit mode
2018-05-04 08:53:49 -07:00
John Conklin II
ef997e647a
Merge pull request #13088 from samcake/rc67
...
RC67: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 16:21:14 -07:00
John Conklin II
182e7c4b5f
Merge pull request #13086 from samcake/rc66.2
...
RC 66.2: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 15:48:41 -07:00
John Conklin II
b426c4e85d
Merge pull request #13089 from druiz17/RC-67-fix-highlighting
...
RC 67 fix entity highlighting
2018-05-03 15:34:21 -07:00
Dante Ruiz
cffb008c31
fixing edge case
2018-05-03 13:07:32 -07:00
