Resolve conflicts in dlgConnectionProfile class [ci skip]

Remove (Host *)HostManager::self() as per AC's changes in
commit-2555505ec897d3ebc72ce87bfbe156a...

Resolve c'flicts in Host/TConsole/TTextEdit/Timer classes + more [ci skip]

Also TAstar/TEvent/TFlipButton/cTelnet headers.

Note: TConsole loses unused methods:
* (QString...

Resolve c'flicts in TAlias class, Tree.h + one in TTrigger.cpp [ci skip]

Incorporates AC's PCRE memory leak fix of:
commit-fd9fcb9e1738be53a64a2f86375f30eb40e00912

Sign...

Resolve conflicts in all .ui files [ci skip]

Actually only main.ui and profile_preferences.ui are affected and it is
quite easy to pick out t...

Resolve conflicts in src.pro [ci skip]

This sets the APP_VERSION in that file to 3.0.0 and the APP_BUILD to "-dev"
this matches the val...

Started resolving TLuaInterpreter [WIP] [ci skip]

Resolved all conflicts in .travis.yml [skip ci]

Resolved all conflicts in travis.linux.before_install.sh

Resolved all conflicts in travis.linux.install.sh

[skip ci]

[skip ci]

Resolved all conflicts in GUIUtils lua/tests [ci skip]

Resolved all conflicts in genDoc.sh [ci skip]

This reverts commit b5f32649bf3a5eeb8ccbe35238e11014ba9bb84e.

* Update CMakeLists.txt and src.pro

Not finished resolving everything yet.

Resolve conflicts: EAction, glwidget, ActionUnit, TEasyButton classes…

Note: removed conflicting ActionUnit::processDataStream(...) declaration
from header file as the...

Resolve all conflicts in mudlet.{cpp,h} [ci skip]

Resolve all conflicts in XMLimport and XML export classes [ci skip]

In XMLimport / XMLexport classes generally retain the HEAD version except
for TAction::mButtonSt...

QString const plus keeping AC's memory leak fixes.

Resolve all conflicts in TRoom and TRoomDB classes [ci skip]

Generally choose QString argument passing by const reference as opposed to
by value?

Signed-off...

Resolve nearly all conflicts in T2DMap.cpp and T2DMap.h [ci skip]

Signed-off-by: Stephen Lyons <[email protected]>

Resolve nearly all conflicts in TMap.cpp and TMap.h

Leaving the TEvent stuff until I can find out about which way to go.

Signed-off-by: Stephen Lyo...

In a choice between Host * and QPointer<Host> choose the latter.

Signed-off-by: Stephen Lyons <...

(the_merge) Resolve conflicts in src/CMakeLists.txt [ci skip]

It is my understanding that urgent bug fixes for the Release 3.0.0 need to
be based on a versio...

This is The Merge to merge what is essentially a fork in release_30 back into development branch...

Release 3.0 merge into master

Finally! 4 years worth the wait :)

(release 30)BugFix: fix mButtonState behaviour for non-Push-Down "Buttons"

Revised: (void)TAction::execute() to always send the string associated with
the "down" command f...

Further decrufting.

Signed-off-by: Stephen Lyons <[email protected]>

The mudlet class is a singleton and there are means to get it thoughout
the application so it is...

Removes one bit of cruft that will be involved in area I am working on.

Signed-off-by: Stephen ...

(dev) Add short commit SHA1 to version for the build

(dev) Move osx installer files to the installer project

(dev) Lua search path adaptions

Latest from https://github.com/IRE-Mudlet-Mapping/ire-mapping-script/blob/gh-pages/downloads/mud...

As per http://bugs.launchpad.net/mudlet/+bug/1369041 the built-in dialog
button that some OS/Wi...

Latest from https://github.com/IRE-Mudlet-Mapping/ire-mapping-script/blob/gh-pages/downloads/mud...

* (release_30)BugFix_buttonCommandUpAndDownRedux_modulesWithToolBars

This is ANOTHER attempt ...

(release_30) Modify the package.cpath for MacOS as well

Not much to say really!

Signed-off-by: Stephen Lyons <[email protected]>

This is ANOTHER attempt to get the Command Up and Down for buttons restored
to Mudlet to get the...

7922a3a4e3c71eae84fcfc1027d5c48ebaeb79ff added getMudletLuaDefaultPath() that returned a single ...

With this change, we can get rid of the run_mudlet helper script in the macOS
app bundle

* Changes to make AppImage install working on Linux

Mostly getting Mudlet to look for files usi...

With this change, we can get rid of the run_mudlet helper script in the macOS
app bundle

There is an extra project for the installer generation, which means the specific
files are bette...

Due to the increasing complexity, I moved the setting of the build information to an own script....

* Applied MCCP toggling patch from Michael

See https://bugs.launchpad.net/mudlet/+bug/1119884...

* Applied MCCP toggling patch from Michael

See https://bugs.launchpad.net/mudlet/+bug/1119884...

This should return a better short SHA1 because git will use longer short IDs, if there are any c...

7922a3a4e3c71eae84fcfc1027d5c48ebaeb79ff added getMudletLuaDefaultPath() that returned a single ...

* Fix cmake build to use C++11 as well

This necessitated updating minimum CMake version to on...

* BugFix: report regexp errors in TAlias correctly

Fixes a long standing bug https://bugs.lau...

(cherry picked from commit 46bf0723ef6f98220ccef4c2beaf588a1e9625c1)

* Changes to make AppImage install working on Linux

Mostly getting Mudlet to look for files u...

In commit-a7f81aafd9897cf38137f22638bfc3bca4d9f0d5 (Pull Request #372) a
change was made that r...

In commit-18750755c8a8acbb35a5dd65478333923da6a8e1 (Pull Request #373) a
change was made that r...

https://github.com/stevedonovan/LDoc/issues/265 explained how to document table parameters.

* Add Windows .ico

Generated with http://icoconvert.com, doubt it supports all of the Win10 f...

Change to getColorWildcard function to include first character on line and to allow single chara...

getMudletLuaDefaultPaths() is necessary for the AppImage on Linux to work as it helps us find th...

Seems to help a lot on my Hackintosh anyway, awaiting feedback from the users. Previously, once ...