Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item
2018-10-22 15:39:23 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates
2018-10-02 16:43:08 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace
...
Better deadlock crash
2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup
...
Android signup
2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c
Better deadlock crash
2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast
...
Fix for bad static_pointer_cast on exit.
2018-10-02 11:31:47 -07:00
Gabriel Calero
13e2b99dfa
Merge remote-tracking branch 'upstream/master' into android_signup
2018-10-02 09:24:09 -03:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -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
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
Gabriel Calero
1422c178a4
Merge remote-tracking branch 'upstream/master' into android_signup
2018-10-01 20:36:27 -03: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
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
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML
2018-10-01 09:48:42 -07:00
Anthony Thibault
58df72af60
Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast
2018-09-28 16:32:12 -07:00
Seth Alves
b69d0f3997
get interface building and working with clang-7 on ubuntu 18
2018-09-28 13:46:51 -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
Gabriel Calero
b7c421ba47
Fixes according to review
2018-09-28 14:39:15 -03:00
Kerry Ivan Kurian
440e2062f5
Fix application uninstall in marketplace item tester
2018-09-27 22:14:02 -07:00
David Rowe
45993ba475
Provide mini tablet details via API instead of messages
2018-09-28 14:23:08 +12:00
Bradley Austin Davis
3dea4fd10a
Fix some Mac rendering issues
2018-09-27 19:21:50 -07:00
luiscuenca
195df9e0ec
compute feet position offset in situ
2018-09-27 17:18:43 -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
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-27 12:05:21 -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
Gabriel Calero
fba3b48923
Merge remote-tracking branch 'upstream/master' into android_signup
2018-09-27 11:38:52 -03:00
John Conklin II
7701cfd9c8
Merge pull request #14084 from luiscuenca/appearOnFloorFix
...
Fix avatars loading below the ground bug
2018-09-26 16:00:53 -07:00
Gabriel Calero
3163ae5997
Fix case 18465: redirect to domain after login
2018-09-26 19:41:43 -03:00
Howard Stearns
da5f77afcd
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-26 15:26:52 -07:00
John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002
...
fix MyAvatar-vs-OtherAvatar collisions
2018-09-26 15:21:18 -07:00
Zach Fox
6a3fa28fad
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520
fix old bad merge, and if told referrer while already setup, follow
...
immediately
2018-09-26 14:57:47 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
...
Prevent thread issues with PickResults modified by Pointers
2018-09-26 12:12:58 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester
...
Marketplace item tester interface
2018-09-26 11:25:53 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6
fix several uninitialized reads
2018-09-26 09:33:12 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
luiscuenca
754653b093
Fix warnings
2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93
Wait until skeleton is loaded to locate the avatar
2018-09-25 16:21:05 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
