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
Wayne Chen
9079c8a6b7
adding log for redirect cases
2018-09-27 10:42:21 -07:00
luiscuenca
bbe836ee88
Remove smooth teleport and set/get API methods
2018-09-27 10:38:45 -07:00
Wayne Chen
747aab2097
persisting signed values
2018-09-27 10:16:11 -07:00
Wayne Chen
03d2fa2787
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-09-27 09:47:08 -07:00
Gabriel Calero
fba3b48923
Merge remote-tracking branch 'upstream/master' into android_signup
2018-09-27 11:38:52 -03:00
David Rowe
5ab22a1f40
Change play area option text for Oculus
2018-09-27 17:07:42 +12:00
David Rowe
3284b2a90e
Immediately hide fading overlays if other hand starts teleporting
2018-09-27 15:20:43 +12:00
David Rowe
6ae206677d
Add Settings > Controls option for displaying play area
2018-09-27 14:55:53 +12:00
David Rowe
b9c6811fdc
Restructure post-teleport fading code
2018-09-27 14:44:30 +12: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
David Back
046a4e4041
ordering/comment tweak
2018-09-26 18:02:15 -07:00
David Back
7e7dc33acd
more CR changes + fix resizing
2018-09-26 17:57:44 -07:00
Wayne Chen
813defebfc
Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged
2018-09-26 16:45:22 -07:00
Wayne Chen
33db8e1f24
only allow right-click for buttons
2018-09-26 16:40:43 -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
Wayne Chen
fda3ec87ce
removing lingering print statement
2018-09-26 15:57:57 -07:00
Gabriel Calero
3163ae5997
Fix case 18465: redirect to domain after login
2018-09-26 19:41:43 -03:00
Wayne Chen
afae4f3b96
adding toolbar reappearing
2018-09-26 15:33:57 -07: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
Wayne Chen
db77cbcbc1
new location drop - unparent overlays
2018-09-26 15:12:48 -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
Wayne Chen
db41a1c16b
error state signal for 404/interstitial
2018-09-26 13:48:15 -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
Gabriel Calero
6908107979
Apply UI changes in android signup
2018-09-26 16:00:14 -03: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
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
...
Use C++ chrono system_clock for timestamps
2018-09-26 11:22:49 -07:00
John Conklin II
d1771b2928
Merge pull request #14058 from danteruiz/fix-dispacther-module-order
...
fix equip while keeping new functionality
2018-09-26 11:06:45 -07:00
Dante Ruiz
7e138ebfff
update to new enabling method
2018-09-26 10:52:45 -07:00
Roxanne Skelly
7257a99414
Checkpoint sysTray Installer
2018-09-26 10:46:19 -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
Dante Ruiz
fa5dfb6e28
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
2018-09-26 09:18:12 -07:00
Wayne Chen
4a87773986
fixing interstitial page, clearing up debug statements
2018-09-26 07:41:18 -07:00
