-
-
Notifications
You must be signed in to change notification settings - Fork 72
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow pack devs to specify font and font size for messages #379
Open
Bauumm
wants to merge
8
commits into
vittorioromeo:develop
Choose a base branch
from
Bauumm:fontoptions
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b5e6494
Add functions to set font and font size for messages
Bauumm 6141d71
Add doc
Bauumm acd4d5a
use const
Bauumm 822c57d
move messageCharacterSize into HGStatus
Bauumm 87c2cd9
Add test level for custom fonts
Bauumm 339816c
Use concat to add strings
Bauumm 837b210
Merge remote-tracking branch 'origin/develop' into HEAD
Bauumm 80a2838
add way to get fonts from other packs
Bauumm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -169,6 +169,21 @@ void HexagonGame::initLua_Utils() | |||||
.doc( | ||||||
"Force-swaps (180 degrees) the player when invoked. If `$0` is " | ||||||
"`true`, the swap sound will be played."); | ||||||
|
||||||
addLuaFn(lua, "u_setMessageFont", // | ||||||
[this](std::string mFontId) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
messageText.setFont( | ||||||
assets.getFontOrNullFont(getPackId() + "_" + mFontId)); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe we can use the |
||||||
}) | ||||||
.arg("fontId") | ||||||
.doc( | ||||||
"Sets the font messages will use to `$0` which is the filename of " | ||||||
"a file inside the `Fonts` folder in your pack."); | ||||||
|
||||||
addLuaFn(lua, "u_setMessageFontSize", // | ||||||
[this](float mSize) { messageTextCharacterSize = mSize; }) | ||||||
.arg("size") | ||||||
.doc("Sets the font size messages will use to `$0`."); | ||||||
} | ||||||
|
||||||
void HexagonGame::initLua_AudioControl() | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This likely needs to be reset between levels or even between resets of the same level. Maybe make it part of
HGStatus
? That should get reset automatically.