Skills menu + merged settings #596
Merged
Conversation
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
…trying to render text. * add some nullptr guards for Text() rendering for book compiling - returns nullptrs for some reason?
* Add 2 GL buffers for grayscale color palettes * import/export statues from data/statues/ folder
resolutions sorted in a more sensible manner Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Settings window lets you change screen resolution Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
fix text being wayyy too big Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
moving mouse changes UI selection Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
add dimmers to all existing windows Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Fixed sliders in main menu glitching out when dragging them MainMenu.cpp: dropdown items can be disabled / grayed out Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
* slider uses individual player mouse x/y instead of global mouse x/y
Add minimap and messages windows Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
* skillsheet allow resizing - add compact view WIP
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
…ECONTROLLER_ADDED and bindings never refreshed.
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
* colored book prompts * added stick axis for glyphs
* ignore commit for unpack alignment as seems to just break things TurningWheel@ce9b618
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
|
Tested this last night and it worked fine for me, I suggest merging it in so we don't waste too much time here |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.