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
Conversation
This file contains 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
…ws when using fixed size.
…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>
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.
Fix cecho link
Add setHexFgColor and setHexBgColor
Update GeyserLabel.lua
Basic callback method stuff
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.
keneanung
approved these changes
Apr 4, 2017
There was a problem hiding this 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)
Yeah, really cool how Git is really powerful to allow this and it'll enable blame and bisect to work. |
Just because it's late and I want a 2nd confirmation - we want to use merge commit for this, yeah? |
Since we want to keep the history, yes! |
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.
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.