1599 Commits

Author SHA1 Message Date
Andrew Welker
3e6b98894d Merge pull request #392 from PepperDash/hotfix/add-vc-camera-control-to-sg-ui
Add camera control for SG UI's
1.6.3
2020-08-28 14:57:50 -04:00
Andrew Welker
25faa7e702 Merge branch 'main' into hotfix/add-vc-camera-control-to-sg-ui 1.6.3-hotfix-679 2020-08-28 14:17:55 -04:00
Andrew Welker
c6dab1fe9a added SO event handler 1.6.3-hotfix-678 2020-08-28 12:02:53 -06:00
Neil Dorin
c9178aef76 Everything working except the actions to select cameras 1.6.3-hotfix-676 2020-08-28 00:12:01 -06:00
Andrew Welker
aa8b349711 Merge pull request #388 from PepperDash/hotfix/fix-joinedsiginterlock-nullref
Fix odd merge issues with Screensaver controller class
2020-08-27 20:51:33 -04:00
Neil Dorin
ff6e898091 More testing. Only remaining issue is camera selection 1.6.3-hotfix-674 2020-08-27 18:14:11 -06:00
Neil Dorin
c43503eb27 Tested locally. Most funtions working correclty 1.6.3-hotfix-673 2020-08-27 17:58:45 -06:00
Andrew Welker
f10ac6da06 Merge branch 'main' into hotfix/fix-joinedsiginterlock-nullref 1.6.3-hotfix-670 2020-08-27 19:15:58 -04:00
Neil Dorin
e90b9fe5e3 Merge remote-tracking branch 'origin/hotfix/fix-joinedsiginterlock-nullref' into hotfix/add-vc-camera-control-to-sg-ui 2020-08-27 16:39:09 -06:00
Neil Dorin
da73365c2f Camera Control implemented and ready to test 1.6.3-hotfix-669 2020-08-27 16:24:05 -06:00
Andrew Welker
3f9253a550 Merge pull request #389 from PepperDash/hotfix/fix-hdcp-issues-on-specific-inputcard-types
Hotfix/fix hdcp issues on specific inputcard types
2020-08-27 16:54:08 -04:00
Neil Dorin
0ed316eaa4 cast as correct base type and change port to HdmiInput 1.6.3-hotfix-666 2020-08-27 13:31:00 -06:00
Neil Dorin
5f80e12faf Handles scenario where Dmc4kHdDspBase may not support Hdcp2 1.6.3-hotfix-665 2020-08-27 13:22:54 -06:00
Neil Dorin
64d92fdfce adds extra event handler 1.6.3-hotfix-664 2020-08-27 13:09:28 -06:00
Neil Dorin
6c400c80a2 Fixes issue where true was always being passed into SetHdcpStateAction method 1.6.3-hotfix-663 2020-08-27 12:58:43 -06:00
Neil Dorin
9846d87a40 Adds case to handle misisng eventId for HdcpSupportOffEventId 1.6.3-hotfix-662 2020-08-27 12:25:08 -06:00
Neil Dorin
e952f3d775 Adds missing case for Dmc4kHdDspBase 1.6.3-hotfix-661 2020-08-27 11:51:06 -06:00
Andrew Welker
436db82006 fix weird merge conflicts 1.6.3-hotfix-659 2020-08-26 14:49:11 -06:00
Andrew Welker
5938869e7a fix show & hide methods 1.6.3-hotfix-658 2020-08-26 14:26:59 -06:00
Andrew Welker
4bad8585e5 add null check to popup handler method 2020-08-26 14:24:20 -06:00
Neil Dorin
9af95e017a Merge pull request #384 from PepperDash/release/1.6.2
Release/1.6.2
1.6.2
2020-08-25 12:26:18 -06:00
Andrew Welker
5e74eaf3f2 Merge branch 'main' into release/1.6.2 1.6.2-rc-656 2020-08-25 12:05:41 -06:00
Trevor Payne
74268d6a9b Merge pull request #383 from PepperDash/feature/Modify-LoadRoom-Errors
Change some console messages
1.6.2-beta-654 1.6.2-rc-655
2020-08-20 09:04:40 -05:00
Trevor Payne
4d53e6b33e Resolves #16
Changed some error messages to notices in LoadRooms() to make them a little less spooky
1.6.2-alpha-652
2020-08-19 17:07:11 -05:00
Trevor Payne
9f70031cc1 Merge pull request #356 from PepperDash/feature/Descriptive-CEC-genericComm-failure-message
Add descriptive CEC generic comm failure message
1.6.2-beta-651
2020-08-19 16:42:01 -05:00
Trevor Payne
c74a92d220 Merge branch 'development' into feature/Descriptive-CEC-genericComm-failure-message 1.6.2-alpha-649 2020-08-19 16:28:02 -05:00
Andrew Welker
a4c24fc197 Merge pull request #379 from PepperDash/bugfix/ScreenSaver-Never-Starts
Fixed improperly set up device extender
1.6.2-beta-648
2020-08-19 17:27:19 -04:00
Andrew Welker
25fccbd095 Merge branch 'development' into bugfix/ScreenSaver-Never-Starts 1.6.2-hotfix-646 2020-08-19 17:11:54 -04:00
Neil Dorin
c9fce06bd7 Updates necessary to make screen saver disappear on incoming call 2020-08-19 14:53:47 -06:00
Trevor Payne
b1040b56d5 Fix Build Process 2020-08-19 13:30:28 -05:00
Neil Dorin
5359427981 Merge pull request #382 from PepperDash/feature/push-to-nuget.org
Put nuget publishing and consumption back where it's supposed to be
1.6.2-beta-641
2020-08-19 11:23:16 -06:00
Andrew Welker
764f61a500 Merge branch 'development' into feature/push-to-nuget.org 1.6.2-alpha-639 2020-08-18 20:56:39 -04:00
Andrew Welker
e292790cea adding nuspec 1.6.2-alpha-637 2020-08-18 18:42:24 -06:00
Andrew Welker
1fb329f1c1 now it'll ACTUALLY use nuget 1.6.2-alpha-636 2020-08-18 17:05:46 -06:00
Andrew Welker
a2fc1b9f40 make essentials use nuget instead of submodule 2020-08-18 17:01:51 -06:00
Andrew Welker
419e7c5b31 fix readme.md 2020-08-18 16:59:15 -06:00
Andrew Welker
efbd78fb7c fixing everything to use nuget 2020-08-18 16:57:03 -06:00
Trevor Payne
486c951982 Fix some merge conflicts 2020-08-18 17:35:03 -05:00
Andrew Welker
fc67c53f4c Merge pull request #381 from PepperDash/feature/push-to-nuget.org
Re-add nuget stuff
1.6.2-beta-630
2020-08-18 18:28:37 -04:00
Trevor Payne
f0a887981d Resolved Tracking Packages 2020-08-18 17:13:41 -05:00
Andrew Welker
7628b0ffff Merge branch 'development' into feature/push-to-nuget.org 1.6.2-alpha-626 1.6.2-alpha-634 2020-08-18 18:11:45 -04:00
Trevor Payne
63d8cf27fd gMerge branch 'bugfix/ScreenSaver-Never-Starts' of https://github.com/PepperDash/Essentials into bugfix/ScreenSaver-Never-Starts 1.6.2-hotfix-624 2020-08-18 16:37:36 -05:00
Trevor Payne
eb9149b96a More gitignore changes 2020-08-18 16:37:28 -05:00
Trevor Payne
f5410c0786 Merge branch 'development' into bugfix/ScreenSaver-Never-Starts 1.6.2-hotfix-622 2020-08-18 16:27:09 -05:00
Trevor Payne
7624445b4b Merge pull request #369 from PepperDash/bugfix/SystemMonitor-IndexOutOfRange
Fix system monitor index out of range exception
1.6.2-beta-621
2020-08-18 16:26:45 -05:00
Trevor Payne
ece05caa28 Merge branch 'bugfix/ScreenSaver-Never-Starts' of https://github.com/PepperDash/Essentials into bugfix/ScreenSaver-Never-Starts 1.6.2-hotfix-619 2020-08-18 16:25:25 -05:00
Trevor Payne
702c186c2c Fixed Gitignore 2020-08-18 16:24:32 -05:00
Andrew Welker
22ce57e628 add packages folder to .gitignore 1.6.2-alpha-617 2020-08-18 15:04:35 -06:00
Andrew Welker
10f1f5b1d6 update version for PepperDashCore to match the correct version 1.6.2-alpha-615 2020-08-18 14:57:05 -06:00
Trevor Payne
182499a79b Merge branch 'development' into bugfix/ScreenSaver-Never-Starts 1.6.2-hotfix-610 2020-08-18 15:35:18 -05:00