Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/latest'
Browse files Browse the repository at this point in the history
  • Loading branch information
christinna9031 committed Jul 1, 2023
2 parents f4d9099 + 4b8246f commit 00ad7bc
Show file tree
Hide file tree
Showing 14 changed files with 240 additions and 4,603 deletions.
2,273 changes: 31 additions & 2,242 deletions bridge/bridge.html

Large diffs are not rendered by default.

Binary file modified bridge/bridge.zip
Binary file not shown.
2,273 changes: 31 additions & 2,242 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.
130 changes: 71 additions & 59 deletions patch notes.txt
Original file line number Diff line number Diff line change
@@ -1,77 +1,89 @@
====================================
SAMMI 2023.2.1 (May 2023)
SAMMI 2023.2.2 (June 2023)
====================================

[SAMMI Core]
-------------------------------------
Improvements:
- Updated translations:
- French [MisterK]
- English (UK) [wolbee]
- Spanish [Sebas]
- German [Chrizzz]
- SAMMI now detects when it is running on Wine and displays a warning that non-Windows platforms are not supported [Christina]
- The Local API server is now enabled by default in all new SAMMI versions to prevent confusion when using SAMMI Voice with the option previously disabled by default [Christina]
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 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]

Bug Fixes:
- Variables inside [] brackets are now correctly treated as variables, not text [Chrizzz & Sebas]
- Saving a variable with "undefined" is now allowed in some commands [Sebas]
- Resolved a crash on SAMMI launch for Wine users [Christina]
- The LAN IP is now correctly copied to the clipboard when using "Get LAN IP" on non-English Windows [Christina]
- Resolved various OBS WebSocket crashes and error messages related to input volume or filter enabled status [Christina]
- Resolved a bug that concatenated the previous command line result with the latest result (e.g., 'echo Hello' followed by 'echo World' occasionally resulted in 'HelloWorld') [Christina]
- The Twitch Low Trust trigger now returns the correct trigger number [Christina]
- Resolved other uncommon crashes, such as those occurring when navigating menus or using the "Get User Info" command [Christina]
- Fixed GUI issues in the Variable and YouTube window [Silverlink]

Known Bugs:
- Special characters in SAMMI folder path (like “ö”) might cause some features to malfunction
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]

[SAMMI Voice]
-------------------------------------
New Features:
- Added a new SAMMI Core command, "Voice: Toggle Status," to toggle the status of SAMMI Voice [Chrizzz]
- Added the "Confidence Level" setting, allowing users to set a minimum accuracy threshold for voice recognition [Chrizzz]
- Added the "Create Recognition Logfile" setting to display all recognized sentences with their confidence levels [Chrizzz]
- Added the "Auto import Voice Triggers" setting for automatically importing voice triggers from SAMMI Core [Chrizzz]
UI Changes:
- Added Integrations menu that lets you download all official SAMMI extensions [Christina]

Improvements:
- Added an error log file for improved debugging capabilities [Chrizzz]
- Added support for Japanese characters [Chrizzz]
- Implemented automatic filtering of duplicate entries [Chrizzz]
- Improved trigger organization by implementing alphabetical auto-sorting on startup [Chrizzz]
- Updated the settings INI file format to ensure compatibility with SAMMI Core [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:
- Fixed an issue where an error would occur if the trigger lines contained only a space character [Chrizzz]
- 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]

[SAMMI Panel]
[SAMMI Bridge]
-------------------------------------
New Features:
- Introduced Auto-Connection [Roadie]
- Added new triggers "SAMMI Panel Connected" and "SAMMI Panel Disconnected" [Christina]
- Added a new global variable "panel_connected" to check if SAMMI Core is connected to SAMMI Panel [Christina]
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:
- Improved text fit for buttons [Roadie]
- Improved button placement and spacing to take up full window [Roadie & Sebas]
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

Bug Fixes:
- "Release Press" now triggers when the button is dragged away, not just on finger release [Roadie]
- "Disconnect Button" now properly closes the connection with SAMMI [Roadie & Christina]
- Text now breaks only on line breaks saved within SAMMI, preventing inappropriate line breaks [Roadie]
- The alert now displays 'SAMMI Panel Connected/Disconnected' when SAMMI Panel is connected or disconnected [Christina]
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

[SAMMI Updater]
-------------------------------------
New Features:
- When extension reinstallation
fails during the SAMMI Bridge update, a popup message displays the failed extensions (not included in the updated bridge file), and a backup bridge file is created in the bridge/backup folder to prevent data loss [Christina]
- Added a button to SAMMI Core Settings to manually open SAMMI Updater, allowing users to check for new versions of SAMMI components (SAMMI only checks for new SAMMI Core versions) [Christina]
Removed Features: [Christina]
- Twitch Test Host Trigger has been removed

Improvements:
- To accommodate users who have not migrated from the Transmitter folder, SAMMI Updater checks both the bridge and transmitter folders for extension files when SAMMI Bridge is being updated. If extensions are missing from the bridge folder but present in the transmitter folder, they are copied to the bridge folder [Christina]
Bug Fixes: [Christina]
- Twitch test subscriber trigger now correctly returns 'sub' context for 1 month subscribers and 'resub' context for 2 months+ subscribers

Bug Fixes:
- Extension files using LF (line feed) are now correctly reinstalled [Christina]
- The updater no longer silently ignores extensions that fail to reinstall [Christina]
35 changes: 35 additions & 0 deletions update.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,41 @@
"file": "SAMMI Updater.exe"
}
}
},
{
"version": "2023.2.2",
"components": {
"SAMMI Core": {
"version": "2023.2.2.0",
"sum": "d9542d065f40f72f5098829519fa6da0e5fdbdb0dd644962b8d7ea5c2ff4bfa8",
"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.20",
"path": "bridge",
"file": "default.txt",
"sum": null
},
"SAMMI Panel": {
"version": "0.9.2",
"sum": "4153e856daa87caf4e2ef5b47011c1a496c29f98e793b487f9d4dba8918a54d1",
"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+rZ3bvNRG02hH4ZncW9jA7QZugL2u+Hayde1LqkiGiY3GCUnd6qPAVSFWA8ZymgHILm2NbylUD7SS/biqpjRDlfZarn+frzwftRGKdO4bknwB5bejIUT52H8MXAU0OHBuqAa4QgZu3QbtjIbWPvNNBTyQmpQCBH2MICRx3XM7isb+Qn+kNFgPEWterv1pMDoillLS4JR3HV1KdqbuvcywyNQ1+EJjJPQKuaJEiTbO/9dpKgPJeadipEO8IkbQdbnORTLGs5l2gRAzlpoySCoMnocWBHVNWyMOqBJdTTYXpt3+2UaJwX2V21Bp1KRi53LI0KV9+H4aU0BOfzdqsqGy4Zsi3DpWeHYF1F7n/sMNSpcPRFQfk185WMTnPttlJeV0O9HZLApsK3Q8WowM2HG3DWieiPbF//2xjkb4SvVjmY+EndDvBRBc78/Uuy1GmPtV1lAQWYlOObNFvZQDJSejGB7AZIgYHXI8otcFyCYjdNLjvAf3WLFqNNxdnvR3nD+qbHCjWMNSQE9FcxrBbOysN04nLYwbYmJJyC4I6qr6kjPQ1paHniDy479MURrY8FtiMBLNzoETquti5C41IGK/F/5osGB5Sj7UFvJrO1GojnqWjy3vjkIgO4ljzMCB3s/H4p1rjpt2c3iXLUfVms8aKxRdb/GvyBXCapAoVstQ5av0orStpExfwij5noBemzu/v/ttMh4WYeTqSTr+unmJY=
qEI4X34QW3qdgWoC/6jw+R6/JAJWPVNJABitQ36HJECbwBXjmqsX0+nrD7drsCNhZlgca9kL+GBjTWOjXysayWv0LAi4s595IefML+n/8mz1oPVqHL73U1DLHbWM890G1Q47YAzkpIdwU4tgmHB9Jjqmao/ESLRqMozc4N9l6MrULS0JE87VrGDbgn/KPsJE/HuI3FKUpCMHSHDSO8UpDSH8DLjFZPc6mBEohEFCIBoeU+rZ3bvNRG02hH4ZncW9jF3RZ+le0+vWY3Bc0rqj3zjB1zzLzYitawIFRDY1Zin2T4Pm0oeok0f7SS/biqpjRDlfZarn+frzwftRGKdO4bknwB5bejIUT52H8MXAU0OHBuqAa4QgZu3QbtjIbWPvNNBTyQmpQCBH2MICRx3XM7isb+Qn+kNFgPEWterv1pMDoillJX4EGiuDivw/OOuPwlGLRFnQJmFFT6nPcB+XOrX9cZLzbpbKIi9FNsIkbQdbnORTLGs5l2gRAzlpoySCoMm/ITUWU9XlaL6PItOBNipv3eiROptIjgvgAs8YR3ghco4KA9/XsvI1BOfzdqsqGy4Zsi3DpWeHYF1F7n/sMNSpcPRFQfk185WMTnPttlJeV0O9HZLApsK3Q8WowM2HG3DVhfWNYhe8wBHUb6KkWHjJ+lGeH/FfCZ2m+Eyy0T6O4g5mUVHBm7aUZVLWRDIDcWLZ4wtFhtfWKsB7IF3XMzcbe23BKSSLFaMaxtjpSCySrfOXEXiOO3dH6ls1pRrJxIIl4GrKzbYmI5yH7JKooeVgJQlueSisDSQ19McBo8tIpSIaLdHjUmSs9y4bsBEYJ/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.
Loading

0 comments on commit 00ad7bc

Please sign in to comment.