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
Gabriel Calero
b7c421ba47
Fixes according to review
2018-09-28 14:39:15 -03:00
Gabriel Calero
c0c95a1d33
Fix flickering between login and signup screens
2018-09-28 13:53:18 -03:00
Gabriel Calero
0d40d78343
Expand clic area for forget password
2018-09-28 12:04:05 -03: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
David Rowe
7b7447739a
Remove unused code noticed in passing
2018-09-28 14:23:20 +12: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
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
David Rowe
d98e7cea4e
Fix not being able to grab tablet with other hand
2018-09-28 11:09:16 +12: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
David Back
8c306b8428
disable debug pick plane
2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9
better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup
2018-09-27 16:01:20 -07:00
Howard Stearns
4cf5b51124
works, using additional handler from wallet.js
2018-09-27 15:34:16 -07:00
Gabriel Calero
5fc24b2587
UI fixes in login and signup for S8 and S9 aspect ratio
2018-09-27 19:20:38 -03:00
David Rowe
1088a0f9ae
Fix invalid state transition in desktop mode
2018-09-28 10:19:17 +12:00
David Rowe
fc78d0582e
Tidying
2018-09-28 10:18:00 +12:00
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12: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
Gabriel Calero
fba3b48923
Merge remote-tracking branch 'upstream/master' into android_signup
2018-09-27 11:38:52 -03: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
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
Howard Stearns
6e2a7c280e
bottleneck opening our marketplace, and make sure it sets up wallet
...
first
2018-09-26 15:21:53 -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
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes
...
Improve ModelBlender queuing
2018-09-26 15:10:02 -07:00
Zach Fox
9a21354c27
Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps
2018-09-26 15:08:20 -07:00
Howard Stearns
940db4f112
fix recently introduced bug
2018-09-26 15:01:30 -07:00
Howard Stearns
6fdae83f1b
fix recent refactoring bug
2018-09-26 14:59:53 -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
Zach Fox
6877af04f1
Fix GOTO notifs; fix WALLET notifs (pending backend change)
2018-09-26 14:57:32 -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
