Roxanne Skelly
|
2f1f1d896c
|
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTraySetup
|
2018-09-28 09:24:52 -07:00 |
|
Roxanne Skelly
|
dde106e42e
|
Make tray icon light map to notification status of various menus
|
2018-09-28 09:24:00 -07:00 |
|
Roxanne Skelly
|
4257a4dfdd
|
Try fixing binary name for 'running process' detection of interface
|
2018-09-27 23:12:24 -07:00 |
|
Roxanne Skelly
|
308deeaa8d
|
Refactoring of NSIS setup files with respect to Sandbox vs Console
|
2018-09-27 19:54:42 -07:00 |
|
Roxanne Skelly
|
79c71b0b79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup
|
2018-09-27 18:28:53 -07:00 |
|
John Conklin II
|
cd18578061
|
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
|
2018-09-27 18:08:25 -07:00 |
|
Roxanne Skelly
|
6d0996c254
|
Show "Sandbox" as the server component for server installs, show
"Console" for client-only installs
|
2018-09-27 16:52:03 -07:00 |
|
Roxanne Skelly
|
57fcdddea2
|
Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup
|
2018-09-27 15:22:38 -07:00 |
|
Roxanne Skelly
|
c3e956932b
|
Fix OSX Build
|
2018-09-27 15:22:04 -07:00 |
|
Roxanne Skelly
|
ec4575f587
|
Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup
|
2018-09-27 13:36:10 -07:00 |
|
Roxanne Skelly
|
b0b2c6f3ee
|
Fixup path finding for interface
|
2018-09-27 13:31:28 -07:00 |
|
Roxanne Skelly
|
eec565e7f4
|
Revert "Checkpoint sysTray Installer"
This reverts commit 7257a99414.
|
2018-09-27 12:58:33 -07:00 |
|
Roxanne Skelly
|
f1ba213ccc
|
Merge branch 'sysTray' of https://github.com/roxanneskelly/hifi into sysTraySetup
|
2018-09-27 12:08:51 -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 |
|
Roxanne Skelly
|
00a5075d34
|
Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup
|
2018-09-27 11:44:41 -07:00 |
|
Roxanne Skelly
|
6a3b286a07
|
Fix windows notification popups:w
|
2018-09-27 11:44:00 -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 |
|
Roxanne Skelly
|
d851e3994e
|
Search for interface should check peer package
Also, retain enabled/disabled state for notifications across restarts
|
2018-09-27 11:10:51 -07:00 |
|
Roxanne Skelly
|
61aef14c64
|
OSX notifications dismiss the previous notifications immediately when
sent, preventing 'click' behavior
|
2018-09-27 10:16:21 -07:00 |
|
Roxanne Skelly
|
b6fd302a83
|
OSX Interface-running detection fixes
|
2018-09-26 18:40:54 -07:00 |
|
Roxanne Skelly
|
ba1bae6408
|
OSX Build fix
|
2018-09-26 17:43:04 -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 |
|
Roxanne Skelly
|
db772fc3fe
|
Update console name for osx build
|
2018-09-26 15:39:45 -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 |
|
Zach Fox
|
6877af04f1
|
Fix GOTO notifs; fix WALLET notifs (pending backend change)
|
2018-09-26 14:57:32 -07:00 |
|
Roxanne Skelly
|
45a3df114f
|
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTray
|
2018-09-26 13:05:30 -07:00 |
|
Roxanne Skelly
|
5949679c0a
|
Add mac interface-run detection to server-console
|
2018-09-26 13:00:37 -07:00 |
|
Roxanne Skelly
|
2c6e9349eb
|
SysTray Setup. server-console.exe should be included in client-only
installs.
By default, on new install, tray notifier should be enabled.
|
2018-09-26 12:59: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 |
|
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 |
|
Roxanne Skelly
|
be87773b2c
|
Checkpoint sysTray Installer
|
2018-09-26 10:47:33 -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 |
|
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 |
|
Kerry Ivan Kurian
|
28ec98be9e
|
Uninstall marketplace item tester on wallet shutdown
|
2018-09-25 19:24:46 -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
|
3d71dfc467
|
Merge pull request #14072 from SamGondelman/highlight
Fix avatar highlighting
|
2018-09-25 16:13:14 -07:00 |
|
Kerry Ivan Kurian
|
e6249e690e
|
Remove duplicate line
|
2018-09-25 15:52:26 -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 |
|
Kerry Ivan Kurian
|
276125937c
|
Eliminate double equals
|
2018-09-25 15:18:12 -07:00 |
|
Kerry Ivan Kurian
|
4e7b03883f
|
Use triple equals
|
2018-09-25 15:13:26 -07:00 |
|
Roxanne Skelly
|
3deb3bc771
|
Coding standard issue found during CR
|
2018-09-25 14:17:15 -07:00 |
|
Roxanne Skelly
|
cbb4bff2db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-25 14:16:43 -07:00 |
|