Skip to content

Commit

Permalink
Merge pull request #10 from CristianVasile23/dev
Browse files Browse the repository at this point in the history
Release 3.5.0
  • Loading branch information
CristianVasile23 committed Apr 15, 2023
2 parents beb2744 + 2012402 commit e6f4e66
Show file tree
Hide file tree
Showing 28 changed files with 553 additions and 308 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -118,7 +118,8 @@ jobs:
js/ \
css/ \
lang/ \
img/
img/ \
packs/
# Don't forget to add a backslash at the end of the line for any
# additional files or directories!
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
@@ -0,0 +1,2 @@
# Ignore all HBS files:
*.hbs
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,9 @@
## 3.5.0

- Added the _Speak As_ functionality. When a conversation is active, the GM can now toggle if they want chat messages to be sent under the name of the currently active conversation participant.
- Added macros which can be used to programmatically trigger several of the ConversationHUD functionalities.
- Miscellaneous improvements and code refactoring.

## 3.4.0

- Improved the drag and drop functionality to allow journal entries as well
Expand Down
26 changes: 22 additions & 4 deletions css/hud.css
Expand Up @@ -298,8 +298,7 @@
z-index: 20;
}

.conversation-controls-minimize-button,
.conversation-controls-save-button {
.conversation-controls-button {
display: flex;
flex-flow: column;
justify-content: center;
Expand All @@ -319,14 +318,33 @@
border: 1px solid var(--color-border-dark);
border-radius: 5px;
}
.conversation-controls-minimize-button:hover,
.conversation-controls-save-button:hover {
.conversation-controls-button:hover {
color: var(--color-text-light-highlight);
border: 1px solid var(--color-border-highlight-alt);
border-bottom: 1px solid var(--color-border-highlight);
box-shadow: 0 0 10px var(--color-shadow-highlight);
}

.conversation-controls-button.margin {
margin-top: 30px;
}

.conversation-controls-button.toggle {
background: rgba(30, 0, 60, 0.5);
border: 1px solid #3b1893;
}
.conversation-controls-button.toggle:hover {
background: rgba(60, 0, 120, 0.75);
border: 1px solid #9b8dff;
box-shadow: 0 0 10px #9b8dff;
}

.conversation-controls-button.toggle.active {
background: rgba(60, 0, 120, 0.75);
border: 1px solid #9b8dff;
box-shadow: 0 0 10px #9b8dff;
}

.conversation-hud-content .conversation-hud-dropzone {
display: none;
flex-flow: column;
Expand Down
15 changes: 15 additions & 0 deletions img/macro-icons/comments-solid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions img/macro-icons/eye-solid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions img/macro-icons/quote-left-solid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions img/macro-icons/toggle-off-solid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions img/macro-icons/user-group-solid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion js/controls.js
Expand Up @@ -7,7 +7,7 @@ Hooks.on("getSceneControlButtons", (controls) => {
title: game.i18n.localize("CHUD.activateHUD"),
icon: "fas fa-comments",
toggle: true,
active: game.ConversationHud.getConversationStatus(),
active: game.ConversationHud.conversationIsActive,
visible: game.user.isGM,
onClick: (toggle) => {
Hooks.call("toggleConversation", toggle);
Expand Down

0 comments on commit e6f4e66

Please sign in to comment.