Skip to content

Merge release-4.6 branch into development#3398

Merged
vadi2 merged 12 commits intodevelopmentfrom
release-4.6
Mar 10, 2020
Merged

Merge release-4.6 branch into development#3398
vadi2 merged 12 commits intodevelopmentfrom
release-4.6

Conversation

@vadi2
Copy link
Copy Markdown
Member

@vadi2 vadi2 commented Mar 9, 2020

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).

vadi2 and others added 10 commits March 3, 2020 21:30
* 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.
@vadi2 vadi2 requested a review from a team as a code owner March 9, 2020 15:52
@vadi2 vadi2 requested review from a team March 9, 2020 15:52
* Add missing Geyser file to mudet.pro

* fix bloody typo

Co-authored-by: Slobodan Terzić <githzerai06@gmail.com>
@vadi2 vadi2 merged commit 4c63abd into development Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants