Zach Fox
0021af8714
Merge in in-progress changes from old commerce_paginationAndFiltering branch
2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f
It's working
2018-05-16 12:17:17 -07:00
Zach Fox
79f8232c14
Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel
2018-05-16 11:11:24 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions
...
avatars collide again
2018-05-16 09:25:05 -07:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto
...
Android Search & Go To
2018-05-15 16:43:38 -07:00
John Conklin II
1313d28b9d
Merge pull request #13112 from sethalves/fix-overlay-asan-warning
...
Fix overlay asan warning
2018-05-15 14:51:05 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable
...
RC67.1 stable mergeback to master
2018-05-15 14:01:06 -07:00
Andrew Meadows
c5773cbe84
restore 'virtual' keyword for overrides
2018-05-15 13:59:22 -07:00
Gabriel Calero
b80597a436
Restore display plugin activation/deactivation
2018-05-15 15:51:11 -03:00
Zach Fox
ccab2dd641
Starting the work
2018-05-15 11:48:33 -07:00
Gabriel Calero
306b8cc68a
Set HomeActivity transparent to avoid texture corruption (black and white)
2018-05-15 15:14:17 -03:00
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866
...
Don't unnecessarily scroll HTML content when keyboard is raised
2018-05-15 11:00:38 -07:00
Seth Alves
78a8e8e500
quiet asan warning
2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan
...
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
2018-05-15 10:58:00 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1
...
Added method to test namespace to save JSON object to a file.
2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item
...
OpenVR: Remove reference to HMD Standing Mode menu item
2018-05-15 10:30:00 -07:00
NissimHadar
d4d2f3c957
Moved ownership of test location into the Test Scripting class.
2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 16:23:36 -07:00
Anthony J. Thibault
ed726c9d77
OpenVR: Remove reference to HMD Standing Mode menu item
...
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
2018-05-14 13:51:13 -07:00
Zach Fox
83cae54601
Show 'invalidated' label for valid = false
2018-05-14 13:34:20 -07:00
NissimHadar
5f219e27f7
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:35:48 -07:00
Andrew Meadows
a30e06d594
don't blend avatar position when far from target
2018-05-14 09:58:16 -07:00
Zach Fox
2a1c2ba7b1
PurchasedItem logic
2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb
Show invalidated items in My Purchases
2018-05-14 09:35:34 -07:00
Andrew Meadows
6de175e794
avatars collide again
2018-05-11 17:01:48 -07:00
Gabriel Calero
9b5da09dc7
Fix connection issue syncing two AccountManagers
2018-05-11 18:08:56 -03:00
Gabriel Calero
db460e9856
Put back the worker thread for account manager in android
2018-05-11 16:09:40 -03: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
NissimHadar
1364f4391d
Can store JSON object.
2018-05-10 18:02:44 -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
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
Gabriel Calero
a1a48d9b9e
Merge remote-tracking branch 'upstream/master' into android_places_goto
2018-05-10 18:24:26 -03:00
Triplelexx
a061e84ad7
remove unused commented code
2018-05-10 19:40:02 +01: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
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
Gabriel Calero
843282739e
Remove unused includes and white spaces
2018-05-09 14:16:51 -03: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
542e707de8
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:40:51 -07:00
Zach Fox
06c6f55069
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:35:42 -07:00
Gabriel Calero
b0fee3fd8b
Improve code based on changes requested in the PR
2018-05-09 11:06:32 -03:00
Zach Fox
22c26c348d
MS14937: Fix Replace button for content sets during Checkout
2018-05-08 16:37:11 -07:00
