Merge release-4.6 branch into development#3398
Merged
vadi2 merged 12 commits intodevelopmentfrom Mar 10, 2020
Merged
Conversation
This reverts commit b7c569f.
…3385) * Fix missing include * Styling
* Simplified PR 3367 Split the functionality of PR 3367 into to internal functions one create Label in UserWindow and the other in the MainWindow Only functional change to PR 3367 is that fillbackground is non-optional again * Update TLuaInterpreter.cpp typo in errormsg (cherry picked from commit 8190d12)
* possible fix for MacOS flickering cause by QOpenGLWidget * Update src/Host.cpp Co-authored-by: Vadim Peretokin <vperetokin@gmail.com> (cherry picked from commit 897dcfd)
This code:
local oldCL = createLabel
function createLabel(name, posX, posY, width, height, fillBackground)
oldCL(name, 0, 0, 0, 0, fillBackground)
moveWindow(name, posX, posY)
resizeWindow(name, width, height)
end
Doesn't understand the new parent argument, and thus no label gets created.
* Add missing Geyser file to mudet.pro * fix bloody typo Co-authored-by: Slobodan Terzić <githzerai06@gmail.com>
demonnic
approved these changes
Mar 9, 2020
keneanung
approved these changes
Mar 10, 2020
This file contains hidden or 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
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.
Brief overview of PR changes/additions
Put all the fixes in release-4.6 branch into development
Motivation for adding to Mudlet
Release process.
Other info (issues closed, discussion etc)
This branch should not be deleted until we're sure a 4.6 hotfix isn't needed anymore (a couple of weeks).