Roxanne Skelly
14c77080eb
Updated notification icon and osx tray notification icon
2018-10-03 17:29:27 -07:00
Roxanne Skelly
2876338a97
Display up to 30 submenus for GOTO
2018-10-03 15:35:19 -07:00
Roxanne Skelly
79b11296f1
Checkpoint sys tray submenus
2018-10-03 13:45:39 -07:00
Roxanne Skelly
35f662d767
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTraySetup
2018-10-02 10:02:40 -07:00
Roxanne Skelly
95ef46d77c
fix some coding standards issues
2018-10-02 10:00:42 -07:00
Roxanne Skelly
34a7aff2ef
Differentiate name of Console.app/Sandbox.app depending on client_only
...
build
2018-10-01 20:12:00 -07:00
Roxanne Skelly
010e2091fa
Fixup CPack install items for OSX to hopefully properly handle
...
OSX .app directories
2018-10-01 14:35:47 -07:00
Roxanne Skelly
c370e064d9
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTrayOsx
2018-10-01 13:36:14 -07:00
Roxanne Skelly
fbaac4254e
Set build targets properly for client-only install of console
2018-10-01 12:45:56 -07:00
Roxanne Skelly
f8409b3977
dd server-console to client build
2018-10-01 11:29:55 -07:00
Roxanne Skelly
d05de53293
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup
2018-10-01 10:07:26 -07:00
Roxanne Skelly
113ad3d917
Fixes for OSX
...
App Translocation makes it nearly impossible to find the interface
executable from the running server-console, specifically in downloaded
builds launched from the Finder. To enable OSX detection and and
launch of the interface, the code has been changed to:
* Assume interface is installed on OSX as we don't produce a server-only
build.
* Launch the interface by using 'open' with the appid.
NOTE: This may launch the wrong version of the app if
multiple instances of the app are installed, but this
is the best we can do for now. For most users, the
behavior should be as expected.
Second, polling was happening even if interface couldn't be
detected if it was previously enabled.
2018-09-30 13:11:15 -07: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
Roxanne Skelly
b6877bca57
Revert ""Add temporary code to test for interface paths"""
...
This reverts commit edd354d109
2018-09-28 16:26:44 -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
Roxanne Skelly
edd354d109
"Add temporary code to test for interface paths""
2018-09-28 14:52:50 -07:00
Roxanne Skelly
42cdf24f5b
Move OSX Back to Sandbox.app
2018-09-28 14:52:21 -07:00
Roxanne Skelly
0c1bef6511
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTrayOsx
2018-09-28 13:47:54 -07:00
Roxanne Skelly
537c0aaf25
Revert "Add temporary code to test for interface paths"
...
This reverts commit 6393f907b8
2018-09-28 13:15:04 -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
Roxanne Skelly
6393f907b8
Add temporary code to test for interface paths
2018-09-28 12:33:38 -07:00
Roxanne Skelly
ee8290f71c
Fix comment
2018-09-28 11:10:42 -07:00
Roxanne Skelly
1aaaca4e6c
Code review changes
2018-09-28 10:48:20 -07:00
Roxanne Skelly
fb3205a847
More OSX Path fixes
2018-09-28 10:02:03 -07:00
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
Kerry Ivan Kurian
440e2062f5
Fix application uninstall in marketplace item tester
2018-09-27 22:14:02 -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
Howard Stearns
f96c7f4db4
minimal time handshake
2018-09-27 17:05:18 -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
