Commit graph

79444 commits

Author SHA1 Message Date
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Anna
9b85c7f1ac Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification 2019-06-28 09:47:17 -07:00
Zach Fox
b95586239a
Merge pull request #15847 from zfox23/removePTTAttenuation
BUGZ-363: Remove 20dB output attenuation during PTT
2019-06-27 13:45:49 -07:00
Andrew Meadows
45ffa2bb1f
Merge pull request #15827 from raveenajain/nitpick_shadows
BUGZ 598: nitpick tests failing due to shadow issue
2019-06-27 13:37:31 -07:00
Zach Fox
7c189d46f2 BUGZ-363: Remove 20dB output attenuation during PTT 2019-06-27 13:28:29 -07:00
jennaingersoll
b6cefd8dfb
Merge pull request #15786 from ChristophHaag/patch-1
Update jsdoc to avoid breakage with recent node
2019-06-27 13:06:12 -07:00
raveenajain
3a60bc6a13 clang braces fix 2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f arrays for bias calcs 2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-27 09:42:03 -07:00
raveenajain
04afbde188 cascade loop, fine tune calc 2019-06-27 09:41:39 -07:00
Shannon Romano
417e02ac9d
Merge pull request #15845 from SamGondelman/threadpool
BUGZ-861: Wait on QThreadPool threads on shutdown
2019-06-27 08:42:06 -07:00
Anna
6b79b275a9 fixed reinhard and filmic curves 2019-06-26 18:00:49 -07:00
Anna
24b6d64e34 removed extraneous code for hmd 2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87 removed extraneous conversion to SRGB and back during deferred rendering 2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff move bias init from config to run 2019-06-26 15:42:11 -07:00
Shannon Romano
a3d6dd2623
Merge pull request #15844 from annabrewer/color-banding
BUGZ-828: Color banding showing up in recent builds
2019-06-26 15:41:22 -07:00
SamGondelman
5937a219dd wait on thread pool threads 2019-06-26 15:25:17 -07:00
Shannon Romano
b96db7517c
Merge pull request #15836 from RebeccaStankus/create
BUGZ-659 Fix create menu paths
2019-06-26 11:52:02 -07:00
Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges
New Top Bar Icons
2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
Anna
59505ab20f fixed color banding on rift 2019-06-26 09:29:06 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Brad Hefta-Gaub
06bb09ff58
Merge pull request #15841 from SimonWalton-HiFi/accountmanager-quit-signal
BUGZ-789: Use a queued signal to quit from AccountManager::saveLoginStatus()
2019-06-25 17:20:41 -07:00
MiladNazeri
7d6cff46ff
Merge pull request #15842 from MiladNazeri/refreshNametagLifetime
[BUGZ 798] :: updated lifetime
2019-06-25 19:32:33 -04:00
RebeccaStankus
d8daee49a8 Fixed bad path to gridControls 2019-06-25 16:31:21 -07:00
milad
72867437be updated lifetime 2019-06-25 15:38:02 -07:00
Shannon Romano
2af701235a
Merge pull request #15815 from annabrewer/snapshot-gamma
BUGZ-765: Snaps Photos are Dark
2019-06-25 15:26:00 -07:00
Shannon Romano
d13b8d354c
Merge pull request #15840 from danteruiz/launcher-issues
BUGZ-837: Fix Launcher crash (mac)
2019-06-25 15:04:44 -07:00
Simon Walton
b4e1c2264c Use a queued signal to quit from AccountManager::saveLoginStatus() 2019-06-25 14:47:58 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79
DOC-79: Entities JSDoc Update
2019-06-25 14:18:13 -07:00
dante ruiz
1e38e7b7eb print out exception error 2019-06-25 14:11:41 -07:00
Andrew Meadows
adce2a6fd0
Merge pull request #15838 from kencooke/render-blendshape-optim-avx2
Fix Mac crash caused by PR#15825
2019-06-25 13:54:39 -07:00
dante ruiz
68d620fca3 fix crash 2019-06-25 13:37:45 -07:00
Zach Fox
1789622bce
Merge pull request #15839 from highfidelity/MiladNazeri-patch-1
Update BUILD_WIN.md
2019-06-25 13:32:10 -07:00
MiladNazeri
31c10d1aa1
Update BUILD_WIN.md
When I updated the download link, I forgot to change the text above.  It might be a little confusing.
2019-06-25 13:24:57 -07:00
Ken Cooke
4c5c61231d Only use QVector resize when actually needed 2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9 Use QVector resize() instead of reserve() to silence Debug builds about size not being set.
Causes unneeded default initialization, but no obvious way to avoid.
2019-06-25 12:53:07 -07:00
Brad Hefta-Gaub
a2aff0d072
Merge pull request #15832 from huffman/fix/winlauncher-terms-link
BUGZ-710: Update win32 launcher with working ToS link
2019-06-25 12:48:49 -07:00
Brad Hefta-Gaub
04ab11eab2
Merge pull request #15833 from huffman/fix/winlauncher-logo-aspect-ratio
Fix aspect ratio of splash logo in win32 launcher
2019-06-25 12:47:28 -07:00
Zach Fox
89db67552f
Merge pull request #15837 from zfox23/SUI/fasterSettingsTabs
DEV-170: Increase the speed of the animation when clicking between tabs in Settings
2019-06-25 12:06:50 -07:00
Sam Gateau
768dd051aa Add sanity check for viewport resolution scale to avoid negative value 2019-06-25 11:54:50 -07:00
Ken Cooke
b079e3283e BUGFIX: use unaligned loads 2019-06-25 11:48:41 -07:00
Zach Fox
b7a3d82f0f DEV-170: Increase the speed of the animation when clicking between tabs in Settings 2019-06-25 11:30:25 -07:00
Sam Gateau
9470467c31 Ad the check for nsight to avoid the COmpositeHUD pass 2019-06-25 11:28:01 -07:00
Sam Gateau
4dcfa59997 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-25 11:14:09 -07:00
RebeccaStankus
d43f35df22 Merge branch 'master' of github.com:highfidelity/hifi into create 2019-06-25 11:05:47 -07:00
Preston Bezos
1481c7424f changed ptt muted icon 2019-06-25 11:02:44 -07:00
Bradley Austin Davis
ca797e30e4
Merge pull request #15825 from kencooke/render-blendshape-optim-avx2
Blendshape CPU optimization
2019-06-25 09:41:13 -07:00
Sam Gateau
962a3c2502 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-25 09:34:18 -07:00