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

Added Buzzer Beater to demos #3482

Merged
merged 4 commits into from Apr 8, 2017
Merged

Added Buzzer Beater to demos #3482

merged 4 commits into from Apr 8, 2017

Conversation

@Jousboxx
Copy link
Contributor

Jousboxx commented Apr 2, 2017

It would make me veryy happy if you merged this :)))

@tresf
Copy link
Member

tresf commented Apr 2, 2017

For those not aware, this is the winner of the LMMS sponsored Kicker-ONLY competition.

@Jousboxx please update LICENSE.TXT and we'll merge.

Note, moving forward, we will be stripping all non-CC0 projects, so this track will be removed in a future version of LMMS if it cannot be released CC0.

Developers, once ready, this PR should be merged against stable-1.2 branch (or cherry-picked against 1.2, accordingly).

@tresf
Copy link
Member

tresf commented Apr 2, 2017

.. and a pic, because everyone loves pics... (missing plugins are a bug w/ my mac version -- please ignore)
screen shot 2017-04-02 at 1 28 50 pm

@Jousboxx
Copy link
Contributor Author

Jousboxx commented Apr 2, 2017

Ok, I updated LICENSES.TXT. I put in BY-SA similar to most of the other projects. I am no lawyer but a quick google shows that CC0 is no rights reserved. I would be ok with that, but BY-SA would be preffered.

@@ -85,3 +85,7 @@
* unfa-Spoken.mmpz
- CC (by-nc)
- https://lmms.io/lsp/index.php?action=show&file=4929

* Jousboxx-BuzzerBeater.mmpz

This comment has been minimized.

Copy link
@tresf

tresf Apr 2, 2017

Member

Can you please bump that asterisk in a notch? :)

@tresf
Copy link
Member

tresf commented Apr 2, 2017

CC0 is no rights reserved. I would be ok with that, but BY-SA would be preferred.

We will likely remove our demos and start from scratch. Most musicians don't want their best works going out CC0, and this is OK, but it's problematic to ship a DAW with samples that have restrictions, so it's a long term goal to clean this up.

We may re-ask when that time comes but chances are we will just start from a clean slate. 👍

@Jousboxx
Copy link
Contributor Author

Jousboxx commented Apr 2, 2017

I'm OK with this going out as CC0. This song isn't making me any money, and I will make much better songs in the future so this isn't like giving up the rights to my big hit or anything.

Updated asterisk.

@@ -86,6 +86,6 @@
- CC (by-nc)
- https://lmms.io/lsp/index.php?action=show&file=4929

* Jousboxx-BuzzerBeater.mmpz
* Jousboxx-BuzzerBeater.mmpz

This comment has been minimized.

Copy link
@tresf

tresf Apr 3, 2017

Member

@Jousboxx one more space to the left please.

@Jousboxx
Copy link
Contributor Author

Jousboxx commented Apr 8, 2017

Done, not sure why I didn't get your message sooner.

@tresf
Copy link
Member

tresf commented Apr 8, 2017

I'm OK with this going out as CC0

We'll try our best to remember this when we clean our bundled content, thanks.

Done

Thanks, merging.

@tresf tresf merged commit e67779f into LMMS:master Apr 8, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Jousboxx
Copy link
Contributor Author

Jousboxx commented Apr 8, 2017

Awesome!! :D

tresf added a commit that referenced this pull request Apr 8, 2017
Add 2017 kicker competition winner to demo projects.
@tresf
Copy link
Member

tresf commented Apr 8, 2017

Cherry-picked to stable-1.2 as well via 32f07ac.

@jasp00
Copy link
Member

jasp00 commented Apr 9, 2017

Which CC version does lmms.io advertise?

@tresf
Copy link
Member

tresf commented Apr 9, 2017

Which CC version does lmms.io advertise?

None currently. The long term goal is CC0

@jasp00
Copy link
Member

jasp00 commented Apr 9, 2017

@Jousboxx, is CC BY-SA 4.0 fine for this demo?

@eagles051387
Copy link

eagles051387 commented Apr 10, 2017

@tresf
Copy link
Member

tresf commented Apr 10, 2017

We should really make an effort to leverage the LSP for future inclusions with some recommendations and some English explanations.

I'm not sure how a wiki would help.

@Jousboxx
Copy link
Contributor Author

Jousboxx commented Apr 12, 2017

@jasp00 sure, CC BY-SA 4.0 works.

@zonkmachine
Copy link
Member

zonkmachine commented Jul 14, 2018

@jasp00 sure, CC BY-SA 4.0 works.

Cool! I'm cleaning up some of the licenses right now and will update this. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.