Skip to content

Merge 3.3.0 development into master#1169

Merged
vadi2 merged 50 commits intomasterfrom
development
Jul 2, 2017
Merged

Merge 3.3.0 development into master#1169
vadi2 merged 50 commits intomasterfrom
development

Conversation

@vadi2
Copy link
Copy Markdown
Member

@vadi2 vadi2 commented Jul 2, 2017

No description provided.

vadi2 and others added 30 commits June 7, 2017 15:37
Merge pull request #1076 from itsTheFae/fix-SaveWindowLayoutOnAutoSaveExit
* shortcut added for delete action
* Delete TScriptEditorManager.h

* Delete TScriptEditorManager.cpp
… fork

import: some Zoilder fixes from the MudletRL fork:
* in TBuffer::translateToPlainText(...): make some MXP related code execute
  only if Host::mFORCE_MXP_NEGOTIATION_OFF is NOT set as well as another
  condition.
* in TBuffer::wrap(...): change a for(...) {...} loop termination condition
  be a "<" rather than a "<=" test - which sounds like an "off-by-one"
  error fix-up.
* In TTextEdit:updateScreenView(): revise code that seems to prevent the
  width of a "main" console being set too small and NOT written to the
  "parent" Host::mScreenWidth variable - the original modification
  removed such a restriction completely, but I have just lowered the
  minimum from 100 to 40 and ensured it is always stored both in the local
  "main" console and to the parent record in the Host class for that
  console.
* In TTextEdit::drawForeground(...): revise the behaviour *I think* when
  at the point where a console "split" becomes unnecessary...

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
* Fixed "reset map colors" button to work

That's a 5 year old bug out of the way!
* Change travis configuration to use installed gcc-5
Thanks to Rick for his prompt response on this
* Add Communi Model & Util libs

* Full refactor of IRC Client code & UI

This retains the primary functions of the old IRC client but adds many
more new IRC commands by default. The UI is slightly more organized and
interactive now.

* Adds QPointer to IRC Dialog pointer variable.

* Update Lua `sendIrc()` slightly.

* Added /msg command, Input History, and updated display colors.

Input History stores a total of 8 previously entered commands the user
can cycle through using the Up Arrow key.
The previously include /msg command has been added again.
Colors of some messages have been updated for (relatively) easier
distinction of message lines.

* Updated channel handling.

* Fix CMake builds

Things needed to fix CMake builds:
- communi CMake builds needed `include_directories` explicitly specified
- more MOC calls in communi
- more explicit dependencies to MOC files in communi
- ircmessageformatter must be compiled into mudlet
Changes IRC client to run with settings given per-profile, making the IRC client more visible and configurable within Lua.   
This adds configuration options to the settings window in the "Special Options" tab for configuring an IRC client on the host profile which opens the settings window.   
See the PR summary comment for details on available Lua functions and IRC Client commands.
* Create CODE_OF_CONDUCT.md
* Finished formatting all filed & added braces
* Re-enabled map load on profile load - disabling it broke scripts that relied on map data w/o the map open
* Fix bugs with Buttons & Toolbars.

- Fixed change detection for location, orienation, and CSS data.
- Buttons are not rendered unless they are part of a group,
Toolbar/Menu.
- ToolBars whos locations are changed now hide their previous TToolBar
or TEasyButtonBar instance as needed.

* Fix Buttons being left behind when parent toolbar is deleted.
Also allows TAction to use QPointer<T>
* also pushed isFolder() and setIsFolder() to the parent Tree class
vadi2 and others added 20 commits June 29, 2017 10:00
Deleted outdated dev_README file.

It also didn't seem to be used all that often, else people would have raised the fact that it's outdated...
* Re-add single QT 5.6 build job

Since we want to keep sure that the minimal Qt version is still compilable (currently we need at least 5.6), we add a single job for that version.
* refactor: rename QMake project/sub-project files

It is down right confusing having several project files in the Qt IDE
which are all labelled "src" - this commit renames the main project file
from "src.pro" to "mudlet.pro" and also renames:
* the lua_yajl module from src.pri to lua_yajl.pri
* the luazip module from src.pri to luazip.pri
it also:
* adds a new communi.pri file (see below)

I also took the liberty of renaming the project resource file from:
* mudlet_alpha.qrc to mudlet.qrc (we are well past the alpha stage now!)
and sorting a couple of items into the right order.

By creating a local project file 3rdparty/communi/communi.pri it is
possible to group the three separate but related communi libraries into
one - as it happens the effective content of the new file is identical to
that of the communi libraries own libcommuni/src/src.pri but it has some
notes on how the portion of the upstream library that we are using was
picked out of there; how to identify the effect version and how to
(hopefully) recreate things if upstream gets revised in the future!

By not using the upstream "src.pri"/"src.pro" files we avoid the confusion
of having a generic "src" project in the Mudlet project as a whole and it
is clearly identify-able as a file from the Mudlet project rather than the
sub-project that it pulls into the whole thing...

There is an minor nuisance side-effect in that having the main project
src.pro file open in a Qt Creator IDE or stored in a session will get
confused when this commit takes effect as the file will disappear from
the repository - it will be necessary to close the project and open the
new src/mudlet.pro project file (and possibly re-enter the build steps)
- OTOH the main project will now be identified as "mudlet" in Creator
rather than the previous "src". 😄

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
…#1154)

* Removes false from sendIrc() return, ignores command filtering status (not used).

* Remove punctuation from lua messages
Enforce uniform locale so scripts don't get tripped up on number representation differences (. vs ,)
* Adapt addMapEvent error messages to current standard
* Fix getMapEvents()
The function now returns a proper indexed table of objects that each describe
a map event.
* Modify files needed for CI deployment of linux builds

* Syntax fix in .travis.yml

* tar the CI AppImages as well

* Add lua sqlite runtime dependency

* Unset LD variable for linuxdeployqt

* Bugfix: unset LD_LIBRARY_PATH in every codepath

* Test: install appmenu-qt5 for global menus

* Revert 781ef97 (Install appmenu-qt5)

The issue was that the first AppImage used Qt 5.6.2 instead of Qt 5.9 (which is how 3.2 was built and how it is build now after merging development in)
…1117)

OK! Would be happy to see that in as well for maps that take a while to load (>1s).
It'll now return the original value passed - it's way better than returning the wrong value.
* Replaced statustips with tooltips in the mapper menu

* Removed statusbar
@vadi2 vadi2 added the 1 - Ready label Jul 2, 2017
@vadi2 vadi2 requested a review from a team July 2, 2017 06:25
Copy link
Copy Markdown
Contributor

@itsTheFae itsTheFae left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go. :)

@vadi2 vadi2 merged commit 7a2ba8e into master Jul 2, 2017
SlySven added a commit to SlySven/Mudlet that referenced this pull request Apr 5, 2022
There are files now in Mudlet that seem to have been forgotten from being
added to these variables so they can be seen in Qt Creator, they are:
* OTHER_FILES:
  * ./.devcontainer/Dockerfile (added by Mudlet#4087)
  * ./.devcontainer/devcontainer.json (added by Mudlet#4087)
  * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Mudlet#4088)
  * ./.github/workflows/generate-changelog.yml (added by Mudlet#6006)
  * ./CI/appveyor.validate_deployment.ps1 (added by Mudlet#3493)
  * ./CI/generate-changelog.lua (renamed from
      ./CI/generate-ptb-changelog.lua by Mudlet#6002, that file created by Mudlet#3517)
  * ./CI/travis.validate_deployment.sh (added by Mudlet#3493)
  * ./CI/update-autocompletion.lua (added by Mudlet#3452)
  * ./dangerfile.js (added by Mudlet#5489)
  * ./docker/.env.template (added by Mudlet#5047)
* DISTFILES:
  * ./.clang-tidy (added by Mudlet#4858)
  * ./cmake/FindLua51.cmake (added by Mudlet#3167)
  * ./cmake/FindSparkle.cmake (added Mudlet#3477)
  * ./cmake/FindZZIPLIB.cmake (added by Mudlet#3630)
  * ./cmake/IncludeOptionalModule.cmake (added by Mudlet#3174)
  * ./cmake/InitGitSubmodule.cmake (added by Mudlet#3171)

The following files have gone away:
* OTHER_FILES:
  * ./.github/workflows/whitespace-linter.yml (removed by Mudlet#4152)
  * ./.travis.yml (removed by Mudlet#5611)
  * ./README (renamed to ./dev_README by Mudlet#439, removed by Mudlet#1169)

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven added a commit that referenced this pull request Apr 5, 2022
…les (#6037)

This PR had three commits:
* The first commit just sorts in a case insensitive manner the files in the
OTHER_FILES and DISTFILES QMake variables. This is a precursor to making
changes to them.
* The second swaps some files between QMake OTHER_FILES and DISTFILES
variables. Technically the latter are for files that are needed to go into
a source tarball that the traditional GNU 'make dist' operation would
produce. As such it does not seem reasonable to include CI/CB control files
in it. Conversely the run-time LUA files that Mudlet needs definitely
should be included and so this commit moves them from the OTHER_FILES
variable, whose contents are merely files that we want to show up in the
Qt Creator IDE so they can be seen, searched and edited from there.
* The third changes the contents of QMake OTHER_FILES and DISTFILES
variables as there are files now in Mudlet that seem to have been forgotten
from being added to these variables so they can be seen in Qt Creator, they
are:
  * OTHER_FILES:
    * ./.devcontainer/Dockerfile (added by Setup Mudlet for C++ Github
                                                           Codespace #4087)
    * ./.devcontainer/devcontainer.json (added by Setup Mudlet for C++
                                                    Github Codespace #4087)
    * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Open
                             Mudlet remotely using Github Codespaces #4088)
    * ./.github/workflows/generate-changelog.yml (added by Infrastructure:
                       add workflow to create changelog from the web #6006)
    * ./CI/appveyor.validate_deployment.ps1 (added by Add updater
                    validation to linux/macos/windows release builds #3493)
    * ./CI/generate-changelog.lua (renamed from
        ./CI/generate-ptb-changelog.lua by Infrastucture: update changelog
        generator to handle releases as well #6002, that file created by 
                          Add a changelog generator for PTB releases #3517)
    * ./CI/travis.validate_deployment.sh (added by Add updater validation
                               to linux/macos/windows release builds #3493)
    * ./CI/update-autocompletion.lua (added by Add action for automatic
                                  updates of Mudlet's autocompletion #3452)
    * ./dangerfile.js (added by Infrastructure: danger checks in JS #5489)
    * ./docker/.env.template (added by Docker development support #5047)
  * DISTFILES:
    * ./.clang-tidy (added by Add automated check to verify improvements
                                    against Mudlet's C++ style guide #4858)
    * ./cmake/FindLua51.cmake (added by Modernize cmake files (part 1)
                                                                     #3167)
    * ./cmake/FindSparkle.cmake (added Improve cmake osx #3477)
    * ./cmake/FindZZIPLIB.cmake (added by Build Mudlet for macOS with
                                                      Github Actions #3630)
    * ./cmake/IncludeOptionalModule.cmake (added by Cmake improve optional
                                                        module check #3174)
    * ./cmake/InitGitSubmodule.cmake (added by Cmake improve git submodule
                                                      initialization #3171)

Also, the following files have gone away:
  * OTHER_FILES:
    * ./.github/workflows/whitespace-linter.yml (removed by Delete
                                            whitespace-linter action #4152)
    * ./.travis.yml (removed by Infrastructure: delete .travis.yml #5611)
    * ./README (renamed to ./dev_README by Release 3.0 merge into master
                #439, removed by Merge 3.3.0 development into master #1169)

Signed-off-by: Stephen Lyons slysven@virginmedia.com
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.

7 participants