Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chrizzz-1508 committed Oct 7, 2023
2 parents 253a8ed + 351f796 commit f179a0f
Show file tree
Hide file tree
Showing 15 changed files with 87 additions and 150 deletions.
4 changes: 2 additions & 2 deletions bridge/bridge.html

Large diffs are not rendered by default.

Binary file modified bridge/bridge.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions bridge/default.txt

Large diffs are not rendered by default.

Binary file modified download/Components.zip
Binary file not shown.
Binary file modified download/SAMMI Updater.zip
Binary file not shown.
Binary file modified download/x64.zip
Binary file not shown.
Binary file modified languages/languages.zip
Binary file not shown.
95 changes: 23 additions & 72 deletions patch notes.txt
Original file line number Diff line number Diff line change
@@ -1,90 +1,41 @@
====================================
SAMMI 2023.2.2 (June 2023)
SAMMI 2023.3.0 (October 2023)
====================================

[SAMMI Core]
-------------------------------------
New Features:
- Introduced comment templates [Christina]
- Allows for the generation of a custom comment template, settings its own name name and color
- These custom comment templates can be seen by other users when they import your buttons/decks into their SAMMI, even without the template themselves (provided they're using the latest SAMMI version)
- Added a new global variable - global.Extensions. This contains all extensions and their versions installed in Bridge (when Bridge is connected to SAMMI) [Christina]
- Extension Development: Support for dynamic extension command dropdowns has been added [Christina]
- Added two new official SAMMI extensions and their triggers:
- Crowd Control [Chrizzz]
- Voicemod [Chrizzz]
- Added Mix It Up integration with two new commands: "Mix It Up: Get All Commands" and "Mix It Up: Run Command" [Christina]
- Added new Command: "String Capitalize" - Makes the first letter of a string uppercase [Chrizzz]
- Added new Command: "Twitch: Get Blocked Terms" - Gets an array of blocked terms from a twitch channel [Chrizzz]
- Added new Command: "Twitch: Add Blocked Term" - Adds a new blocked term [Chrizzz]
- Added new Command: "Twitch: Remove Blocked Term" - Removes a blocked term [Chrizzz]
- Added new Command: "Send JSON To Extension" - Allows you to send payload to Bridge without needing to use an Extension Command [Christina]
- Added New Command: "String Substitute Variables" - Replaces variables in a template string with the supplied placeholder names in an object [Christina]
- New translation - Russian [Solo_mag]
- Added new Command: "Twitch: Reply to Message" - Reply to Twitch messages directly instead of just sending chat messages [Chrizzz]
- New Integration: Pulsoid - This integration sends your heartrate to SAMMI as long as you use any pulsoid device (will be available soon) [Chrizzz]
- Added new "Alert Log" function - You can activate it in the settings menu for SAMMI to document all yellow alerts in a logfile (alert.log) [Chrizzz]
- Added the deck names to the variable viewer for all persistent buttons to easily find which deck your buttons belong to [Chrizzz & Silverlink]
- Added a "RefreshBrowserSource" template to the "Send OBS Request" templates for OBSWS5 [Chrizzz]
- Added "fullFPS" key you can set to "1" in settings.ini, to keep full FPS when SAMMI is not in focus [Christina]


Improvements:
- Deprecated the old "Twitch: Get Channel Info" command (existing commands will still work) and added a new version of it which accepts the username instead of the userid [Chrizzz]
- Added a new scope for managing blocked terms (please relink your Twitch account to use the new blocked term commands) [Chrizzz]
- Added a check for duplicated Button IDs [Sebas]
- Set Button Variable command now allows you to set the variable to an object or an array natively, without the need to stringify and parse it again [Christina]
- When importing a button/deck, the original button ID is now preserved unless there's an existing one already [Christina]
- When importing a button/deck, you now get an alert if SAMMI detects a command from a higher version of SAMMI [Christina]
- Execute Program command newly accepts parameters and you can choose the display mode (e.g. show, hide, minimize, maximize) [Christina]
- Updated translations:
- English [Sebas]
- Spanish [Sebas]
- Rewrote the "Twitch: Get Latest Followers" and "Twitch: Get Follower Count" command to use the new API endpoint to make them work again [Chrizzz]
- Renamed the "error_log.txt" file to "error.log" [Chrizzz]
- Whenever SAMMI shuts down or crashes, all active socket connections (e.g. Bridge, Panel, Twitch) are now forcibly closed. This ensures SAMMI doesn't occupy ports unnecessarily, which sometimes needed a complete system reboot. [Christina]
- When the "Trigger Button" command is used, the "Trigger Pull Data" command inside the button which got triggered can now fetch the Instance ID of the originating button. This allows you to set variables in the originating button even if it's not persistent. [Christina]

UI Changes:
- Added Integrations menu that lets you download all official SAMMI extensions [Christina]
- Removed beta tags in the settings menu [Chrizzz]

Removed Features:
- The backup menu button is no longer available [Christina]
- To create a backup of SAMMI, you can simply compress and copy the entire SAMMI folder


Bug Fixes:
- Resolved an issue where commands were not processed in the right order when a very small delay was set, e.g. 5 ms [Christina]
- Fixed a bug with false detection of mouse double clicks within deck editor [Christina]
- Fixed a crash that would sometimes happen due to excessive Command Line command usage [Christina]
- Fixed several crashes associated with OBSWS, Twitch and general websocket connections [Christina]
- A check has been introduced to verify if an image is correctly copied into the Image folder when setting it as button image [Christina]
- Command 'String to Number' now supports numbers exceeding 32 bytes without causing a crash [Christina]
- Disabled interaction with commands outside the commands surface [Sebas]
- Date/Time commands: `twitch` is in UTC now [Sebas]
- HTTP Upload File command no longer crashes if the file does not exist [Christina]
- When importing corrupted decks/buttons, SAMMI automatically removes the corrupted portion now [Christina]
- SAMMI no longer crashes when you run a button containing a command from a higher version of SAMMI [Christina]
- Fixed a bug that would crash SAMMI when an empty menu was loaded + improved performance of menus [Sebas]
- Fixed bugs that would break certain translations [Sebas]
- Fixed an issue with the Twitch: Modify Channel Information and the Twitch: Get Game Info command when using special characters in the game name [Chrizzz]
- Extension files are now properly removed from the `bridge/extensions/installed` folder and moved to `bridge/extensions/uninstalled` folder when an extension is uninstalled [Christina]
- Deck: Get Status command now returns 0 if the deck does not exist in the first place [Christina]
- Fixed Local API Set Variable endpoint where setting a variable to a number did not properly work [Christina]
- Fixed some command error alerts missing information [Christina]
- Fixed various crashes related to sockets, checkboxes, closing Twitch connection window, Twitch API command errors, installing extensions and more [Christina]


[SAMMI Bridge]
-------------------------------------
New Features: [Christina]
- 'Extensions' tab has been introduced
- This tab displays all installed extensions in a table format with their versions, including an option to download or update directly linked to the source of the download.
- Extension developers can include their entries here: https://github.com/SAMMISolutions/SAMMI-Bridge/tree/main/extensions
- Shoutout Twitch test trigger has been added
- Added username fields for Twitch follower, subscriber, bits, and channel points. The user id is fetched if a name is provided, otherwise, a name is selected randomly.

Improvements: [Christina]
- The 'Status' tab has been rebranded to 'Settings' tab, and can no longer be moved or hidden
- The current Bridge version is now visible in the Settings tab
- All test trigger alerts from Bridge now carry the [test trigger] tag.
- The Bridge code has undergone complete refactoring
- The code is now minified and runs in strict mode (not mandated in extension code). An unminified bridge for extension development can be downloaded from SAMMI Bridge repository

UI Changes: [Christina]
- Official tabs such as Settings, Extensions, Twitch, and YouTube Triggers now have a specific icon
- Official SAMMI Extensions bear a check mark icon, indicating their development by the SAMMI team
- A tab can be hidden now by dragging it up and dropping on an 'X' mark
- Various visual elements have been refined for an enhanced user experience, including larger input fields in Twitch/YouTube triggers

Removed Features: [Christina]
- Twitch Test Host Trigger has been removed

Bug Fixes: [Christina]
- Twitch test subscriber trigger now correctly returns 'sub' context for 1 month subscribers and 'resub' context for 2 months+ subscribers

New Features:
- Added SAMMI.loadIni() function to load text/number from ini file directly from Bridge [Christina]
- Added SAMMI.saveIni() function to save text/number to ini file directly from Bridge [Christina]
- Added SAMMI.httpRequest() to make an API call directly from SAMMI (to avoid browser CORS errors) [Christina]
- Added SAMMI.openURL() to open a URL in a default browser directly from SAMMI (rather than opening it in OBS if Bridge is docked) [Christina]
- Added SAMMI.editButton() to quickly navigate to the selected button's edit commands screen window in SAMMI Core directly from Bridge. Highly experimental. [Christina]
35 changes: 35 additions & 0 deletions update.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,41 @@
"file": "SAMMI Updater.exe"
}
}
},
{
"version": "2023.3.0",
"components": {
"SAMMI Core": {
"version": "2023.3.0.0",
"sum": "e13b8b020e2c87979077e708850fbbcf69a8ebb84b90c992c0cf036210a02674",
"path": "",
"file": "SAMMI Core.exe"
},
"SAMMI Voice": {
"version": "1.0.1.0",
"sum": "c18321fbddb498618455945b6407d0ec736b65a3c6fee444eebdbbfd4c2b68de",
"path": "SAMMI Voice",
"file": "SAMMI Voice.exe"
},
"SAMMI Bridge": {
"version": "7.21",
"path": "bridge",
"file": "default.txt",
"sum": null
},
"SAMMI Panel": {
"version": "0.9.2",
"sum": "571f6ca0fc52a2246e934a615d23973b03a0b902ba0c38030c21252553d5bf46",
"path": "SAMMI Panel",
"file": "SAMMI Panel.exe"
},
"SAMMI Updater": {
"version": "1.0.1.0",
"sum": "0c179074c9a039cb91608c89f274ec52",
"path": "SAMMI Updater",
"file": "SAMMI Updater.exe"
}
}
}
]
}
2 changes: 1 addition & 1 deletion update.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
qEI4X34QW3qdgWoC/6jw+R6/JAJWPVNJABitQ36HJECbwBXjmqsX0+nrD7drsCNhZlgca9kL+GBjTWOjXysayWv0LAi4s595IefML+n/8mz1oPVqHL73U1DLHbWM890G1Q47YAzkpIdwU4tgmHB9Jjqmao/ESLRqMozc4N9l6MrULS0JE87VrGDbgn/KPsJE/HuI3FKUpCMHSHDSO8UpDSH8DLjFZPc6mBEohEFCIBoeU+rZ3bvNRG02hH4ZncW9jF3RZ+le0+vWY3Bc0rqj3zjB1zzLzYitawIFRDY1Zin2T4Pm0oeok0f7SS/biqpjRDlfZarn+frzwftRGKdO4bknwB5bejIUT52H8MXAU0OHBuqAa4QgZu3QbtjIbWPvNNBTyQmpQCBH2MICRx3XM7isb+Qn+kNFgPEWterv1pMDoillIy4GSibR0PA4buqMz1uOEVnQc2IfQq7JIRmWO7T9fMLwOJXLJ3sVOcIkbQdbnORTLGs5l2gRAzlpoySCoMm/IDYSU9flMOqMdIDSMXtri7qWbcEXiVjkVpNNRS4iLNpYVNyH4vBhBOfzdqsqGy4Zsi3DpWeHYF1F7n/sMNSpcPRFQfk185WMTnPttlJeV0O9HZLApsK3Q8WowM2HG3DVhfWNYhe8wBHUb6KkWHjJ+lHMFPcMCcny9kviiW6LtFgwBAvOne2dOFHXG2pTJDyP5VsWhYLQc8AqLlXTaDROKGiRK3mLHfMdy9DhRXnH+aPEEXiOO3dH6ls1pRrJxIIl4GrKzbYmI5yH7JKooeVgJQlueSisDSQ19McBo8tIpSIaLdHjUmSs9y4bsBEYJ/V26owIRsWh9TIMOL+xd4WijmbN6ff5PA+8+zGJLxOh7TkjneTruSVngmTafBzz87rzFd3pFP26ZRiHCZNitEdF+EBgFthKnehum5fqHbGn95GXkrlt+ShZRO/D8Oun
qEI4X34QW3qdgWoC/6jw+R6/JAJWPVNJABitQ36HJECbwBXjmqsX0+nrD7drsCNhZlgca9kL+GBjTWOjXysayWv0LAi4s595IefML+n/8mz1oPVqHL73U1DLHbWM890G1Q47YAzkpIdwU4tgmHB9Jjqmao/ESLRqMozc4N9l6MrULS0JE87VrGDbgn/KPsJE/HuI3FKUpCMHSHDSO8UpDSH8DLjFZPc6mBEohEFCIBoeU+rZ3bvNRG02hH4ZncW9jAiEauhf0O2EaHJQ0Oui3D2a3W7Bydz7bAEGEDRhZXrwEte23YH6zxT7SS/biqpjRDlfZarn+frzwftRGKdO4bknwB5bejIUT52H8MXAU0OHBuqAa4QgZu3QbtjIbWPvNNBTyQmpQCBH2MICRx3XM7isb+Qn+kNFgPEWterv1pMDoillcyoITnWChvduPeSOzAvRQVbQImYbEK/II0XHPrCgdsL3acHAdyoTbcIkbQdbnORTLGs5l2gRAzlpoySCoMm5cmcSXtC3YL6PcYCAMHs42OiRa5xFjAu2Ac9JFSwhLd1ZBIOF5fhnBOfzdqsqGy4Zsi3DpWeHYF1F7n/sMNSpcPRFQfk185WMTnPttlJeV0O9HZLApsK3Q8WowM2HGnDXhfWNYhe8wBHUb6KkWHjJ+lGZGvJaCsemrRy5gDiO5gkzVAqfn+aYYgLXEmQAezPd51oRhtfQK8J4dQfUZmtPLD/HK3GHRPIbkITtFHuS+qPNEXiOO3dH6ls1pRrJxIIl4GrKzbYmI5yH7JKooeVgJQlueSisDSQ19McBo8tIpSIaLdHjUmSs9y4bsBEYJ/V26owIRsWh9TIMOL+xd4WijmbN6ff5PA+8+zGJLxOh7TkjneTruSVngmTafBzz87rzFd3pFP26ZRiHCZNitEdF+EBgFthKnehum5fqHbGn95GXkrlt+ShZRO/D8Oun
Binary file modified x64/SAMMI Core.exe
Binary file not shown.
Binary file modified x64/data.win
Binary file not shown.
2 changes: 1 addition & 1 deletion x64/options.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
SleepMargin=0
Usex64=True
[LLVM-WINDOWS]
VisualStudioDir=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat
VisualStudioDir=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat
[sammiDLL]
Loading

0 comments on commit f179a0f

Please sign in to comment.