Zach Fox
43254e2981
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-14 15:12:44 -07:00
Seth Alves
c624528f72
Merge pull request #13157 from druiz17/fix-qml-crash
...
fix qml crash on start up
2018-05-11 11:38:12 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2
...
Additional work on splash screen
2018-05-11 11:26:37 -07:00
Dante Ruiz
4eba727849
fix qml crash on start up
2018-05-11 10:47:41 -07:00
Zach Fox
a6dd95e31b
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose
...
don't enable so much logging when 'verbose logging' is turned on
2018-05-11 10:44:48 -07:00
Dante Ruiz
9e9852d67b
Merge pull request #12989 from Triplelexx/21774_file_browser
...
Worklist #21774 : Fix Windows.browseAssets() bugs
2018-05-11 08:50:17 -07:00
Seth Alves
826c427e2a
trying to sort-out audio-stream logging
2018-05-10 15:42:59 -07:00
Seth Alves
32d10641dc
don't enable so much logging when 'verbose logging' is turned on
2018-05-10 14:41:54 -07:00
Triplelexx
a061e84ad7
remove unused commented code
2018-05-10 19:40:02 +01:00
Zach Fox
0236bc0c44
Cleanup after merge conflict
2018-05-10 09:51:45 -07:00
Zach Fox
ce575d367a
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-10 09:31:02 -07:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression
...
more suppression of logging
2018-05-09 17:36:12 -07:00
Zach Fox
44cfa95830
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-09 15:01:24 -07:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix
...
MS14937: Fix Replace button for content sets during Checkout
2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08
use setFilterRules rather than specifying each logging category to suppress
2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f
more suppression of logging
2018-05-09 13:01:49 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound
...
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:07:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester
...
Command line parameters for autotester
2018-05-09 10:51:31 -07:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue
...
Do not open help on first run
2018-05-09 18:48:05 +02:00
Zach Fox
06c6f55069
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:35:42 -07:00
Zach Fox
540f200b99
MS14937: Fix Replace button for content sets during Checkout
2018-05-08 16:34:28 -07:00
NissimHadar
175fa9108e
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-08 15:52:15 -07:00
Stephen Birarda
4165ab3667
Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master
2018-05-08 14:08:21 -07:00
NissimHadar
d5bb582811
Per Austin's comments.
2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5
Per Austin's comments.
2018-05-08 11:13:06 -07:00
NissimHadar
8ad13826bd
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441
Use 'standard' format for command line parameter with multiple options.
2018-05-07 13:01:18 -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
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors
...
don't spam resetSensors function when holding down Qt::Key_Apostrophe
2018-05-07 10:52:51 -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
NissimHadar
481eddb2a3
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 08:24:03 -07:00
Alexander Ivash
b4cfea2fbc
FB14818 Login page for steam is blank
2018-05-06 17:17:06 +03:00
Clement
5a3773ba72
Fix compile error on linux/windows
2018-05-04 18:18:46 -07:00
Bradley Austin Davis
38f43bdc68
Disable current splash frame implementaton
2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6
Alternate shader
2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9
Additional work on splash screen
2018-05-04 16:40:05 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07: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
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode
...
MS14699: Prevent Wallet passcode from being sticky in certain cases
2018-05-04 15:22:41 -07:00
Clement
ad60a79180
Fix for android builds
2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Liv Erickson
ee0af079cf
merge from upstream master and fix conflict
2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-04 14:13:43 -07:00
Zach Fox
53fe0bc616
MS14699: Prevent Wallet passcode from being sticky in certain cases
2018-05-04 14:08:21 -07:00
NissimHadar
aef5ea0936
Correct usage of the test script URL.
2018-05-04 12:30:13 -07:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639
...
Fix for crash deep in QML after useFullAvatarURL
2018-05-04 11:33:28 -07:00
Zach Fox
1da840984b
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-04 10:24:28 -07:00
