John Conklin II
|
3bbc01477e
|
Merge pull request #14055 from davidkelly/dk/18147
Do not have active buy button on invalidated items
|
2018-10-01 16:50:53 -07:00 |
|
John Conklin II
|
3ab83731b9
|
Merge pull request #14087 from sethalves/quiet-asan
fix several uninitialized reads
|
2018-10-01 16:48:54 -07:00 |
|
John Conklin II
|
dd5cd5de82
|
Merge pull request #14091 from gcalero/fix-case-18465
Fix case 18465: redirect to domain after login
|
2018-10-01 16:48:27 -07:00 |
|
Brad Hefta-Gaub
|
e5d9c0d442
|
Merge pull request #14083 from sethalves/fix-recording-upload-crash
call saveRecordingToAsset callback on correct thread
|
2018-10-01 16:46:36 -07:00 |
|
Brad Hefta-Gaub
|
d8959367c6
|
Merge pull request #14104 from birarda/bug/zone-ordering
fix for row re-ordering causing no change alone
|
2018-10-01 16:45:50 -07:00 |
|
John Conklin II
|
878d2a6f25
|
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
Account-managed wallet flow improvements
|
2018-10-01 16:43:01 -07:00 |
|
John Conklin II
|
8ad5ca5a67
|
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix
Fix avatar warp into floor when navigating to a saved bookmark
|
2018-10-01 16:36:31 -07:00 |
|
John Conklin II
|
87b39f690c
|
Merge pull request #14106 from jherico/fix/mac_gl1
Fix some Mac rendering issues
|
2018-10-01 16:35:57 -07:00 |
|
Seth Alves
|
c144671c97
|
Merge pull request #14110 from sethalves/fix-clang-7-build
get interface building and working with clang-7 on ubuntu 18
|
2018-10-01 16:32:39 -07:00 |
|
Brad Hefta-Gaub
|
6290b56383
|
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
Simple avatar transit
|
2018-10-01 16:24:46 -07:00 |
|
Brad Hefta-Gaub
|
edd5db7768
|
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
|
2018-10-01 16:16:48 -07:00 |
|
Brad Hefta-Gaub
|
ef063a4072
|
Merge pull request #14026 from huffman/fix/edit-rotation
Fix edit rotation handle fidgeting
|
2018-10-01 16:15:32 -07:00 |
|
Brad Hefta-Gaub
|
8b03a21799
|
Merge pull request #14025 from ElderOrb/FB18061
use current wearable index, not joint index!
|
2018-10-01 16:14:33 -07:00 |
|
Brad Hefta-Gaub
|
526d69f1b8
|
Merge pull request #14020 from wayne-chen/fixMainTextContainerQML
Login Dialog UI improvements
|
2018-10-01 16:13:59 -07:00 |
|
Brad Hefta-Gaub
|
a3310be3fe
|
Merge pull request #14013 from gcalero/fix_android_login
Fix android login infinite loading (case 18459)
|
2018-10-01 16:13:29 -07:00 |
|
Brad Hefta-Gaub
|
6eae178389
|
Merge pull request #13997 from gcalero/case_18057
Fix switch from Top View to My View
|
2018-10-01 16:13:07 -07:00 |
|
Thijs Wenker
|
eeda7400c9
|
check if id matches in filtered getMultipleEntityProperties
|
2018-10-01 19:36:53 +02:00 |
|
Wayne Chen
|
189e7e15fe
|
Merge branch 'master' into fixMainTextContainerQML
|
2018-10-01 09:48:42 -07:00 |
|
Thijs Wenker
|
e266e2ebbf
|
filter getEntity(Multiple)Properties entities unitTest
|
2018-09-29 02:44:11 +02:00 |
|
John Conklin II
|
130e8dfbe9
|
Merge pull request #14023 from dback2/selectEntityEveryFrameFix
Only call selectEntity once triggered when using edit handles
|
2018-09-28 16:38:10 -07:00 |
|
John Conklin II
|
1135228b3b
|
Merge pull request #14095 from kencooke/audio-hrtf-reset
Audio-mixer optimizations
|
2018-09-28 16:34:38 -07:00 |
|
John Conklin II
|
789062d0b9
|
Merge pull request #14103 from howard-stearns/shorter-handshake
minimal time handshake
|
2018-09-28 16:29:38 -07:00 |
|
Ryan Huffman
|
feb230b3bd
|
Remove old comment in entitySelectionTool.js
|
2018-09-28 16:17:52 -07:00 |
|
John Conklin II
|
11492ce8ee
|
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
don't call enterEntity before the entity's script is loaded
|
2018-09-28 16:07:08 -07:00 |
|
Seth Alves
|
bbe9b5c26f
|
code review, remove some unneeded automoc includes
|
2018-09-28 16:04:40 -07:00 |
|
Seth Alves
|
cb04894e33
|
try another way of fixing _spare warning
|
2018-09-28 14:53:05 -07:00 |
|
Seth Alves
|
b69d0f3997
|
get interface building and working with clang-7 on ubuntu 18
|
2018-09-28 13:46:51 -07:00 |
|
John Conklin II
|
5d00aa0bdb
|
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
fix scaling of worn shape entities
|
2018-09-28 13:08:46 -07:00 |
|
John Conklin II
|
b4abaabe5e
|
Merge pull request #14107 from kkurian/hotfix-marketplace-item-tester
Fix application uninstall in marketplace item tester
|
2018-09-28 12:58:33 -07:00 |
|
Howard Stearns
|
053f22182a
|
fix inspection case
|
2018-09-28 11:57:36 -07:00 |
|
Howard Stearns
|
2d29906e3c
|
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
|
2018-09-28 11:22:57 -07:00 |
|
Kerry Ivan Kurian
|
440e2062f5
|
Fix application uninstall in marketplace item tester
|
2018-09-27 22:14:02 -07:00 |
|
howard-stearns
|
b45677cd02
|
additionally handle item urls (marketplace links from cert inspections)
|
2018-09-27 19:42:01 -07:00 |
|
Bradley Austin Davis
|
3dea4fd10a
|
Fix some Mac rendering issues
|
2018-09-27 19:21:50 -07:00 |
|
howard-stearns
|
a6ef25f662
|
just whitespace and varname changes
|
2018-09-27 18:14:16 -07:00 |
|
John Conklin II
|
cd18578061
|
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
|
2018-09-27 18:08:25 -07:00 |
|
luiscuenca
|
195df9e0ec
|
compute feet position offset in situ
|
2018-09-27 17:18:43 -07:00 |
|
Stephen Birarda
|
97d5e8f614
|
fix for row re-ordering causing no change alone
|
2018-09-27 17:11:10 -07:00 |
|
Howard Stearns
|
f96c7f4db4
|
minimal time handshake
|
2018-09-27 17:05:18 -07:00 |
|
Howard Stearns
|
75de305ec3
|
remove dead code
|
2018-09-27 16:37:07 -07:00 |
|
Howard Stearns
|
7616639a40
|
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
|
2018-09-27 16:12:21 -07:00 |
|
Howard Stearns
|
ad676b14a1
|
doh - return with a newline (and no semicolon) does not continue. Don't
need extra handler in marketplace any more.
|
2018-09-27 16:06:55 -07:00 |
|
Howard Stearns
|
4cf5b51124
|
works, using additional handler from wallet.js
|
2018-09-27 15:34:16 -07:00 |
|
Roxanne Skelly
|
eec565e7f4
|
Revert "Checkpoint sysTray Installer"
This reverts commit 7257a99414.
|
2018-09-27 12:58:33 -07:00 |
|
Roxanne Skelly
|
af6db93b70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-27 12:05:21 -07:00 |
|
Roxanne Skelly
|
330789471d
|
Fix merge conflict and set proper polling times
|
2018-09-27 12:03:37 -07:00 |
|
John Conklin II
|
0b185c6890
|
Merge pull request #14031 from zfox23/notificationsForFourApps
Discovery Notifications Project: Notifications for PEOPLE, WALLET, MARKET, and GOTO
|
2018-09-27 11:34:05 -07:00 |
|
luiscuenca
|
bbe836ee88
|
Remove smooth teleport and set/get API methods
|
2018-09-27 10:38:45 -07:00 |
|
Ken Cooke
|
9dc0aa5c8d
|
HRTF starts in silent state
|
2018-09-26 18:23:26 -07:00 |
|
Ken Cooke
|
a8f7ff7d8a
|
Add HRTF reset()
|
2018-09-26 18:18:20 -07:00 |
|