Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move vadi2/mudlet-lua into Mudlet/Mudlet officially #832

Merged
merged 341 commits into from Apr 4, 2017

Conversation

vadi2
Copy link
Member

@vadi2 vadi2 commented Apr 4, 2017

This is all pre-reviewed code that is already available in latest development (with a few minor last-min merges) that I'm moving from vadi2/mudlet-lua into the Mudlet repository officially. The amount of commits is big because I'm moving all of the files with history, instead of copy/pasting them as that was the case before.

You'll see that the only actual differences really are the few outstanding PRs I've merged in.

Historically, mudlet-lua was split off into a separate branch for maintenance because the official Mudlet development was rather cumbersome and patch-based. We have solved that problem with time however and it was now the fact that mudlet-lua was in a separate repository became the issue: we have to sync things every once in a while, it's harder to tag releases everywhere, we have to move things to and from repositories, and PRs that affect both repositories have to be duplicated.

Tagging @Mudlet/lua-interface for review.

Beliar83 and others added 30 commits April 26, 2011 12:45
…arent (auto-hidden) or itself. This makes it possible for them to retain its hidden status when its parent is hidden or shown.
…king

Conflicts:
	lua/LuaGlobal.lua
	lua/geyser/GeyserMapper.lua
Signed-off-by: Vadim Peretokin <vperetokin@gmail.com>
…ections as well as numbers

Signed-off-by: Vadim Peretokin <vperetokin@gmail.com>
dicene and others added 21 commits March 9, 2017 08:20
Change to getColorWildcard function to include first character on line and to allow single character long runs of color.
lunarmodules/ldoc#265 explained how to document table parameters.
Add setHexFgColor and setHexBgColor
Mudlet uses X11 colours as the base, not the W3C standard and it hasn't been an issue thus far - plus you can adjust the colours table to whatever is needed. Happy to put forceWebColorsTable() if there's demand for it but as far as I see there isn't much and having options people don't need is not sustainable long-term.
BugFix: revise & add colour definitions to provided table
Moving vadi2/mudlet-lua into main Mudlet repository.
@vadi2 vadi2 added the 1 - Ready label Apr 4, 2017
@vadi2 vadi2 self-assigned this Apr 4, 2017
Copy link
Member

@keneanung keneanung left a comment

Choose a reason for hiding this comment

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

👍 (Yay for faking git history :D)

@vadi2
Copy link
Member Author

vadi2 commented Apr 4, 2017

Yeah, really cool how Git is really powerful to allow this and it'll enable blame and bisect to work.

@vadi2
Copy link
Member Author

vadi2 commented Apr 4, 2017

Just because it's late and I want a 2nd confirmation - we want to use merge commit for this, yeah?

@keneanung
Copy link
Member

Since we want to keep the history, yes!

@vadi2 vadi2 merged commit 4862ef5 into Mudlet:development Apr 4, 2017
@vadi2 vadi2 deleted the move-vadi2-mudlet-lua branch April 5, 2017 03:14
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.

None yet

9 participants